From 87a408a8466134c9c329871d921a8d8a8a76b126 Mon Sep 17 00:00:00 2001 From: Bradford Wetmore Date: Fri, 22 Aug 2008 18:48:00 -0700 Subject: [PATCH 01/91] 6497740: Limit the size of RSA public keys Reviewed-by: andreas, valeriep, vinnie --- .../security/pkcs11/P11KeyPairGenerator.java | 59 +++++--- .../sun/security/pkcs11/P11KeyStore.java | 11 ++ .../sun/security/pkcs11/P11RSAKeyFactory.java | 20 ++- .../sun/security/pkcs11/SunPKCS11.java | 89 ++++++++---- .../sun/security/rsa/RSAKeyFactory.java | 135 +++++++++++------- .../sun/security/rsa/RSAKeyPairGenerator.java | 59 ++++---- .../security/rsa/RSAPrivateCrtKeyImpl.java | 7 +- .../sun/security/rsa/RSAPrivateKeyImpl.java | 4 +- .../sun/security/rsa/RSAPublicKeyImpl.java | 9 +- .../security/mscapi/RSAKeyPairGenerator.java | 44 +++--- .../sun/security/mscapi/RSASignature.java | 30 ++-- 11 files changed, 299 insertions(+), 168 deletions(-) diff --git a/jdk/src/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java b/jdk/src/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java index 701e104d529..1027df9ddb7 100644 --- a/jdk/src/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java +++ b/jdk/src/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -38,6 +38,8 @@ import static sun.security.pkcs11.TemplateManager.*; import sun.security.pkcs11.wrapper.*; import static sun.security.pkcs11.wrapper.PKCS11Constants.*; +import sun.security.rsa.RSAKeyFactory; + /** * KeyPairGenerator implementation class. This class currently supports * RSA, DSA, DH, and EC. @@ -66,7 +68,7 @@ final class P11KeyPairGenerator extends KeyPairGeneratorSpi { private AlgorithmParameterSpec params; // for RSA, selected or default value of public exponent, always valid - private BigInteger rsaPublicExponent; + private BigInteger rsaPublicExponent = RSAKeyGenParameterSpec.F4; // SecureRandom instance, if specified in init private SecureRandom random; @@ -88,19 +90,19 @@ final class P11KeyPairGenerator extends KeyPairGeneratorSpi { public void initialize(int keySize, SecureRandom random) { token.ensureValid(); try { - checkKeySize(keySize); + checkKeySize(keySize, null); } catch (InvalidAlgorithmParameterException e) { throw new InvalidParameterException(e.getMessage()); } this.keySize = keySize; this.params = null; this.random = random; - this.rsaPublicExponent = RSAKeyGenParameterSpec.F4; if (algorithm.equals("EC")) { params = P11ECKeyFactory.getECParameterSpec(keySize); if (params == null) { - throw new InvalidParameterException - ("No EC parameters available for key size " + keySize + " bits"); + throw new InvalidParameterException( + "No EC parameters available for key size " + + keySize + " bits"); } } } @@ -115,8 +117,10 @@ final class P11KeyPairGenerator extends KeyPairGeneratorSpi { ("DHParameterSpec required for Diffie-Hellman"); } DHParameterSpec dhParams = (DHParameterSpec)params; - this.keySize = dhParams.getP().bitLength(); - this.params = params; + int tmpKeySize = dhParams.getP().bitLength(); + checkKeySize(tmpKeySize, dhParams); + this.keySize = tmpKeySize; + this.params = dhParams; // XXX sanity check params } else if (algorithm.equals("RSA")) { if (params instanceof RSAKeyGenParameterSpec == false) { @@ -124,7 +128,9 @@ final class P11KeyPairGenerator extends KeyPairGeneratorSpi { ("RSAKeyGenParameterSpec required for RSA"); } RSAKeyGenParameterSpec rsaParams = (RSAKeyGenParameterSpec)params; - this.keySize = rsaParams.getKeysize(); + int tmpKeySize = rsaParams.getKeysize(); + checkKeySize(tmpKeySize, rsaParams); + this.keySize = tmpKeySize; this.params = null; this.rsaPublicExponent = rsaParams.getPublicExponent(); // XXX sanity check params @@ -134,13 +140,16 @@ final class P11KeyPairGenerator extends KeyPairGeneratorSpi { ("DSAParameterSpec required for DSA"); } DSAParameterSpec dsaParams = (DSAParameterSpec)params; - this.keySize = dsaParams.getP().bitLength(); - this.params = params; + int tmpKeySize = dsaParams.getP().bitLength(); + checkKeySize(tmpKeySize, dsaParams); + this.keySize = tmpKeySize; + this.params = dsaParams; // XXX sanity check params } else if (algorithm.equals("EC")) { ECParameterSpec ecParams; if (params instanceof ECParameterSpec) { - ecParams = P11ECKeyFactory.getECParameterSpec((ECParameterSpec)params); + ecParams = P11ECKeyFactory.getECParameterSpec( + (ECParameterSpec)params); if (ecParams == null) { throw new InvalidAlgorithmParameterException ("Unsupported curve: " + params); @@ -156,16 +165,17 @@ final class P11KeyPairGenerator extends KeyPairGeneratorSpi { throw new InvalidAlgorithmParameterException ("ECParameterSpec or ECGenParameterSpec required for EC"); } - this.keySize = ecParams.getCurve().getField().getFieldSize(); + int tmpKeySize = ecParams.getCurve().getField().getFieldSize(); + checkKeySize(tmpKeySize, ecParams); + this.keySize = tmpKeySize; this.params = ecParams; } else { throw new ProviderException("Unknown algorithm: " + algorithm); } this.random = random; - checkKeySize(keySize); } - private void checkKeySize(int keySize) + private void checkKeySize(int keySize, AlgorithmParameterSpec params) throws InvalidAlgorithmParameterException { if (algorithm.equals("EC")) { if (keySize < 112) { @@ -178,13 +188,28 @@ final class P11KeyPairGenerator extends KeyPairGeneratorSpi { ("Key size must be at most 2048 bit"); } return; + } else if (algorithm.equals("RSA")) { + BigInteger tmpExponent = rsaPublicExponent; + if (params != null) { + // Already tested for instanceof RSAKeyGenParameterSpec above + tmpExponent = + ((RSAKeyGenParameterSpec)params).getPublicExponent(); + } + try { + // This provider supports 64K or less. + RSAKeyFactory.checkKeyLengths(keySize, tmpExponent, + 512, 64 * 1024); + } catch (InvalidKeyException e) { + throw new InvalidAlgorithmParameterException(e.getMessage()); + } + return; } + if (keySize < 512) { throw new InvalidAlgorithmParameterException ("Key size must be at least 512 bit"); } - if (algorithm.equals("RSA") || - (algorithm.equals("DH") && (params != null))) { + if (algorithm.equals("DH") && (params != null)) { // sanity check, nobody really wants keys this large if (keySize > 64 * 1024) { throw new InvalidAlgorithmParameterException diff --git a/jdk/src/share/classes/sun/security/pkcs11/P11KeyStore.java b/jdk/src/share/classes/sun/security/pkcs11/P11KeyStore.java index 839a2f3ba64..b0e20711dc8 100644 --- a/jdk/src/share/classes/sun/security/pkcs11/P11KeyStore.java +++ b/jdk/src/share/classes/sun/security/pkcs11/P11KeyStore.java @@ -80,6 +80,8 @@ import static sun.security.pkcs11.P11Util.*; import sun.security.pkcs11.wrapper.*; import static sun.security.pkcs11.wrapper.PKCS11Constants.*; +import sun.security.rsa.RSAKeyFactory; + final class P11KeyStore extends KeyStoreSpi { private static final CK_ATTRIBUTE ATTR_CLASS_CERT = @@ -1328,6 +1330,15 @@ final class P11KeyStore extends KeyStoreSpi { BigInteger modulus = attrs[0].getBigInteger(); keyLength = modulus.bitLength(); + // This check will combine our "don't care" values here + // with the system-wide min/max values. + try { + RSAKeyFactory.checkKeyLengths(keyLength, null, + -1, Integer.MAX_VALUE); + } catch (InvalidKeyException e) { + throw new KeyStoreException(e.getMessage()); + } + return P11Key.privateKey(session, oHandle, keyType, diff --git a/jdk/src/share/classes/sun/security/pkcs11/P11RSAKeyFactory.java b/jdk/src/share/classes/sun/security/pkcs11/P11RSAKeyFactory.java index 5f3cbbf93c9..1bd764d326e 100644 --- a/jdk/src/share/classes/sun/security/pkcs11/P11RSAKeyFactory.java +++ b/jdk/src/share/classes/sun/security/pkcs11/P11RSAKeyFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -35,6 +35,8 @@ import static sun.security.pkcs11.TemplateManager.*; import sun.security.pkcs11.wrapper.*; import static sun.security.pkcs11.wrapper.PKCS11Constants.*; +import sun.security.rsa.RSAKeyFactory; + /** * RSA KeyFactory implemenation. * @@ -131,6 +133,9 @@ final class P11RSAKeyFactory extends P11KeyFactory { } catch (PKCS11Exception e) { throw new InvalidKeySpecException ("Could not create RSA public key", e); + } catch (InvalidKeyException e) { + throw new InvalidKeySpecException + ("Could not create RSA public key", e); } } @@ -175,11 +180,15 @@ final class P11RSAKeyFactory extends P11KeyFactory { } catch (PKCS11Exception e) { throw new InvalidKeySpecException ("Could not create RSA private key", e); + } catch (InvalidKeyException e) { + throw new InvalidKeySpecException + ("Could not create RSA private key", e); } } private PublicKey generatePublic(BigInteger n, BigInteger e) - throws PKCS11Exception { + throws PKCS11Exception, InvalidKeyException { + RSAKeyFactory.checkKeyLengths(n.bitLength(), e, -1, 64 * 1024); CK_ATTRIBUTE[] attributes = new CK_ATTRIBUTE[] { new CK_ATTRIBUTE(CKA_CLASS, CKO_PUBLIC_KEY), new CK_ATTRIBUTE(CKA_KEY_TYPE, CKK_RSA), @@ -200,7 +209,8 @@ final class P11RSAKeyFactory extends P11KeyFactory { } private PrivateKey generatePrivate(BigInteger n, BigInteger d) - throws PKCS11Exception { + throws PKCS11Exception, InvalidKeyException { + RSAKeyFactory.checkKeyLengths(n.bitLength(), null, -1, 64 * 1024); CK_ATTRIBUTE[] attributes = new CK_ATTRIBUTE[] { new CK_ATTRIBUTE(CKA_CLASS, CKO_PRIVATE_KEY), new CK_ATTRIBUTE(CKA_KEY_TYPE, CKK_RSA), @@ -222,7 +232,9 @@ final class P11RSAKeyFactory extends P11KeyFactory { private PrivateKey generatePrivate(BigInteger n, BigInteger e, BigInteger d, BigInteger p, BigInteger q, BigInteger pe, - BigInteger qe, BigInteger coeff) throws PKCS11Exception { + BigInteger qe, BigInteger coeff) throws PKCS11Exception, + InvalidKeyException { + RSAKeyFactory.checkKeyLengths(n.bitLength(), e, -1, 64 * 1024); CK_ATTRIBUTE[] attributes = new CK_ATTRIBUTE[] { new CK_ATTRIBUTE(CKA_CLASS, CKO_PRIVATE_KEY), new CK_ATTRIBUTE(CKA_KEY_TYPE, CKK_RSA), diff --git a/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java b/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java index b6eb1c258f4..6d0e045f2ee 100644 --- a/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java +++ b/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java @@ -120,11 +120,13 @@ public final class SunPKCS11 extends AuthProvider { } /** - * @deprecated use new SunPKCS11(String) or new SunPKCS11(InputStream) instead + * @deprecated use new SunPKCS11(String) or new SunPKCS11(InputStream) + * instead */ @Deprecated public SunPKCS11(String configName, InputStream configStream) { - super("SunPKCS11-" + Config.getConfig(configName, configStream).getName(), + super("SunPKCS11-" + + Config.getConfig(configName, configStream).getName(), 1.7d, Config.getConfig(configName, configStream).getDescription()); this.configName = configName; this.config = Config.removeConfig(configName); @@ -153,7 +155,8 @@ public final class SunPKCS11 extends AuthProvider { // // If we are in Secmod mode and configured to use either the // nssKeyStore or the nssTrustAnchors module, we automatically - // switch to using the NSS trust attributes for trusted certs (KeyStore). + // switch to using the NSS trust attributes for trusted certs + // (KeyStore). // if (useSecmod) { @@ -168,33 +171,40 @@ public final class SunPKCS11 extends AuthProvider { if (secmod.isInitialized()) { if (nssSecmodDirectory != null) { String s = secmod.getConfigDir(); - if ((s != null) && (s.equals(nssSecmodDirectory) == false)) { + if ((s != null) && + (s.equals(nssSecmodDirectory) == false)) { throw new ProviderException("Secmod directory " + nssSecmodDirectory - + " invalid, NSS already initialized with " + s); + + " invalid, NSS already initialized with " + + s); } } if (nssLibraryDirectory != null) { String s = secmod.getLibDir(); - if ((s != null) && (s.equals(nssLibraryDirectory) == false)) { + if ((s != null) && + (s.equals(nssLibraryDirectory) == false)) { throw new ProviderException("NSS library directory " + nssLibraryDirectory - + " invalid, NSS already initialized with " + s); + + " invalid, NSS already initialized with " + + s); } } } else { if (nssDbMode != DbMode.NO_DB) { if (nssSecmodDirectory == null) { - throw new ProviderException("Secmod not initialized and " - + "nssSecmodDirectory not specified"); + throw new ProviderException( + "Secmod not initialized and " + + "nssSecmodDirectory not specified"); } } else { if (nssSecmodDirectory != null) { - throw new ProviderException - ("nssSecmodDirectory must not be specified in noDb mode"); + throw new ProviderException( + "nssSecmodDirectory must not be " + + "specified in noDb mode"); } } - secmod.initialize(nssDbMode, nssSecmodDirectory, nssLibraryDirectory); + secmod.initialize(nssDbMode, nssSecmodDirectory, + nssLibraryDirectory); } } catch (IOException e) { // XXX which exception to throw @@ -211,7 +221,8 @@ public final class SunPKCS11 extends AuthProvider { if (nssModule != null) { moduleName = "fips"; } else { - moduleName = (nssDbMode == DbMode.NO_DB) ? "crypto" : "keystore"; + moduleName = (nssDbMode == DbMode.NO_DB) ? + "crypto" : "keystore"; } } if (moduleName.equals("fips")) { @@ -253,10 +264,12 @@ public final class SunPKCS11 extends AuthProvider { + ": only " + k + " external NSS modules available"); } } else { - throw new ProviderException("Unknown NSS module: " + moduleName); + throw new ProviderException( + "Unknown NSS module: " + moduleName); } if (nssModule == null) { - throw new ProviderException("NSS module not available: " + moduleName); + throw new ProviderException( + "NSS module not available: " + moduleName); } if (nssModule.hasInitializedProvider()) { throw new ProviderException("Secmod module already configured"); @@ -296,8 +309,9 @@ public final class SunPKCS11 extends AuthProvider { initArgs.flags = CKF_OS_LOCKING_OK; PKCS11 tmpPKCS11; try { - tmpPKCS11 = PKCS11.getInstance - (library, functionList, initArgs, config.getOmitInitialize()); + tmpPKCS11 = PKCS11.getInstance( + library, functionList, initArgs, + config.getOmitInitialize()); } catch (PKCS11Exception e) { if (debug != null) { debug.println("Multi-threaded initialization failed: " + e); @@ -312,8 +326,8 @@ public final class SunPKCS11 extends AuthProvider { } else { initArgs.flags = 0; } - tmpPKCS11 = PKCS11.getInstance - (library, functionList, initArgs, config.getOmitInitialize()); + tmpPKCS11 = PKCS11.getInstance(library, + functionList, initArgs, config.getOmitInitialize()); } p11 = tmpPKCS11; @@ -336,8 +350,10 @@ public final class SunPKCS11 extends AuthProvider { System.out.println("Slots with tokens: " + toString(slots)); } if (slotID < 0) { - if ((slotListIndex < 0) || (slotListIndex >= slots.length)) { - throw new ProviderException("slotListIndex is " + slotListIndex + if ((slotListIndex < 0) + || (slotListIndex >= slots.length)) { + throw new ProviderException("slotListIndex is " + + slotListIndex + " but token only has " + slots.length + " slots"); } slotID = slots[slotListIndex]; @@ -575,12 +591,15 @@ public final class SunPKCS11 extends AuthProvider { d(KF, "DH", P11DHKeyFactory, s("DiffieHellman"), m(CKM_DH_PKCS_KEY_PAIR_GEN, CKM_DH_PKCS_DERIVE)); d(KF, "EC", P11DHKeyFactory, - m(CKM_EC_KEY_PAIR_GEN, CKM_ECDH1_DERIVE, CKM_ECDSA, CKM_ECDSA_SHA1)); + m(CKM_EC_KEY_PAIR_GEN, CKM_ECDH1_DERIVE, + CKM_ECDSA, CKM_ECDSA_SHA1)); // AlgorithmParameters for EC. // Only needed until we have an EC implementation in the SUN provider. - d(AGP, "EC", "sun.security.ec.ECParameters", s("1.2.840.10045.2.1"), - m(CKM_EC_KEY_PAIR_GEN, CKM_ECDH1_DERIVE, CKM_ECDSA, CKM_ECDSA_SHA1)); + d(AGP, "EC", "sun.security.ec.ECParameters", + s("1.2.840.10045.2.1"), + m(CKM_EC_KEY_PAIR_GEN, CKM_ECDH1_DERIVE, + CKM_ECDSA, CKM_ECDSA_SHA1)); d(KA, "DH", P11KeyAgreement, s("DiffieHellman"), m(CKM_DH_PKCS_DERIVE)); @@ -654,12 +673,16 @@ public final class SunPKCS11 extends AuthProvider { d(SIG, "SHA512withRSA", P11Signature, m(CKM_SHA512_RSA_PKCS, CKM_RSA_PKCS, CKM_RSA_X_509)); - d(KG, "SunTlsRsaPremasterSecret", "sun.security.pkcs11.P11TlsRsaPremasterSecretGenerator", + d(KG, "SunTlsRsaPremasterSecret", + "sun.security.pkcs11.P11TlsRsaPremasterSecretGenerator", m(CKM_SSL3_PRE_MASTER_KEY_GEN, CKM_TLS_PRE_MASTER_KEY_GEN)); - d(KG, "SunTlsMasterSecret", "sun.security.pkcs11.P11TlsMasterSecretGenerator", + d(KG, "SunTlsMasterSecret", + "sun.security.pkcs11.P11TlsMasterSecretGenerator", m(CKM_SSL3_MASTER_KEY_DERIVE, CKM_TLS_MASTER_KEY_DERIVE, - CKM_SSL3_MASTER_KEY_DERIVE_DH, CKM_TLS_MASTER_KEY_DERIVE_DH)); - d(KG, "SunTlsKeyMaterial", "sun.security.pkcs11.P11TlsKeyMaterialGenerator", + CKM_SSL3_MASTER_KEY_DERIVE_DH, + CKM_TLS_MASTER_KEY_DERIVE_DH)); + d(KG, "SunTlsKeyMaterial", + "sun.security.pkcs11.P11TlsKeyMaterialGenerator", m(CKM_SSL3_KEY_AND_MAC_DERIVE, CKM_TLS_KEY_AND_MAC_DERIVE)); d(KG, "SunTlsPrf", "sun.security.pkcs11.P11TlsPrfGenerator", m(CKM_TLS_PRF, CKM_NSS_TLS_PRF_GENERAL)); @@ -773,6 +796,13 @@ public final class SunPKCS11 extends AuthProvider { System.out.println(token.tokenInfo); } long[] supportedMechanisms = p11.C_GetMechanismList(slotID); + + // Create a map from the various Descriptors to the "most + // preferred" mechanism that was defined during the + // static initialization. For example, DES/CBC/PKCS5Padding + // could be mapped to CKM_DES_CBC_PAD or CKM_DES_CBC. Prefer + // the earliest entry. When asked for "DES/CBC/PKCS5Padding", we + // return a CKM_DES_CBC_PAD. final Map supportedAlgs = new HashMap(); for (int i = 0; i < supportedMechanisms.length; i++) { @@ -807,6 +837,9 @@ public final class SunPKCS11 extends AuthProvider { supportedAlgs.put(d, integerMech); continue; } + // See if there is something "more preferred" + // than what we currently have in the supportedAlgs + // map. int intOldMech = oldMech.intValue(); for (int j = 0; j < d.mechanisms.length; j++) { int nextMech = d.mechanisms[j]; diff --git a/jdk/src/share/classes/sun/security/rsa/RSAKeyFactory.java b/jdk/src/share/classes/sun/security/rsa/RSAKeyFactory.java index 17ce8cde639..d877f28fb54 100644 --- a/jdk/src/share/classes/sun/security/rsa/RSAKeyFactory.java +++ b/jdk/src/share/classes/sun/security/rsa/RSAKeyFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved. * 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,6 +31,8 @@ import java.security.*; import java.security.interfaces.*; import java.security.spec.*; +import sun.security.action.GetPropertyAction; + /** * KeyFactory for RSA keys. Keys must be instances of PublicKey or PrivateKey * and getAlgorithm() must return "RSA". For such keys, it supports conversion @@ -68,6 +70,24 @@ public final class RSAKeyFactory extends KeyFactorySpi { private final static Class x509KeySpecClass = X509EncodedKeySpec.class; private final static Class pkcs8KeySpecClass = PKCS8EncodedKeySpec.class; + public final static int MIN_MODLEN = 512; + public final static int MAX_MODLEN = 16384; + + /* + * If the modulus length is above this value, restrict the size of + * the exponent to something that can be reasonably computed. We + * could simply hardcode the exp len to something like 64 bits, but + * this approach allows flexibility in case impls would like to use + * larger module and exponent values. + */ + public final static int MAX_MODLEN_RESTRICT_EXP = 3072; + public final static int MAX_RESTRICTED_EXPLEN = 64; + + private static final boolean restrictExpLen = + "true".equalsIgnoreCase(AccessController.doPrivileged( + new GetPropertyAction( + "sun.security.rsa.restrictRSAExponent", "true"))); + // instance used for static translateKey(); private final static RSAKeyFactory INSTANCE = new RSAKeyFactory(); @@ -76,74 +96,79 @@ public final class RSAKeyFactory extends KeyFactorySpi { } /** - * Static method to convert Key into a useable instance of - * RSAPublicKey or RSAPrivate(Crt)Key. Check the key and convert it - * to a SunRsaSign key if necessary. If the key is not an RSA key - * or cannot be used, throw an InvalidKeyException. - * - * The difference between this method and engineTranslateKey() is that - * we do not convert keys of other providers that are already an - * instance of RSAPublicKey or RSAPrivate(Crt)Key. + * Static method to convert Key into an instance of RSAPublicKeyImpl + * or RSAPrivate(Crt)KeyImpl. If the key is not an RSA key or cannot be + * used, throw an InvalidKeyException. * * Used by RSASignature and RSACipher. */ public static RSAKey toRSAKey(Key key) throws InvalidKeyException { - if (key instanceof RSAKey) { - RSAKey rsaKey = (RSAKey)key; - checkKey(rsaKey); - return rsaKey; + if ((key instanceof RSAPrivateKeyImpl) || + (key instanceof RSAPrivateCrtKeyImpl) || + (key instanceof RSAPublicKeyImpl)) { + return (RSAKey)key; } else { return (RSAKey)INSTANCE.engineTranslateKey(key); } } - /** - * Check that the given RSA key is valid. + /* + * Single test entry point for all of the mechanisms in the SunRsaSign + * provider (RSA*KeyImpls). All of the tests are the same. + * + * For compatibility, we round up to the nearest byte here: + * some Key impls might pass in a value within a byte of the + * real value. */ - private static void checkKey(RSAKey key) throws InvalidKeyException { - // check for subinterfaces, omit additional checks for our keys - if (key instanceof RSAPublicKey) { - if (key instanceof RSAPublicKeyImpl) { - return; - } - } else if (key instanceof RSAPrivateKey) { - if ((key instanceof RSAPrivateCrtKeyImpl) - || (key instanceof RSAPrivateKeyImpl)) { - return; - } - } else { - throw new InvalidKeyException("Neither a public nor a private key"); - } - // RSAKey does not extend Key, so we need to do a cast - String keyAlg = ((Key)key).getAlgorithm(); - if (keyAlg.equals("RSA") == false) { - throw new InvalidKeyException("Not an RSA key: " + keyAlg); - } - BigInteger modulus; - // some providers implement RSAKey for keys where the values are - // not accessible (although they should). Detect those here - // for a more graceful failure. - try { - modulus = key.getModulus(); - if (modulus == null) { - throw new InvalidKeyException("Modulus is missing"); - } - } catch (RuntimeException e) { - throw new InvalidKeyException(e); - } - checkKeyLength(modulus); + static void checkRSAProviderKeyLengths(int modulusLen, BigInteger exponent) + throws InvalidKeyException { + checkKeyLengths(((modulusLen + 7) & ~7), exponent, + RSAKeyFactory.MIN_MODLEN, Integer.MAX_VALUE); } /** - * Check the length of the modulus of an RSA key. We only support keys - * at least 505 bits long. + * Check the length of an RSA key modulus/exponent to make sure it + * is not too short or long. Some impls have their own min and + * max key sizes that may or may not match with a system defined value. + * + * @param modulusLen the bit length of the RSA modulus. + * @param exponent the RSA exponent + * @param minModulusLen if > 0, check to see if modulusLen is at + * least this long, otherwise unused. + * @param maxModulusLen caller will allow this max number of bits. + * Allow the smaller of the system-defined maximum and this param. + * + * @throws InvalidKeyException if any of the values are unacceptable. */ - static void checkKeyLength(BigInteger modulus) throws InvalidKeyException { - if (modulus.bitLength() < 505) { - // some providers may generate slightly shorter keys - // accept them if the encoding is at least 64 bytes long - throw new InvalidKeyException - ("RSA keys must be at least 512 bits long"); + public static void checkKeyLengths(int modulusLen, BigInteger exponent, + int minModulusLen, int maxModulusLen) throws InvalidKeyException { + + if ((minModulusLen > 0) && (modulusLen < (minModulusLen))) { + throw new InvalidKeyException( "RSA keys must be at least " + + minModulusLen + " bits long"); + } + + // Even though our policy file may allow this, we don't want + // either value (mod/exp) to be too big. + + int maxLen = Math.min(maxModulusLen, MAX_MODLEN); + + // If a RSAPrivateKey/RSAPublicKey, make sure the + // modulus len isn't too big. + if (modulusLen > maxLen) { + throw new InvalidKeyException( + "RSA keys must be no longer than " + maxLen + " bits"); + } + + // If a RSAPublicKey, make sure the exponent isn't too big. + if (restrictExpLen && (exponent != null) && + (modulusLen > MAX_MODLEN_RESTRICT_EXP) && + (exponent.bitLength() > MAX_RESTRICTED_EXPLEN)) { + throw new InvalidKeyException( + "RSA exponents can be no longer than " + + MAX_RESTRICTED_EXPLEN + " bits " + + " if modulus is greater than " + + MAX_MODLEN_RESTRICT_EXP + " bits"); } } diff --git a/jdk/src/share/classes/sun/security/rsa/RSAKeyPairGenerator.java b/jdk/src/share/classes/sun/security/rsa/RSAKeyPairGenerator.java index f800dec543b..2898a3d1f51 100644 --- a/jdk/src/share/classes/sun/security/rsa/RSAKeyPairGenerator.java +++ b/jdk/src/share/classes/sun/security/rsa/RSAKeyPairGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved. * 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 @@ public final class RSAKeyPairGenerator extends KeyPairGeneratorSpi { // public exponent to use private BigInteger publicExponent; - // size of the key to generate, >= 512 + // size of the key to generate, >= RSAKeyFactory.MIN_MODLEN private int keySize; // PRNG to use @@ -60,15 +60,16 @@ public final class RSAKeyPairGenerator extends KeyPairGeneratorSpi { // initialize the generator. See JCA doc public void initialize(int keySize, SecureRandom random) { - if (keySize < 512) { - throw new InvalidParameterException - ("Key size must be at least 512 bits"); - } - if (keySize > 64 * 1024) { - // do not allow unreasonably large key sizes, probably user error - throw new InvalidParameterException - ("Key size must be 65536 bits or less"); + + // do not allow unreasonably small or large key sizes, + // probably user error + try { + RSAKeyFactory.checkKeyLengths(keySize, RSAKeyGenParameterSpec.F4, + 512, 64 * 1024); + } catch (InvalidKeyException e) { + throw new InvalidParameterException(e.getMessage()); } + this.keySize = keySize; this.random = random; this.publicExponent = RSAKeyGenParameterSpec.F4; @@ -77,35 +78,41 @@ public final class RSAKeyPairGenerator extends KeyPairGeneratorSpi { // second initialize method. See JCA doc. public void initialize(AlgorithmParameterSpec params, SecureRandom random) throws InvalidAlgorithmParameterException { + if (params instanceof RSAKeyGenParameterSpec == false) { throw new InvalidAlgorithmParameterException ("Params must be instance of RSAKeyGenParameterSpec"); } + RSAKeyGenParameterSpec rsaSpec = (RSAKeyGenParameterSpec)params; - keySize = rsaSpec.getKeysize(); - publicExponent = rsaSpec.getPublicExponent(); - this.random = random; - if (keySize < 512) { - throw new InvalidAlgorithmParameterException - ("Key size must be at least 512 bits"); - } - if (keySize > 64 * 1024) { - // do not allow unreasonably large key sizes, probably user error - throw new InvalidAlgorithmParameterException - ("Key size must be 65536 bits or less"); - } - if (publicExponent == null) { - publicExponent = RSAKeyGenParameterSpec.F4; + int tmpKeySize = rsaSpec.getKeysize(); + BigInteger tmpPublicExponent = rsaSpec.getPublicExponent(); + + if (tmpPublicExponent == null) { + tmpPublicExponent = RSAKeyGenParameterSpec.F4; } else { - if (publicExponent.compareTo(RSAKeyGenParameterSpec.F0) < 0) { + if (tmpPublicExponent.compareTo(RSAKeyGenParameterSpec.F0) < 0) { throw new InvalidAlgorithmParameterException ("Public exponent must be 3 or larger"); } - if (publicExponent.bitLength() > keySize) { + if (tmpPublicExponent.bitLength() > tmpKeySize) { throw new InvalidAlgorithmParameterException ("Public exponent must be smaller than key size"); } } + + // do not allow unreasonably large key sizes, probably user error + try { + RSAKeyFactory.checkKeyLengths(tmpKeySize, tmpPublicExponent, + 512, 64 * 1024); + } catch (InvalidKeyException e) { + throw new InvalidAlgorithmParameterException( + "Invalid key sizes", e); + } + + this.keySize = tmpKeySize; + this.publicExponent = tmpPublicExponent; + this.random = random; } // generate the keypair. See JCA doc diff --git a/jdk/src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java b/jdk/src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java index ac296b49f60..640972a2495 100644 --- a/jdk/src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java +++ b/jdk/src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -89,7 +89,7 @@ public final class RSAPrivateCrtKeyImpl */ RSAPrivateCrtKeyImpl(byte[] encoded) throws InvalidKeyException { decode(encoded); - RSAKeyFactory.checkKeyLength(n); + RSAKeyFactory.checkRSAProviderKeyLengths(n.bitLength(), e); } /** @@ -107,7 +107,8 @@ public final class RSAPrivateCrtKeyImpl this.pe = pe; this.qe = qe; this.coeff = coeff; - RSAKeyFactory.checkKeyLength(n); + RSAKeyFactory.checkRSAProviderKeyLengths(n.bitLength(), e); + // generate the encoding algid = rsaId; try { diff --git a/jdk/src/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java b/jdk/src/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java index 1f883f4205d..860e7706bc9 100644 --- a/jdk/src/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java +++ b/jdk/src/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -61,7 +61,7 @@ public final class RSAPrivateKeyImpl extends PKCS8Key implements RSAPrivateKey { RSAPrivateKeyImpl(BigInteger n, BigInteger d) throws InvalidKeyException { this.n = n; this.d = d; - RSAKeyFactory.checkKeyLength(n); + RSAKeyFactory.checkRSAProviderKeyLengths(n.bitLength(), null); // generate the encoding algid = RSAPrivateCrtKeyImpl.rsaId; try { diff --git a/jdk/src/share/classes/sun/security/rsa/RSAPublicKeyImpl.java b/jdk/src/share/classes/sun/security/rsa/RSAPublicKeyImpl.java index c500ca2dee4..6db08f6a393 100644 --- a/jdk/src/share/classes/sun/security/rsa/RSAPublicKeyImpl.java +++ b/jdk/src/share/classes/sun/security/rsa/RSAPublicKeyImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved. * 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,10 +56,11 @@ public final class RSAPublicKeyImpl extends X509Key implements RSAPublicKey { * Construct a key from its components. Used by the * RSAKeyFactory and the RSAKeyPairGenerator. */ - public RSAPublicKeyImpl(BigInteger n, BigInteger e) throws InvalidKeyException { + public RSAPublicKeyImpl(BigInteger n, BigInteger e) + throws InvalidKeyException { this.n = n; this.e = e; - RSAKeyFactory.checkKeyLength(n); + RSAKeyFactory.checkRSAProviderKeyLengths(n.bitLength(), e); // generate the encoding algid = RSAPrivateCrtKeyImpl.rsaId; try { @@ -80,7 +81,7 @@ public final class RSAPublicKeyImpl extends X509Key implements RSAPublicKey { */ public RSAPublicKeyImpl(byte[] encoded) throws InvalidKeyException { decode(encoded); - RSAKeyFactory.checkKeyLength(n); + RSAKeyFactory.checkRSAProviderKeyLengths(n.bitLength(), e); } // see JCA doc diff --git a/jdk/src/windows/classes/sun/security/mscapi/RSAKeyPairGenerator.java b/jdk/src/windows/classes/sun/security/mscapi/RSAKeyPairGenerator.java index 146d7c1632d..44dd25ab8cd 100644 --- a/jdk/src/windows/classes/sun/security/mscapi/RSAKeyPairGenerator.java +++ b/jdk/src/windows/classes/sun/security/mscapi/RSAKeyPairGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2008 Sun Microsystems, Inc. All Rights Reserved. * 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,6 +31,7 @@ import java.security.spec.AlgorithmParameterSpec; import java.security.spec.RSAKeyGenParameterSpec; import sun.security.jca.JCAUtil; +import sun.security.rsa.RSAKeyFactory; /** * RSA keypair generator. @@ -43,8 +44,8 @@ import sun.security.jca.JCAUtil; public final class RSAKeyPairGenerator extends KeyPairGeneratorSpi { // Supported by Microsoft Base, Strong and Enhanced Cryptographic Providers - private static final int KEY_SIZE_MIN = 512; // disallow MSCAPI min. of 384 - private static final int KEY_SIZE_MAX = 16384; + static final int KEY_SIZE_MIN = 512; // disallow MSCAPI min. of 384 + static final int KEY_SIZE_MAX = 16384; private static final int KEY_SIZE_DEFAULT = 1024; // size of the key to generate, KEY_SIZE_MIN <= keySize <= KEY_SIZE_MAX @@ -59,7 +60,14 @@ public final class RSAKeyPairGenerator extends KeyPairGeneratorSpi { // random is always ignored public void initialize(int keySize, SecureRandom random) { - checkKeySize(keySize); + try { + RSAKeyFactory.checkKeyLengths(keySize, null, + KEY_SIZE_MIN, KEY_SIZE_MAX); + } catch (InvalidKeyException e) { + throw new InvalidParameterException(e.getMessage()); + } + + this.keySize = keySize; } // second initialize method. See JCA doc @@ -67,21 +75,31 @@ public final class RSAKeyPairGenerator extends KeyPairGeneratorSpi { public void initialize(AlgorithmParameterSpec params, SecureRandom random) throws InvalidAlgorithmParameterException { + int tmpSize; if (params == null) { - checkKeySize(KEY_SIZE_DEFAULT); - + tmpSize = KEY_SIZE_DEFAULT; } else if (params instanceof RSAKeyGenParameterSpec) { if (((RSAKeyGenParameterSpec) params).getPublicExponent() != null) { throw new InvalidAlgorithmParameterException ("Exponent parameter is not supported"); } - checkKeySize(((RSAKeyGenParameterSpec) params).getKeysize()); + tmpSize = ((RSAKeyGenParameterSpec) params).getKeysize(); } else { throw new InvalidAlgorithmParameterException ("Params must be an instance of RSAKeyGenParameterSpec"); } + + try { + RSAKeyFactory.checkKeyLengths(tmpSize, null, + KEY_SIZE_MIN, KEY_SIZE_MAX); + } catch (InvalidKeyException e) { + throw new InvalidAlgorithmParameterException( + "Invalid Key sizes", e); + } + + this.keySize = tmpSize; } // generate the keypair. See JCA doc @@ -95,18 +113,6 @@ public final class RSAKeyPairGenerator extends KeyPairGeneratorSpi { return new KeyPair(keys.getPublic(), keys.getPrivate()); } - private void checkKeySize(int keySize) throws InvalidParameterException { - if (keySize < KEY_SIZE_MIN) { - throw new InvalidParameterException - ("Key size must be at least " + KEY_SIZE_MIN + " bits"); - } - if (keySize > KEY_SIZE_MAX) { - throw new InvalidParameterException - ("Key size must be " + KEY_SIZE_MAX + " bits or less"); - } - this.keySize = keySize; - } - private static native RSAKeyPair generateRSAKeyPair(int keySize, String keyContainerName); } diff --git a/jdk/src/windows/classes/sun/security/mscapi/RSASignature.java b/jdk/src/windows/classes/sun/security/mscapi/RSASignature.java index 606423d53a4..982e1836a7d 100644 --- a/jdk/src/windows/classes/sun/security/mscapi/RSASignature.java +++ b/jdk/src/windows/classes/sun/security/mscapi/RSASignature.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2008 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -38,6 +38,9 @@ import java.security.SecureRandom; import java.security.Signature; import java.security.SignatureSpi; import java.security.SignatureException; +import java.math.BigInteger; + +import sun.security.rsa.RSAKeyFactory; /** * RSA signature implementation. Supports RSA signing using PKCS#1 v1.5 padding. @@ -124,7 +127,16 @@ abstract class RSASignature extends java.security.SignatureSpi // convert key to MSCAPI format - byte[] modulusBytes = rsaKey.getModulus().toByteArray(); + BigInteger modulus = rsaKey.getModulus(); + BigInteger exponent = rsaKey.getPublicExponent(); + + // Check against the local and global values to make sure + // the sizes are ok. Round up to the nearest byte. + RSAKeyFactory.checkKeyLengths(((modulus.bitLength() + 7) & ~7), + exponent, -1, RSAKeyPairGenerator.KEY_SIZE_MAX); + + byte[] modulusBytes = modulus.toByteArray(); + byte[] exponentBytes = exponent.toByteArray(); // Adjust key length due to sign bit int keyBitLength = (modulusBytes[0] == 0) @@ -132,8 +144,7 @@ abstract class RSASignature extends java.security.SignatureSpi : modulusBytes.length * 8; byte[] keyBlob = generatePublicKeyBlob( - keyBitLength, modulusBytes, - rsaKey.getPublicExponent().toByteArray()); + keyBitLength, modulusBytes, exponentBytes); publicKey = importPublicKey(keyBlob, keyBitLength); @@ -166,12 +177,11 @@ abstract class RSASignature extends java.security.SignatureSpi } privateKey = (sun.security.mscapi.RSAPrivateKey) key; - // Determine byte length from bit length - int keySize = (privateKey.bitLength() + 7) >> 3; - - if (keySize < 64) - throw new InvalidKeyException( - "RSA keys must be at least 512 bits long"); + // Check against the local and global values to make sure + // the sizes are ok. Round up to nearest byte. + RSAKeyFactory.checkKeyLengths(((privateKey.bitLength() + 7) & ~7), + null, RSAKeyPairGenerator.KEY_SIZE_MIN, + RSAKeyPairGenerator.KEY_SIZE_MAX); if (needsReset) { messageDigest.reset(); From 6aab63dd371dfeb79ce7c3a9c70fd1758c7c4a9f Mon Sep 17 00:00:00 2001 From: Weijun Wang Date: Wed, 1 Oct 2008 10:01:45 +0800 Subject: [PATCH 02/91] 6588160: jaas krb5 client leaks OS-level UDP sockets (all platforms) Reviewed-by: jccollet, chegar --- .../classes/sun/security/krb5/KrbKdcReq.java | 38 ++++++++++--------- .../sun/security/krb5/internal/UDPClient.java | 3 ++ 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/jdk/src/share/classes/sun/security/krb5/KrbKdcReq.java b/jdk/src/share/classes/sun/security/krb5/KrbKdcReq.java index e9ff9cc04d5..259aedd66fa 100644 --- a/jdk/src/share/classes/sun/security/krb5/KrbKdcReq.java +++ b/jdk/src/share/classes/sun/security/krb5/KrbKdcReq.java @@ -274,27 +274,31 @@ public abstract class KrbKdcReq { + ",Attempt =" + i + ", #bytes=" + obuf.length); } - /* - * Send the data to the kdc. - */ + try { + /* + * Send the data to the kdc. + */ kdcClient.send(obuf); - /* - * And get a response. - */ - try { - ibuf = kdcClient.receive(); - break; - } catch (SocketTimeoutException se) { - if (DEBUG) { - System.out.println ("SocketTimeOutException with " + - "attempt: " + i); - } - if (i == DEFAULT_KDC_RETRY_LIMIT) { - ibuf = null; - throw se; + /* + * And get a response. + */ + try { + ibuf = kdcClient.receive(); + break; + } catch (SocketTimeoutException se) { + if (DEBUG) { + System.out.println ("SocketTimeOutException with " + + "attempt: " + i); + } + if (i == DEFAULT_KDC_RETRY_LIMIT) { + ibuf = null; + throw se; + } } + } finally { + kdcClient.close(); } } } diff --git a/jdk/src/share/classes/sun/security/krb5/internal/UDPClient.java b/jdk/src/share/classes/sun/security/krb5/internal/UDPClient.java index c9e440f1ef7..670df9210df 100644 --- a/jdk/src/share/classes/sun/security/krb5/internal/UDPClient.java +++ b/jdk/src/share/classes/sun/security/krb5/internal/UDPClient.java @@ -93,4 +93,7 @@ public class UDPClient { return data; } + public void close() { + dgSocket.close(); + } } From 3a7a9cc5577bd4ad27ae072ccd9b3bf65c637c02 Mon Sep 17 00:00:00 2001 From: Kumar Srinivasan Date: Thu, 4 Sep 2008 09:43:32 -0700 Subject: [PATCH 03/91] 6733959: Insufficient checks for "Main-Class" manifest entry in JAR files Fixes a buffer overrun problem with a very long Main-Class attribute. Reviewed-by: darcy --- jdk/src/share/bin/emessages.h | 1 + jdk/src/share/bin/java.c | 10 ++- jdk/test/tools/launcher/MultipleJRE.sh | 82 ++++++++++++++++++----- jdk/test/tools/launcher/ZipMeUp.java | 91 ++++++++++++++++++++++++++ 4 files changed, 164 insertions(+), 20 deletions(-) create mode 100644 jdk/test/tools/launcher/ZipMeUp.java diff --git a/jdk/src/share/bin/emessages.h b/jdk/src/share/bin/emessages.h index 03824bba5d1..6bfb8e16614 100644 --- a/jdk/src/share/bin/emessages.h +++ b/jdk/src/share/bin/emessages.h @@ -54,6 +54,7 @@ #define CLS_ERROR2 "Error: Failed to load Main Class: %s\n%s" #define CLS_ERROR3 "Error: No main method found in specified class.\n" GEN_ERROR #define CLS_ERROR4 "Error: Main method not public\n" GEN_ERROR +#define CLS_ERROR5 "Error: main-class: attribute exceeds system limits of %d bytes\n" GEN_ERROR #define CFG_WARN1 "Warning: %s VM not supported; %s VM will be used" #define CFG_WARN2 "Warning: No leading - on line %d of `%s'" diff --git a/jdk/src/share/bin/java.c b/jdk/src/share/bin/java.c index f7cbcdc95bc..b351fe3aa83 100644 --- a/jdk/src/share/bin/java.c +++ b/jdk/src/share/bin/java.c @@ -987,8 +987,14 @@ SelectVersion(int argc, char **argv, char **main_class) * to avoid locating, expanding and parsing the manifest extra * times. */ - if (info.main_class != NULL) - (void)JLI_StrCat(env_entry, info.main_class); + if (info.main_class != NULL) { + if (JLI_StrLen(info.main_class) <= MAXNAMELEN) { + (void)JLI_StrCat(env_entry, info.main_class); + } else { + ReportErrorMessage(CLS_ERROR5, MAXNAMELEN); + exit(1); + } + } (void)putenv(env_entry); ExecJRE(jre, new_argv); JLI_FreeManifest(); diff --git a/jdk/test/tools/launcher/MultipleJRE.sh b/jdk/test/tools/launcher/MultipleJRE.sh index b3e1cf764ed..a6dfaaa5253 100644 --- a/jdk/test/tools/launcher/MultipleJRE.sh +++ b/jdk/test/tools/launcher/MultipleJRE.sh @@ -1,14 +1,14 @@ # @test MultipleJRE.sh -# @bug 4811102 4953711 4955505 4956301 4991229 4998210 5018605 6387069 +# @bug 4811102 4953711 4955505 4956301 4991229 4998210 5018605 6387069 6733959 # @build PrintVersion # @build UglyPrintVersion +# @build ZipMeUp # @run shell MultipleJRE.sh # @summary Verify Multiple JRE version support # @author Joseph E. Kowalski - # -# Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved. # 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,10 +49,25 @@ then exit 1 fi +JAVAEXE="$TESTJAVA/bin/java" JAVA="$TESTJAVA/bin/java -classpath $TESTCLASSES" JAR="$TESTJAVA/bin/jar" OS=`uname -s`; +# +# Tests whether we are on windows (true) or not. +# +IsWindows() { + case "$OS" in + Windows* | CYGWIN* ) + printf "true" + ;; + * ) + printf "false" + ;; + esac +} + # # Shell routine to test for the proper rejection of syntactically incorrect # version specifications. @@ -139,7 +154,6 @@ CreateUglyJar() { $PACKAGE/UglyPrintVersion.class } - # # Constructs a jar file with a fair number of "zip directory" entries and # the MANIFEST.MF entry at or near the end of that directory to validate @@ -262,6 +276,29 @@ LaunchVM() { fi } +# Tests very long Main-Class attribute in the jar +TestLongMainClass() { + JVER=$1 + if [ "$JVER" = "mklink" ]; then + JVER=XX + JDKXX=jdk/j2re$JVER + rm -rf jdk + mkdir jdk + ln -s $TESTJAVA $JDKXX + JAVA_VERSION_PATH="`pwd`/jdk" + export JAVA_VERSION_PATH + fi + $JAVAEXE -cp $TESTCLASSES ZipMeUp UglyBetty.jar 4097 + message="`$JAVAEXE -version:$JVER -jar UglyBetty.jar 2>&1`" + echo $message | grep "Error: main-class: attribute exceeds system limits" > /dev/null 2>&1 + if [ $? -ne 0 ]; then + printf "Long manifest test did not get expected error" + exit 1 + fi + unset JAVA_VERSION_PATH + rm -rf jdk +} + # # Main test sequence starts here # @@ -280,14 +317,11 @@ CreateJar "" "" LaunchVM "" "${RELEASE}" CreateJar "" "0" LaunchVM "" "${RELEASE}" -case "$OS" in - Windows* | CYGWIN* ) - MAXIMUM_PATH=255; - ;; - *) - MAXIMUM_PATH=1024; - ;; -esac +if [ `IsWindows` = "true" ]; then + MAXIMUM_PATH=255; +else + MAXIMUM_PATH=1024; +fi PATH_LENGTH=`printf "%s" "$UGLYCLASS" | wc -c` if [ ${PATH_LENGTH} -lt ${MAXIMUM_PATH} ]; then @@ -346,7 +380,6 @@ if [ -x /usr/bin/zipnote ]; then LaunchVM "" "${RELEASE}" fi - # # Throw some syntactically challenged (illegal) version specifiers at # the interface. Failure (of the launcher) is success for the test. @@ -357,15 +390,28 @@ TestSyntax "1.2.3-" # Ends with a separator TestSyntax "1.2+.3" # Embedded modifier TestSyntax "1.2.4+&1.2*&1++" # Long and invalid +# On windows we see if there is another jre installed, usually +# there is, then we test using that, otherwise links are created +# to get through to SelectVersion. +if [ `IsWindows` = "false" ]; then + TestLongMainClass "mklink" +else + $JAVAEXE -version:1.0+ + if [ $? -eq 0 ]; then + TestLongMainClass "1.0+" + else + printf "Warning: TestLongMainClass skipped as there is no" + printf "viable MJRE installed.\n" + fi +fi + # # Because scribbling in the registry can be rather destructive, only a # subset of the tests are run on Windows. # -case "$OS" in - Windows* | CYGWIN* ) - exit 0; - ;; -esac +if [ `IsWindows` = "true" ]; then + exit 0; +fi # # Additional version specifiers containing spaces. (Sigh, unable to diff --git a/jdk/test/tools/launcher/ZipMeUp.java b/jdk/test/tools/launcher/ZipMeUp.java new file mode 100644 index 00000000000..84d3f186e7e --- /dev/null +++ b/jdk/test/tools/launcher/ZipMeUp.java @@ -0,0 +1,91 @@ +/* + * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. + * 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. + * + * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +/** + * A simple class to create our erring Jar with a very long Main-Class + * attribute in the manifest. + */ +import java.io.ByteArrayOutputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.PrintStream; +import java.util.zip.CRC32; +import java.util.zip.CheckedOutputStream; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; +public class ZipMeUp { + + static final CRC32 crc = new CRC32(); + + private static String SOME_KLASS = ".Some"; + + static byte[] getManifestAsBytes(int nchars) throws IOException { + crc.reset(); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + CheckedOutputStream cos = new CheckedOutputStream(baos, crc); + PrintStream ps = new PrintStream(cos); + ps.println("Manifest-Version: 1.0"); + ps.print("Main-Class: "); + for (int i = 0 ; i < nchars - SOME_KLASS.length() ; i++) { + ps.print(i%10); + } + ps.println(SOME_KLASS); + cos.flush(); + cos.close(); + ps.close(); + return baos.toByteArray(); + } + + /** + * The arguments are: filename_to_create length + * @param args + * @throws java.lang.Exception + */ + public static void main(String...args) throws Exception { + FileOutputStream fos = new FileOutputStream(args[0]); + ZipOutputStream zos = new ZipOutputStream(fos); + byte[] manifest = getManifestAsBytes(Integer.parseInt(args[1])); + ZipEntry ze = new ZipEntry("META-INF/MANIFEST.MF"); + ze.setMethod(ZipEntry.STORED); + ze.setSize(manifest.length); + ze.setCompressedSize(manifest.length); + ze.setCrc(crc.getValue()); + ze.setTime(System.currentTimeMillis()); + zos.putNextEntry(ze); + zos.write(manifest); + zos.flush(); + + // add a zero length class + ze = new ZipEntry(SOME_KLASS + ".class"); + ze.setMethod(ZipEntry.STORED); + ze.setSize(0); + ze.setCompressedSize(0); + ze.setCrc(0); + ze.setTime(System.currentTimeMillis()); + zos.putNextEntry(ze); + zos.flush(); + zos.closeEntry(); + zos.close(); + System.exit(0); + } +} From 3729356740fb70966397e582528db89a60e0824e Mon Sep 17 00:00:00 2001 From: Masayoshi Okutsu Date: Thu, 2 Oct 2008 16:49:33 +0900 Subject: [PATCH 04/91] 6734167: Calendar.readObject allows elevation of privileges Reviewed-by: peytoia --- jdk/src/share/classes/java/util/Calendar.java | 54 ++++++++++++++----- 1 file changed, 42 insertions(+), 12 deletions(-) diff --git a/jdk/src/share/classes/java/util/Calendar.java b/jdk/src/share/classes/java/util/Calendar.java index e1f65e6a885..072de9e142f 100644 --- a/jdk/src/share/classes/java/util/Calendar.java +++ b/jdk/src/share/classes/java/util/Calendar.java @@ -41,9 +41,14 @@ package java.util; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.OptionalDataException; import java.io.Serializable; +import java.security.AccessControlContext; import java.security.AccessController; +import java.security.PermissionCollection; +import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; +import java.security.ProtectionDomain; import java.text.DateFormat; import java.text.DateFormatSymbols; import sun.util.BuddhistCalendar; @@ -2626,6 +2631,18 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable() { + public ZoneInfo run() throws Exception { + return (ZoneInfo) input.readObject(); + } + }, + CalendarAccessControlContext.INSTANCE); + } catch (PrivilegedActionException pae) { + Exception e = pae.getException(); + if (!(e instanceof OptionalDataException)) { + if (e instanceof RuntimeException) { + throw (RuntimeException) e; + } else if (e instanceof IOException) { + throw (IOException) e; + } else if (e instanceof ClassNotFoundException) { + throw (ClassNotFoundException) e; + } + throw new RuntimeException(e); } - } catch (Exception e) { + } + if (zi != null) { + zone = zi; } // If the deserialized object has a SimpleTimeZone, try to @@ -2674,9 +2704,9 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable Date: Thu, 2 Oct 2008 20:37:43 +0400 Subject: [PATCH 05/91] 6726779: ConvolveOp on USHORT raster can cause the JVM crash Reviewed-by: igor, prr --- .../native/sun/awt/medialib/awt_ImagingLib.c | 38 +++----- .../awt/image/ConvolveOp/EdgeNoOpCrash.java | 95 +++++++++++++++++++ 2 files changed, 107 insertions(+), 26 deletions(-) create mode 100644 jdk/test/java/awt/image/ConvolveOp/EdgeNoOpCrash.java diff --git a/jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c b/jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c index 681f26290b8..157827fef29 100644 --- a/jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c +++ b/jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c @@ -216,6 +216,16 @@ printMedialibError(int status) { #endif /* ! DEBUG */ +static int +getMlibEdgeHint(jint edgeHint) { + switch (edgeHint) { + case java_awt_image_ConvolveOp_EDGE_NO_OP: + return MLIB_EDGE_DST_COPY_SRC; + case java_awt_image_ConvolveOp_EDGE_ZERO_FILL: + default: + return MLIB_EDGE_DST_FILL_ZERO; + } +} /*************************************************************************** * External Functions * @@ -400,22 +410,10 @@ Java_sun_awt_image_ImagingLib_convolveBI(JNIEnv *env, jobject this, } } - if (edgeHint == java_awt_image_ConvolveOp_EDGE_NO_OP) { - int kw2 = kwidth>>1; - int kh2 = kheight>>1; - int bsize = mlib_ImageGetChannels(src)* - (mlib_ImageGetType(src) == MLIB_BYTE ? 1 : 2); - - void *dstDataP = mlib_ImageGetData(dst); - void *srcDataP = mlib_ImageGetData(src); - /* REMIND: Copy a smaller area */ - memcpy(dstDataP, srcDataP, dst->width*dst->height*bsize); - } - cmask = (1<channels)-1; status = (*sMlibFns[MLIB_CONVMxN].fptr)(dst, src, kdata, w, h, (w-1)/2, (h-1)/2, scale, cmask, - MLIB_EDGE_DST_NO_WRITE); + getMlibEdgeHint(edgeHint)); if (status != MLIB_SUCCESS) { printMedialibError(status); @@ -660,22 +658,10 @@ Java_sun_awt_image_ImagingLib_convolveRaster(JNIEnv *env, jobject this, } } - if (edgeHint == java_awt_image_ConvolveOp_EDGE_NO_OP) { - int kw2 = kwidth>>1; - int kh2 = kheight>>1; - int bsize = mlib_ImageGetChannels(src)* - (mlib_ImageGetType(src) == MLIB_BYTE ? 1 : 2); - - void *dstDataP = mlib_ImageGetData(dst); - void *srcDataP = mlib_ImageGetData(src); - /* REMIND: Copy a smaller area */ - memcpy(dstDataP, srcDataP, dst->width*dst->height*bsize); - } - cmask = (1<channels)-1; status = (*sMlibFns[MLIB_CONVMxN].fptr)(dst, src, kdata, w, h, (w-1)/2, (h-1)/2, scale, cmask, - MLIB_EDGE_DST_NO_WRITE); + getMlibEdgeHint(edgeHint)); if (status != MLIB_SUCCESS) { printMedialibError(status); diff --git a/jdk/test/java/awt/image/ConvolveOp/EdgeNoOpCrash.java b/jdk/test/java/awt/image/ConvolveOp/EdgeNoOpCrash.java new file mode 100644 index 00000000000..5e1d2eb3f66 --- /dev/null +++ b/jdk/test/java/awt/image/ConvolveOp/EdgeNoOpCrash.java @@ -0,0 +1,95 @@ +/* + * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. + * 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. + * + * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +/* + * @test + * @bug 6726779 + * @summary Test verifies that ConvolveOp with the EDGE_NO_OP edge condition + * does not cause JVM crash if size of source raster elements is + * greather than size of the destination raster element. + * + * @run main EdgeNoOpCrash + */ +import java.awt.Point; +import java.awt.image.ConvolveOp; +import java.awt.image.DataBuffer; +import java.awt.image.ImagingOpException; +import java.awt.image.Kernel; +import java.awt.image.Raster; +import java.awt.image.WritableRaster; +import java.util.Arrays; + +public class EdgeNoOpCrash { + private static final int w = 3000; + private static final int h = 200; + + public static void main(String[] args) { + crashTest(); + } + + private static void crashTest() { + Raster src = createSrcRaster(); + WritableRaster dst = createDstRaster(); + ConvolveOp op = createConvolveOp(ConvolveOp.EDGE_NO_OP); + try { + op.filter(src, dst); + } catch (ImagingOpException e) { + /* + * The test pair of source and destination rasters + * may cause failure of the medialib convolution routine, + * so this exception is expected. + * + * The JVM crash is the only manifestation of this + * test failure. + */ + } + System.out.println("Test PASSED."); + } + + private static Raster createSrcRaster() { + WritableRaster r = Raster.createInterleavedRaster(DataBuffer.TYPE_USHORT, + w, h, 4, new Point(0, 0)); + + return r; + } + + private static WritableRaster createDstRaster() { + WritableRaster r = Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE, + w, h, 4, new Point(0, 0)); + + return r; + } + + private static ConvolveOp createConvolveOp(int edgeHint) { + final int kw = 3; + final int kh = 3; + float[] kdata = new float[kw * kh]; + float v = 1f / kdata.length; + Arrays.fill(kdata, v); + + Kernel k = new Kernel(kw, kh, kdata); + ConvolveOp op = new ConvolveOp(k, edgeHint, null); + + return op; + } +} \ No newline at end of file From 01bf9872448b93153ab539f370858bf830c3fd7d Mon Sep 17 00:00:00 2001 From: Alan Bateman Date: Thu, 9 Oct 2008 21:12:56 +0100 Subject: [PATCH 06/91] 6721753: File.createTempFile produces guessable file names Reviewed-by: sherman --- jdk/src/share/classes/java/io/File.java | 54 ++++++++++++------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/jdk/src/share/classes/java/io/File.java b/jdk/src/share/classes/java/io/File.java index 7c58136a44d..8433c75d488 100644 --- a/jdk/src/share/classes/java/io/File.java +++ b/jdk/src/share/classes/java/io/File.java @@ -33,9 +33,9 @@ import java.net.URISyntaxException; import java.util.ArrayList; import java.util.Map; import java.util.Hashtable; -import java.util.Random; import java.security.AccessController; import java.security.AccessControlException; +import java.security.SecureRandom; import sun.security.action.GetPropertyAction; @@ -1678,28 +1678,28 @@ public class File /* -- Temporary files -- */ - private static final Object tmpFileLock = new Object(); + // lazy initialization of SecureRandom and temporary file directory + private static class LazyInitialization { + static final SecureRandom random = new SecureRandom(); - private static int counter = -1; /* Protected by tmpFileLock */ + static final String temporaryDirectory = temporaryDirectory(); + static String temporaryDirectory() { + return fs.normalize( + AccessController.doPrivileged( + new GetPropertyAction("java.io.tmpdir"))); + } + } private static File generateFile(String prefix, String suffix, File dir) throws IOException { - if (counter == -1) { - counter = new Random().nextInt() & 0xffff; + long n = LazyInitialization.random.nextLong(); + if (n == Long.MIN_VALUE) { + n = 0; // corner case + } else { + n = Math.abs(n); } - counter++; - return new File(dir, prefix + Integer.toString(counter) + suffix); - } - - private static String tmpdir; /* Protected by tmpFileLock */ - - private static String getTempDir() { - if (tmpdir == null) - tmpdir = fs.normalize( - AccessController.doPrivileged( - new GetPropertyAction("java.io.tmpdir"))); - return tmpdir; + return new File(dir, prefix + Long.toString(n) + suffix); } private static boolean checkAndCreate(String filename, SecurityManager sm) @@ -1795,18 +1795,16 @@ public class File if (prefix.length() < 3) throw new IllegalArgumentException("Prefix string too short"); String s = (suffix == null) ? ".tmp" : suffix; - synchronized (tmpFileLock) { - if (directory == null) { - String tmpDir = getTempDir(); - directory = new File(tmpDir, fs.prefixLength(tmpDir)); - } - SecurityManager sm = System.getSecurityManager(); - File f; - do { - f = generateFile(prefix, s, directory); - } while (!checkAndCreate(f.getPath(), sm)); - return f; + if (directory == null) { + String tmpDir = LazyInitialization.temporaryDirectory(); + directory = new File(tmpDir, fs.prefixLength(tmpDir)); } + SecurityManager sm = System.getSecurityManager(); + File f; + do { + f = generateFile(prefix, s, directory); + } while (!checkAndCreate(f.getPath(), sm)); + return f; } /** From 92992b2e764bc12439d30b28c4161445e86db0bb Mon Sep 17 00:00:00 2001 From: Kumar Srinivasan Date: Fri, 17 Oct 2008 09:43:30 -0700 Subject: [PATCH 07/91] 6755943: Java JAR Pack200 Decompression should enforce stricter header checks Fixes a core dump when fed with a faulty pack file and related malicious take over Reviewed-by: jrose --- jdk/make/common/shared/Defs-windows.gmk | 4 + .../com/sun/java/util/jar/pack/bytes.cpp | 6 +- .../com/sun/java/util/jar/pack/defines.h | 10 +- .../com/sun/java/util/jar/pack/main.cpp | 4 +- .../com/sun/java/util/jar/pack/unpack.cpp | 24 +- .../com/sun/java/util/jar/pack/unpack.h | 4 +- .../com/sun/java/util/jar/pack/utils.cpp | 11 +- .../native/com/sun/java/util/jar/pack/utils.h | 22 +- .../tools/pack200/MemoryAllocatorTest.java | 369 ++++++++++++++++++ 9 files changed, 423 insertions(+), 31 deletions(-) create mode 100644 jdk/test/tools/pack200/MemoryAllocatorTest.java diff --git a/jdk/make/common/shared/Defs-windows.gmk b/jdk/make/common/shared/Defs-windows.gmk index 250604136bc..d829a41853e 100644 --- a/jdk/make/common/shared/Defs-windows.gmk +++ b/jdk/make/common/shared/Defs-windows.gmk @@ -539,6 +539,7 @@ else WSCRIPT :=$(call FileExists,$(_WSCRIPT1),$(_WSCRIPT2)) endif WSCRIPT:=$(call AltCheckSpaces,WSCRIPT) +WSCRIPT += -B # CSCRIPT: path to cscript.exe (used in creating install bundles) ifdef ALT_CSCRIPT @@ -561,6 +562,9 @@ else MSIVAL2 :=$(call FileExists,$(_MSIVAL2_1),$(_MSIVAL2_2)) endif MSIVAL2:=$(call AltCheckSpaces,MSIVAL2) +ifdef SKIP_MSIVAL2 + MSIVAL2 := $(ECHO) +endif # LOGOCUB: path to cub file for (used in validating install msi files) ifdef ALT_LOGOCUB diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.cpp b/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.cpp index 95c3dde66e9..36843061354 100644 --- a/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.cpp +++ b/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2001-2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2001-2008 Sun Microsystems, Inc. All Rights Reserved. * 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,7 +56,7 @@ void bytes::realloc(size_t len_) { return; } byte* oldptr = ptr; - ptr = (byte*)::realloc(ptr, len_+1); + ptr = (len_ >= PSIZE_MAX) ? null : (byte*)::realloc(ptr, len_+1); if (ptr != null) { mtrace('r', oldptr, 0); mtrace('m', ptr, len_+1); @@ -126,7 +126,7 @@ const char* bytes::string() { // Make sure there are 'o' bytes beyond the fill pointer, // advance the fill pointer, and return the old fill pointer. byte* fillbytes::grow(size_t s) { - size_t nlen = b.len+s; + size_t nlen = add_size(b.len, s); if (nlen <= allocated) { b.len = nlen; return limit()-s; diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h b/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h index 19f7567e7bc..f780f247b2a 100644 --- a/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h +++ b/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h @@ -1,5 +1,5 @@ /* - * Copyright 2001-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2001-2008 Sun Microsystems, Inc. All Rights Reserved. * 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,11 +47,13 @@ #define NOT_PRODUCT(xxx) #define assert(p) (0) #define printcr false && +#define VERSION_STRING "%s version %s\n" #else #define IF_PRODUCT(xxx) #define NOT_PRODUCT(xxx) xxx #define assert(p) ((p) || (assert_failed(#p), 1)) #define printcr u->verbose && u->printcr_if_verbose +#define VERSION_STRING "%s version non-product %s\n" extern "C" void breakpoint(); extern void assert_failed(const char*); #define BREAK (breakpoint()) @@ -79,9 +81,9 @@ extern void assert_failed(const char*); #define lengthof(array) (sizeof(array)/sizeof(array[0])) -#define NEW(T, n) (T*) must_malloc(sizeof(T)*(n)) -#define U_NEW(T, n) (T*) u->alloc(sizeof(T)*(n)) -#define T_NEW(T, n) (T*) u->temp_alloc(sizeof(T)*(n)) +#define NEW(T, n) (T*) must_malloc(scale_size(n, sizeof(T))) +#define U_NEW(T, n) (T*) u->alloc(scale_size(n, sizeof(T))) +#define T_NEW(T, n) (T*) u->temp_alloc(scale_size(n, sizeof(T))) // bytes and byte arrays diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp b/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp index 9e216cd19c7..234a6009da5 100644 --- a/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp +++ b/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -300,7 +300,7 @@ int unpacker::run(int argc, char **argv) { case 'J': argp += 1; break; // skip ignored -Jxxx parameter case 'V': - fprintf(u.errstrm, "%s version %s\n", nbasename(argv[0]), sccsver); + fprintf(u.errstrm, VERSION_STRING, nbasename(argv[0]), sccsver); exit(0); case 'h': diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp b/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp index 6480da70021..08fbbc2aa4a 100644 --- a/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp +++ b/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2001-2008 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -618,18 +618,17 @@ void unpacker::read_file_header() { if ((archive_options & AO_HAVE_FILE_HEADERS) != 0) { uint hi = hdr.getInt(); uint lo = hdr.getInt(); - archive_size = band::makeLong(hi, lo); + julong x = band::makeLong(hi, lo); + archive_size = (size_t) x; + if (archive_size != x) { + // Silly size specified; force overflow. + archive_size = PSIZE_MAX+1; + } hdrVals += 2; } else { hdrValsSkipped += 2; } - if (archive_size != (size_t)archive_size) { - // Silly size specified. - abort("archive too large"); - return; - } - // Now we can size the whole archive. // Read everything else into a mega-buffer. rp = hdr.rp; @@ -643,8 +642,8 @@ void unpacker::read_file_header() { abort("EOF reading fixed input buffer"); return; } - } else if (archive_size > 0) { - input.set(U_NEW(byte, (size_t) header_size_0 + archive_size + C_SLOP), + } else if (archive_size != 0) { + input.set(U_NEW(byte, add_size(header_size_0, archive_size, C_SLOP)), (size_t) header_size_0 + archive_size); assert(input.limit()[0] == 0); // Move all the bytes we read initially into the real buffer. @@ -654,7 +653,6 @@ void unpacker::read_file_header() { } else { // It's more complicated and painful. // A zero archive_size means that we must read until EOF. - assert(archive_size == 0); input.init(CHUNK*2); CHECK; input.b.len = input.allocated; @@ -664,7 +662,7 @@ void unpacker::read_file_header() { rplimit += header_size; while (ensure_input(input.limit() - rp)) { size_t dataSoFar = input_remaining(); - size_t nextSize = dataSoFar + CHUNK; + size_t nextSize = add_size(dataSoFar, CHUNK); input.ensureSize(nextSize); CHECK; input.b.len = input.allocated; @@ -949,10 +947,12 @@ void unpacker::read_Utf8_values(entry* cpMap, int len) { // First band: Read lengths of shared prefixes. if (len > PREFIX_SKIP_2) cp_Utf8_prefix.readData(len - PREFIX_SKIP_2); + NOT_PRODUCT(else cp_Utf8_prefix.readData(0)); // for asserts // Second band: Read lengths of unshared suffixes: if (len > SUFFIX_SKIP_1) cp_Utf8_suffix.readData(len - SUFFIX_SKIP_1); + NOT_PRODUCT(else cp_Utf8_suffix.readData(0)); // for asserts bytes* allsuffixes = T_NEW(bytes, len); CHECK; diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h b/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h index 7ab8e07b2ac..03e2edadcd3 100644 --- a/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h +++ b/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2002-2008 Sun Microsystems, Inc. All Rights Reserved. * 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 @@ struct unpacker { // archive header fields int magic, minver, majver; - julong archive_size; + size_t archive_size; int archive_next_count, archive_options, archive_modtime; int band_headers_size; int file_count, attr_definition_count, ic_count, class_count; diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp b/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp index 4f45c84b524..8a88dcd961e 100644 --- a/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp +++ b/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2001-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2001-2008 Sun Microsystems, Inc. All Rights Reserved. * 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,14 +46,13 @@ #include "unpack.h" -void* must_malloc(int size) { - int msize = size; - assert(size >= 0); +void* must_malloc(size_t size) { + size_t msize = size; #ifdef USE_MTRACE - if (msize < sizeof(int)) + if (msize >= 0 && msize < sizeof(int)) msize = sizeof(int); // see 0xbaadf00d below #endif - void* ptr = malloc(msize); + void* ptr = (msize > PSIZE_MAX) ? null : malloc(msize); if (ptr != null) { memset(ptr, 0, size); } else { diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/utils.h b/jdk/src/share/native/com/sun/java/util/jar/pack/utils.h index 6176634bcaf..cc211400eac 100644 --- a/jdk/src/share/native/com/sun/java/util/jar/pack/utils.h +++ b/jdk/src/share/native/com/sun/java/util/jar/pack/utils.h @@ -1,5 +1,5 @@ /* - * Copyright 2001-2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2001-2008 Sun Microsystems, Inc. All Rights Reserved. * 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,13 +25,31 @@ //Definitions of our util functions -void* must_malloc(int size); +void* must_malloc(size_t size); #ifndef USE_MTRACE #define mtrace(c, ptr, size) (0) #else void mtrace(char c, void* ptr, size_t size); #endif +// overflow management +#define OVERFLOW ((size_t)-1) +#define PSIZE_MAX (OVERFLOW/2) /* normal size limit */ + +inline size_t scale_size(size_t size, size_t scale) { + return (size > PSIZE_MAX / scale) ? OVERFLOW : size * scale; +} + +inline size_t add_size(size_t size1, size_t size2) { + return ((size1 | size2 | (size1 + size2)) > PSIZE_MAX) + ? OVERFLOW + : size1 + size2; +} + +inline size_t add_size(size_t size1, size_t size2, int size3) { + return add_size(add_size(size1, size2), size3); +} + // These may be expensive, because they have to go via Java TSD, // if the optional u argument is missing. struct unpacker; diff --git a/jdk/test/tools/pack200/MemoryAllocatorTest.java b/jdk/test/tools/pack200/MemoryAllocatorTest.java new file mode 100644 index 00000000000..6015a4e470d --- /dev/null +++ b/jdk/test/tools/pack200/MemoryAllocatorTest.java @@ -0,0 +1,369 @@ +/* + * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. + * 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. + * + * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +/* + * @test + * @bug 6755943 + * @summary Checks any memory overruns in archive length. + * @run main/timeout=1200 MemoryAllocatorTest + */ +import java.io.BufferedReader; +import java.io.DataOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.RandomAccessFile; +import java.nio.MappedByteBuffer; +import java.nio.channels.FileChannel; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +public class MemoryAllocatorTest { + + /* + * The smallest possible pack file with 1 empty resource + */ + static int[] magic = { + 0xCA, 0xFE, 0xD0, 0x0D + }; + static int[] version_info = { + 0x07, // minor + 0x96 // major + }; + static int[] option = { + 0x10 + }; + static int[] size_hi = { + 0x00 + }; + static int[] size_lo_ulong = { + 0xFF, 0xFC, 0xFC, 0xFC, 0xFC // ULONG_MAX 0xFFFFFFFF + }; + static int[] size_lo_correct = { + 0x17 + }; + static int[] data = { + 0x00, 0xEC, 0xDA, 0xDE, 0xF8, 0x45, 0x01, 0x02, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x01, 0x31, 0x01, 0x00 + }; + // End of pack file data + + static final String JAVA_HOME = System.getProperty("java.home"); + + static final boolean debug = Boolean.getBoolean("MemoryAllocatorTest.Debug"); + static final boolean WINDOWS = System.getProperty("os.name").startsWith("Windows"); + static final boolean LINUX = System.getProperty("os.name").startsWith("Linux"); + static final boolean SIXTYFOUR_BIT = System.getProperty("sun.arch.data.model", "32").equals("64"); + static final private int EXPECTED_EXIT_CODE = (WINDOWS) ? -1 : 255; + + static int testExitValue = 0; + + static byte[] bytes(int[] a) { + byte[] b = new byte[a.length]; + for (int i = 0; i < b.length; i++) { + b[i] = (byte) a[i]; + } + return b; + } + + static void createPackFile(boolean good, File packFile) throws IOException { + FileOutputStream fos = new FileOutputStream(packFile); + fos.write(bytes(magic)); + fos.write(bytes(version_info)); + fos.write(bytes(option)); + fos.write(bytes(size_hi)); + if (good) { + fos.write(bytes(size_lo_correct)); + } else { + fos.write(bytes(size_lo_ulong)); + } + fos.write(bytes(data)); + } + + /* + * This method modifies the LSB of the size_lo for various wicked + * values between MAXINT-0x3F and MAXINT. + */ + static int modifyPackFile(File packFile) throws IOException { + RandomAccessFile raf = new RandomAccessFile(packFile, "rws"); + long len = packFile.length(); + FileChannel fc = raf.getChannel(); + MappedByteBuffer bb = fc.map(FileChannel.MapMode.READ_WRITE, 0, len); + int pos = magic.length + version_info.length + option.length + + size_hi.length; + byte value = bb.get(pos); + value--; + bb.position(pos); + bb.put(value); + bb.force(); + fc.truncate(len); + fc.close(); + return value & 0xFF; + } + + static String getUnpack200Cmd() throws Exception { + File binDir = new File(JAVA_HOME, "bin"); + File unpack200File = WINDOWS + ? new File(binDir, "unpack200.exe") + : new File(binDir, "unpack200"); + + String cmd = unpack200File.getAbsolutePath(); + if (!unpack200File.canExecute()) { + throw new Exception("please check" + + cmd + " exists and is executable"); + } + return cmd; + } + + static TestResult runUnpacker(File packFile) throws Exception { + if (!packFile.exists()) { + throw new Exception("please check" + packFile + " exists"); + } + ArrayList alist = new ArrayList(); + ProcessBuilder pb = new ProcessBuilder(getUnpack200Cmd(), + packFile.getName(), "testout.jar"); + Map env = pb.environment(); + pb.directory(new File(".")); + int retval = 0; + try { + pb.redirectErrorStream(true); + Process p = pb.start(); + BufferedReader rd = new BufferedReader( + new InputStreamReader(p.getInputStream()), 8192); + String in = rd.readLine(); + while (in != null) { + alist.add(in); + System.out.println(in); + in = rd.readLine(); + } + retval = p.waitFor(); + p.destroy(); + } catch (Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex.getMessage()); + } + return new TestResult("", retval, alist); + } + + /* + * The debug version builds of unpack200 call abort(3) which might set + * an unexpected return value, therefore this test is to determine + * if we are using a product or non-product build and check the + * return value appropriately. + */ + static boolean isNonProductVersion() throws Exception { + ArrayList alist = new ArrayList(); + ProcessBuilder pb = new ProcessBuilder(getUnpack200Cmd(), "--version"); + Map env = pb.environment(); + pb.directory(new File(".")); + int retval = 0; + try { + pb.redirectErrorStream(true); + Process p = pb.start(); + BufferedReader rd = new BufferedReader( + new InputStreamReader(p.getInputStream()), 8192); + String in = rd.readLine(); + while (in != null) { + alist.add(in); + System.out.println(in); + in = rd.readLine(); + } + retval = p.waitFor(); + p.destroy(); + } catch (Exception ex) { + ex.printStackTrace(); + throw new RuntimeException(ex.getMessage()); + } + for (String x : alist) { + if (x.contains("non-product")) { + return true; + } + } + return false; + } + + /** + * @param args the command line arguments + * @throws java.lang.Exception + */ + public static void main(String[] args) throws Exception { + + File packFile = new File("tiny.pack"); + boolean isNPVersion = isNonProductVersion(); + + // Create a good pack file and test if everything is ok + createPackFile(true, packFile); + TestResult tr = runUnpacker(packFile); + tr.setDescription("a good pack file"); + tr.checkPositive(); + tr.isOK(); + System.out.println(tr); + + /* + * jprt systems on windows and linux seem to have abundant memory + * therefore can take a very long time to run, and even if it does + * the error message is not accurate for us to discern if the test + * passess successfully. + */ + if (SIXTYFOUR_BIT && (LINUX || WINDOWS)) { + System.out.println("Warning: Windows/Linux 64bit tests passes vacuously"); + return; + } + + /* + * debug builds call abort, the exit code under these conditions + * are not really relevant. + */ + if (isNPVersion) { + System.out.println("Warning: non-product build: exit values not checked"); + } + + // create a bad pack file + createPackFile(false, packFile); + tr = runUnpacker(packFile); + tr.setDescription("a wicked pack file"); + tr.contains("Native allocation failed"); + if(!isNPVersion) { + tr.checkValue(EXPECTED_EXIT_CODE); + } + System.out.println(tr); + int value = modifyPackFile(packFile); + tr.setDescription("value=" + value); + + // continue creating bad pack files by modifying the specimen pack file. + while (value >= 0xc0) { + tr = runUnpacker(packFile); + tr.contains("Native allocation failed"); + if (!isNPVersion) { + tr.checkValue(EXPECTED_EXIT_CODE); + } + tr.setDescription("wicked value=0x" + + Integer.toHexString(value & 0xFF)); + System.out.println(tr); + value = modifyPackFile(packFile); + } + if (testExitValue != 0) { + throw new Exception("Pack200 archive length tests(" + + testExitValue + ") failed "); + } else { + System.out.println("All tests pass"); + } + } + + /* + * A class to encapsulate the test results and stuff, with some ease + * of use methods to check the test results. + */ + static class TestResult { + + StringBuilder status; + int exitValue; + List testOutput; + String description; + + public TestResult(String str, int rv, List oList) { + status = new StringBuilder(str); + exitValue = rv; + testOutput = oList; + } + + void setDescription(String description) { + this.description = description; + } + + void checkValue(int value) { + if (exitValue != value) { + status = + status.append(" Error: test expected exit value " + + value + "got " + exitValue); + testExitValue++; + } + } + + void checkNegative() { + if (exitValue == 0) { + status = status.append( + " Error: test did not expect 0 exit value"); + + testExitValue++; + } + } + + void checkPositive() { + if (exitValue != 0) { + status = status.append( + " Error: test did not return 0 exit value"); + testExitValue++; + } + } + + boolean isOK() { + return exitValue == 0; + } + + boolean isZeroOutput() { + if (!testOutput.isEmpty()) { + status = status.append(" Error: No message from cmd please"); + testExitValue++; + return false; + } + return true; + } + + boolean isNotZeroOutput() { + if (testOutput.isEmpty()) { + status = status.append(" Error: Missing message"); + testExitValue++; + return false; + } + return true; + } + + public String toString() { + if (debug) { + for (String x : testOutput) { + status = status.append(x + "\n"); + } + } + if (description != null) { + status.insert(0, description); + } + return status.append("\nexitValue = " + exitValue).toString(); + } + + boolean contains(String str) { + for (String x : testOutput) { + if (x.contains(str)) { + return true; + } + } + status = status.append(" Error: string <" + str + "> not found "); + testExitValue++; + return false; + } + } +} From b44236abdf1aea0dbd9fdcf04fe621c5dd7117e3 Mon Sep 17 00:00:00 2001 From: Andrew Brygin Date: Wed, 3 Dec 2008 13:34:50 +0300 Subject: [PATCH 08/91] 6766136: corrupted gif image may cause crash in java splashscreen library Reviewed-by: prr, art --- .../awt/splashscreen/splashscreen_gfx_impl.h | 2 +- .../sun/awt/splashscreen/splashscreen_gif.c | 92 +++++++++++++++---- 2 files changed, 76 insertions(+), 18 deletions(-) diff --git a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gfx_impl.h b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gfx_impl.h index 1c55702fe73..32f7d4e2e47 100644 --- a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gfx_impl.h +++ b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gfx_impl.h @@ -31,7 +31,7 @@ /* here come some very simple macros */ /* advance a pointer p by sizeof(type)*n bytes */ -#define INCPN(type,p,n) ((p) = (type*)(p)+n) +#define INCPN(type,p,n) ((p) = (type*)(p)+(n)) /* advance a pointer by sizeof(type) */ #define INCP(type,p) INCPN(type,(p),1) diff --git a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c index f6d9acb0c36..71bc3a3b39d 100644 --- a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c +++ b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c @@ -53,6 +53,10 @@ static const char szNetscape20ext[11] = "NETSCAPE2.0"; // convert libungif samples to our ones #define MAKE_QUAD_GIF(c,a) MAKE_QUAD((c).Red, (c).Green, (c).Blue, (a)) +#define SAFE_TO_ALLOC(c, sz) \ + (((c) > 0) && ((sz) > 0) && \ + ((0xffffffffu / ((unsigned int)(c))) > (unsigned int)(sz))) + /* stdio FILE* and memory input functions for libungif */ int SplashStreamGifInputFunc(GifFileType * gif, GifByteType * buf, int n) @@ -62,6 +66,15 @@ SplashStreamGifInputFunc(GifFileType * gif, GifByteType * buf, int n) return rc; } +/* These macro help to ensure that we only take part of frame that fits into + logical screen. */ + +/* Ensure that p belongs to [pmin, pmax) interval. Returns fixed point (if fix is needed) */ +#define FIX_POINT(p, pmin, pmax) ( ((p) < (pmin)) ? (pmin) : (((p) > (pmax)) ? (pmax) : (p))) +/* Ensures that line starting at point p does not exceed boundary pmax. + Returns fixed length (if fix is needed) */ +#define FIX_LENGTH(p, len, pmax) ( ((p) + (len)) > (pmax) ? ((pmax) - (p)) : (len)) + int SplashDecodeGif(Splash * splash, GifFileType * gif) { @@ -70,6 +83,7 @@ SplashDecodeGif(Splash * splash, GifFileType * gif) byte_t *pBitmapBits, *pOldBitmapBits; int i, j; int imageIndex; + int cx, cy, cw, ch; /* clamped coordinates */ const int interlacedOffset[] = { 0, 4, 2, 1, 0 }; /* The way Interlaced image should. */ const int interlacedJumps[] = { 8, 8, 4, 2, 1 }; /* be read - offsets and jumps... */ @@ -79,14 +93,31 @@ SplashDecodeGif(Splash * splash, GifFileType * gif) SplashCleanup(splash); + if (!SAFE_TO_ALLOC(gif->SWidth, splash->imageFormat.depthBytes)) { + return 0; + } stride = gif->SWidth * splash->imageFormat.depthBytes; if (splash->byteAlignment > 1) stride = (stride + splash->byteAlignment - 1) & ~(splash->byteAlignment - 1); + if (!SAFE_TO_ALLOC(gif->SHeight, stride)) { + return 0; + } + + if (!SAFE_TO_ALLOC(gif->ImageCount, sizeof(SplashImage*))) { + return 0; + } bufferSize = stride * gif->SHeight; pBitmapBits = (byte_t *) malloc(bufferSize); + if (!pBitmapBits) { + return 0; + } pOldBitmapBits = (byte_t *) malloc(bufferSize); + if (!pOldBitmapBits) { + free(pBitmapBits); + return 0; + } memset(pBitmapBits, 0, bufferSize); splash->width = gif->SWidth; @@ -94,6 +125,11 @@ SplashDecodeGif(Splash * splash, GifFileType * gif) splash->frameCount = gif->ImageCount; splash->frames = (SplashImage *) malloc(sizeof(SplashImage) * gif->ImageCount); + if (!splash->frames) { + free(pBitmapBits); + free(pOldBitmapBits); + return 0; + } memset(splash->frames, 0, sizeof(SplashImage) * gif->ImageCount); splash->loopCount = 1; @@ -109,6 +145,11 @@ SplashDecodeGif(Splash * splash, GifFileType * gif) int colorCount = 0; rgbquad_t colorMapBuf[SPLASH_COLOR_MAP_SIZE]; + cx = FIX_POINT(desc->Left, 0, gif->SWidth); + cy = FIX_POINT(desc->Top, 0, gif->SHeight); + cw = FIX_LENGTH(desc->Left, desc->Width, gif->SWidth); + ch = FIX_LENGTH(desc->Top, desc->Height, gif->SHeight); + if (colorMap) { if (colorMap->ColorCount <= SPLASH_COLOR_MAP_SIZE) { colorCount = colorMap->ColorCount; @@ -195,13 +236,22 @@ SplashDecodeGif(Splash * splash, GifFileType * gif) for (; pass < npass; ++pass) { int jump = interlacedJumps[pass]; int ofs = interlacedOffset[pass]; - int numLines = (desc->Height + jump - 1 - ofs) / jump; + /* Number of source lines for current pass */ + int numPassLines = (desc->Height + jump - ofs - 1) / jump; + /* Number of lines that fits to dest buffer */ + int numLines = (ch + jump - ofs - 1) / jump; initRect(&srcRect, 0, 0, desc->Width, numLines, 1, desc->Width, pSrc, &srcFormat); - initRect(&dstRect, desc->Left, desc->Top + ofs, desc->Width, - numLines, jump, stride, pBitmapBits, &splash->imageFormat); - pSrc += convertRect(&srcRect, &dstRect, CVT_ALPHATEST); + + if (numLines > 0) { + initRect(&dstRect, cx, cy + ofs, cw, + numLines , jump, stride, pBitmapBits, &splash->imageFormat); + + pSrc += convertRect(&srcRect, &dstRect, CVT_ALPHATEST); + } + // skip extra source data + pSrc += (numPassLines - numLines) * srcRect.stride; } } @@ -209,6 +259,12 @@ SplashDecodeGif(Splash * splash, GifFileType * gif) splash->frames[imageIndex].bitmapBits = (rgbquad_t *) malloc(bufferSize); + if (!splash->frames[imageIndex].bitmapBits) { + free(pBitmapBits); + free(pOldBitmapBits); + /* Assuming that callee will take care of splash frames we have already allocated */ + return 0; + } memcpy(splash->frames[imageIndex].bitmapBits, pBitmapBits, bufferSize); SplashInitFrameShape(splash, imageIndex); @@ -224,27 +280,29 @@ SplashDecodeGif(Splash * splash, GifFileType * gif) { ImageRect dstRect; rgbquad_t fillColor = 0; // 0 is transparent - if (transparentColor < 0) { + + if (transparentColor > 0) { fillColor= MAKE_QUAD_GIF( colorMap->Colors[gif->SBackGroundColor], 0xff); } - initRect(&dstRect, desc->Left, desc->Top, - desc->Width, desc->Height, 1, stride, - pBitmapBits, &splash->imageFormat); + initRect(&dstRect, + cx, cy, cw, ch, + 1, stride, + pBitmapBits, &splash->imageFormat); fillRect(fillColor, &dstRect); } break; case GIF_DISPOSE_RESTORE: { - - int lineSize = desc->Width * splash->imageFormat.depthBytes; - - for (j = 0; j < desc->Height; j++) { - int lineIndex = stride * (j + desc->Top) + - desc->Left * splash->imageFormat.depthBytes; - - memcpy(pBitmapBits + lineIndex, pOldBitmapBits + lineIndex, - lineSize); + int lineSize = cw * splash->imageFormat.depthBytes; + if (lineSize > 0) { + int lineOffset = cx * splash->imageFormat.depthBytes; + int lineIndex = cy * stride + lineOffset; + for (j=0; j Date: Wed, 24 Dec 2008 15:48:59 -0800 Subject: [PATCH 09/91] 6652463: MediaSize constructors allow to redefine the mapping of standard MediaSizeName values Reviewed-by: igor, jgodinez --- .../print/attribute/standard/MediaSize.java | 12 +++-- .../print/attribute/MediaMappingsTest.java | 48 +++++++++++++++++++ 2 files changed, 56 insertions(+), 4 deletions(-) create mode 100644 jdk/test/javax/print/attribute/MediaMappingsTest.java diff --git a/jdk/src/share/classes/javax/print/attribute/standard/MediaSize.java b/jdk/src/share/classes/javax/print/attribute/standard/MediaSize.java index 55cd1aed923..3b6262d2387 100644 --- a/jdk/src/share/classes/javax/print/attribute/standard/MediaSize.java +++ b/jdk/src/share/classes/javax/print/attribute/standard/MediaSize.java @@ -123,8 +123,10 @@ public class MediaSize extends Size2DSyntax implements Attribute { if (x > y) { throw new IllegalArgumentException("X dimension > Y dimension"); } - mediaName = media; - mediaMap.put(mediaName, this); + if (media != null && mediaMap.get(media) == null) { + mediaName = media; + mediaMap.put(mediaName, this); + } sizeVector.add(this); } @@ -147,8 +149,10 @@ public class MediaSize extends Size2DSyntax implements Attribute { if (x > y) { throw new IllegalArgumentException("X dimension > Y dimension"); } - mediaName = media; - mediaMap.put(mediaName, this); + if (media != null && mediaMap.get(media) == null) { + mediaName = media; + mediaMap.put(mediaName, this); + } sizeVector.add(this); } diff --git a/jdk/test/javax/print/attribute/MediaMappingsTest.java b/jdk/test/javax/print/attribute/MediaMappingsTest.java new file mode 100644 index 00000000000..16110d8a49e --- /dev/null +++ b/jdk/test/javax/print/attribute/MediaMappingsTest.java @@ -0,0 +1,48 @@ +/* + * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. + * 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. + * + * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +/* + * @test + * @bug 6652463 + * @summary Verify media size-> media mappings can't be altered + * @run main MediaMappingsTest +*/ + +import javax.print.attribute.standard.MediaSize; +import javax.print.attribute.standard.MediaSizeName; + +public class MediaMappingsTest { + + public static void main(String args[]) { + MediaSize sizeA = MediaSize.getMediaSizeForName(MediaSizeName.A); + new MediaSize(1.0f, 2.0f, MediaSize.MM, MediaSizeName.A); + if (!sizeA.equals(MediaSize.getMediaSizeForName(MediaSizeName.A))) { + throw new RuntimeException("mapping changed"); + } + MediaSize sizeB = MediaSize.getMediaSizeForName(MediaSizeName.B); + new MediaSize(1, 2, MediaSize.MM, MediaSizeName.B); + if (!sizeB.equals(MediaSize.getMediaSizeForName(MediaSizeName.B))) { + throw new RuntimeException("mapping changed"); + } + } +} From e33cec202fee549a07071d2472b26bc4806908d9 Mon Sep 17 00:00:00 2001 From: Weijun Wang Date: Tue, 30 Dec 2008 10:42:45 +0800 Subject: [PATCH 10/91] 6717680: LdapCtx does not close the connection if initialization fails Reviewed-by: vinnie, xuelei --- jdk/src/share/classes/com/sun/jndi/ldap/LdapCtx.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/LdapCtx.java b/jdk/src/share/classes/com/sun/jndi/ldap/LdapCtx.java index bec6fd0e761..5f9462c5931 100644 --- a/jdk/src/share/classes/com/sun/jndi/ldap/LdapCtx.java +++ b/jdk/src/share/classes/com/sun/jndi/ldap/LdapCtx.java @@ -302,7 +302,16 @@ final public class LdapCtx extends ComponentDirContext schemaTrees = new Hashtable(11, 0.75f); initEnv(); - connect(false); + try { + connect(false); + } catch (NamingException e) { + try { + close(); + } catch (Exception e2) { + // Nothing + } + throw e; + } } LdapCtx(LdapCtx existing, String newDN) throws NamingException { From c357cbe4e01b7eb44b24191232e0fa099796bb73 Mon Sep 17 00:00:00 2001 From: Phil Race Date: Mon, 5 Jan 2009 11:28:43 -0800 Subject: [PATCH 11/91] 6632886: Font.createFont can be persuaded to leak temporary files 6522586: Enforce limits on Font creation 6652929: Font.createFont(int,File) trusts File.getPath Reviewed-by: igor --- jdk/src/share/classes/java/awt/Font.java | 177 ++++++++++++------ .../classes/sun/font/CreatedFontTracker.java | 54 ++++++ jdk/src/share/classes/sun/font/FileFont.java | 17 +- .../share/classes/sun/font/FontManager.java | 11 +- jdk/test/java/awt/FontClass/CreateFont/A.ttf | Bin 0 -> 2348 bytes .../awt/FontClass/CreateFont/BigFont.java | 139 ++++++++++++++ .../awt/FontClass/CreateFont/DeleteFont.java | 83 ++++++++ .../awt/FontClass/CreateFont/DeleteFont.sh | 66 +++++++ .../awt/FontClass/CreateFont/bigfont.html | 48 +++++ .../CreateFont/fileaccess/FontFile.java | 83 ++++++++ 10 files changed, 616 insertions(+), 62 deletions(-) create mode 100644 jdk/src/share/classes/sun/font/CreatedFontTracker.java create mode 100644 jdk/test/java/awt/FontClass/CreateFont/A.ttf create mode 100644 jdk/test/java/awt/FontClass/CreateFont/BigFont.java create mode 100644 jdk/test/java/awt/FontClass/CreateFont/DeleteFont.java create mode 100644 jdk/test/java/awt/FontClass/CreateFont/DeleteFont.sh create mode 100644 jdk/test/java/awt/FontClass/CreateFont/bigfont.html create mode 100644 jdk/test/java/awt/FontClass/CreateFont/fileaccess/FontFile.java diff --git a/jdk/src/share/classes/java/awt/Font.java b/jdk/src/share/classes/java/awt/Font.java index 8dc5938d411..3ed40325b04 100644 --- a/jdk/src/share/classes/java/awt/Font.java +++ b/jdk/src/share/classes/java/awt/Font.java @@ -37,6 +37,8 @@ import java.awt.geom.Rectangle2D; import java.awt.peer.FontPeer; import java.io.*; import java.lang.ref.SoftReference; +import java.security.AccessController; +import java.security.PrivilegedExceptionAction; import java.text.AttributedCharacterIterator.Attribute; import java.text.CharacterIterator; import java.text.StringCharacterIterator; @@ -51,6 +53,7 @@ import sun.font.AttributeMap; import sun.font.AttributeValues; import sun.font.EAttribute; import sun.font.CompositeFont; +import sun.font.CreatedFontTracker; import sun.font.Font2D; import sun.font.Font2DHandle; import sun.font.FontManager; @@ -575,14 +578,16 @@ public class Font implements java.io.Serializable } /* used to implement Font.createFont */ - private Font(File fontFile, int fontFormat, boolean isCopy) + private Font(File fontFile, int fontFormat, + boolean isCopy, CreatedFontTracker tracker) throws FontFormatException { this.createdFont = true; /* Font2D instances created by this method track their font file * so that when the Font2D is GC'd it can also remove the file. */ this.font2DHandle = - FontManager.createFont2D(fontFile, fontFormat, isCopy).handle; + FontManager.createFont2D(fontFile, fontFormat, + isCopy, tracker).handle; this.name = this.font2DHandle.font2D.getFontName(Locale.getDefault()); this.style = Font.PLAIN; this.size = 1; @@ -787,6 +792,29 @@ public class Font implements java.io.Serializable return new Font(attributes); } + /** + * Used with the byte count tracker for fonts created from streams. + * If a thread can create temp files anyway, no point in counting + * font bytes. + */ + private static boolean hasTempPermission() { + + if (System.getSecurityManager() == null) { + return true; + } + File f = null; + boolean hasPerm = false; + try { + f = File.createTempFile("+~JT", ".tmp", null); + f.delete(); + f = null; + hasPerm = true; + } catch (Throwable t) { + /* inc. any kind of SecurityException */ + } + return hasPerm; + } + /** * Returns a new Font using the specified font type * and input data. The new Font is @@ -822,58 +850,96 @@ public class Font implements java.io.Serializable fontFormat != Font.TYPE1_FONT) { throw new IllegalArgumentException ("font format not recognized"); } - final InputStream fStream = fontStream; - Object ret = java.security.AccessController.doPrivileged( - new java.security.PrivilegedAction() { - public Object run() { - File tFile = null; - FileOutputStream outStream = null; - try { - tFile = File.createTempFile("+~JF", ".tmp", null); - /* Temp file deleted by font shutdown hook */ - BufferedInputStream inStream = - new BufferedInputStream(fStream); - outStream = new FileOutputStream(tFile); - int bytesRead = 0; - int bufSize = 8192; - byte [] buf = new byte[bufSize]; - while (bytesRead != -1) { - try { - bytesRead = inStream.read(buf, 0, bufSize); - } catch (Throwable t) { - throw new IOException(); - } - if (bytesRead != -1) { - outStream.write(buf, 0, bytesRead); - } - } - /* don't close the input stream */ - outStream.close(); - } catch (IOException e) { - if (outStream != null) { - try { - outStream.close(); - } catch (Exception e1) { - } - } - if (tFile != null) { - try { - tFile.delete(); - } catch (Exception e2) { - } - } - return e; - } - return tFile; - } - }); + boolean copiedFontData = false; - if (ret instanceof File) { - return new Font((File)ret, fontFormat, true); - } else if (ret instanceof IOException) { - throw (IOException)ret; - } else { - throw new FontFormatException("Couldn't access font stream"); + try { + final File tFile = AccessController.doPrivileged( + new PrivilegedExceptionAction() { + public File run() throws IOException { + return File.createTempFile("+~JF", ".tmp", null); + } + } + ); + + int totalSize = 0; + CreatedFontTracker tracker = null; + try { + final OutputStream outStream = + AccessController.doPrivileged( + new PrivilegedExceptionAction() { + public OutputStream run() throws IOException { + return new FileOutputStream(tFile); + } + } + ); + if (!hasTempPermission()) { + tracker = CreatedFontTracker.getTracker(); + } + try { + byte[] buf = new byte[8192]; + for (;;) { + int bytesRead = fontStream.read(buf); + if (bytesRead < 0) { + break; + } + if (tracker != null) { + if (totalSize+bytesRead > tracker.MAX_FILE_SIZE) { + throw new IOException("File too big."); + } + if (totalSize+tracker.getNumBytes() > + tracker.MAX_TOTAL_BYTES) + { + throw new IOException("Total files too big."); + } + totalSize += bytesRead; + tracker.addBytes(bytesRead); + } + outStream.write(buf, 0, bytesRead); + } + /* don't close the input stream */ + } finally { + outStream.close(); + } + /* After all references to a Font2D are dropped, the file + * will be removed. To support long-lived AppContexts, + * we need to then decrement the byte count by the size + * of the file. + * If the data isn't a valid font, the implementation will + * delete the tmp file and decrement the byte count + * in the tracker object before returning from the + * constructor, so we can set 'copiedFontData' to true here + * without waiting for the results of that constructor. + */ + copiedFontData = true; + Font font = new Font(tFile, fontFormat, true, tracker); + return font; + } finally { + if (!copiedFontData) { + if (tracker != null) { + tracker.subBytes(totalSize); + } + AccessController.doPrivileged( + new PrivilegedExceptionAction() { + public Void run() { + tFile.delete(); + return null; + } + } + ); + } + } + } catch (Throwable t) { + if (t instanceof FontFormatException) { + throw (FontFormatException)t; + } + if (t instanceof IOException) { + throw (IOException)t; + } + Throwable cause = t.getCause(); + if (cause instanceof FontFormatException) { + throw (FontFormatException)cause; + } + throw new IOException("Problem reading font data."); } } @@ -913,6 +979,9 @@ public class Font implements java.io.Serializable */ public static Font createFont(int fontFormat, File fontFile) throws java.awt.FontFormatException, java.io.IOException { + + fontFile = new File(fontFile.getPath()); + if (fontFormat != Font.TRUETYPE_FONT && fontFormat != Font.TYPE1_FONT) { throw new IllegalArgumentException ("font format not recognized"); @@ -926,7 +995,7 @@ public class Font implements java.io.Serializable if (!fontFile.canRead()) { throw new IOException("Can't read " + fontFile); } - return new Font(fontFile, fontFormat, false); + return new Font(fontFile, fontFormat, false, null); } /** diff --git a/jdk/src/share/classes/sun/font/CreatedFontTracker.java b/jdk/src/share/classes/sun/font/CreatedFontTracker.java new file mode 100644 index 00000000000..741337d5b19 --- /dev/null +++ b/jdk/src/share/classes/sun/font/CreatedFontTracker.java @@ -0,0 +1,54 @@ +/* + * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. + * 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. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +package sun.font; + +public class CreatedFontTracker { + + public static final int MAX_FILE_SIZE = 32 * 1024 * 1024; + public static final int MAX_TOTAL_BYTES = 10 * MAX_FILE_SIZE; + + static int numBytes; + static CreatedFontTracker tracker; + + public static synchronized CreatedFontTracker getTracker() { + if (tracker == null) { + tracker = new CreatedFontTracker(); + } + return tracker; + } + + public synchronized int getNumBytes() { + return numBytes; + } + + public synchronized void addBytes(int sz) { + numBytes += sz; + } + + public synchronized void subBytes(int sz) { + numBytes -= sz; + } +} diff --git a/jdk/src/share/classes/sun/font/FileFont.java b/jdk/src/share/classes/sun/font/FileFont.java index b6a2099d2a4..5aad11b2acd 100644 --- a/jdk/src/share/classes/sun/font/FileFont.java +++ b/jdk/src/share/classes/sun/font/FileFont.java @@ -1,5 +1,5 @@ /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -125,9 +125,9 @@ public abstract class FileFont extends PhysicalFont { return true; } - void setFileToRemove(File file) { + void setFileToRemove(File file, CreatedFontTracker tracker) { Disposer.addObjectRecord(this, - new CreatedFontFileDisposerRecord(file)); + new CreatedFontFileDisposerRecord(file, tracker)); } /* This is called when a font scaler is determined to @@ -246,12 +246,16 @@ public abstract class FileFont extends PhysicalFont { return getScaler().getUnitsPerEm(); } - private static class CreatedFontFileDisposerRecord implements DisposerRecord { + private static class CreatedFontFileDisposerRecord + implements DisposerRecord { File fontFile = null; + CreatedFontTracker tracker; - private CreatedFontFileDisposerRecord(File file) { + private CreatedFontFileDisposerRecord(File file, + CreatedFontTracker tracker) { fontFile = file; + this.tracker = tracker; } public void dispose() { @@ -260,6 +264,9 @@ public abstract class FileFont extends PhysicalFont { public Object run() { if (fontFile != null) { try { + if (tracker != null) { + tracker.subBytes((int)fontFile.length()); + } /* REMIND: is it possible that the file is * still open? It will be closed when the * font2D is disposed but could this code diff --git a/jdk/src/share/classes/sun/font/FontManager.java b/jdk/src/share/classes/sun/font/FontManager.java index 09f181f12c2..29d14047fbd 100644 --- a/jdk/src/share/classes/sun/font/FontManager.java +++ b/jdk/src/share/classes/sun/font/FontManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -2347,12 +2347,14 @@ public final class FontManager { static Vector tmpFontFiles = null; public static Font2D createFont2D(File fontFile, int fontFormat, - boolean isCopy) + boolean isCopy, + CreatedFontTracker tracker) throws FontFormatException { String fontFilePath = fontFile.getPath(); FileFont font2D = null; final File fFile = fontFile; + final CreatedFontTracker _tracker = tracker; try { switch (fontFormat) { case Font.TRUETYPE_FONT: @@ -2369,6 +2371,9 @@ public final class FontManager { java.security.AccessController.doPrivileged( new java.security.PrivilegedAction() { public Object run() { + if (_tracker != null) { + _tracker.subBytes((int)fFile.length()); + } fFile.delete(); return null; } @@ -2377,7 +2382,7 @@ public final class FontManager { throw(e); } if (isCopy) { - font2D.setFileToRemove(fontFile); + font2D.setFileToRemove(fontFile, tracker); synchronized (FontManager.class) { if (tmpFontFiles == null) { diff --git a/jdk/test/java/awt/FontClass/CreateFont/A.ttf b/jdk/test/java/awt/FontClass/CreateFont/A.ttf new file mode 100644 index 0000000000000000000000000000000000000000..f80f5c3d569c810493a9fbaf7141a63831733764 GIT binary patch literal 2348 zcmbVO&2JM&6n``O>5tg!+OZ8Ju*6B67Kmdzu@eZ5A>f26!6qam0n%iX7&}rN8^;NW z+5=T7qF*Yg66&Fss;9P53qs;ULRDG`Rh4>aFTHT!*gt^wfH3Zx-EDxNwrbyc=KX$e z-p>4HcXq}=0Kf@tz`=Uzcqo$kYWxcTS;gpybnn3Mz}LUrL%xDMHj~$i@CUsNAl^lO ze`dL?-W<7o8h~3zUU#OL&A%P}K81V@xhFfndS=h!XE^{~0igZ4+5F0tmS7P;`UKlA zS4NH^stYxw-~>G5-UMwH8a6;yvys2kN_zyd8_5G-GYpUZ^(_ z0R<*aOu+%mCgz|Y)=kV~4(pYf07p%0~3&8)Wj4dD43Xo zM)=gkJmy?5u>b)gn^**yoHeo0KL>=jVBbu?ferlzHuM|V&~IQvzkv%oE)mw{@ z)ALk(@U0LYSt!qy=QFb~qG!!v<~+N9D3e{9*Ge#iBnwLz)S&ct$%EQVsgTdi&S@_w zQ#bAz#2#i)LILu+z&YgqDi1R@3Hzt9Iz!=bsH+S9?@*l(f-qho=z^{d;hO|Ng23+O z!|FAz>2N^H`2)GBLwj(Y$5HEU*a}V(C2+E2T)=~vut<_95`xR_!`r0#&f(mljo%H9 zCSlhNfyeqfr5L}?^H>9g9?ZYVskoLTIFV3^EGH~f;yD7Mz;RUId5}b&P{OhGoLmmY z{m|1L>Q*Z3M?&2dB$aLmw~-^cJGe0ABRTC_VrZ<>6~6;=b-i;u>e}gQin;Vq^)!L7tF(X_-gOujyG`qats(Gw%X$A^v$BoDRGDU4xg z3}YBd4@A5ma{C*&qpxtCazD3!8&x{^-RXYbB5xOJ8u@)5-oKC308vcEJ)w$%moB$L zLX{B8#!9KQzG(1bsMVaF0@}0F)7bQy#6Ux^xuZQE5G8~R#e7}{#afRy8i~g`+5-&| zHr9F=^F<^F(eq+auX{W3d41k!EE);Mg3Up1tw##_g1)#Em(T^##c7J~sI}H{({0KA z-j_R^t}QB0M5S)0XMQ}L=?b^o=;+`MDsekCJE9)TT*aOmpXm`_JF_>RFSMVX1LPrFW4L%88ih_kJsHFRWl@0Y z8{jd}rdmW!FpKSzO?n$HLEYBO9kGt>fEZcBeHhOvv|h7CCwfIN$1roer%js>>j@8w zP0{~Oc|0L_JY(@7LeFNP!og}4xe5n#&*mk9h?v6+K_5cFTDAxR2!g;_Mdn4$CSjT= z@pjYK$P!4B%sUJ(I4v^Bc$Z>j-YU4P7O+^X;!8H>ZKB&|1*_F2dhE>GrP>-B*labD z*YrMz9qe|8>~}Kn)K49985L1_m%fLJJ~BMH2NAXb;MvY9!=8Img9mztAi-ve-!qy~ z<2(ℜyHe$X3A=a4KE;YvWT*tD?oL)h8oIhlkqO(__Z&$MRa%9hh`>|BkPR{a1h+ zzaGW4_0-c8?qKZQQFBDRhf}MasAB@-4w~9ff>bwAkBE3W81tZb0w=(VZDVi?+sL1^ CwQRot literal 0 HcmV?d00001 diff --git a/jdk/test/java/awt/FontClass/CreateFont/BigFont.java b/jdk/test/java/awt/FontClass/CreateFont/BigFont.java new file mode 100644 index 00000000000..c14802485bc --- /dev/null +++ b/jdk/test/java/awt/FontClass/CreateFont/BigFont.java @@ -0,0 +1,139 @@ +/* + * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. + * 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. + * + * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +import java.applet.*; +import java.awt.*; +import java.io.*; +import java.net.*; + +public class BigFont extends Applet { + + static private class SizedInputStream extends InputStream { + + int size; + int cnt = 0; + + SizedInputStream(int size) { + this.size = size; + } + + public int read() { + if (cnt < size) { + cnt++; + return 0; + } else { + return -1; + } + } + + public int getCurrentSize() { + return cnt; + } + } + + String id; + String fileName; + + public void init() { + id = getParameter("number"); + fileName = getParameter("font"); + + System.out.println("Applet " + id + " "+ + Thread.currentThread().getThreadGroup()); + // Larger than size for a single font. + int fontSize = 64 * 1000 * 1000; + SizedInputStream sis = new SizedInputStream(fontSize); + try { + Font font = Font.createFont(Font.TRUETYPE_FONT, sis); + } catch (Throwable t) { + if (t instanceof FontFormatException || + fontSize <= sis.getCurrentSize()) + { + System.out.println(sis.getCurrentSize()); + System.out.println(t); + throw new RuntimeException("Allowed file to be too large."); + } + } + // The following part of the test was verified manually but + // is impractical to enable because it requires a fairly large + // valid font to be part of the test, and we can't easily include + // that, nor dependably reference one from the applet environment. + /* + if (fileName == null) { + return; + } + int size = getFileSize(fileName); + if (size == 0) { + return; + } + int fontCnt = 1000 * 1000 * 1000 / size; + loadMany(size, fontCnt, fileName); + System.gc(); System.gc(); + fontCnt = fontCnt / 2; + System.out.println("Applet " + id + " load more."); + loadMany(size, fontCnt, fileName); + */ + System.out.println("Applet " + id + " finished."); + } + + int getFileSize(String fileName) { + try { + URL url = new URL(getCodeBase(), fileName); + InputStream inStream = url.openStream(); + BufferedInputStream fontStream = new BufferedInputStream(inStream); + int size = 0; + while (fontStream.read() != -1) { + size++; + } + fontStream.close(); + return size; + } catch (IOException e) { + return 0; + } + + } + void loadMany(int oneFont, int fontCnt, String fileName) { + System.out.println("fontcnt= " + fontCnt); + Font[] fonts = new Font[fontCnt]; + int totalSize = 0; + boolean gotException = false; + for (int i=0; i + + + + Test Font Creation Limits + + +
+ + + + + + + + +
+ + + diff --git a/jdk/test/java/awt/FontClass/CreateFont/fileaccess/FontFile.java b/jdk/test/java/awt/FontClass/CreateFont/fileaccess/FontFile.java new file mode 100644 index 00000000000..44419748903 --- /dev/null +++ b/jdk/test/java/awt/FontClass/CreateFont/fileaccess/FontFile.java @@ -0,0 +1,83 @@ +/* + * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. + * 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. + * + * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +/* + * @test + * @bug 6652929 + * @summary verify handling of File.getPath() + */ + +import java.awt.*; +import java.io.*; + +public class FontFile { + public static void main(String[] args) throws Exception { + String sep = System.getProperty("file.separator"); + String fname = ".." + sep + "A.ttf"; + String dir = System.getProperty("test.src"); + if (dir != null) { + fname = dir + sep + fname; + } + final String name = fname; + System.out.println("Will try to access " + name); + if (!(new File(name)).canRead()) { + System.out.println("File not available : can't run test"); + return; + } + System.out.println("File is available. Verify no access under SM"); + + System.setSecurityManager(new SecurityManager()); + + + // Check cannot read file. + try { + new FileInputStream(name); + throw new Error("Something wrong with test environment"); + } catch (SecurityException exc) { + // Good. + } + + try { + Font font = Font.createFont(Font.TRUETYPE_FONT, + new File("nosuchfile") { + private boolean read; + @Override public String getPath() { + if (read) { + return name; + } else { + read = true; + return "somefile"; + } + } + @Override public boolean canRead() { + return true; + } + } + ); + System.err.println(font.getFontName()); + throw new RuntimeException("No expected exception"); + } catch (IOException e) { + System.err.println("Test passed."); + } + } +} From dcbd65a1c35d8e693d35275ae2a92e7ce891d32b Mon Sep 17 00:00:00 2001 From: Kumar Srinivasan Date: Wed, 18 Feb 2009 14:14:03 -0800 Subject: [PATCH 12/91] 6792554: Java JAR Pack200 header checks are insufficent Added several checks to ensure that the values read from the headers are consistent Reviewed-by: jrose --- .../com/sun/java/util/jar/pack/bands.cpp | 15 +- .../com/sun/java/util/jar/pack/coding.cpp | 3 +- .../com/sun/java/util/jar/pack/defines.h | 4 +- .../com/sun/java/util/jar/pack/unpack.cpp | 85 +++- .../tools/pack200/MemoryAllocatorTest.java | 369 ------------------ 5 files changed, 97 insertions(+), 379 deletions(-) delete mode 100644 jdk/test/tools/pack200/MemoryAllocatorTest.java diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/bands.cpp b/jdk/src/share/native/com/sun/java/util/jar/pack/bands.cpp index d900404dec4..e96d61c6b06 100644 --- a/jdk/src/share/native/com/sun/java/util/jar/pack/bands.cpp +++ b/jdk/src/share/native/com/sun/java/util/jar/pack/bands.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2002-2009 Sun Microsystems, Inc. All Rights Reserved. * 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,6 +94,7 @@ void band::readData(int expectedLength) { assert(!valc->isMalloc); } xvs.init(u->rp, u->rplimit, valc); + CHECK; int X = xvs.getInt(); if (valc->S() != 0) { assert(valc->min <= -256); @@ -117,6 +118,7 @@ void band::readData(int expectedLength) { byte XB_byte = (byte) XB; byte* XB_ptr = &XB_byte; cm.init(u->rp, u->rplimit, XB_ptr, 0, defc, length, null); + CHECK; } else { NOT_PRODUCT(byte* meta_rp0 = u->meta_rp); assert(u->meta_rp != null); @@ -215,8 +217,19 @@ int band::getIntTotal() { if (length == 0) return 0; if (total_memo > 0) return total_memo-1; int total = getInt(); + // overflow checks require that none of the addends are <0, + // and that the partial sums never overflow (wrap negative) + if (total < 0) { + abort("overflow detected"); + return 0; + } for (int k = length-1; k > 0; k--) { + int prev_total = total; total += vs[0].getInt(); + if (total < prev_total) { + abort("overflow detected"); + return 0; + } } rewind(); total_memo = total+1; diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/coding.cpp b/jdk/src/share/native/com/sun/java/util/jar/pack/coding.cpp index d3ec4ae0e22..713ca999c98 100644 --- a/jdk/src/share/native/com/sun/java/util/jar/pack/coding.cpp +++ b/jdk/src/share/native/com/sun/java/util/jar/pack/coding.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2002-2009 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -809,6 +809,7 @@ void coding_method::init(byte* &band_rp, byte* band_limit, } band_rp = vs.rp; } + CHECK; // Get an accurate upper limit now. vs0.rplimit = band_rp; diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h b/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h index f780f247b2a..fa280ffb054 100644 --- a/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h +++ b/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h @@ -1,5 +1,5 @@ /* - * Copyright 2001-2008 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -155,6 +155,8 @@ enum { false, true }; #define CHECK_NULL_(y,p) _CHECK_DO((p)==null, return y) #define CHECK_NULL_0(p) _CHECK_DO((p)==null, return 0) +#define CHECK_COUNT(t) if (t < 0){abort("bad value count");} CHECK + #define STR_TRUE "true" #define STR_FALSE "false" diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp b/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp index 08fbbc2aa4a..e3a6945f30b 100644 --- a/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp +++ b/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2001-2008 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -504,15 +504,39 @@ void unpacker::read_file_header() { enum { MAGIC_BYTES = 4, AH_LENGTH_0 = 3, //minver, majver, options are outside of archive_size + AH_LENGTH_0_MAX = AH_LENGTH_0 + 1, // options might have 2 bytes AH_LENGTH = 26, //maximum archive header length (w/ all fields) // Length contributions from optional header fields: AH_FILE_HEADER_LEN = 5, // sizehi/lo/next/modtime/files + AH_ARCHIVE_SIZE_LEN = 2, // sizehi/lo only; part of AH_FILE_HEADER_LEN AH_CP_NUMBER_LEN = 4, // int/float/long/double AH_SPECIAL_FORMAT_LEN = 2, // layouts/band-headers AH_LENGTH_MIN = AH_LENGTH -(AH_FILE_HEADER_LEN+AH_SPECIAL_FORMAT_LEN+AH_CP_NUMBER_LEN), + ARCHIVE_SIZE_MIN = AH_LENGTH_MIN - (AH_LENGTH_0 + AH_ARCHIVE_SIZE_LEN), FIRST_READ = MAGIC_BYTES + AH_LENGTH_MIN }; + + assert(AH_LENGTH_MIN == 15); // # of UNSIGNED5 fields required after archive_magic + assert(ARCHIVE_SIZE_MIN == 10); // # of UNSIGNED5 fields required after archive_size + // An absolute minimum null archive is magic[4], {minver,majver,options}[3], + // archive_size[0], cp_counts[8], class_counts[4], for a total of 19 bytes. + // (Note that archive_size is optional; it may be 0..10 bytes in length.) + // The first read must capture everything up through the options field. + // This happens to work even if {minver,majver,options} is a pathological + // 15 bytes long. Legal pack files limit those three fields to 1+1+2 bytes. + assert(FIRST_READ >= MAGIC_BYTES + AH_LENGTH_0 * B_MAX); + + // Up through archive_size, the largest possible archive header is + // magic[4], {minver,majver,options}[4], archive_size[10]. + // (Note only the low 12 bits of options are allowed to be non-zero.) + // In order to parse archive_size, we need at least this many bytes + // in the first read. Of course, if archive_size_hi is more than + // a byte, we probably will fail to allocate the buffer, since it + // will be many gigabytes long. This is a practical, not an + // architectural limit to Pack200 archive sizes. + assert(FIRST_READ >= MAGIC_BYTES + AH_LENGTH_0_MAX + 2*B_MAX); + bool foreign_buf = (read_input_fn == null); byte initbuf[FIRST_READ + C_SLOP + 200]; // 200 is for JAR I/O if (foreign_buf) { @@ -528,7 +552,7 @@ void unpacker::read_file_header() { // There is no way to tell the caller that we used only part of them. // Therefore, the caller must use only a bare minimum of read-ahead. if (inbytes.len > FIRST_READ) { - abort("too much pushback"); + abort("too much read-ahead"); return; } input.set(initbuf, sizeof(initbuf)); @@ -538,7 +562,7 @@ void unpacker::read_file_header() { rplimit += inbytes.len; bytes_read += inbytes.len; } - // Read only 19 bytes, which is certain to contain #archive_size fields, + // Read only 19 bytes, which is certain to contain #archive_options fields, // but is certain not to overflow past the archive_header. input.b.len = FIRST_READ; if (!ensure_input(FIRST_READ)) @@ -610,9 +634,9 @@ void unpacker::read_file_header() { #undef ORBIT if ((archive_options & ~OPTION_LIMIT) != 0) { fprintf(errstrm, "Warning: Illegal archive options 0x%x\n", - archive_options); - // Do not abort. If the format really changes, version numbers will bump. - //abort("illegal archive options"); + archive_options); + abort("illegal archive options"); + return; } if ((archive_options & AO_HAVE_FILE_HEADERS) != 0) { @@ -643,8 +667,17 @@ void unpacker::read_file_header() { return; } } else if (archive_size != 0) { + if (archive_size < ARCHIVE_SIZE_MIN) { + abort("impossible archive size"); // bad input data + return; + } + if (archive_size < header_size_1) { + abort("too much read-ahead"); // somehow we pre-fetched too much? + return; + } input.set(U_NEW(byte, add_size(header_size_0, archive_size, C_SLOP)), (size_t) header_size_0 + archive_size); + CHECK; assert(input.limit()[0] == 0); // Move all the bytes we read initially into the real buffer. input.b.copyFrom(initbuf, header_size); @@ -659,6 +692,7 @@ void unpacker::read_file_header() { rp = rplimit = input.base(); // Set up input buffer as if we already read the header: input.b.copyFrom(initbuf, header_size); + CHECK; rplimit += header_size; while (ensure_input(input.limit() - rp)) { size_t dataSoFar = input_remaining(); @@ -694,8 +728,10 @@ void unpacker::read_file_header() { if ((archive_options & AO_HAVE_FILE_HEADERS) != 0) { archive_next_count = hdr.getInt(); + CHECK_COUNT(archive_next_count); archive_modtime = hdr.getInt(); file_count = hdr.getInt(); + CHECK_COUNT(file_count); hdrVals += 3; } else { hdrValsSkipped += 3; @@ -703,7 +739,9 @@ void unpacker::read_file_header() { if ((archive_options & AO_HAVE_SPECIAL_FORMATS) != 0) { band_headers_size = hdr.getInt(); + CHECK_COUNT(band_headers_size); attr_definition_count = hdr.getInt(); + CHECK_COUNT(attr_definition_count); hdrVals += 2; } else { hdrValsSkipped += 2; @@ -723,13 +761,16 @@ void unpacker::read_file_header() { } } cp_counts[k] = hdr.getInt(); + CHECK_COUNT(cp_counts[k]); hdrVals += 1; } ic_count = hdr.getInt(); + CHECK_COUNT(ic_count); default_class_minver = hdr.getInt(); default_class_majver = hdr.getInt(); class_count = hdr.getInt(); + CHECK_COUNT(class_count); hdrVals += 4; // done with archive_header @@ -783,7 +824,6 @@ void unpacker::read_file_header() { bytes::of(band_headers.limit(), C_SLOP).clear(_meta_error); } - void unpacker::finish() { if (verbose >= 1) { fprintf(errstrm, @@ -2089,6 +2129,7 @@ void unpacker::read_classes() { field_descr.readData(field_count); read_attrs(ATTR_CONTEXT_FIELD, field_count); + CHECK; method_descr.readData(method_count); read_attrs(ATTR_CONTEXT_METHOD, method_count); @@ -2096,6 +2137,7 @@ void unpacker::read_classes() { CHECK; read_attrs(ATTR_CONTEXT_CLASS, class_count); + CHECK; read_code_headers(); @@ -2122,10 +2164,12 @@ void unpacker::read_attrs(int attrc, int obj_count) { assert(endsWith(xxx_flags_hi.name, "_flags_hi")); if (haveLongFlags) xxx_flags_hi.readData(obj_count); + CHECK; band& xxx_flags_lo = ad.xxx_flags_lo(); assert(endsWith(xxx_flags_lo.name, "_flags_lo")); xxx_flags_lo.readData(obj_count); + CHECK; // pre-scan flags, counting occurrences of each index bit julong indexMask = ad.flagIndexMask(); // which flag bits are index bits? @@ -2148,11 +2192,13 @@ void unpacker::read_attrs(int attrc, int obj_count) { assert(endsWith(xxx_attr_count.name, "_attr_count")); // There is one count element for each 1<<16 bit set in flags: xxx_attr_count.readData(ad.predefCount(X_ATTR_OVERFLOW)); + CHECK; band& xxx_attr_indexes = ad.xxx_attr_indexes(); assert(endsWith(xxx_attr_indexes.name, "_attr_indexes")); int overflowIndexCount = xxx_attr_count.getIntTotal(); xxx_attr_indexes.readData(overflowIndexCount); + CHECK; // pre-scan attr indexes, counting occurrences of each value for (i = 0; i < overflowIndexCount; i++) { idx = xxx_attr_indexes.getInt(); @@ -2183,6 +2229,7 @@ void unpacker::read_attrs(int attrc, int obj_count) { } } ad.xxx_attr_calls().readData(backwardCounts); + CHECK; // Read built-in bands. // Mostly, these are hand-coded equivalents to readBandData(). @@ -2191,42 +2238,53 @@ void unpacker::read_attrs(int attrc, int obj_count) { count = ad.predefCount(CLASS_ATTR_SourceFile); class_SourceFile_RUN.readData(count); + CHECK; count = ad.predefCount(CLASS_ATTR_EnclosingMethod); class_EnclosingMethod_RC.readData(count); class_EnclosingMethod_RDN.readData(count); + CHECK; count = ad.predefCount(X_ATTR_Signature); class_Signature_RS.readData(count); + CHECK; ad.readBandData(X_ATTR_RuntimeVisibleAnnotations); ad.readBandData(X_ATTR_RuntimeInvisibleAnnotations); count = ad.predefCount(CLASS_ATTR_InnerClasses); class_InnerClasses_N.readData(count); + CHECK; + count = class_InnerClasses_N.getIntTotal(); class_InnerClasses_RC.readData(count); class_InnerClasses_F.readData(count); + CHECK; // Drop remaining columns wherever flags are zero: count -= class_InnerClasses_F.getIntCount(0); class_InnerClasses_outer_RCN.readData(count); class_InnerClasses_name_RUN.readData(count); + CHECK; count = ad.predefCount(CLASS_ATTR_ClassFile_version); class_ClassFile_version_minor_H.readData(count); class_ClassFile_version_major_H.readData(count); + CHECK; break; case ATTR_CONTEXT_FIELD: count = ad.predefCount(FIELD_ATTR_ConstantValue); field_ConstantValue_KQ.readData(count); + CHECK; count = ad.predefCount(X_ATTR_Signature); field_Signature_RS.readData(count); + CHECK; ad.readBandData(X_ATTR_RuntimeVisibleAnnotations); ad.readBandData(X_ATTR_RuntimeInvisibleAnnotations); + CHECK; break; case ATTR_CONTEXT_METHOD: @@ -2238,15 +2296,18 @@ void unpacker::read_attrs(int attrc, int obj_count) { method_Exceptions_N.readData(count); count = method_Exceptions_N.getIntTotal(); method_Exceptions_RC.readData(count); + CHECK; count = ad.predefCount(X_ATTR_Signature); method_Signature_RS.readData(count); + CHECK; ad.readBandData(X_ATTR_RuntimeVisibleAnnotations); ad.readBandData(X_ATTR_RuntimeInvisibleAnnotations); ad.readBandData(METHOD_ATTR_RuntimeVisibleParameterAnnotations); ad.readBandData(METHOD_ATTR_RuntimeInvisibleParameterAnnotations); ad.readBandData(METHOD_ATTR_AnnotationDefault); + CHECK; break; case ATTR_CONTEXT_CODE: @@ -2258,8 +2319,10 @@ void unpacker::read_attrs(int attrc, int obj_count) { return; } code_StackMapTable_N.readData(count); + CHECK; count = code_StackMapTable_N.getIntTotal(); code_StackMapTable_frame_T.readData(count); + CHECK; // the rest of it depends in a complicated way on frame tags { int fat_frame_count = 0; @@ -2293,18 +2356,23 @@ void unpacker::read_attrs(int attrc, int obj_count) { // deal completely with fat frames: offset_count += fat_frame_count; code_StackMapTable_local_N.readData(fat_frame_count); + CHECK; type_count += code_StackMapTable_local_N.getIntTotal(); code_StackMapTable_stack_N.readData(fat_frame_count); type_count += code_StackMapTable_stack_N.getIntTotal(); + CHECK; // read the rest: code_StackMapTable_offset.readData(offset_count); code_StackMapTable_T.readData(type_count); + CHECK; // (7) [RCH] count = code_StackMapTable_T.getIntCount(7); code_StackMapTable_RC.readData(count); + CHECK; // (8) [PH] count = code_StackMapTable_T.getIntCount(8); code_StackMapTable_P.readData(count); + CHECK; } count = ad.predefCount(CODE_ATTR_LineNumberTable); @@ -2626,6 +2694,7 @@ void unpacker::read_code_headers() { code_max_na_locals.readData(); code_handler_count.readData(); totalHandlerCount += code_handler_count.getIntTotal(); + CHECK; // Read handler specifications. // Cf. PackageReader.readCodeHandlers. @@ -2633,8 +2702,10 @@ void unpacker::read_code_headers() { code_handler_end_PO.readData(totalHandlerCount); code_handler_catch_PO.readData(totalHandlerCount); code_handler_class_RCN.readData(totalHandlerCount); + CHECK; read_attrs(ATTR_CONTEXT_CODE, totalFlagsCount); + CHECK; } static inline bool is_in_range(uint n, uint min, uint max) { diff --git a/jdk/test/tools/pack200/MemoryAllocatorTest.java b/jdk/test/tools/pack200/MemoryAllocatorTest.java deleted file mode 100644 index 6015a4e470d..00000000000 --- a/jdk/test/tools/pack200/MemoryAllocatorTest.java +++ /dev/null @@ -1,369 +0,0 @@ -/* - * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. - * 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. - * - * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - */ - -/* - * @test - * @bug 6755943 - * @summary Checks any memory overruns in archive length. - * @run main/timeout=1200 MemoryAllocatorTest - */ -import java.io.BufferedReader; -import java.io.DataOutputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.io.RandomAccessFile; -import java.nio.MappedByteBuffer; -import java.nio.channels.FileChannel; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -public class MemoryAllocatorTest { - - /* - * The smallest possible pack file with 1 empty resource - */ - static int[] magic = { - 0xCA, 0xFE, 0xD0, 0x0D - }; - static int[] version_info = { - 0x07, // minor - 0x96 // major - }; - static int[] option = { - 0x10 - }; - static int[] size_hi = { - 0x00 - }; - static int[] size_lo_ulong = { - 0xFF, 0xFC, 0xFC, 0xFC, 0xFC // ULONG_MAX 0xFFFFFFFF - }; - static int[] size_lo_correct = { - 0x17 - }; - static int[] data = { - 0x00, 0xEC, 0xDA, 0xDE, 0xF8, 0x45, 0x01, 0x02, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x01, 0x31, 0x01, 0x00 - }; - // End of pack file data - - static final String JAVA_HOME = System.getProperty("java.home"); - - static final boolean debug = Boolean.getBoolean("MemoryAllocatorTest.Debug"); - static final boolean WINDOWS = System.getProperty("os.name").startsWith("Windows"); - static final boolean LINUX = System.getProperty("os.name").startsWith("Linux"); - static final boolean SIXTYFOUR_BIT = System.getProperty("sun.arch.data.model", "32").equals("64"); - static final private int EXPECTED_EXIT_CODE = (WINDOWS) ? -1 : 255; - - static int testExitValue = 0; - - static byte[] bytes(int[] a) { - byte[] b = new byte[a.length]; - for (int i = 0; i < b.length; i++) { - b[i] = (byte) a[i]; - } - return b; - } - - static void createPackFile(boolean good, File packFile) throws IOException { - FileOutputStream fos = new FileOutputStream(packFile); - fos.write(bytes(magic)); - fos.write(bytes(version_info)); - fos.write(bytes(option)); - fos.write(bytes(size_hi)); - if (good) { - fos.write(bytes(size_lo_correct)); - } else { - fos.write(bytes(size_lo_ulong)); - } - fos.write(bytes(data)); - } - - /* - * This method modifies the LSB of the size_lo for various wicked - * values between MAXINT-0x3F and MAXINT. - */ - static int modifyPackFile(File packFile) throws IOException { - RandomAccessFile raf = new RandomAccessFile(packFile, "rws"); - long len = packFile.length(); - FileChannel fc = raf.getChannel(); - MappedByteBuffer bb = fc.map(FileChannel.MapMode.READ_WRITE, 0, len); - int pos = magic.length + version_info.length + option.length + - size_hi.length; - byte value = bb.get(pos); - value--; - bb.position(pos); - bb.put(value); - bb.force(); - fc.truncate(len); - fc.close(); - return value & 0xFF; - } - - static String getUnpack200Cmd() throws Exception { - File binDir = new File(JAVA_HOME, "bin"); - File unpack200File = WINDOWS - ? new File(binDir, "unpack200.exe") - : new File(binDir, "unpack200"); - - String cmd = unpack200File.getAbsolutePath(); - if (!unpack200File.canExecute()) { - throw new Exception("please check" + - cmd + " exists and is executable"); - } - return cmd; - } - - static TestResult runUnpacker(File packFile) throws Exception { - if (!packFile.exists()) { - throw new Exception("please check" + packFile + " exists"); - } - ArrayList alist = new ArrayList(); - ProcessBuilder pb = new ProcessBuilder(getUnpack200Cmd(), - packFile.getName(), "testout.jar"); - Map env = pb.environment(); - pb.directory(new File(".")); - int retval = 0; - try { - pb.redirectErrorStream(true); - Process p = pb.start(); - BufferedReader rd = new BufferedReader( - new InputStreamReader(p.getInputStream()), 8192); - String in = rd.readLine(); - while (in != null) { - alist.add(in); - System.out.println(in); - in = rd.readLine(); - } - retval = p.waitFor(); - p.destroy(); - } catch (Exception ex) { - ex.printStackTrace(); - throw new RuntimeException(ex.getMessage()); - } - return new TestResult("", retval, alist); - } - - /* - * The debug version builds of unpack200 call abort(3) which might set - * an unexpected return value, therefore this test is to determine - * if we are using a product or non-product build and check the - * return value appropriately. - */ - static boolean isNonProductVersion() throws Exception { - ArrayList alist = new ArrayList(); - ProcessBuilder pb = new ProcessBuilder(getUnpack200Cmd(), "--version"); - Map env = pb.environment(); - pb.directory(new File(".")); - int retval = 0; - try { - pb.redirectErrorStream(true); - Process p = pb.start(); - BufferedReader rd = new BufferedReader( - new InputStreamReader(p.getInputStream()), 8192); - String in = rd.readLine(); - while (in != null) { - alist.add(in); - System.out.println(in); - in = rd.readLine(); - } - retval = p.waitFor(); - p.destroy(); - } catch (Exception ex) { - ex.printStackTrace(); - throw new RuntimeException(ex.getMessage()); - } - for (String x : alist) { - if (x.contains("non-product")) { - return true; - } - } - return false; - } - - /** - * @param args the command line arguments - * @throws java.lang.Exception - */ - public static void main(String[] args) throws Exception { - - File packFile = new File("tiny.pack"); - boolean isNPVersion = isNonProductVersion(); - - // Create a good pack file and test if everything is ok - createPackFile(true, packFile); - TestResult tr = runUnpacker(packFile); - tr.setDescription("a good pack file"); - tr.checkPositive(); - tr.isOK(); - System.out.println(tr); - - /* - * jprt systems on windows and linux seem to have abundant memory - * therefore can take a very long time to run, and even if it does - * the error message is not accurate for us to discern if the test - * passess successfully. - */ - if (SIXTYFOUR_BIT && (LINUX || WINDOWS)) { - System.out.println("Warning: Windows/Linux 64bit tests passes vacuously"); - return; - } - - /* - * debug builds call abort, the exit code under these conditions - * are not really relevant. - */ - if (isNPVersion) { - System.out.println("Warning: non-product build: exit values not checked"); - } - - // create a bad pack file - createPackFile(false, packFile); - tr = runUnpacker(packFile); - tr.setDescription("a wicked pack file"); - tr.contains("Native allocation failed"); - if(!isNPVersion) { - tr.checkValue(EXPECTED_EXIT_CODE); - } - System.out.println(tr); - int value = modifyPackFile(packFile); - tr.setDescription("value=" + value); - - // continue creating bad pack files by modifying the specimen pack file. - while (value >= 0xc0) { - tr = runUnpacker(packFile); - tr.contains("Native allocation failed"); - if (!isNPVersion) { - tr.checkValue(EXPECTED_EXIT_CODE); - } - tr.setDescription("wicked value=0x" + - Integer.toHexString(value & 0xFF)); - System.out.println(tr); - value = modifyPackFile(packFile); - } - if (testExitValue != 0) { - throw new Exception("Pack200 archive length tests(" + - testExitValue + ") failed "); - } else { - System.out.println("All tests pass"); - } - } - - /* - * A class to encapsulate the test results and stuff, with some ease - * of use methods to check the test results. - */ - static class TestResult { - - StringBuilder status; - int exitValue; - List testOutput; - String description; - - public TestResult(String str, int rv, List oList) { - status = new StringBuilder(str); - exitValue = rv; - testOutput = oList; - } - - void setDescription(String description) { - this.description = description; - } - - void checkValue(int value) { - if (exitValue != value) { - status = - status.append(" Error: test expected exit value " + - value + "got " + exitValue); - testExitValue++; - } - } - - void checkNegative() { - if (exitValue == 0) { - status = status.append( - " Error: test did not expect 0 exit value"); - - testExitValue++; - } - } - - void checkPositive() { - if (exitValue != 0) { - status = status.append( - " Error: test did not return 0 exit value"); - testExitValue++; - } - } - - boolean isOK() { - return exitValue == 0; - } - - boolean isZeroOutput() { - if (!testOutput.isEmpty()) { - status = status.append(" Error: No message from cmd please"); - testExitValue++; - return false; - } - return true; - } - - boolean isNotZeroOutput() { - if (testOutput.isEmpty()) { - status = status.append(" Error: Missing message"); - testExitValue++; - return false; - } - return true; - } - - public String toString() { - if (debug) { - for (String x : testOutput) { - status = status.append(x + "\n"); - } - } - if (description != null) { - status.insert(0, description); - } - return status.append("\nexitValue = " + exitValue).toString(); - } - - boolean contains(String str) { - for (String x : testOutput) { - if (x.contains(str)) { - return true; - } - } - status = status.append(" Error: string <" + str + "> not found "); - testExitValue++; - return false; - } - } -} From 22f94de7e6abdcf00ef9893416ccf5c0c3436ab8 Mon Sep 17 00:00:00 2001 From: Andrew Brygin Date: Fri, 20 Feb 2009 13:48:32 +0300 Subject: [PATCH 13/91] 6804996: JWS PNG Decoding Integer Overflow [V-flrhat2ln8] Reviewed-by: prr --- .../sun/awt/splashscreen/splashscreen_gif.c | 4 ---- .../sun/awt/splashscreen/splashscreen_impl.h | 4 ++++ .../sun/awt/splashscreen/splashscreen_png.c | 23 +++++++++++++++++++ 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c index 71bc3a3b39d..f1651ab1f49 100644 --- a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c +++ b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c @@ -53,10 +53,6 @@ static const char szNetscape20ext[11] = "NETSCAPE2.0"; // convert libungif samples to our ones #define MAKE_QUAD_GIF(c,a) MAKE_QUAD((c).Red, (c).Green, (c).Blue, (a)) -#define SAFE_TO_ALLOC(c, sz) \ - (((c) > 0) && ((sz) > 0) && \ - ((0xffffffffu / ((unsigned int)(c))) > (unsigned int)(sz))) - /* stdio FILE* and memory input functions for libungif */ int SplashStreamGifInputFunc(GifFileType * gif, GifByteType * buf, int n) diff --git a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_impl.h b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_impl.h index c6bad14c45a..6f4e03ef53e 100644 --- a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_impl.h +++ b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_impl.h @@ -155,6 +155,10 @@ int BitmapToYXBandedRectangles(ImageRect * pSrcRect, RECT_T * out); void SplashInitFrameShape(Splash * splash, int imageIndex); +#define SAFE_TO_ALLOC(c, sz) \ + (((c) > 0) && ((sz) > 0) && \ + ((0xffffffffu / ((unsigned int)(c))) > (unsigned int)(sz))) + #define dbgprintf printf #endif diff --git a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c index f0926ec90dc..abc54dcb753 100644 --- a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c +++ b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c @@ -103,9 +103,17 @@ SplashDecodePng(Splash * splash, png_rw_ptr read_func, void *io_ptr) rowbytes = png_get_rowbytes(png_ptr, info_ptr); + if (!SAFE_TO_ALLOC(rowbytes, height)) { + goto done; + } + if ((image_data = (unsigned char *) malloc(rowbytes * height)) == NULL) { goto done; } + + if (!SAFE_TO_ALLOC(height, sizeof(png_bytep))) { + goto done; + } if ((row_pointers = (png_bytepp) malloc(height * sizeof(png_bytep))) == NULL) { goto done; @@ -121,13 +129,28 @@ SplashDecodePng(Splash * splash, png_rw_ptr read_func, void *io_ptr) splash->width = width; splash->height = height; + if (!SAFE_TO_ALLOC(splash->width, splash->imageFormat.depthBytes)) { + goto done; + } stride = splash->width * splash->imageFormat.depthBytes; + if (!SAFE_TO_ALLOC(splash->height, stride)) { + goto done; + } splash->frameCount = 1; splash->frames = (SplashImage *) malloc(sizeof(SplashImage) * splash->frameCount); + + if (splash->frames == NULL) { + goto done; + } + splash->loopCount = 1; splash->frames[0].bitmapBits = malloc(stride * splash->height); + if (splash->frames[0].bitmapBits == NULL) { + free(splash->frames); + goto done; + } splash->frames[0].delay = 0; /* FIXME: sort out the real format */ From de4c8e0eb58259a6a8f7261925a508ebc12b8cec Mon Sep 17 00:00:00 2001 From: Phil Race Date: Tue, 3 Mar 2009 16:10:37 -0800 Subject: [PATCH 14/91] 2163516: Font.createFont can be persuaded to leak temporary files Reviewed-by: igor --- .../share/classes/sun/font/FontManager.java | 2 +- .../share/classes/sun/font/TrueTypeFont.java | 13 ++++- jdk/src/share/classes/sun/font/Type1Font.java | 50 ++++++++++++++++++- .../awt/FontClass/CreateFont/DeleteFont.java | 14 ++++-- 4 files changed, 70 insertions(+), 9 deletions(-) diff --git a/jdk/src/share/classes/sun/font/FontManager.java b/jdk/src/share/classes/sun/font/FontManager.java index 29d14047fbd..aad8c5116c0 100644 --- a/jdk/src/share/classes/sun/font/FontManager.java +++ b/jdk/src/share/classes/sun/font/FontManager.java @@ -2361,7 +2361,7 @@ public final class FontManager { font2D = new TrueTypeFont(fontFilePath, null, 0, true); break; case Font.TYPE1_FONT: - font2D = new Type1Font(fontFilePath, null); + font2D = new Type1Font(fontFilePath, null, isCopy); break; default: throw new FontFormatException("Unrecognised Font Format"); diff --git a/jdk/src/share/classes/sun/font/TrueTypeFont.java b/jdk/src/share/classes/sun/font/TrueTypeFont.java index 8a8309efab4..e4784eec86b 100644 --- a/jdk/src/share/classes/sun/font/TrueTypeFont.java +++ b/jdk/src/share/classes/sun/font/TrueTypeFont.java @@ -174,8 +174,17 @@ public class TrueTypeFont extends FileFont { super(platname, nativeNames); useJavaRasterizer = javaRasterizer; fontRank = Font2D.TTF_RANK; - verify(); - init(fIndex); + try { + verify(); + init(fIndex); + } catch (Throwable t) { + close(); + if (t instanceof FontFormatException) { + throw (FontFormatException)t; + } else { + throw new FontFormatException("Unexpected runtime exception."); + } + } Disposer.addObjectRecord(this, disposerRecord); } diff --git a/jdk/src/share/classes/sun/font/Type1Font.java b/jdk/src/share/classes/sun/font/Type1Font.java index 90236ff64c1..e63303fbdbc 100644 --- a/jdk/src/share/classes/sun/font/Type1Font.java +++ b/jdk/src/share/classes/sun/font/Type1Font.java @@ -39,6 +39,7 @@ import java.nio.BufferUnderflowException; import java.nio.channels.ClosedChannelException; import java.nio.channels.FileChannel; import sun.java2d.Disposer; +import sun.java2d.DisposerRecord; import java.util.HashSet; import java.util.HashMap; import java.awt.Font; @@ -76,6 +77,27 @@ import java.awt.Font; */ public class Type1Font extends FileFont { + private static class T1DisposerRecord implements DisposerRecord { + String fileName = null; + + T1DisposerRecord(String name) { + fileName = name; + } + + public synchronized void dispose() { + java.security.AccessController.doPrivileged( + new java.security.PrivilegedAction() { + public Object run() { + + if (fileName != null) { + (new java.io.File(fileName)).delete(); + } + return null; + } + }); + } + } + WeakReference bufferRef = new WeakReference(null); private String psName = null; @@ -124,6 +146,17 @@ public class Type1Font extends FileFont { } + /** + * Constructs a Type1 Font. + * @param platname - Platform identifier of the font. Typically file name. + * @param nativeNames - Native names - typically XLFDs on Unix. + */ + public Type1Font(String platname, Object nativeNames) + throws FontFormatException { + + this(platname, nativeNames, false); + } + /** * - does basic verification of the file * - reads the names (full, family). @@ -131,12 +164,25 @@ public class Type1Font extends FileFont { * @throws FontFormatException - if the font can't be opened * or fails verification, or there's no usable cmap */ - public Type1Font(String platname, Object nativeNames) + public Type1Font(String platname, Object nativeNames, boolean createdCopy) throws FontFormatException { super(platname, nativeNames); fontRank = Font2D.TYPE1_RANK; checkedNatives = true; - verify(); + try { + verify(); + } catch (Throwable t) { + if (createdCopy) { + T1DisposerRecord ref = new T1DisposerRecord(platname); + Disposer.addObjectRecord(bufferRef, ref); + bufferRef = null; + } + if (t instanceof FontFormatException) { + throw (FontFormatException)t; + } else { + throw new FontFormatException("Unexpected runtime exception."); + } + } } private synchronized ByteBuffer getBuffer() throws FontFormatException { diff --git a/jdk/test/java/awt/FontClass/CreateFont/DeleteFont.java b/jdk/test/java/awt/FontClass/CreateFont/DeleteFont.java index eba9462f842..361b0b436ac 100644 --- a/jdk/test/java/awt/FontClass/CreateFont/DeleteFont.java +++ b/jdk/test/java/awt/FontClass/CreateFont/DeleteFont.java @@ -55,17 +55,23 @@ public class DeleteFont { if (!gotException) { throw new RuntimeException("No expected IOException"); } - badRead(-2); - badRead(8193); + badRead(-2, Font.TRUETYPE_FONT); + badRead(8193, Font.TRUETYPE_FONT); + + badRead(-2, Font.TYPE1_FONT); + badRead(8193, Font.TYPE1_FONT); + + // Make sure GC has a chance to clean up before we exit. + System.gc(); System.gc(); } - static void badRead(final int retval) { + static void badRead(final int retval, int fontType) { int num = 2; byte[] buff = new byte[16*8192]; // Multiple of 8192 is important. for (int ct=0; ct Date: Thu, 5 Mar 2009 19:36:51 +0300 Subject: [PATCH 15/91] 6804998: JRE GIF Decoding Heap Corruption [V-y6g5jlm8e1] Reviewed-by: prr --- .../share/classes/sun/awt/image/GifImageDecoder.java | 11 +++++++++-- jdk/src/share/native/sun/awt/image/gif/gifdecoder.c | 5 +++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/jdk/src/share/classes/sun/awt/image/GifImageDecoder.java b/jdk/src/share/classes/sun/awt/image/GifImageDecoder.java index aa87fb82ef7..b0679afc437 100644 --- a/jdk/src/share/classes/sun/awt/image/GifImageDecoder.java +++ b/jdk/src/share/classes/sun/awt/image/GifImageDecoder.java @@ -585,9 +585,16 @@ public class GifImageDecoder extends ImageDecoder { System.out.print("Reading a " + width + " by " + height + " " + (interlace ? "" : "non-") + "interlaced image..."); } - + int initCodeSize = ExtractByte(block, 9); + if (initCodeSize >= 12) { + if (verbose) { + System.out.println("Invalid initial code size: " + + initCodeSize); + } + return false; + } boolean ret = parseImage(x, y, width, height, - interlace, ExtractByte(block, 9), + interlace, initCodeSize, block, rasline, model); if (!ret) { diff --git a/jdk/src/share/native/sun/awt/image/gif/gifdecoder.c b/jdk/src/share/native/sun/awt/image/gif/gifdecoder.c index 1429931f8c6..893007f1366 100644 --- a/jdk/src/share/native/sun/awt/image/gif/gifdecoder.c +++ b/jdk/src/share/native/sun/awt/image/gif/gifdecoder.c @@ -191,6 +191,11 @@ Java_sun_awt_image_GifImageDecoder_parseImage(JNIEnv *env, int passht = passinc; int len; + /* We have verified the initial code size on the java layer. + * Here we just check bounds for particular indexes. */ + if (freeCode >= 4096 || maxCode >= 4096) { + return 0; + } if (blockh == 0 || raslineh == 0 || prefixh == 0 || suffixh == 0 || outCodeh == 0) From 6c11535cddb56103822a86c878bedf6932791008 Mon Sep 17 00:00:00 2001 From: Andrew Brygin Date: Fri, 6 Mar 2009 12:40:38 +0300 Subject: [PATCH 16/91] 6804997: JWS GIF Decoding Heap Corruption [V-r687oxuocp] Reviewed-by: prr --- jdk/src/share/native/sun/awt/giflib/dgif_lib.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/jdk/src/share/native/sun/awt/giflib/dgif_lib.c b/jdk/src/share/native/sun/awt/giflib/dgif_lib.c index be91d3e7811..f20372fe925 100644 --- a/jdk/src/share/native/sun/awt/giflib/dgif_lib.c +++ b/jdk/src/share/native/sun/awt/giflib/dgif_lib.c @@ -722,6 +722,10 @@ DGifSetupDecompress(GifFileType * GifFile) { GifFilePrivateType *Private = (GifFilePrivateType *)GifFile->Private; READ(GifFile, &CodeSize, 1); /* Read Code size from file. */ + if (CodeSize >= 12) { + /* Invalid initial code size: report failure */ + return GIF_ERROR; + } BitsPerPixel = CodeSize; Private->Buf[0] = 0; /* Input Buffer empty. */ @@ -964,10 +968,13 @@ DGifDecompressInput(GifFileType * GifFile, /* If code cannot fit into RunningBits bits, must raise its size. Note * however that codes above 4095 are used for special signaling. */ - if (++Private->RunningCode > Private->MaxCode1 && - Private->RunningBits < LZ_BITS) { - Private->MaxCode1 <<= 1; - Private->RunningBits++; + if (++Private->RunningCode > Private->MaxCode1) { + if (Private->RunningBits < LZ_BITS) { + Private->MaxCode1 <<= 1; + Private->RunningBits++; + } else { + Private->RunningCode = Private->MaxCode1; + } } return GIF_OK; } From 605e712ecd9b7e9088a7b79cd506ff1b088fdac2 Mon Sep 17 00:00:00 2001 From: Daniel Fuchs Date: Mon, 9 Mar 2009 21:49:56 +0100 Subject: [PATCH 17/91] 6656633: getNotificationInfo methods static mutable Reviewed-by: emcmanus, jfdenise --- .../classes/javax/management/monitor/CounterMonitor.java | 2 +- .../share/classes/javax/management/monitor/GaugeMonitor.java | 2 +- .../classes/javax/management/monitor/StringMonitor.java | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/jdk/src/share/classes/javax/management/monitor/CounterMonitor.java b/jdk/src/share/classes/javax/management/monitor/CounterMonitor.java index f2f9887b4cd..8105e6fa8aa 100644 --- a/jdk/src/share/classes/javax/management/monitor/CounterMonitor.java +++ b/jdk/src/share/classes/javax/management/monitor/CounterMonitor.java @@ -596,7 +596,7 @@ public class CounterMonitor extends Monitor implements CounterMonitorMBean { * types sent by the counter monitor. */ public MBeanNotificationInfo[] getNotificationInfo() { - return notifsInfo; + return notifsInfo.clone(); } /* diff --git a/jdk/src/share/classes/javax/management/monitor/GaugeMonitor.java b/jdk/src/share/classes/javax/management/monitor/GaugeMonitor.java index 5ce63fbe532..8fe8700464f 100644 --- a/jdk/src/share/classes/javax/management/monitor/GaugeMonitor.java +++ b/jdk/src/share/classes/javax/management/monitor/GaugeMonitor.java @@ -478,7 +478,7 @@ public class GaugeMonitor extends Monitor implements GaugeMonitorMBean { * types sent by the gauge monitor. */ public MBeanNotificationInfo[] getNotificationInfo() { - return notifsInfo; + return notifsInfo.clone(); } /* diff --git a/jdk/src/share/classes/javax/management/monitor/StringMonitor.java b/jdk/src/share/classes/javax/management/monitor/StringMonitor.java index 3c2bbc56410..9b4af52d41e 100644 --- a/jdk/src/share/classes/javax/management/monitor/StringMonitor.java +++ b/jdk/src/share/classes/javax/management/monitor/StringMonitor.java @@ -184,6 +184,7 @@ public class StringMonitor extends Monitor implements StringMonitorMBean { * @return The derived gauge of the specified object. * */ + @Override public synchronized String getDerivedGauge(ObjectName object) { return (String) super.getDerivedGauge(object); } @@ -199,6 +200,7 @@ public class StringMonitor extends Monitor implements StringMonitorMBean { * @return The derived gauge timestamp of the specified object. * */ + @Override public synchronized long getDerivedGaugeTimeStamp(ObjectName object) { return super.getDerivedGaugeTimeStamp(object); } @@ -341,8 +343,9 @@ public class StringMonitor extends Monitor implements StringMonitorMBean { * the Java class of the notification and the notification types sent by * the string monitor. */ + @Override public MBeanNotificationInfo[] getNotificationInfo() { - return notifsInfo; + return notifsInfo.clone(); } /* From 2f5bb727a1e15d0f1d2177080cda44dcee359c4c Mon Sep 17 00:00:00 2001 From: Daniel Fuchs Date: Mon, 9 Mar 2009 22:17:52 +0100 Subject: [PATCH 18/91] 6691246: Thread context class loader can be set using JMX remote ClientNotifForwarded Reviewed-by: emcmanus --- .../remote/internal/ClientNotifForwarder.java | 98 +++++++++++++++---- 1 file changed, 80 insertions(+), 18 deletions(-) diff --git a/jdk/src/share/classes/com/sun/jmx/remote/internal/ClientNotifForwarder.java b/jdk/src/share/classes/com/sun/jmx/remote/internal/ClientNotifForwarder.java index 7af1e5f47bc..0b876340e05 100644 --- a/jdk/src/share/classes/com/sun/jmx/remote/internal/ClientNotifForwarder.java +++ b/jdk/src/share/classes/com/sun/jmx/remote/internal/ClientNotifForwarder.java @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.jmx.remote.internal; import java.io.IOException; @@ -34,6 +33,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.Executor; +import java.security.AccessControlContext; import java.security.AccessController; import java.security.PrivilegedAction; import javax.security.auth.Subject; @@ -54,6 +54,9 @@ import com.sun.jmx.remote.util.EnvHelp; public abstract class ClientNotifForwarder { + + private final AccessControlContext acc; + public ClientNotifForwarder(Map env) { this(null, env); } @@ -87,6 +90,8 @@ public abstract class ClientNotifForwarder { this.command = command; if (thread == null) { thread = new Thread() { + + @Override public void run() { while (true) { Runnable r; @@ -130,6 +135,7 @@ public abstract class ClientNotifForwarder { this.defaultClassLoader = defaultClassLoader; this.executor = ex; + this.acc = AccessController.getContext(); } /** @@ -390,28 +396,85 @@ public abstract class ClientNotifForwarder { setState(TERMINATED); } -// ------------------------------------------------- -// private classes -// ------------------------------------------------- + + // ------------------------------------------------- + // private classes + // ------------------------------------------------- // + private class NotifFetcher implements Runnable { + + private volatile boolean alreadyLogged = false; + + private void logOnce(String msg, SecurityException x) { + if (alreadyLogged) return; + // Log only once. + logger.config("setContextClassLoader",msg); + if (x != null) logger.fine("setContextClassLoader", x); + alreadyLogged = true; + } + + // Set new context class loader, returns previous one. + private final ClassLoader setContextClassLoader(final ClassLoader loader) { + final AccessControlContext ctxt = ClientNotifForwarder.this.acc; + // if ctxt is null, log a config message and throw a + // SecurityException. + if (ctxt == null) { + logOnce("AccessControlContext must not be null.",null); + throw new SecurityException("AccessControlContext must not be null"); + } + return AccessController.doPrivileged( + new PrivilegedAction() { + public ClassLoader run() { + try { + // get context class loader - may throw + // SecurityException - though unlikely. + final ClassLoader previous = + Thread.currentThread().getContextClassLoader(); + + // if nothing needs to be done, break here... + if (loader == previous) return previous; + + // reset context class loader - may throw + // SecurityException + Thread.currentThread().setContextClassLoader(loader); + return previous; + } catch (SecurityException x) { + logOnce("Permission to set ContextClassLoader missing. " + + "Notifications will not be dispatched. " + + "Please check your Java policy configuration: " + + x, x); + throw x; + } + } + }, ctxt); + } + public void run() { + final ClassLoader previous; + if (defaultClassLoader != null) { + previous = setContextClassLoader(defaultClassLoader); + } else { + previous = null; + } + try { + doRun(); + } finally { + if (defaultClassLoader != null) { + setContextClassLoader(previous); + } + } + } + + private void doRun() { synchronized (ClientNotifForwarder.this) { currentFetchThread = Thread.currentThread(); - if (state == STARTING) + if (state == STARTING) { setState(STARTED); + } } - if (defaultClassLoader != null) { - AccessController.doPrivileged(new PrivilegedAction() { - public Void run() { - Thread.currentThread(). - setContextClassLoader(defaultClassLoader); - return null; - } - }); - } NotificationResult nr = null; if (!shouldStop() && (nr = fetchNotifs()) != null) { @@ -444,8 +507,9 @@ public abstract class ClientNotifForwarder { // check if an mbean unregistration notif if (!listenerID.equals(mbeanRemovedNotifID)) { final ClientListenerInfo li = infoList.get(listenerID); - if (li != null) - listeners.put(listenerID,li); + if (li != null) { + listeners.put(listenerID, li); + } continue; } final Notification notif = tn.getNotification(); @@ -786,9 +850,7 @@ public abstract class ClientNotifForwarder { private long clientSequenceNumber = -1; private final int maxNotifications; private final long timeout; - private Integer mbeanRemovedNotifID = null; - private Thread currentFetchThread; // state From b047886b2f759d6bef024537432eecf9a4d70311 Mon Sep 17 00:00:00 2001 From: Daniel Fuchs Date: Mon, 9 Mar 2009 22:34:08 +0100 Subject: [PATCH 19/91] 6610888: Potential use of cleared of incorrect acc in JMX Monitor Reviewed-by: emcmanus --- .../javax/management/monitor/Monitor.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/jdk/src/share/classes/javax/management/monitor/Monitor.java b/jdk/src/share/classes/javax/management/monitor/Monitor.java index 1b057e1b4a6..75f3ae87771 100644 --- a/jdk/src/share/classes/javax/management/monitor/Monitor.java +++ b/jdk/src/share/classes/javax/management/monitor/Monitor.java @@ -32,6 +32,7 @@ import java.io.IOException; import java.security.AccessControlContext; import java.security.AccessController; import java.security.PrivilegedAction; +import java.security.ProtectionDomain; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.ExecutorService; @@ -164,7 +165,10 @@ public abstract class Monitor /** * AccessControlContext of the Monitor.start() caller. */ - private AccessControlContext acc; + private static final AccessControlContext noPermissionsACC = + new AccessControlContext( + new ProtectionDomain[] {new ProtectionDomain(null, null)}); + private volatile AccessControlContext acc = noPermissionsACC; /** * Scheduler Service. @@ -749,7 +753,7 @@ public abstract class Monitor // Reset the AccessControlContext. // - acc = null; + acc = noPermissionsACC; // Reset the complex type attribute information // such that it is recalculated again. @@ -1518,10 +1522,12 @@ public abstract class Monitor public void run() { final ScheduledFuture sf; + final AccessControlContext ac; synchronized (Monitor.this) { sf = Monitor.this.schedulerFuture; + ac = Monitor.this.acc; } - AccessController.doPrivileged(new PrivilegedAction() { + PrivilegedAction action = new PrivilegedAction() { public Void run() { if (Monitor.this.isActive()) { final int an[] = alreadyNotifieds; @@ -1534,7 +1540,11 @@ public abstract class Monitor } return null; } - }, Monitor.this.acc); + }; + if (ac == null) { + throw new SecurityException("AccessControlContext cannot be null"); + } + AccessController.doPrivileged(action, ac); synchronized (Monitor.this) { if (Monitor.this.isActive() && Monitor.this.schedulerFuture == sf) { From fbcaea5fc158f43ff301239350232d25dc251120 Mon Sep 17 00:00:00 2001 From: Daniel Fuchs Date: Mon, 9 Mar 2009 22:49:21 +0100 Subject: [PATCH 20/91] 6610896: JMX Monitor handles thread groups incorrectly Reviewed-by: emcmanus --- .../javax/management/monitor/Monitor.java | 97 ++++++++++++++----- 1 file changed, 74 insertions(+), 23 deletions(-) diff --git a/jdk/src/share/classes/javax/management/monitor/Monitor.java b/jdk/src/share/classes/javax/management/monitor/Monitor.java index 1b057e1b4a6..df66414a1a0 100644 --- a/jdk/src/share/classes/javax/management/monitor/Monitor.java +++ b/jdk/src/share/classes/javax/management/monitor/Monitor.java @@ -33,8 +33,9 @@ import java.security.AccessControlContext; import java.security.AccessController; import java.security.PrivilegedAction; import java.util.List; +import java.util.Map; +import java.util.WeakHashMap; import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.LinkedBlockingQueue; @@ -173,15 +174,21 @@ public abstract class Monitor Executors.newSingleThreadScheduledExecutor( new DaemonThreadFactory("Scheduler")); + /** + * Map containing the thread pool executor per thread group. + */ + private static final Map executors = + new WeakHashMap(); + + /** + * Lock for executors map. + */ + private static final Object executorsLock = new Object(); + /** * Maximum Pool Size */ private static final int maximumPoolSize; - - /** - * Executor Service. - */ - private static final ExecutorService executor; static { final String maximumPoolSizeSysProp = "jmx.x.monitor.maximum.pool.size"; final String maximumPoolSizeStr = AccessController.doPrivileged( @@ -211,21 +218,8 @@ public abstract class Monitor maximumPoolSize = maximumPoolSizeTmp; } } - executor = new ThreadPoolExecutor( - maximumPoolSize, - maximumPoolSize, - 60L, - TimeUnit.SECONDS, - new LinkedBlockingQueue(), - new DaemonThreadFactory("Executor")); - ((ThreadPoolExecutor)executor).allowCoreThreadTimeOut(true); } - /** - * Monitor task to be executed by the Executor Service. - */ - private final MonitorTask monitorTask = new MonitorTask(); - /** * Future associated to the current monitor task. */ @@ -234,7 +228,7 @@ public abstract class Monitor /** * Scheduler task to be executed by the Scheduler Service. */ - private final SchedulerTask schedulerTask = new SchedulerTask(monitorTask); + private final SchedulerTask schedulerTask = new SchedulerTask(); /** * ScheduledFuture associated to the current scheduler task. @@ -720,6 +714,7 @@ public abstract class Monitor // Start the scheduler. // cleanupFutures(); + schedulerTask.setMonitorTask(new MonitorTask()); schedulerFuture = scheduler.schedule(schedulerTask, getGranularityPeriod(), TimeUnit.MILLISECONDS); @@ -1468,7 +1463,7 @@ public abstract class Monitor */ private class SchedulerTask implements Runnable { - private Runnable task = null; + private MonitorTask task; /* * ------------------------------------------ @@ -1476,7 +1471,16 @@ public abstract class Monitor * ------------------------------------------ */ - public SchedulerTask(Runnable task) { + public SchedulerTask() { + } + + /* + * ------------------------------------------ + * GETTERS/SETTERS + * ------------------------------------------ + */ + + public void setMonitorTask(MonitorTask task) { this.task = task; } @@ -1488,7 +1492,7 @@ public abstract class Monitor public void run() { synchronized (Monitor.this) { - Monitor.this.monitorFuture = executor.submit(task); + Monitor.this.monitorFuture = task.submit(); } } } @@ -1501,6 +1505,8 @@ public abstract class Monitor */ private class MonitorTask implements Runnable { + private ThreadPoolExecutor executor; + /* * ------------------------------------------ * CONSTRUCTORS @@ -1508,6 +1514,38 @@ public abstract class Monitor */ public MonitorTask() { + // Find out if there's already an existing executor for the calling + // thread and reuse it. Otherwise, create a new one and store it in + // the executors map. If there is a SecurityManager, the group of + // System.getSecurityManager() is used, else the group of the thread + // instantiating this MonitorTask, i.e. the group of the thread that + // calls "Monitor.start()". + SecurityManager s = System.getSecurityManager(); + ThreadGroup group = (s != null) ? s.getThreadGroup() : + Thread.currentThread().getThreadGroup(); + synchronized (executorsLock) { + for (ThreadPoolExecutor e : executors.keySet()) { + DaemonThreadFactory tf = + (DaemonThreadFactory) e.getThreadFactory(); + ThreadGroup tg = tf.getThreadGroup(); + if (tg == group) { + executor = e; + break; + } + } + if (executor == null) { + executor = new ThreadPoolExecutor( + maximumPoolSize, + maximumPoolSize, + 60L, + TimeUnit.SECONDS, + new LinkedBlockingQueue(), + new DaemonThreadFactory("ThreadGroup<" + + group.getName() + "> Executor", group)); + executor.allowCoreThreadTimeOut(true); + executors.put(executor, null); + } + } } /* @@ -1516,6 +1554,10 @@ public abstract class Monitor * ------------------------------------------ */ + public Future submit() { + return executor.submit(this); + } + public void run() { final ScheduledFuture sf; synchronized (Monitor.this) { @@ -1574,6 +1616,15 @@ public abstract class Monitor namePrefix = "JMX Monitor " + poolName + " Pool [Thread-"; } + public DaemonThreadFactory(String poolName, ThreadGroup threadGroup) { + group = threadGroup; + namePrefix = "JMX Monitor " + poolName + " Pool [Thread-"; + } + + public ThreadGroup getThreadGroup() { + return group; + } + public Thread newThread(Runnable r) { Thread t = new Thread(group, r, From f9e73b6fb38fb03fc425473f8c7d9a4d0f770001 Mon Sep 17 00:00:00 2001 From: Rama Pulavarthi Date: Mon, 9 Mar 2009 15:32:10 -0700 Subject: [PATCH 21/91] 6536193: Fix the flaw in UTF8XmlOutput Reviewed-by: tbell --- .../bind/v2/runtime/output/UTF8XmlOutput.java | 46 +++++++++++++------ 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java index 0bace854bdd..cd3a5de9b32 100644 --- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java +++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.xml.internal.bind.v2.runtime.output; import java.io.IOException; @@ -33,6 +32,7 @@ import javax.xml.stream.XMLStreamException; import com.sun.xml.internal.bind.DatatypeConverterImpl; import com.sun.xml.internal.bind.v2.runtime.Name; import com.sun.xml.internal.bind.v2.runtime.XMLSerializer; +import com.sun.xml.internal.bind.v2.runtime.MarshallerImpl; import org.xml.sax.SAXException; @@ -81,6 +81,11 @@ public class UTF8XmlOutput extends XmlOutputAbstractImpl { */ protected boolean closeStartTagPending = false; + /** + * @see MarshallerImpl#header + */ + private String header; + /** * * @param localNames @@ -93,6 +98,10 @@ public class UTF8XmlOutput extends XmlOutputAbstractImpl { prefixes[i] = new Encoded(); } + public void setHeader(String header) { + this.header = header; + } + @Override public void startDocument(XMLSerializer serializer, boolean fragment, int[] nsUriIndex2prefixIndex, NamespaceContextImpl nsContext) throws IOException, SAXException, XMLStreamException { super.startDocument(serializer, fragment,nsUriIndex2prefixIndex,nsContext); @@ -101,6 +110,10 @@ public class UTF8XmlOutput extends XmlOutputAbstractImpl { if(!fragment) { write(XML_DECL); } + if(header!=null) { + textBuffer.set(header); + textBuffer.write(this); + } } public void endDocument(boolean fragment) throws IOException, SAXException, XMLStreamException { @@ -377,13 +390,6 @@ public class UTF8XmlOutput extends XmlOutputAbstractImpl { octetBufferIndex = 0; } - public void flush() throws IOException { - flushBuffer(); - out.flush(); - } - - - static byte[] toBytes(String s) { byte[] buf = new byte[s.length()]; for( int i=s.length()-1; i>=0; i-- ) @@ -391,11 +397,23 @@ public class UTF8XmlOutput extends XmlOutputAbstractImpl { return buf; } - private static final byte[] XMLNS_EQUALS = toBytes(" xmlns=\""); - private static final byte[] XMLNS_COLON = toBytes(" xmlns:"); - private static final byte[] EQUALS = toBytes("=\""); - private static final byte[] CLOSE_TAG = toBytes(""); + // per instance copy to prevent an attack where malicious OutputStream + // rewrites the byte array. + private final byte[] XMLNS_EQUALS = _XMLNS_EQUALS.clone(); + private final byte[] XMLNS_COLON = _XMLNS_COLON.clone(); + private final byte[] EQUALS = _EQUALS.clone(); + private final byte[] CLOSE_TAG = _CLOSE_TAG.clone(); + private final byte[] EMPTY_TAG = _EMPTY_TAG.clone(); + private final byte[] XML_DECL = _XML_DECL.clone(); + + // masters + private static final byte[] _XMLNS_EQUALS = toBytes(" xmlns=\""); + private static final byte[] _XMLNS_COLON = toBytes(" xmlns:"); + private static final byte[] _EQUALS = toBytes("=\""); + private static final byte[] _CLOSE_TAG = toBytes(""); + private static final byte[] _XML_DECL = toBytes(""); + + // no need to copy private static final byte[] EMPTY_BYTE_ARRAY = new byte[0]; - private static final byte[] XML_DECL = toBytes(""); } From 576a962dcb64912573e7298c03ef8d66cce17ead Mon Sep 17 00:00:00 2001 From: Daniel Fuchs Date: Mon, 9 Mar 2009 23:50:11 +0100 Subject: [PATCH 22/91] 6721651: Security problem with out-of-the-box management Reviewed-by: emcmanus, lmalvent --- .../security/MBeanServerAccessController.java | 52 ++- .../MBeanServerFileAccessController.java | 376 +++++++++++++++--- jdk/src/share/lib/management/jmxremote.access | 47 ++- 3 files changed, 389 insertions(+), 86 deletions(-) diff --git a/jdk/src/share/classes/com/sun/jmx/remote/security/MBeanServerAccessController.java b/jdk/src/share/classes/com/sun/jmx/remote/security/MBeanServerAccessController.java index d75f829c321..71e6f6ff019 100644 --- a/jdk/src/share/classes/com/sun/jmx/remote/security/MBeanServerAccessController.java +++ b/jdk/src/share/classes/com/sun/jmx/remote/security/MBeanServerAccessController.java @@ -111,6 +111,22 @@ public abstract class MBeanServerAccessController */ protected abstract void checkWrite(); + /** + * Check if the caller can create the named class. The default + * implementation of this method calls {@link #checkWrite()}. + */ + protected void checkCreate(String className) { + checkWrite(); + } + + /** + * Check if the caller can unregister the named MBean. The default + * implementation of this method calls {@link #checkWrite()}. + */ + protected void checkUnregister(ObjectName name) { + checkWrite(); + } + //-------------------------------------------- //-------------------------------------------- // @@ -148,7 +164,7 @@ public abstract class MBeanServerAccessController } /** - * Call checkWrite(), then forward this method to the + * Call checkCreate(className), then forward this method to the * wrapped object. */ public ObjectInstance createMBean(String className, ObjectName name) @@ -158,7 +174,7 @@ public abstract class MBeanServerAccessController MBeanRegistrationException, MBeanException, NotCompliantMBeanException { - checkWrite(); + checkCreate(className); SecurityManager sm = System.getSecurityManager(); if (sm == null) { Object object = getMBeanServer().instantiate(className); @@ -170,7 +186,7 @@ public abstract class MBeanServerAccessController } /** - * Call checkWrite(), then forward this method to the + * Call checkCreate(className), then forward this method to the * wrapped object. */ public ObjectInstance createMBean(String className, ObjectName name, @@ -181,7 +197,7 @@ public abstract class MBeanServerAccessController MBeanRegistrationException, MBeanException, NotCompliantMBeanException { - checkWrite(); + checkCreate(className); SecurityManager sm = System.getSecurityManager(); if (sm == null) { Object object = getMBeanServer().instantiate(className, @@ -196,7 +212,7 @@ public abstract class MBeanServerAccessController } /** - * Call checkWrite(), then forward this method to the + * Call checkCreate(className), then forward this method to the * wrapped object. */ public ObjectInstance createMBean(String className, @@ -209,7 +225,7 @@ public abstract class MBeanServerAccessController MBeanException, NotCompliantMBeanException, InstanceNotFoundException { - checkWrite(); + checkCreate(className); SecurityManager sm = System.getSecurityManager(); if (sm == null) { Object object = getMBeanServer().instantiate(className, @@ -222,7 +238,7 @@ public abstract class MBeanServerAccessController } /** - * Call checkWrite(), then forward this method to the + * Call checkCreate(className), then forward this method to the * wrapped object. */ public ObjectInstance createMBean(String className, @@ -237,7 +253,7 @@ public abstract class MBeanServerAccessController MBeanException, NotCompliantMBeanException, InstanceNotFoundException { - checkWrite(); + checkCreate(className); SecurityManager sm = System.getSecurityManager(); if (sm == null) { Object object = getMBeanServer().instantiate(className, @@ -394,45 +410,45 @@ public abstract class MBeanServerAccessController } /** - * Call checkWrite(), then forward this method to the + * Call checkCreate(className), then forward this method to the * wrapped object. */ public Object instantiate(String className) throws ReflectionException, MBeanException { - checkWrite(); + checkCreate(className); return getMBeanServer().instantiate(className); } /** - * Call checkWrite(), then forward this method to the + * Call checkCreate(className), then forward this method to the * wrapped object. */ public Object instantiate(String className, Object params[], String signature[]) throws ReflectionException, MBeanException { - checkWrite(); + checkCreate(className); return getMBeanServer().instantiate(className, params, signature); } /** - * Call checkWrite(), then forward this method to the + * Call checkCreate(className), then forward this method to the * wrapped object. */ public Object instantiate(String className, ObjectName loaderName) throws ReflectionException, MBeanException, InstanceNotFoundException { - checkWrite(); + checkCreate(className); return getMBeanServer().instantiate(className, loaderName); } /** - * Call checkWrite(), then forward this method to the + * Call checkCreate(className), then forward this method to the * wrapped object. */ public Object instantiate(String className, ObjectName loaderName, Object params[], String signature[]) throws ReflectionException, MBeanException, InstanceNotFoundException { - checkWrite(); + checkCreate(className); return getMBeanServer().instantiate(className, loaderName, params, signature); } @@ -579,12 +595,12 @@ public abstract class MBeanServerAccessController } /** - * Call checkWrite(), then forward this method to the + * Call checkUnregister(), then forward this method to the * wrapped object. */ public void unregisterMBean(ObjectName name) throws InstanceNotFoundException, MBeanRegistrationException { - checkWrite(); + checkUnregister(name); getMBeanServer().unregisterMBean(name); } diff --git a/jdk/src/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java b/jdk/src/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java index 8bca71dbc62..01bb6108e43 100644 --- a/jdk/src/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java +++ b/jdk/src/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java @@ -31,11 +31,17 @@ import java.security.AccessControlContext; import java.security.AccessController; import java.security.Principal; import java.security.PrivilegedAction; -import java.util.Collection; +import java.util.ArrayList; +import java.util.HashMap; import java.util.Iterator; +import java.util.List; +import java.util.Map; import java.util.Properties; import java.util.Set; +import java.util.StringTokenizer; +import java.util.regex.Pattern; import javax.management.MBeanServer; +import javax.management.ObjectName; import javax.security.auth.Subject; /** @@ -46,7 +52,8 @@ import javax.security.auth.Subject; * not allowed; in this case the request is not forwarded to the * wrapped object.

* - *

This class implements the {@link #checkRead()} and {@link #checkWrite()} + *

This class implements the {@link #checkRead()}, {@link #checkWrite()}, + * {@link #checkCreate(String)}, and {@link #checkUnregister(ObjectName)} * methods based on an access level properties file containing username/access * level pairs. The set of username/access level pairs is passed either as a * filename which denotes a properties file on disk, or directly as an instance @@ -56,14 +63,50 @@ import javax.security.auth.Subject; * has exactly one access level. The same access level can be shared by several * usernames.

* - *

The supported access level values are readonly and - * readwrite.

+ *

The supported access level values are {@code readonly} and + * {@code readwrite}. The {@code readwrite} access level can be + * qualified by one or more clauses, where each clause looks + * like create classNamePattern or {@code + * unregister}. For example:

+ * + * 
+ * monitorRole  readonly
+ * controlRole  readwrite \
+ *              create javax.management.timer.*,javax.management.monitor.* \
+ *              unregister
+ *
+ * + *

(The continuation lines with {@code \} come from the parser for + * Properties files.)

*/ public class MBeanServerFileAccessController extends MBeanServerAccessController { - public static final String READONLY = "readonly"; - public static final String READWRITE = "readwrite"; + static final String READONLY = "readonly"; + static final String READWRITE = "readwrite"; + + static final String CREATE = "create"; + static final String UNREGISTER = "unregister"; + + private enum AccessType {READ, WRITE, CREATE, UNREGISTER}; + + private static class Access { + final boolean write; + final String[] createPatterns; + private boolean unregister; + + Access(boolean write, boolean unregister, List createPatternList) { + this.write = write; + int npats = (createPatternList == null) ? 0 : createPatternList.size(); + if (npats == 0) + this.createPatterns = NO_STRINGS; + else + this.createPatterns = createPatternList.toArray(new String[npats]); + this.unregister = unregister; + } + + private final String[] NO_STRINGS = new String[0]; + } /** *

Create a new MBeanServerAccessController that forwards all the @@ -87,8 +130,8 @@ public class MBeanServerFileAccessController throws IOException { super(); this.accessFileName = accessFileName; - props = propertiesFromFile(accessFileName); - checkValues(props); + Properties props = propertiesFromFile(accessFileName); + parseProperties(props); } /** @@ -123,14 +166,14 @@ public class MBeanServerFileAccessController * #setMBeanServer} method after doing access checks based on read and * write permissions.

* - *

This instance is initialized from the specified properties instance. - * This constructor makes a copy of the properties instance using its - * clone method and it is the copy that is consulted to check - * the username and access level of an incoming connection. The original - * properties object can be modified without affecting the copy. If the - * {@link #refresh} method is then called, the - * MBeanServerFileAccessController will make a new copy of the - * properties object at that time.

+ *

This instance is initialized from the specified properties + * instance. This constructor makes a copy of the properties + * instance and it is the copy that is consulted to check the + * username and access level of an incoming connection. The + * original properties object can be modified without affecting + * the copy. If the {@link #refresh} method is then called, the + * MBeanServerFileAccessController will make a new + * copy of the properties object at that time.

* * @param accessFileProps properties list containing the username/access * level entries. @@ -145,8 +188,7 @@ public class MBeanServerFileAccessController if (accessFileProps == null) throw new IllegalArgumentException("Null properties"); originalProps = accessFileProps; - props = (Properties) accessFileProps.clone(); - checkValues(props); + parseProperties(accessFileProps); } /** @@ -155,14 +197,14 @@ public class MBeanServerFileAccessController * #setMBeanServer} method after doing access checks based on read and * write permissions.

* - *

This instance is initialized from the specified properties instance. - * This constructor makes a copy of the properties instance using its - * clone method and it is the copy that is consulted to check - * the username and access level of an incoming connection. The original - * properties object can be modified without affecting the copy. If the - * {@link #refresh} method is then called, the - * MBeanServerFileAccessController will make a new copy of the - * properties object at that time.

+ *

This instance is initialized from the specified properties + * instance. This constructor makes a copy of the properties + * instance and it is the copy that is consulted to check the + * username and access level of an incoming connection. The + * original properties object can be modified without affecting + * the copy. If the {@link #refresh} method is then called, the + * MBeanServerFileAccessController will make a new + * copy of the properties object at that time.

* * @param accessFileProps properties list containing the username/access * level entries. @@ -184,16 +226,36 @@ public class MBeanServerFileAccessController * Check if the caller can do read operations. This method does * nothing if so, otherwise throws SecurityException. */ + @Override public void checkRead() { - checkAccessLevel(READONLY); + checkAccess(AccessType.READ, null); } /** * Check if the caller can do write operations. This method does * nothing if so, otherwise throws SecurityException. */ + @Override public void checkWrite() { - checkAccessLevel(READWRITE); + checkAccess(AccessType.WRITE, null); + } + + /** + * Check if the caller can create MBeans or instances of the given class. + * This method does nothing if so, otherwise throws SecurityException. + */ + @Override + public void checkCreate(String className) { + checkAccess(AccessType.CREATE, className); + } + + /** + * Check if the caller can do unregister operations. This method does + * nothing if so, otherwise throws SecurityException. + */ + @Override + public void checkUnregister(ObjectName name) { + checkAccess(AccessType.UNREGISTER, null); } /** @@ -218,14 +280,13 @@ public class MBeanServerFileAccessController * @exception IllegalArgumentException if any of the supplied access * level values differs from "readonly" or "readwrite". */ - public void refresh() throws IOException { - synchronized (props) { - if (accessFileName == null) - props = (Properties) originalProps.clone(); - else - props = propertiesFromFile(accessFileName); - checkValues(props); - } + public synchronized void refresh() throws IOException { + Properties props; + if (accessFileName == null) + props = (Properties) originalProps; + else + props = propertiesFromFile(accessFileName); + parseProperties(props); } private static Properties propertiesFromFile(String fname) @@ -240,7 +301,7 @@ public class MBeanServerFileAccessController } } - private void checkAccessLevel(String accessLevel) { + private synchronized void checkAccess(AccessType requiredAccess, String arg) { final AccessControlContext acc = AccessController.getContext(); final Subject s = AccessController.doPrivileged(new PrivilegedAction() { @@ -250,39 +311,234 @@ public class MBeanServerFileAccessController }); if (s == null) return; /* security has not been enabled */ final Set principals = s.getPrincipals(); + String newPropertyValue = null; for (Iterator i = principals.iterator(); i.hasNext(); ) { final Principal p = (Principal) i.next(); - String grantedAccessLevel; - synchronized (props) { - grantedAccessLevel = props.getProperty(p.getName()); - } - if (grantedAccessLevel != null) { - if (accessLevel.equals(READONLY) && - (grantedAccessLevel.equals(READONLY) || - grantedAccessLevel.equals(READWRITE))) - return; - if (accessLevel.equals(READWRITE) && - grantedAccessLevel.equals(READWRITE)) + Access access = accessMap.get(p.getName()); + if (access != null) { + boolean ok; + switch (requiredAccess) { + case READ: + ok = true; // all access entries imply read + break; + case WRITE: + ok = access.write; + break; + case UNREGISTER: + ok = access.unregister; + if (!ok && access.write) + newPropertyValue = "unregister"; + break; + case CREATE: + ok = checkCreateAccess(access, arg); + if (!ok && access.write) + newPropertyValue = "create " + arg; + break; + default: + throw new AssertionError(); + } + if (ok) return; } } - throw new SecurityException("Access denied! Invalid access level for " + - "requested MBeanServer operation."); + SecurityException se = new SecurityException("Access denied! Invalid " + + "access level for requested MBeanServer operation."); + // Add some more information to help people with deployments that + // worked before we required explicit create clauses. We're not giving + // any information to the bad guys, other than that the access control + // is based on a file, which they could have worked out from the stack + // trace anyway. + if (newPropertyValue != null) { + SecurityException se2 = new SecurityException("Access property " + + "for this identity should be similar to: " + READWRITE + + " " + newPropertyValue); + se.initCause(se2); + } + throw se; } - private void checkValues(Properties props) { - Collection c = props.values(); - for (Iterator i = c.iterator(); i.hasNext(); ) { - final String accessLevel = (String) i.next(); - if (!accessLevel.equals(READONLY) && - !accessLevel.equals(READWRITE)) { - throw new IllegalArgumentException( - "Syntax error in access level entry [" + accessLevel + "]"); - } + private static boolean checkCreateAccess(Access access, String className) { + for (String classNamePattern : access.createPatterns) { + if (classNameMatch(classNamePattern, className)) + return true; + } + return false; + } + + private static boolean classNameMatch(String pattern, String className) { + // We studiously avoided regexes when parsing the properties file, + // because that is done whenever the VM is started with the + // appropriate -Dcom.sun.management options, even if nobody ever + // creates an MBean. We don't want to incur the overhead of loading + // all the regex code whenever those options are specified, but if we + // get as far as here then the VM is already running and somebody is + // doing the very unusual operation of remotely creating an MBean. + // Because that operation is so unusual, we don't try to optimize + // by hand-matching or by caching compiled Pattern objects. + StringBuilder sb = new StringBuilder(); + StringTokenizer stok = new StringTokenizer(pattern, "*", true); + while (stok.hasMoreTokens()) { + String tok = stok.nextToken(); + if (tok.equals("*")) + sb.append("[^.]*"); + else + sb.append(Pattern.quote(tok)); + } + return className.matches(sb.toString()); + } + + private void parseProperties(Properties props) { + this.accessMap = new HashMap(); + for (Map.Entry entry : props.entrySet()) { + String identity = (String) entry.getKey(); + String accessString = (String) entry.getValue(); + Access access = Parser.parseAccess(identity, accessString); + accessMap.put(identity, access); } } - private Properties props; + private static class Parser { + private final static int EOS = -1; // pseudo-codepoint "end of string" + static { + assert !Character.isWhitespace(EOS); + } + + private final String identity; // just for better error messages + private final String s; // the string we're parsing + private final int len; // s.length() + private int i; + private int c; + // At any point, either c is s.codePointAt(i), or i == len and + // c is EOS. We use int rather than char because it is conceivable + // (if unlikely) that a classname in a create clause might contain + // "supplementary characters", the ones that don't fit in the original + // 16 bits for Unicode. + + private Parser(String identity, String s) { + this.identity = identity; + this.s = s; + this.len = s.length(); + this.i = 0; + if (i < len) + this.c = s.codePointAt(i); + else + this.c = EOS; + } + + static Access parseAccess(String identity, String s) { + return new Parser(identity, s).parseAccess(); + } + + private Access parseAccess() { + skipSpace(); + String type = parseWord(); + Access access; + if (type.equals(READONLY)) + access = new Access(false, false, null); + else if (type.equals(READWRITE)) + access = parseReadWrite(); + else { + throw syntax("Expected " + READONLY + " or " + READWRITE + + ": " + type); + } + if (c != EOS) + throw syntax("Extra text at end of line"); + return access; + } + + private Access parseReadWrite() { + List createClasses = new ArrayList(); + boolean unregister = false; + while (true) { + skipSpace(); + if (c == EOS) + break; + String type = parseWord(); + if (type.equals(UNREGISTER)) + unregister = true; + else if (type.equals(CREATE)) + parseCreate(createClasses); + else + throw syntax("Unrecognized keyword " + type); + } + return new Access(true, unregister, createClasses); + } + + private void parseCreate(List createClasses) { + while (true) { + skipSpace(); + createClasses.add(parseClassName()); + skipSpace(); + if (c == ',') + next(); + else + break; + } + } + + private String parseClassName() { + // We don't check that classname components begin with suitable + // characters (so we accept 1.2.3 for example). This means that + // there are only two states, which we can call dotOK and !dotOK + // according as a dot (.) is legal or not. Initially we're in + // !dotOK since a classname can't start with a dot; after a dot + // we're in !dotOK again; and after any other characters we're in + // dotOK. The classname is only accepted if we end in dotOK, + // so we reject an empty name or a name that ends with a dot. + final int start = i; + boolean dotOK = false; + while (true) { + if (c == '.') { + if (!dotOK) + throw syntax("Bad . in class name"); + dotOK = false; + } else if (c == '*' || Character.isJavaIdentifierPart(c)) + dotOK = true; + else + break; + next(); + } + String className = s.substring(start, i); + if (!dotOK) + throw syntax("Bad class name " + className); + return className; + } + + // Advance c and i to the next character, unless already at EOS. + private void next() { + if (c != EOS) { + i += Character.charCount(c); + if (i < len) + c = s.codePointAt(i); + else + c = EOS; + } + } + + private void skipSpace() { + while (Character.isWhitespace(c)) + next(); + } + + private String parseWord() { + skipSpace(); + if (c == EOS) + throw syntax("Expected word at end of line"); + final int start = i; + while (c != EOS && !Character.isWhitespace(c)) + next(); + String word = s.substring(start, i); + skipSpace(); + return word; + } + + private IllegalArgumentException syntax(String msg) { + return new IllegalArgumentException( + msg + " [" + identity + " " + s + "]"); + } + } + + private Map accessMap; private Properties originalProps; private String accessFileName; } diff --git a/jdk/src/share/lib/management/jmxremote.access b/jdk/src/share/lib/management/jmxremote.access index 765f118a364..ce80b47a1a8 100644 --- a/jdk/src/share/lib/management/jmxremote.access +++ b/jdk/src/share/lib/management/jmxremote.access @@ -8,7 +8,7 @@ # passwords. To be functional, a role must have an entry in # both the password and the access files. # -# Default location of this file is $JRE/lib/management/jmxremote.access +# The default location of this file is $JRE/lib/management/jmxremote.access # You can specify an alternate location by specifying a property in # the management config file $JRE/lib/management/management.properties # (See that file for details) @@ -16,7 +16,7 @@ # The file format for password and access files is syntactically the same # as the Properties file format. The syntax is described in the Javadoc # for java.util.Properties.load. -# Typical access file has multiple lines, where each line is blank, +# A typical access file has multiple lines, where each line is blank, # a comment (like this one), or an access control entry. # # An access control entry consists of a role name, and an @@ -29,10 +29,38 @@ # role can read measurements but cannot perform any action # that changes the environment of the running program. # "readwrite" grants access to read and write attributes of MBeans, -# to invoke operations on them, and to create or remove them. -# This access should be granted to only trusted clients, -# since they can potentially interfere with the smooth -# operation of a running program +# to invoke operations on them, and optionally +# to create or remove them. This access should be granted +# only to trusted clients, since they can potentially +# interfere with the smooth operation of a running program. +# +# The "readwrite" access level can optionally be followed by the "create" and/or +# "unregister" keywords. The "unregister" keyword grants access to unregister +# (delete) MBeans. The "create" keyword grants access to create MBeans of a +# particular class or of any class matching a particular pattern. Access +# should only be granted to create MBeans of known and trusted classes. +# +# For example, the following entry would grant readwrite access +# to "controlRole", as well as access to create MBeans of the class +# javax.management.monitor.CounterMonitor and to unregister any MBean: +# controlRole readwrite \ +# create javax.management.monitor.CounterMonitorMBean \ +# unregister +# or equivalently: +# controlRole readwrite unregister create javax.management.monitor.CounterMBean +# +# The following entry would grant readwrite access as well as access to create +# MBeans of any class in the packages javax.management.monitor and +# javax.management.timer: +# controlRole readwrite \ +# create javax.management.monitor.*,javax.management.timer.* \ +# unregister +# +# The \ character is defined in the Properties file syntax to allow continuation +# lines as shown here. A * in a class pattern matches a sequence of characters +# other than dot (.), so javax.management.monitor.* matches +# javax.management.monitor.CounterMonitor but not +# javax.management.monitor.foo.Bar. # # A given role should have at most one entry in this file. If a role # has no entry, it has no access. @@ -42,7 +70,10 @@ # # Default access control entries: # o The "monitorRole" role has readonly access. -# o The "controlRole" role has readwrite access. +# o The "controlRole" role has readwrite access and can create the standard +# Timer and Monitor MBeans defined by the JMX API. monitorRole readonly -controlRole readwrite +controlRole readwrite \ + create javax.management.monitor.*,javax.management.timer.* \ + unregister From a0ec52da3321d09d06b2b59adac591d63d9330cc Mon Sep 17 00:00:00 2001 From: Michael McMahon Date: Tue, 10 Mar 2009 03:18:22 -0700 Subject: [PATCH 23/91] 6630639: lightweight HttpServer leaks file descriptors on no-data connections Not cleaning up no-data connections properly Reviewed-by: chegar --- jdk/src/share/classes/sun/net/httpserver/Request.java | 3 +++ jdk/src/share/classes/sun/net/httpserver/ServerImpl.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/jdk/src/share/classes/sun/net/httpserver/Request.java b/jdk/src/share/classes/sun/net/httpserver/Request.java index bdafe663c1b..02d240c989c 100644 --- a/jdk/src/share/classes/sun/net/httpserver/Request.java +++ b/jdk/src/share/classes/sun/net/httpserver/Request.java @@ -52,6 +52,9 @@ class Request { os = rawout; do { startLine = readLine(); + if (startLine == null) { + return; + } /* skip blank lines */ } while (startLine.equals ("")); } diff --git a/jdk/src/share/classes/sun/net/httpserver/ServerImpl.java b/jdk/src/share/classes/sun/net/httpserver/ServerImpl.java index 104bdb0180b..919f7ce8ab6 100644 --- a/jdk/src/share/classes/sun/net/httpserver/ServerImpl.java +++ b/jdk/src/share/classes/sun/net/httpserver/ServerImpl.java @@ -441,6 +441,7 @@ class ServerImpl implements TimeSource { rawin = sslStreams.getInputStream(); rawout = sslStreams.getOutputStream(); engine = sslStreams.getSSLEngine(); + connection.sslStreams = sslStreams; } else { rawin = new BufferedInputStream( new Request.ReadStream ( @@ -450,6 +451,8 @@ class ServerImpl implements TimeSource { ServerImpl.this, chan ); } + connection.raw = rawin; + connection.rawout = rawout; } Request req = new Request (rawin, rawout); requestLine = req.requestLine(); From 006e84fc77a582552e71a888db1be31407b783c7 Mon Sep 17 00:00:00 2001 From: Vinnie Ryan Date: Tue, 10 Mar 2009 18:43:00 +0000 Subject: [PATCH 24/91] 6737315: LDAP serialized data vulnerability Reviewed-by: alanb --- .../com/sun/jndi/ldap/VersionHelper12.java | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/VersionHelper12.java b/jdk/src/share/classes/com/sun/jndi/ldap/VersionHelper12.java index a4131166d30..0f6a70e04c9 100644 --- a/jdk/src/share/classes/com/sun/jndi/ldap/VersionHelper12.java +++ b/jdk/src/share/classes/com/sun/jndi/ldap/VersionHelper12.java @@ -1,5 +1,5 @@ /* - * Copyright 1999 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved. * 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,12 +33,33 @@ import java.security.PrivilegedAction; final class VersionHelper12 extends VersionHelper { + // System property to control whether classes may be loaded from an + // arbitrary URL code base. + private static final String TRUST_URL_CODEBASE_PROPERTY = + "com.sun.jndi.ldap.object.trustURLCodebase"; + + // Determine whether classes may be loaded from an arbitrary URL code base. + private static final String trustURLCodebase = + AccessController.doPrivileged( + new PrivilegedAction() { + public String run() { + return System.getProperty(TRUST_URL_CODEBASE_PROPERTY, + "false"); + } + } + ); + VersionHelper12() {} // Disallow external from creating one of these. ClassLoader getURLClassLoader(String[] url) throws MalformedURLException { ClassLoader parent = getContextClassLoader(); - if (url != null) { + /* + * Classes may only be loaded from an arbitrary URL code base when + * the system property com.sun.jndi.ldap.object.trustURLCodebase + * has been set to "true". + */ + if (url != null && "true".equalsIgnoreCase(trustURLCodebase)) { return URLClassLoader.newInstance(getUrlArray(url), parent); } else { return parent; From 67bb035b94ad692ac264e625c8169950a074c613 Mon Sep 17 00:00:00 2001 From: Weijun Wang Date: Wed, 8 Apr 2009 13:54:34 +0800 Subject: [PATCH 25/91] 4811968: ASN.1 (X509Certificate) implementations don't handle large OID components Reviewed-by: xuelei --- .../sun/security/util/ObjectIdentifier.java | 771 +++++++++++------- jdk/test/sun/security/util/Oid/OidFormat.java | 19 +- jdk/test/sun/security/util/Oid/S11N.sh | 164 ++++ .../sun/security/util/Oid/SerialTest.java | 66 ++ 4 files changed, 732 insertions(+), 288 deletions(-) create mode 100644 jdk/test/sun/security/util/Oid/S11N.sh create mode 100644 jdk/test/sun/security/util/Oid/SerialTest.java diff --git a/jdk/src/share/classes/sun/security/util/ObjectIdentifier.java b/jdk/src/share/classes/sun/security/util/ObjectIdentifier.java index 2ad04c0b360..717e5bcf65e 100644 --- a/jdk/src/share/classes/sun/security/util/ObjectIdentifier.java +++ b/jdk/src/share/classes/sun/security/util/ObjectIdentifier.java @@ -26,7 +26,8 @@ package sun.security.util; import java.io.*; - +import java.math.BigInteger; +import java.util.Arrays; /** * Represent an ISO Object Identifier. @@ -44,105 +45,186 @@ import java.io.*; * hierarchy, and other organizations can easily acquire the ability * to assign such unique identifiers. * - * * @author David Brownell * @author Amit Kapoor * @author Hemma Prafullchandra */ + final public class ObjectIdentifier implements Serializable { - /** use serialVersionUID from JDK 1.1. for interoperability */ + /** + * We use the DER value (no tag, no length) as the internal format + * @serial + */ + private byte[] encoding = null; + + private transient volatile String stringForm; + + /* + * IMPORTANT NOTES FOR CODE CHANGES (bug 4811968) IN JDK 1.7.0 + * =========================================================== + * + * (Almost) serialization compatibility with old versions: + * + * serialVersionUID is unchanged. Old field "component" is changed to + * type Object so that "poison" (unknown object type for old versions) + * can be put inside if there are huge components that cannot be saved + * as integers. + * + * New version use the new filed "encoding" only. + * + * Below are all 4 cases in a serialization/deserialization process: + * + * 1. old -> old: Not covered here + * 2. old -> new: There's no "encoding" field, new readObject() reads + * "components" and "componentLen" instead and inits correctly. + * 3. new -> new: "encoding" field exists, new readObject() uses it + * (ignoring the other 2 fields) and inits correctly. + * 4. new -> old: old readObject() only recognizes "components" and + * "componentLen" fields. If no huge components are involved, they + * are serialized as legal values and old object can init correctly. + * Otherwise, old object cannot recognize the form (component not int[]) + * and throw a ClassNotFoundException at deserialization time. + * + * Therfore, for the first 3 cases, exact compatibility is preserved. In + * the 4th case, non-huge OID is still supportable in old versions, while + * huge OID is not. + */ private static final long serialVersionUID = 8697030238860181294L; - private static final int maxFirstComponent = 2; - private static final int maxSecondComponent = 39; /** - * Constructs an object identifier from a string. This string - * should be of the form 1.23.34.45.56 etc. + * Changed to Object + * @serial + */ + private Object components = null; // path from root + /** + * @serial + */ + private int componentLen = -1; // how much is used. + + // Is the components field calculated? + transient private boolean componentsCalculated = false; + + private void readObject(ObjectInputStream is) + throws IOException, ClassNotFoundException { + is.defaultReadObject(); + + if (encoding == null) { // from an old version + init((int[])components, componentLen); + } + } + + private void writeObject(ObjectOutputStream os) + throws IOException { + if (!componentsCalculated) { + int[] comps = toIntArray(); + if (comps != null) { // every one understands this + components = comps; + componentLen = comps.length; + } else { + components = HugeOidNotSupportedByOldJDK.theOne; + } + componentsCalculated = true; + } + os.defaultWriteObject(); + } + + static class HugeOidNotSupportedByOldJDK implements Serializable { + private static final long serialVersionUID = 1L; + static HugeOidNotSupportedByOldJDK theOne = new HugeOidNotSupportedByOldJDK(); + } + + /** + * Constructs, from a string. This string should be of the form 1.23.56. + * Validity check included. */ public ObjectIdentifier (String oid) throws IOException { int ch = '.'; - int start = 0; + int start = 0; int end = 0; - // Calculate length of oid - componentLen = 0; - while ((end = oid.indexOf(ch,start)) != -1) { - start = end + 1; - componentLen += 1; - } - componentLen += 1; - components = new int[componentLen]; + int pos = 0; + byte[] tmp = new byte[oid.length()]; + int first = 0, second; + int count = 0; - start = 0; - int i = 0; - String comp = null; try { - while ((end = oid.indexOf(ch,start)) != -1) { - comp = oid.substring(start,end); - components[i++] = Integer.valueOf(comp).intValue(); + String comp = null; + do { + int length = 0; // length of one section + end = oid.indexOf(ch,start); + if (end == -1) { + comp = oid.substring(start); + length = oid.length() - start; + } else { + comp = oid.substring(start,end); + length = end - start; + } + + if (length > 9) { + BigInteger bignum = new BigInteger(comp); + if (count == 0) { + checkFirstComponent(bignum); + first = bignum.intValue(); + } else { + if (count == 1) { + checkSecondComponent(first, bignum); + bignum = bignum.add(BigInteger.valueOf(40*first)); + } else { + checkOtherComponent(count, bignum); + } + pos += pack7Oid(bignum, tmp, pos); + } + } else { + int num = Integer.parseInt(comp); + if (count == 0) { + checkFirstComponent(num); + first = num; + } else { + if (count == 1) { + checkSecondComponent(first, num); + num += 40 * first; + } else { + checkOtherComponent(count, num); + } + pos += pack7Oid(num, tmp, pos); + } + } start = end + 1; - } - comp = oid.substring(start); - components[i] = Integer.valueOf(comp).intValue(); + count++; + } while (end != -1); + + checkCount(count); + encoding = new byte[pos]; + System.arraycopy(tmp, 0, encoding, 0, pos); + this.stringForm = oid; + } catch (IOException ioe) { // already detected by checkXXX + throw ioe; } catch (Exception e) { throw new IOException("ObjectIdentifier() -- Invalid format: " + e.toString(), e); } - checkValidOid(components, componentLen); - this.stringForm = oid; } /** - * Check if the values make a legal OID. There must be at least 2 - * components and they must be all non-negative. The first component - * should be 0,1 or 2. When the first component is 0 or 1, the - * second component should be less than or equal to 39 - * - * @param values the components that will make the OID - * @param len the number of components to check. Note that the allocation - * size of values may be longer than len. - * In this case, only the first len items are checked. - * @exception IOException if this is not a legal OID - */ - private void checkValidOid(int[] values, int len) throws IOException { - if (values == null || len < 2) { - throw new IOException("ObjectIdentifier() -- " + - "Must be at least two oid components "); - } - - for (int i=0; i maxFirstComponent) { - throw new IOException("ObjectIdentifier() -- " + - "First oid component is invalid "); - } - - if (values[0] < 2 && values[1] > maxSecondComponent) { - throw new IOException("ObjectIdentifier() -- " + - "Second oid component is invalid "); - } - } - /** - * Constructs an object ID from an array of integers. This - * is used to construct constant object IDs. + * Constructor, from an array of integers. + * Validity check included. */ public ObjectIdentifier (int values []) throws IOException { - checkValidOid(values, values.length); - components = values.clone(); - componentLen = values.length; + checkCount(values.length); + checkFirstComponent(values[0]); + checkSecondComponent(values[0], values[1]); + for (int i=2; i bufferEnd; - ) { - component = getComponent (in); - if (component < 0) { - throw new IOException( - "ObjectIdentifier() -- " + - "component values must be nonnegative"); - } - if (first_subid) { - int X, Y; - - /* - * NOTE: the allocation quantum is large enough that we know - * we don't have to reallocate here! - */ - if (component < 40) - X = 0; - else if (component < 80) - X = 1; - else - X = 2; - Y = component - ( X * 40); - components [0] = X; - components [1] = Y; - componentLen = 2; - - first_subid = false; - - } else { - - /* - * Other components are encoded less exotically. The only - * potential trouble is the need to grow the array. - */ - if (componentLen >= components.length) { - int tmp_components []; - - tmp_components = new int [components.length - + allocationQuantum]; - System.arraycopy (components, 0, tmp_components, 0, - components.length); - components = tmp_components; - } - components [componentLen++] = component; - } - } - - checkValidOid(components, componentLen); - - /* - * Final sanity check -- if we didn't use exactly the number of bytes - * specified, something's quite wrong. - */ - if (in.available () != bufferEnd) { - throw new IOException ( - "ObjectIdentifier() -- malformed input data"); + try { + return new ObjectIdentifier(values); + } catch (IOException ex) { + throw new RuntimeException(ex); + // Should not happen, internal calls always uses legal values. } } - /* * n.b. the only public interface is DerOutputStream.putOID() */ void encode (DerOutputStream out) throws IOException { - DerOutputStream bytes = new DerOutputStream (); - int i; - - // According to ISO X.660, when the 1st component is 0 or 1, the 2nd - // component is restricted to be less than or equal to 39, thus make - // it small enough to be encoded into one single byte. - if (components[0] < 2) { - bytes.write ((components [0] * 40) + components [1]); - } else { - putComponent(bytes, (components [0] * 40) + components [1]); - } - for (i = 2; i < componentLen; i++) - putComponent (bytes, components [i]); - - /* - * Now that we've constructed the component, encode - * it in the stream we were given. - */ - out.write (DerValue.tag_ObjectId, bytes); - } - - /* - * Tricky OID component parsing technique ... note that one bit - * per octet is lost, this returns at most 28 bits of component. - * Also, notice this parses in big-endian format. - */ - private static int getComponent (DerInputStream in) - throws IOException - { - int retval, i, tmp; - - for (i = 0, retval = 0; i < 4; i++) { - retval <<= 7; - tmp = in.getByte (); - retval |= (tmp & 0x07f); - if ((tmp & 0x080) == 0) - return retval; - } - - throw new IOException ("ObjectIdentifier() -- component value too big"); - } - - /* - * Reverse of the above routine. Notice it needs to emit in - * big-endian form, so it buffers the output until it's ready. - * (Minimum length encoding is a DER requirement.) - */ - private static void putComponent (DerOutputStream out, int val) - throws IOException - { - int i; - // TODO: val must be <128*128*128*128 here, otherwise, 4 bytes is not - // enough to hold it. Will address this later. - byte buf [] = new byte [4] ; - - for (i = 0; i < 4; i++) { - buf [i] = (byte) (val & 0x07f); - val >>>= 7; - if (val == 0) - break; - } - for ( ; i > 0; --i) - out.write (buf [i] | 0x080); - out.write (buf [0]); - } - - // XXX this API should probably facilitate the JDK sort utility - - /** - * Compares this identifier with another, for sorting purposes. - * An identifier does not precede itself. - * - * @param other identifer that may precede this one. - * @return true iff other precedes this one - * in a particular sorting order. - */ - public boolean precedes (ObjectIdentifier other) - { - int i; - - // shorter IDs go first - if (other == this || componentLen < other.componentLen) - return false; - if (other.componentLen < componentLen) - return true; - - // for each component, the lesser component goes first - for (i = 0; i < componentLen; i++) { - if (other.components [i] < components [i]) - return true; - } - - // identical IDs don't precede each other - return false; + out.write (DerValue.tag_ObjectId, encoding); } /** @@ -398,6 +331,7 @@ class ObjectIdentifier implements Serializable * * @return true iff the names are identical. */ + @Override public boolean equals(Object obj) { if (this == obj) { return true; @@ -406,23 +340,71 @@ class ObjectIdentifier implements Serializable return false; } ObjectIdentifier other = (ObjectIdentifier)obj; - if (componentLen != other.componentLen) { - return false; - } - for (int i = 0; i < componentLen; i++) { - if (components[i] != other.components[i]) { - return false; - } - } - return true; + return Arrays.equals(encoding, other.encoding); } + @Override public int hashCode() { - int h = componentLen; - for (int i = 0; i < componentLen; i++) { - h += components[i] * 37; + return Arrays.hashCode(encoding); + } + + /** + * Private helper method for serialization. To be compatible with old + * versions of JDK. + * @return components in an int array, if all the components are less than + * Integer.MAX_VALUE. Otherwise, null. + */ + private int[] toIntArray() { + int length = encoding.length; + int[] result = new int[20]; + int which = 0; + int fromPos = 0; + for (int i = 0; i < length; i++) { + if ((encoding[i] & 0x80) == 0) { + // one section [fromPos..i] + if (i - fromPos + 1 > 4) { + BigInteger big = new BigInteger(pack(encoding, fromPos, i-fromPos+1, 7, 8)); + if (fromPos == 0) { + result[which++] = 2; + BigInteger second = big.subtract(BigInteger.valueOf(80)); + if (second.compareTo(BigInteger.valueOf(Integer.MAX_VALUE)) == 1) { + return null; + } else { + result[which++] = second.intValue(); + } + } else { + if (big.compareTo(BigInteger.valueOf(Integer.MAX_VALUE)) == 1) { + return null; + } else { + result[which++] = big.intValue(); + } + } + } else { + int retval = 0; + for (int j = fromPos; j <= i; j++) { + retval <<= 7; + byte tmp = encoding[j]; + retval |= (tmp & 0x07f); + } + if (fromPos == 0) { + if (retval < 80) { + result[which++] = retval / 40; + result[which++] = retval % 40; + } else { + result[which++] = 2; + result[which++] = retval - 80; + } + } else { + result[which++] = retval; + } + } + fromPos = i+1; + } + if (which >= result.length) { + result = Arrays.copyOf(result, which + 10); + } } - return h; + return Arrays.copyOf(result, which); } /** @@ -431,15 +413,52 @@ class ObjectIdentifier implements Serializable * user-friendly descriptive strings, since those strings * will not be understood everywhere. */ + @Override public String toString() { String s = stringForm; if (s == null) { - StringBuffer sb = new StringBuffer(componentLen * 4); - for (int i = 0; i < componentLen; i++) { - if (i != 0) { - sb.append('.'); + int length = encoding.length; + StringBuffer sb = new StringBuffer(length * 4); + + int fromPos = 0; + for (int i = 0; i < length; i++) { + if ((encoding[i] & 0x80) == 0) { + // one section [fromPos..i] + if (fromPos != 0) { // not the first segment + sb.append('.'); + } + if (i - fromPos + 1 > 4) { // maybe big integer + BigInteger big = new BigInteger(pack(encoding, fromPos, i-fromPos+1, 7, 8)); + if (fromPos == 0) { + // first section encoded with more than 4 bytes, + // must be 2.something + sb.append("2."); + sb.append(big.subtract(BigInteger.valueOf(80))); + } else { + sb.append(big); + } + } else { // small integer + int retval = 0; + for (int j = fromPos; j <= i; j++) { + retval <<= 7; + byte tmp = encoding[j]; + retval |= (tmp & 0x07f); + } + if (fromPos == 0) { + if (retval < 80) { + sb.append(retval/40); + sb.append('.'); + sb.append(retval%40); + } else { + sb.append("2."); + sb.append(retval - 80); + } + } else { + sb.append(retval); + } + } + fromPos = i+1; } - sb.append(components[i]); } s = sb.toString(); stringForm = s; @@ -447,15 +466,197 @@ class ObjectIdentifier implements Serializable return s; } - /* - * To simplify, we assume no individual component of an object ID is - * larger than 32 bits. Then we represent the path from the root as - * an array that's (usually) only filled at the beginning. + /** + * Repack all bits from input to output. On the both sides, only a portion + * (from the least significant bit) of the 8 bits in a byte is used. This + * number is defined as the number of useful bits (NUB) for the array. All the + * used bits from the input byte array and repacked into the output in the + * exactly same order. The output bits are aligned so that the final bit of + * the input (the least significant bit in the last byte), when repacked as + * the final bit of the output, is still at the least significant position. + * Zeroes will be padded on the left side of the first output byte if + * necessary. All unused bits in the output are also zeroed. + * + * For example: if the input is 01001100 with NUB 8, the output which + * has a NUB 6 will look like: + * 00000001 00001100 + * The first 2 bits of the output bytes are unused bits. The other bits + * turn out to be 000001 001100. While the 8 bits on the right are from + * the input, the left 4 zeroes are padded to fill the 6 bits space. + * + * @param in the input byte array + * @param ioffset start point inside in + * @param ilength number of bytes to repack + * @param iw NUB for input + * @param ow NUB for output + * @return the repacked bytes */ - private int components []; // path from root - private int componentLen; // how much is used. + private static byte[] pack(byte[] in, int ioffset, int ilength, int iw, int ow) { + assert (iw > 0 && iw <= 8): "input NUB must be between 1 and 8"; + assert (ow > 0 && ow <= 8): "output NUB must be between 1 and 8"; - private transient volatile String stringForm; + if (iw == ow) { + return in.clone(); + } - private static final int allocationQuantum = 5; // >= 2 + int bits = ilength * iw; // number of all used bits + byte[] out = new byte[(bits+ow-1)/ow]; + + // starting from the 0th bit in the input + int ipos = 0; + + // the number of padding 0's needed in the output, skip them + int opos = (bits+ow-1)/ow*ow-bits; + + while(ipos < bits) { + int count = iw - ipos%iw; // unpacked bits in current input byte + if (count > ow - opos%ow) { // free space available in output byte + count = ow - opos%ow; // choose the smaller number + } + // and move them! + out[opos/ow] |= // paste! + (((in[ioffset+ipos/iw]+256) // locate the byte (+256 so that it's never negative) + >> (iw-ipos%iw-count)) // move to the end of a byte + & ((1 << (count))-1)) // zero out all other bits + << (ow-opos%ow-count); // move to the output position + ipos += count; // advance + opos += count; // advance + } + return out; + } + + /** + * Repack from NUB 8 to a NUB 7 OID sub-identifier, remove all + * unnecessary 0 headings, set the first bit of all non-tail + * output bytes to 1 (as ITU-T Rec. X.690 8.19.2 says), and + * paste it into an existing byte array. + * @param out the existing array to be pasted into + * @param ooffset the starting position to paste + * @return the number of bytes pasted + */ + private static int pack7Oid(byte[] in, int ioffset, int ilength, byte[] out, int ooffset) { + byte[] pack = pack(in, ioffset, ilength, 8, 7); + int firstNonZero = pack.length-1; // paste at least one byte + for (int i=pack.length-2; i>=0; i--) { + if (pack[i] != 0) { + firstNonZero = i; + } + pack[i] |= 0x80; + } + System.arraycopy(pack, firstNonZero, out, ooffset, pack.length-firstNonZero); + return pack.length-firstNonZero; + } + + /** + * Repack from NUB 7 to NUB 8, remove all unnecessary 0 + * headings, and paste it into an existing byte array. + * @param out the existing array to be pasted into + * @param ooffset the starting position to paste + * @return the number of bytes pasted + */ + private static int pack8(byte[] in, int ioffset, int ilength, byte[] out, int ooffset) { + byte[] pack = pack(in, ioffset, ilength, 7, 8); + int firstNonZero = pack.length-1; // paste at least one byte + for (int i=pack.length-2; i>=0; i--) { + if (pack[i] != 0) { + firstNonZero = i; + } + } + System.arraycopy(pack, firstNonZero, out, ooffset, pack.length-firstNonZero); + return pack.length-firstNonZero; + } + + /** + * Pack the int into a OID sub-identifier DER encoding + */ + private static int pack7Oid(int input, byte[] out, int ooffset) { + byte[] b = new byte[4]; + b[0] = (byte)(input >> 24); + b[1] = (byte)(input >> 16); + b[2] = (byte)(input >> 8); + b[3] = (byte)(input); + return pack7Oid(b, 0, 4, out, ooffset); + } + + /** + * Pack the BigInteger into a OID subidentifier DER encoding + */ + private static int pack7Oid(BigInteger input, byte[] out, int ooffset) { + byte[] b = input.toByteArray(); + return pack7Oid(b, 0, b.length, out, ooffset); + } + + /** + * Private methods to check validity of OID. They must be -- + * 1. at least 2 components + * 2. all components must be non-negative + * 3. the first must be 0, 1 or 2 + * 4. if the first is 0 or 1, the second must be <40 + */ + + /** + * Check the DER encoding. Since DER encoding defines that the integer bits + * are unsigned, so there's no need to check the MSB. + */ + private static void check(byte[] encoding) throws IOException { + int length = encoding.length; + if (length < 1 || // too short + (encoding[length - 1] & 0x80) != 0) { // not ended + throw new IOException("ObjectIdentifier() -- " + + "Invalid DER encoding, not ended"); + } + for (int i=0; i 2) { + throw new IOException("ObjectIdentifier() -- " + + "First oid component is invalid "); + } + } + private static void checkFirstComponent(BigInteger first) throws IOException { + if (first.signum() == -1 || + first.compareTo(BigInteger.valueOf(2)) == 1) { + throw new IOException("ObjectIdentifier() -- " + + "First oid component is invalid "); + } + } + private static void checkSecondComponent(int first, int second) throws IOException { + if (second < 0 || first != 2 && second > 39) { + throw new IOException("ObjectIdentifier() -- " + + "Second oid component is invalid "); + } + } + private static void checkSecondComponent(int first, BigInteger second) throws IOException { + if (second.signum() == -1 || + first != 2 && + second.compareTo(BigInteger.valueOf(39)) == 1) { + throw new IOException("ObjectIdentifier() -- " + + "Second oid component is invalid "); + } + } + private static void checkOtherComponent(int i, int num) throws IOException { + if (num < 0) { + throw new IOException("ObjectIdentifier() -- " + + "oid component #" + (i+1) + " must be non-negative "); + } + } + private static void checkOtherComponent(int i, BigInteger num) throws IOException { + if (num.signum() == -1) { + throw new IOException("ObjectIdentifier() -- " + + "oid component #" + (i+1) + " must be non-negative "); + } + } } diff --git a/jdk/test/sun/security/util/Oid/OidFormat.java b/jdk/test/sun/security/util/Oid/OidFormat.java index 9de4a757ea7..10b7fdd9ee5 100644 --- a/jdk/test/sun/security/util/Oid/OidFormat.java +++ b/jdk/test/sun/security/util/Oid/OidFormat.java @@ -63,9 +63,22 @@ public class OidFormat { "1.2.3", "1.2.3445", "1.3.6.1.4.1.42.2.17", // 4811968: ASN.1 cannot handle huge OID components - //"2.16.764.1.3101555394.1.0.100.2.1", - //"1.2.2147483647.4", - //"1.2.268435456.4", + "2.16.764.1.3101555394.1.0.100.2.1", + "2.2726957624935694386592435", // as huge as possible + "1.2.777777777777777777", + "1.2.888888888888888888.111111111111111.2222222222222.33333333333333333.44444444444444", + "1.2." + + "1111111111111111111111111111111111111111111111111111111111111." + + "2222222222222222222222222222222222222222222222222222222222222222." + + "333333333333333333333333333333333333333333333333333333333333333." + + "4444444444444444444444444444444444444444444444444444444." + + "55555555555555555555555555555555555555555555555555555555555555555555555." + + "666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666." + + "77777777777777777777777777777777777777777777777777777777777777777777777777." + + "8888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888." + + "9999999999999999999999999999999999999999999999999999999999999999999999999999999999999999", + "1.2.2147483647.4", + "1.2.268435456.4", }; for (String s: goodOids) { diff --git a/jdk/test/sun/security/util/Oid/S11N.sh b/jdk/test/sun/security/util/Oid/S11N.sh new file mode 100644 index 00000000000..77341e8a91b --- /dev/null +++ b/jdk/test/sun/security/util/Oid/S11N.sh @@ -0,0 +1,164 @@ +# +# Copyright 2004-2005 Sun Microsystems, Inc. All Rights Reserved. +# 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. +# +# 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, +# CA 95054 USA or visit www.sun.com if you need additional information or +# have any questions. +# +# @test +# @bug 4811968 +# @summary Serialization compatibility with old versions +# @author Weijun Wang +# +# set a few environment variables so that the shell-script can run stand-alone +# in the source directory + +if [ "${TESTSRC}" = "" ] ; then + TESTSRC="." +fi +if [ "${TESTCLASSES}" = "" ] ; then + TESTCLASSES="." +fi +if [ "${TESTJAVA}" = "" ] ; then + echo "TESTJAVA not set. Test cannot execute." + echo "FAILED!!!" + exit 1 +fi + +# set platform-dependent variables +PF="" + +OS=`uname -s` +case "$OS" in + SunOS ) + FS="/" + ARCH=`isainfo` + case "$ARCH" in + sparc* ) + PF="solaris-sparc" + ;; + i[3-6]86 ) + PF="solaris-i586" + ;; + amd64* ) + PF="solaris-amd64" + ;; + * ) + echo "Unsupported System: Solaris ${ARCH}" + exit 0; + ;; + esac + ;; + Linux ) + ARCH=`uname -m` + FS="/" + case "$ARCH" in + i[3-6]86 ) + PF="linux-i586" + ;; + amd64* ) + PF="linux-amd64" + ;; + * ) + echo "Unsupported System: Linux ${ARCH}" + exit 0; + ;; + esac + ;; + Windows* ) + FS="\\" + PF="windows-i586" + + # 'uname -m' does not give us enough information - + # should rely on $PROCESSOR_IDENTIFIER (as is done in Defs-windows.gmk), + # but JTREG does not pass this env variable when executing a shell script. + # + # execute test program - rely on it to exit if platform unsupported + + ;; + * ) + echo "Unsupported System: ${OS}" + exit 0; + ;; +esac + +# the test code + +${TESTJAVA}${FS}bin${FS}javac -source 1.3 -target 1.3 -d . ${TESTSRC}${FS}SerialTest.java || exit 10 + +OLDJAVA=" + /java/re/j2se/1.6.0/latest/binaries/${PF} + /java/re/j2se/1.5.0/latest/binaries/${PF} + /java/re/j2se/1.4.2/latest/binaries/${PF} +" + +SMALL=" + 0.0 + 1.1 + 2.2 + 1.2.3456 + 1.2.2147483647.4 + 1.2.268435456.4 +" + +HUGE=" + 2.16.764.1.3101555394.1.0.100.2.1 + 1.2.2147483648.4 + 2.3.4444444444444444444444 + 1.2.888888888888888888.111111111111111.2222222222222.33333333333333333.44444444444444 +" + +for oid in ${SMALL}; do + echo ${oid} + # new -> + ${TESTJAVA}${FS}bin${FS}java SerialTest out ${oid} > tmp.oid.serial || exit 1 + # -> new + ${TESTJAVA}${FS}bin${FS}java SerialTest in ${oid} < tmp.oid.serial || exit 2 + for oldj in ${OLDJAVA}; do + if [ -d ${oldj} ]; then + echo ${oldj} + # -> old + ${oldj}${FS}bin${FS}java SerialTest in ${oid} < tmp.oid.serial || exit 3 + # old -> + ${oldj}${FS}bin${FS}java SerialTest out ${oid} > tmp.oid.serial.old || exit 4 + # -> new + ${TESTJAVA}${FS}bin${FS}java SerialTest in ${oid} < tmp.oid.serial.old || exit 5 + fi + done +done + +for oid in ${HUGE}; do + echo ${oid} + # new -> + ${TESTJAVA}${FS}bin${FS}java SerialTest out ${oid} > tmp.oid.serial || exit 1 + # -> new + ${TESTJAVA}${FS}bin${FS}java SerialTest in ${oid} < tmp.oid.serial || exit 2 + for oldj in ${OLDJAVA}; do + if [ -d ${oldj} ]; then + echo ${oldj} + # -> old + ${oldj}${FS}bin${FS}java SerialTest badin < tmp.oid.serial || exit 3 + fi + done +done + +rm -f tmp.oid.serial +rm -f tmp.oid.serial.old +rm -f SerialTest.class + +exit 0 diff --git a/jdk/test/sun/security/util/Oid/SerialTest.java b/jdk/test/sun/security/util/Oid/SerialTest.java new file mode 100644 index 00000000000..2c8516eaa6a --- /dev/null +++ b/jdk/test/sun/security/util/Oid/SerialTest.java @@ -0,0 +1,66 @@ +/* + * Copyright 2004 Sun Microsystems, Inc. All Rights Reserved. + * 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. + * + * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +/* + * read S11.sh + */ +import java.io.*; +import sun.security.util.*; + +/** + * Test OID serialization between versions + * + * java SerialTest out oid // write a OID into System.out + * java SerialTest in oid // read from System.in and compare it with oid + * java SerialTest badin // make sure *cannot* read from System.in + */ +class SerialTest { + public static void main(String[] args) throws Exception { + if (args[0].equals("out")) + out(args[1]); + else if (args[0].equals("in")) + in(args[1]); + else + badin(); + } + + static void in(String oid) throws Exception { + ObjectIdentifier o = (ObjectIdentifier) (new ObjectInputStream(System.in).readObject()); + if (!o.toString().equals(oid)) + throw new Exception("Read Fail " + o + ", not " + oid); + } + + static void badin() throws Exception { + boolean pass = true; + try { + new ObjectInputStream(System.in).readObject(); + } catch (Exception e) { + pass = false; + } + if (pass) throw new Exception("Should fail but not"); + } + + static void out(String oid) throws Exception { + new ObjectOutputStream(System.out).writeObject(new ObjectIdentifier(oid)); + } +} From 7e58d1b49748554f6e72c48c82984bebae5fcf60 Mon Sep 17 00:00:00 2001 From: Xueming Shen Date: Wed, 8 Apr 2009 09:21:06 -0700 Subject: [PATCH 26/91] 6827871: Cleanup leftover code in CharToByteJohab.java Removed the leftover data tables Reviewed-by: alanb --- .../share/classes/sun/io/CharToByteJohab.java | 4724 ----------------- 1 file changed, 4724 deletions(-) diff --git a/jdk/src/share/classes/sun/io/CharToByteJohab.java b/jdk/src/share/classes/sun/io/CharToByteJohab.java index 37ed253a7bb..b3b609d85f0 100644 --- a/jdk/src/share/classes/sun/io/CharToByteJohab.java +++ b/jdk/src/share/classes/sun/io/CharToByteJohab.java @@ -46,4728 +46,4 @@ public class CharToByteJohab extends CharToByteDoubleByte { super.index1 = nioCoder.getEncoderIndex1(); super.index2 = nioCoder.getEncoderIndex2(); } - - private final static String innerIndex0= - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0020\u0021\"\u0023\u0024\u0025\u0026\'"+ - "\u0028\u0029\u002A\u002B\u002C\u002D\u002E\u002F"+ - "\u0030\u0031\u0032\u0033\u0034\u0035\u0036\u0037"+ - "\u0038\u0039\u003A\u003B\u003C\u003D\u003E\u003F"+ - "\u0040\u0041\u0042\u0043\u0044\u0045\u0046\u0047"+ - "\u0048\u0049\u004A\u004B\u004C\u004D\u004E\u004F"+ - "\u0050\u0051\u0052\u0053\u0054\u0055\u0056\u0057"+ - "\u0058\u0059\u005A\u005B\\\u005D\u005E\u005F"+ - "\u0060\u0061\u0062\u0063\u0064\u0065\u0066\u0067"+ - "\u0068\u0069\u006A\u006B\u006C\u006D\u006E\u006F"+ - "\u0070\u0071\u0072\u0073\u0074\u0075\u0076\u0077"+ - "\u0078\u0079\u007A\u007B\u007C\u007D\u007E\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uD9AE\u0000\u0000\uD9B4\u0000\u0000\uD967"+ - "\uD937\u0000\uDCA3\u0000\u0000\uD939\u0000\u0000"+ - "\uD956\uD94E\uDD99\uDD9A\uD9A5\u0000\uD9D2\uD934"+ - "\uD9AC\uDD98\uDCAC\u0000\uDCF9\uDCF6\uDCFA\uD9AF"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uDCA1\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uDCA2\u0000\u0000\u0000\u0000\u0000\u0000\uD94F"+ - "\uDCAA\u0000\u0000\u0000\u0000\u0000\uDCAD\uDD3C"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uDD31\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uDD33\u0000\u0000\u0000\u0000\u0000\u0000\uD950"+ - "\uDD3A\u0000\u0000\u0000\u0000\u0000\uDD3D\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uDD32\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uDCA4\uDD34"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uDD35\uDCA6\uDD36\u0000\u0000\u0000\u0000"+ - "\uDD37\u0000\u0000\u0000\u0000\u0000\u0000\uDCA8"+ - "\uDD38\uDCA9\uDD39\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uDD40\uDCAF\uDD3F\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uDCAB\uDD3B\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uDCAE\uDD3E"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uD9A7"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uD9B0\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uD9A8\uD9AB\uD9AA\uD9AD\u0000\uD9A9\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uDB51\uDB52\uDB53\uDB54\uDB55\uDB56\uDB57"+ - "\uDB58\uDB59\uDB5A\uDB5B\uDB5C\uDB5D\uDB5E\uDB5F"+ - "\uDB60\uDB61\u0000\uDB62\uDB63\uDB64\uDB65\uDB66"+ - "\uDB67\uDB68\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uDB71\uDB72\uDB73\uDB74\uDB75\uDB76\uDB77"+ - "\uDB78\uDB79\uDB7A\uDB7B\uDB7C\uDB7D\uDB7E\uDB91"+ - "\uDB92\uDB93\u0000\uDB94\uDB95\uDB96\uDB97\uDB98"+ - "\uDB99\uDB9A\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uDEA7\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uDEA1\uDEA2\uDEA3\uDEA4\uDEA5\uDEA6\uDEA8\uDEA9"+ - "\uDEAA\uDEAB\uDEAC\uDEAD\uDEAE\uDEAF\uDEB0\uDEB1"+ - "\uDEB2\uDEB3\uDEB4\uDEB5\uDEB6\uDEB7\uDEB8\uDEB9"+ - "\uDEBA\uDEBB\uDEBC\uDEBD\uDEBE\uDEBF\uDEC0\uDEC1"+ - "\uDED1\uDED2\uDED3\uDED4\uDED5\uDED6\uDED8\uDED9"+ - "\uDEDA\uDEDB\uDEDC\uDEDD\uDEDE\uDEDF\uDEE0\uDEE1"+ - "\uDEE2\uDEE3\uDEE4\uDEE5\uDEE6\uDEE7\uDEE8\uDEE9"+ - "\uDEEA\uDEEB\uDEEC\uDEED\uDEEE\uDEEF\uDEF0\uDEF1"+ - "\u0000\uDED7\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uD93A\u0000\u0000"+ - "\uD93E\uD93F\u0000\u0000\uD940\uD941\u0000\u0000"+ - "\uD9D3\uD9D4\u0000\u0000\u0000\uD935\uD936\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uD9B6\u0000\uD957\uD958\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uD968\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uDD9B\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uDD9C"+ - "\u0000\uDD9D\uDD9E\uDD9F\uDDA0\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uD959\u0000\u0000\u0000\u0000"+ - "\u0000\uD9B5\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uDC34\u0000\u0000\uD9E0\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uD9E5\uD9E2\u0000\u0000\u0000\uDC69\u0000"+ - "\u0000\u0000\u0000\uD95A\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uDCF7\uDCF8\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uDCFB\uDCFC\uDCFD\uDCFE\u0000"+ - "\uDB40\uDB41\uDB42\uDB43\uDB44\uDB45\uDB46\uDB47"+ - "\uDB48\uDB49\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uDB31\uDB32\uDB33\uDB34\uDB35\uDB36\uDB37\uDB38"+ - "\uDB39\uDB3A\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uD977\uD978\uD976\uD979\uD97A\uD9D5\uD9D8\uD9D6"+ - "\uD9D9\uD9D7\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uD9A1\u0000\uD9A2\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uD9A3\u0000\uD963\uD9A4\u0000\u0000\u0000\uD964"+ - "\uD996\u0000\u0000\uD997\u0000\u0000\u0000\uD9B3"+ - "\u0000\uD9B2\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uD97E\u0000\u0000\uD992\uD954\u0000"+ - "\uD960\u0000\u0000\u0000\u0000\uD93B\u0000\uD99E"+ - "\uD99F\uD99D\uD99C\uD994\uD995\u0000\uD9B1\u0000"+ - "\u0000\u0000\u0000\u0000\uD955\uD993\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uD93D\uD991\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uD966\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uD951\uD965\u0000\u0000\uD952\uD953\u0000\u0000"+ - "\u0000\u0000\uD97C\uD97D\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uD99A\uD99B\u0000\u0000\uD998\uD999"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uD9C1\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uD961\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uD962\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uDCE7\uDCE8\uDCE9\uDCEA\uDCEB\uDCEC\uDCED\uDCEE"+ - "\uDCEF\uDCF0\uDCF1\uDCF2\uDCF3\uDCF4\uDCF5\u0000"+ - "\u0000\u0000\u0000\u0000\uDD77\uDD78\uDD79\uDD7A"+ - "\uDD7B\uDD7C\uDD7D\uDD7E\uDD91\uDD92\uDD93\uDD94"+ - "\uDD95\uDD96\uDD97\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uDD5D\uDD5E\uDD5F\uDD60"+ - "\uDD61\uDD62\uDD63\uDD64\uDD65\uDD66\uDD67\uDD68"+ - "\uDD69\uDD6A\uDD6B\uDD6C\uDD6D\uDD6E\uDD6F\uDD70"+ - "\uDD71\uDD72\uDD73\uDD74\uDD75\uDD76\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uDCCD\uDCCE\uDCCF\uDCD0\uDCD1\uDCD2\uDCD3\uDCD4"+ - "\uDCD5\uDCD6\uDCD7\uDCD8\uDCD9\uDCDA\uDCDB\uDCDC"+ - "\uDCDD\uDCDE\uDCDF\uDCE0\uDCE1\uDCE2\uDCE3\uDCE4"+ - "\uDCE5\uDCE6\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uDBA1\uDBAC\uDBA2\uDBAD\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uDBA3\uDBC8\uDBC7\uDBAE"+ - "\uDBA4\uDBC2\uDBC1\uDBAF\uDBA6\uDBC6\uDBC5\uDBB1"+ - "\uDBA5\uDBC4\uDBC3\uDBB0\uDBA7\uDBBC\uDBC9\uDBCA"+ - "\uDBB7\uDBCB\uDBCC\uDBB2\uDBA9\uDBBE\uDBCD\uDBCE"+ - "\uDBB9\uDBCF\uDBD0\uDBB4\uDBA8\uDBD1\uDBD2\uDBB8"+ - "\uDBBD\uDBD3\uDBD4\uDBB3\uDBAA\uDBD5\uDBD6\uDBBA"+ - "\uDBBF\uDBD7\uDBD8\uDBB5\uDBAB\uDBD9\uDBDA\uDBBB"+ - "\uDBDB\uDBDC\uDBC0\uDBDD\uDBDE\uDBDF\uDBE0\uDBE1"+ - "\uDBE2\uDBE3\uDBE4\uDBB6\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uD9C6\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uD971\uD970\u0000\uD9C3\uD9C7\uD9C8\uD9CB\uD9CA"+ - "\uD9C9\uD9CC\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uD973\uD972\u0000\u0000\uD9BA\uD9B9"+ - "\u0000\u0000\u0000\u0000\uD975\uD974\u0000\u0000"+ - "\uD9B8\uD9B7\u0000\u0000\u0000\u0000\uD96F\uD96E"+ - "\uD9C2\u0000\u0000\uD96B\u0000\u0000\uD96D\uD96C"+ - "\uD9C4\uD9C5\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uD96A\uD969\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uD9CF\uD9CE"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uD9D0\u0000\uD9D1\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uD95F\u0000\uD95E\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uD9BC\uD9BD\u0000\uD9C0\uD9BB\uD9BE\u0000\uD9BF"+ - "\uD9CD\uD9DB\uD9DC\u0000\uD9DD\uD9DA\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uD931\uD932\uD933\uD938\u0000\u0000\u0000\u0000"+ - "\uD944\uD945\uD946\uD947\uD948\uD949\uD94A\uD94B"+ - "\uD94C\uD94D\u0000\uD97B\uD942\uD943\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uDDA1\uDDA2\uDDA3\uDDA4\uDDA5\uDDA6\uDDA7"+ - "\uDDA8\uDDA9\uDDAA\uDDAB\uDDAC\uDDAD\uDDAE\uDDAF"+ - "\uDDB0\uDDB1\uDDB2\uDDB3\uDDB4\uDDB5\uDDB6\uDDB7"+ - "\uDDB8\uDDB9\uDDBA\uDDBB\uDDBC\uDDBD\uDDBE\uDDBF"+ - "\uDDC0\uDDC1\uDDC2\uDDC3\uDDC4\uDDC5\uDDC6\uDDC7"+ - "\uDDC8\uDDC9\uDDCA\uDDCB\uDDCC\uDDCD\uDDCE\uDDCF"+ - "\uDDD0\uDDD1\uDDD2\uDDD3\uDDD4\uDDD5\uDDD6\uDDD7"+ - "\uDDD8\uDDD9\uDDDA\uDDDB\uDDDC\uDDDD\uDDDE\uDDDF"+ - "\uDDE0\uDDE1\uDDE2\uDDE3\uDDE4\uDDE5\uDDE6\uDDE7"+ - "\uDDE8\uDDE9\uDDEA\uDDEB\uDDEC\uDDED\uDDEE\uDDEF"+ - "\uDDF0\uDDF1\uDDF2\uDDF3\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uDE31\uDE32\uDE33\uDE34\uDE35\uDE36\uDE37"+ - "\uDE38\uDE39\uDE3A\uDE3B\uDE3C\uDE3D\uDE3E\uDE3F"+ - "\uDE40\uDE41\uDE42\uDE43\uDE44\uDE45\uDE46\uDE47"+ - "\uDE48\uDE49\uDE4A\uDE4B\uDE4C\uDE4D\uDE4E\uDE4F"+ - "\uDE50\uDE51\uDE52\uDE53\uDE54\uDE55\uDE56\uDE57"+ - "\uDE58\uDE59\uDE5A\uDE5B\uDE5C\uDE5D\uDE5E\uDE5F"+ - "\uDE60\uDE61\uDE62\uDE63\uDE64\uDE65\uDE66\uDE67"+ - "\uDE68\uDE69\uDE6A\uDE6B\uDE6C\uDE6D\uDE6E\uDE6F"+ - "\uDE70\uDE71\uDE72\uDE73\uDE74\uDE75\uDE76\uDE77"+ - "\uDE78\uDE79\uDE7A\uDE7B\uDE7C\uDE7D\uDE7E\uDE91"+ - "\uDE92\uDE93\uDE94\uDE95\uDE96\uDE97\uDE98\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u8841\u8C41\u8444\u9041\u8446\u8447\u9441"+ - "\u9841\u9C41\u844A\u844B\u844C\u844D\u844E\u844F"+ - "\u8450\uA041\uA441\uA841\u8454\uAC41\uB041\uB441"+ - "\uB841\uBC41\uC041\uC441\uC841\uCC41\uD041\u8461"+ - "\u8481\u84A1\u84C1\u84E1\u8541\u8561\u8581\u85A1"+ - "\u85C1\u85E1\u8641\u8661\u8681\u86A1\u86C1\u86E1"+ - "\u8741\u8761\u8781\u87A1\uDAD4\uDAD5\uDAD6\uDAD7"+ - "\uDAD8\uDAD9\uDADA\uDADB\uDADC\uDADD\uDADE\uDADF"+ - "\uDAE0\uDAE1\uDAE2\uDAE3\uDAE4\uDAE5\uDAE6\uDAE7"+ - "\uDAE8\uDAE9\uDAEA\uDAEB\uDAEC\uDAED\uDAEE\uDAEF"+ - "\uDAF0\uDAF1\uDAF2\uDAF3\uDAF4\uDAF5\uDAF6\uDAF7"+ - "\uDAF8\uDAF9\uDAFA\uDAFB\uDAFC\uDAFD\uDAFE\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uDD41\uDD42\uDD43\uDD44\uDD45\uDD46\uDD47\uDD48"+ - "\uDD49\uDD4A\uDD4B\uDD4C\uDD4D\uDD4E\uDD4F\uDD50"+ - "\uDD51\uDD52\uDD53\uDD54\uDD55\uDD56\uDD57\uDD58"+ - "\uDD59\uDD5A\uDD5B\uDD5C\uD9DF\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uDCB1\uDCB2\uDCB3\uDCB4\uDCB5\uDCB6\uDCB7\uDCB8"+ - "\uDCB9\uDCBA\uDCBB\uDCBC\uDCBD\uDCBE\uDCBF\uDCC0"+ - "\uDCC1\uDCC2\uDCC3\uDCC4\uDCC5\uDCC6\uDCC7\uDCC8"+ - "\uDCC9\uDCCA\uDCCB\uDCCC\u0000\u0000\u0000\uD9DE"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"; - - private final static String innerIndex1= - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uDC59\uDC5A\uDC5B\uDC5C\uDC5D\u0000\u0000\u0000"+ - "\uDC4A\uDC4B\uDC6C\uDC6D\uDC6E\uDC46\uDC47\uDC48"+ - "\uDC64\uDC65\uDC66\uDC67\uDC68\uDC31\uDC32\uDC33"+ - "\uDC35\uDC3B\uDC3C\uDC3D\uDC3E\uDC3F\uDC40\uDC41"+ - "\uDC42\uDC43\uDC44\uDC37\uDC38\uDC39\uDC3A\uDC4D"+ - "\uDC4E\uDC75\uDC76\uDC77\uDC78\uDC71\uDC72\uDC73"+ - "\uDC4F\uDC50\uDC51\uDC52\uDC53\uDC54\uDC55\uDC56"+ - "\uDC57\uDC58\uDC5E\uDC5F\uDC60\uDC61\uDC62\uDC63"+ - "\uDC6A\uDC6B\uD9E3\uDC7C\uDC36\uDC70\uDC91\uD9E1"+ - "\uDC4C\uDC7D\uDC45\u0000\u0000\u0000\u0000\uDC49"+ - "\uDC7A\u0000\u0000\uDC7B\u0000\u0000\uDC6F\u0000"+ - "\uD9E4\u0000\u0000\uDC74\uDC7E\uDC79\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF179\uF2CB\u0000\uF662\u0000\u0000\u0000\uE742"+ - "\uF1DB\uEAB2\uEABE\uF7BB\u0000\uE996\u0000\u0000"+ - "\u0000\uF5E4\u0000\u0000\uF4A6\uE9E0\uEBA6\u0000"+ - "\uE29A\uE940\u0000\u0000\u0000\u0000\uECAA\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF3E9\u0000\u0000"+ - "\u0000\u0000\uE1FA\u0000\u0000\u0000\u0000\u0000"+ - "\uF93F\uE4A1\u0000\uF3AB\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uEED1\uE43C\u0000\uE29B\u0000\u0000"+ - "\u0000\u0000\u0000\uF3FD\u0000\uEA4F\uF8BA\uF7B9"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE262\u0000"+ - "\uECAB\uF0E0\u0000\u0000\u0000\uE29C\uE0F7\uEDA5"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE071\u0000\uE55C\u0000\u0000"+ - "\u0000\u0000\u0000\uF071\u0000\u0000\uE973\uEAAD"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE0EB\u0000"+ - "\u0000\u0000\uE5AF\u0000\u0000\u0000\uE697\u0000"+ - "\uEDF8\u0000\u0000\uEA50\uF133\u0000\uEFCD\u0000"+ - "\uF037\uEFF6\uF8BB\u0000\uEEE9\uF2CC\u0000\u0000"+ - "\uE376\u0000\u0000\uEA51\u0000\u0000\uED3C\u0000"+ - "\u0000\uE75C\uF7F1\u0000\uE26F\uF834\uEE42\u0000"+ - "\uF89D\u0000\u0000\uF84D\uE158\uF2CD\uE5D5\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE4A2\u0000"+ - "\u0000\u0000\uF161\u0000\u0000\u0000\u0000\u0000"+ - "\uED37\uF162\u0000\u0000\uF641\u0000\u0000\uE29D"+ - "\u0000\u0000\uE361\uE0BF\u0000\uF1A4\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uF1A8\uEA52\uF672\uF1DC"+ - "\uE997\uEB49\u0000\u0000\u0000\uE55E\u0000\uF545"+ - "\u0000\u0000\u0000\uE4DB\uE645\uF134\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uED76\u0000\uF3EA\u0000\u0000\u0000\uE0EC\uE0C0"+ - "\u0000\u0000\u0000\uF194\u0000\u0000\u0000\u0000"+ - "\u0000\uE37A\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF7F2\uF135\uE36F\u0000\uEEEA\uE37B\uE961"+ - "\uE8E9\uF9CC\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE8D7"+ - "\u0000\u0000\u0000\u0000\uE871\u0000\uE646\u0000"+ - "\uECDF\u0000\uEA53\u0000\uEA54\uE031\u0000\u0000"+ - "\u0000\u0000\u0000\uF27C\u0000\u0000\uE4A3\uF247"+ - "\uF75F\u0000\u0000\u0000\u0000\uF058\uF248\uF3AC"+ - "\uF3A5\uEFCE\u0000\u0000\u0000\uF7BC\u0000\u0000"+ - "\u0000\uEDF9\uF17A\uE9D6\uF1C2\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF735\u0000\u0000\u0000\u0000\u0000\uEDBA"+ - "\uE8D8\u0000\u0000\uE032\u0000\u0000\uE3CD\u0000"+ - "\u0000\u0000\uF27D\u0000\u0000\u0000\uF17B\uEA55"+ - "\u0000\uECE0\u0000\uE059\uF479\u0000\uE5CE\u0000"+ - "\uF646\u0000\uE252\uE657\u0000\uECB4\u0000\uF3AD"+ - "\u0000\uF072\u0000\u0000\u0000\u0000\uE6C2\u0000"+ - "\uF4A7\u0000\u0000\uE1EA\u0000\uF0EE\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE7B2\uF9A5"+ - "\u0000\u0000\u0000\u0000\u0000\uF665\uE5E2\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uF745"+ - "\u0000\u0000\uE197\uF5B5\uED3D\u0000\u0000\u0000"+ - "\u0000\uEEEB\uF3D5\u0000\u0000\u0000\uF34B\u0000"+ - "\u0000\uEFB5\u0000\uE159\uF865\u0000\u0000\uEBD4"+ - "\u0000\u0000\uE6D6\u0000\u0000\uE951\u0000\uEA56"+ - "\uF891\uECE1\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uEBF3\uE998"+ - "\u0000\uE29E\u0000\uE8C4\u0000\uF793\u0000\u0000"+ - "\uE974\u0000\uEDEF\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE941\u0000\u0000\u0000\uE5D6\u0000"+ - "\u0000\uF4DA\u0000\uE0C1\u0000\uE8C3\u0000\u0000"+ - "\u0000\uE7FA\uE4EE\u0000\u0000\u0000\uF848\u0000"+ - "\u0000\uF9A6\uF0EF\u0000\uF536\u0000\uE15A\uF4A8"+ - "\u0000\uF4DB\u0000\uE8A7\uF647\u0000\uE2E6\uF394"+ - "\uE0DA\u0000\uEED2\uE6C3\uF692\uEF6E\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uEDA6\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uEDE7\u0000\u0000\u0000\uE033"+ - "\uE137\uF059\u0000\u0000\u0000\u0000\u0000\uF746"+ - "\u0000\u0000\u0000\u0000\u0000\uF835\u0000\u0000"+ - "\u0000\u0000\uF3AE\u0000\uF2CE\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uE0ED\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uF640\uF2CF\uEFCF\u0000"+ - "\uF6DE\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE263\u0000\u0000\u0000\u0000\uE999\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uE8A8\u0000\u0000"+ - "\u0000\uE0F8\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uEAA1\uE9E1\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uF5CA\uEFB6\u0000\u0000"+ - "\u0000\u0000\uEEEC\uF27E\u0000\uF4F0\u0000\uEABF"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE15B\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uE351\u0000\u0000"+ - "\u0000\uF562\uEB4A\u0000\u0000\u0000\u0000\uEAC0"+ - "\u0000\uE270\u0000\u0000\u0000\uE962\uF9EA\u0000"+ - "\u0000\u0000\uE698\u0000\u0000\u0000\uF05A\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uEF79\u0000\uECAC"+ - "\u0000\u0000\u0000\u0000\u0000\uF4D0\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE034\u0000\uE8F8\u0000\u0000\u0000\uEA57"+ - "\uF0F0\uF3D6\u0000\u0000\uEDE2\u0000\uE15C\u0000"+ - "\u0000\uE0FB\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF073\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uEAC1"+ - "\u0000\uE67D\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uEFD0\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF249\u0000\u0000\u0000\u0000\uE5E3"+ - "\u0000\u0000\uE3D3\u0000\uEDF0\u0000\u0000\u0000"+ - "\uEF44\uF0C3\u0000\uF03A\uF89E\uF5F6\uF34C\uF9D4"+ - "\uEB4B\uE253\u0000\uE34A\uF6BA\uE795\uF6CD\u0000"+ - "\u0000\u0000\uED3E\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE56F\u0000\u0000\u0000"+ - "\u0000\u0000\uE377\u0000\u0000\uF19F\u0000\uE43E"+ - "\uF291\uE5D7\uF074\uF732\uE1EB\uE6BF\uF8B1\u0000"+ - "\u0000\uE1EC\u0000\u0000\u0000\uE942\uE37C\uE29F"+ - "\uF292\u0000\u0000\u0000\uE152\u0000\u0000\u0000"+ - "\uE37D\u0000\u0000\u0000\u0000\u0000\uEDF7\u0000"+ - "\u0000\u0000\uF4FC\u0000\u0000\uF232\u0000\u0000"+ - "\u0000\u0000\uE7B3\u0000\u0000\uE796\u0000\uEFB7"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE23E\u0000\u0000\u0000\u0000\uE7A2\u0000\u0000"+ - "\u0000\u0000\uE793\u0000\uE55F\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uEDA7\uE5D2"+ - "\u0000\u0000\u0000\u0000\u0000\uE639\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uF532\u0000\uF3D7\u0000"+ - "\u0000\uE5D8\u0000\uF34D\uE6D0\uE560\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE6CF\uF0EA\uF9EB\u0000"+ - "\u0000\uE8ED\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF955\uE0C2\u0000\u0000\u0000\u0000\uF9D5\u0000"+ - "\uF558\uEF7A\uF5F3\u0000\u0000\uF7DE\u0000\u0000"+ - "\uE4EF\u0000\u0000\uF163\u0000\u0000\uE9C2\uF2B7"+ - "\uEED4\u0000\uE05A\u0000\u0000\u0000\uE7FB\u0000"+ - "\u0000\uF89F\u0000\u0000\u0000\u0000\u0000\uE63A"+ - "\u0000\u0000\u0000\u0000\u0000\uF59A\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uF6F7\uE93C\u0000\u0000"+ - "\u0000\uE6D7\uEAA2\u0000\u0000\u0000\uE24E\u0000"+ - "\uE4F0\u0000\u0000\u0000\u0000\u0000\uF334\uEBEC"+ - "\uE2E7\uF4CB\uF1A9\uE04E\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF591\u0000\u0000\u0000\uF65E"+ - "\u0000\u0000\uEA9D\uE34B\uE5B7\uF293\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uF538\u0000\uE99A\u0000"+ - "\u0000\u0000\u0000\uE0A7\u0000\uE85E\u0000\u0000"+ - "\u0000\uEB76\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF1A5\uF294\u0000\u0000\u0000\u0000\uE99B"+ - "\u0000\u0000\uF7DC\u0000\u0000\uF4DC\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF794\u0000\uF59B"+ - "\u0000\u0000\u0000\uF993\u0000\u0000\u0000\uE34C"+ - "\uE8F9\uE6B1\u0000\u0000\u0000\uE0FC\u0000\u0000"+ - "\u0000\uF335\uE0FD\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE5F4\u0000\u0000\u0000\uE1ED"+ - "\uE035\u0000\u0000\uE63B\uE352\u0000\u0000\u0000"+ - "\u0000\uF34E\uE44D\uE134\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF846\u0000"+ - "\u0000\uE15D\u0000\uE89C\u0000\uF65F\u0000\uEFB8"+ - "\u0000\uE797\u0000\u0000\u0000\uE15E\u0000\u0000"+ - "\u0000\u0000\uE6CD\u0000\u0000\uE561\uEFED\u0000"+ - "\uE07B\uE7E2\u0000\uF9B2\u0000\uECAD\uE65C\uE7B4"+ - "\u0000\u0000\uEBA7\uF263\uE353\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF9B3\u0000\uE5E4\u0000\u0000"+ - "\uE2E8\u0000\uF1C3\uE342\u0000\u0000\uE2A0\uE838"+ - "\u0000\u0000\u0000\u0000\u0000\uF760\u0000\u0000"+ - "\uF9D6\u0000\u0000\u0000\u0000\uF761\u0000\uF762"+ - "\uE963\u0000\u0000\u0000\u0000\uE9E2\uF8F9\uE9C1"+ - "\u0000\uECB5\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF1DD\uE254\u0000\uE0A1\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE9E3\u0000\u0000\u0000\u0000\uF96D"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF7AF\u0000\u0000\u0000\u0000\u0000\uE49D"+ - "\uE2A1\uED38\u0000\uF546\uF1A0\u0000\u0000\uECAE"+ - "\uEEED\uF9C1\uE872\u0000\u0000\uE743\u0000\u0000"+ - "\u0000\uE9E4\uF391\uF693\uF892\u0000\u0000\uE3F5"+ - "\u0000\u0000\uE85F\u0000\uE964\u0000\uE936\u0000"+ - "\uF2BF\u0000\u0000\u0000\u0000\u0000\uE25F\u0000"+ - "\uEB69\u0000\u0000\u0000\u0000\u0000\u0000\uE7D6"+ - "\uF164\uF05B\u0000\u0000\uE04F\uE5B0\u0000\uE2E9"+ - "\u0000\u0000\u0000\u0000\u0000\uF3ED\u0000\uE15F"+ - "\u0000\u0000\u0000\u0000\uED9A\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uED7D\u0000\u0000\u0000\u0000"+ - "\uE6D8\u0000\uF9A7\u0000\u0000\u0000\u0000\uF03B"+ - "\uF642\u0000\u0000\u0000\u0000\uE2F0\uF7BD\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uEE96\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE0DB\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF4D1\u0000\u0000\u0000\u0000"+ - "\uEFD1\uF4A9\uE370\uEFD2\u0000\uE873\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uEC62\u0000\uF632\uEBF4"+ - "\u0000\u0000\u0000\uE874\u0000\u0000\u0000\u0000"+ - "\u0000\uEED5\uF5BF\uE2A2\uE1AF\uE2A3\u0000\u0000"+ - "\u0000\uE1B0\uF3FE\uE333\uEBAF\uF733\u0000\uE036"+ - "\uF6BB\uF47A\uEA58\uEFD3\u0000\u0000\u0000\u0000"+ - "\uEA59\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF9DE\uE050\u0000\u0000\u0000"+ - "\uF7EA\uE3CE\uF264\u0000\uE562\uE7A3\uF9A8\uE6D9"+ - "\uF6CE\uF84E\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE2D6\u0000\uE6F0\u0000\uF0E1"+ - "\uF755\u0000\u0000\u0000\u0000\u0000\uE99C\u0000"+ - "\u0000\uE9C3\u0000\uF7DF\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uEEEF\u0000\u0000\u0000\u0000"+ - "\uF9E5\uF633\u0000\uE7FC\uF9A9\u0000\uEEEE\u0000"+ - "\u0000\u0000\uE5E5\u0000\u0000\u0000\u0000\u0000"+ - "\uF2D0\u0000\uE1B1\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF6A2\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF3B2\u0000\uF3B1\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE1B2\u0000\uE83B\u0000\uE037\u0000\u0000"+ - "\u0000\u0000\u0000\uECE2\uF8BC\uE7A4\u0000\u0000"+ - "\uF24A\u0000\u0000\u0000\u0000\u0000\uF763\u0000"+ - "\u0000\u0000\u0000\u0000\uF8FA\u0000\uE2A4\u0000"+ - "\uE99D\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uF673\u0000\u0000\u0000"+ - "\uF1AA\u0000\u0000\uF431\uE271\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF836\u0000\u0000\u0000\u0000"+ - "\uF7E0\u0000\u0000\u0000\u0000\uF166\u0000\u0000"+ - "\uED7E\uF7A1\u0000\u0000\uF8EF\u0000\u0000\u0000"+ - "\uF7EB\uF233\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF03C\u0000\u0000\u0000\uE038\u0000\u0000"+ - "\uF59C\u0000\u0000\u0000\u0000\uE1D6\uF998\u0000"+ - "\u0000\u0000\uF559\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF764\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uF736\u0000\uEA5A\uF456"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE6DA\u0000"+ - "\uE4D0\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE755\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uF076"+ - "\u0000\uF4DD\u0000\u0000\u0000\uED6A\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF674\u0000"+ - "\u0000\u0000\u0000\u0000\uF694\u0000\uEAC2\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE7FD"+ - "\u0000\u0000\u0000\uE198\u0000\u0000\uE4BA\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uED3F\u0000"+ - "\u0000\u0000\u0000\uF7E1\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uF336\u0000\u0000\u0000"+ - "\uE0D3\u0000\u0000\u0000\uEB4C\u0000\uF55A\uE59C"+ - "\u0000\uF9AA\uF7E2\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF547\uF9C2\uF940\u0000\uF9EC\uE072\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uF9BD"+ - "\u0000\uF077\uEAC3\uE3D2\uE272\u0000\uE4A4\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF9AB\u0000\uEAE0"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uF457\u0000\u0000\u0000"+ - "\u0000\u0000\uEEF0\u0000\uE37E\u0000\u0000\uF4AA"+ - "\u0000\u0000\u0000\uEA5B\uF648\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uEBF5\uF3B3\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF6A3\u0000"+ - "\u0000\uE039\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE2A5\u0000\u0000\uEAC4"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uEBB0"+ - "\u0000\u0000\uF34F\u0000\uF634\u0000\uECB6\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF856\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE391\u0000\u0000\uF9ED\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE9C4\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF999\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uEE4F\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uEA3D\u0000\uF84F\u0000"+ - "\u0000\u0000\u0000\u0000\uEDF1\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uF1C4\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE435\u0000\u0000\uF9EE\u0000\u0000"+ - "\u0000\uF5B6\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uEBF6\uEA5C\u0000\u0000\uF96E\u0000"+ - "\uF167\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE1DD\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE647\uE1B3\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF765\uEDD8\u0000\u0000\u0000"+ - "\uE2EA\u0000\u0000\uE2D0\u0000\uF05C\u0000\u0000"+ - "\u0000\u0000\uF03E\uF03D\u0000\u0000\uE4F1\u0000"+ - "\uE4A5\u0000\u0000\u0000\u0000\u0000\u0000\uF6CF"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF234\u0000\u0000\u0000\u0000\uE334\u0000\u0000"+ - "\uF432\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE392\u0000\u0000\u0000\u0000"+ - "\uF433\u0000\uF6F8\u0000\u0000\u0000\u0000\uE343"+ - "\u0000\u0000\uE8A9\u0000\u0000\uE4BB\uE07C\u0000"+ - "\uF3A6\uE0D5\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF6E7\u0000\u0000\uE1DE\u0000\uF6A4\u0000"+ - "\u0000\u0000\uF750\u0000\u0000\u0000\uE4DD\u0000"+ - "\uE160\u0000\u0000\u0000\u0000\uE2A6\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uF695\u0000\u0000\u0000"+ - "\u0000\u0000\uEBF7\u0000\u0000\u0000\u0000\u0000"+ - "\uE4DC\u0000\u0000\uF8A0\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF837\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF0D9\u0000\uE2A7\uF03F\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uED91\u0000\u0000\u0000\uEFB9"+ - "\uF3D8\u0000\u0000\uE768\u0000\u0000\uEB94\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uEE44"+ - "\uE99E\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF4F1\u0000\u0000\u0000\uECD0\u0000\u0000\uF49D"+ - "\u0000\uE8C6\uE393\u0000\uE394\u0000\u0000\u0000"+ - "\uE2DC\u0000\uE4D1\u0000\u0000\uE141\uF6D8\u0000"+ - "\uE0A8\uF0BC\uED4E\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF56C\u0000"+ - "\u0000\uE952\u0000\u0000\uF337\u0000\u0000\uEE50"+ - "\u0000\u0000\uE07D\u0000\u0000\u0000\u0000\uEF7B"+ - "\uEDE8\uE953\u0000\u0000\uF1DE\uE4F2\u0000\u0000"+ - "\u0000\u0000\uE199\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE264\uEEAB\u0000\u0000\u0000\uE0C3"+ - "\u0000\uEBB1\u0000\u0000\uF6B2\u0000\u0000\uE4F3"+ - "\uE4D2\u0000\uF5C0\u0000\u0000\u0000\uEADD\u0000"+ - "\u0000\uF295\uEEF1\u0000\uF9B4\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF458\u0000\u0000"+ - "\u0000\uF4D2\u0000\u0000\uF296\u0000\uEC63\u0000"+ - "\u0000\u0000\u0000\uE161\u0000\uEAEA\u0000\u0000"+ - "\u0000\uEFBA\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE7D7\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uF5CD\u0000\uF3F2\uF857"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE7F8\uE552\u0000\u0000\u0000\u0000\uF675\u0000"+ - "\u0000\u0000\u0000\uE9C5\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uEEF2\uF1DF\u0000\u0000\uE05B\u0000"+ - "\u0000\uE8FA\u0000\u0000\u0000\uEF45\u0000\uE4A6"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF9B5\u0000"+ - "\u0000\uF7C9\u0000\uED72\u0000\uF8BD\u0000\u0000"+ - "\uE6A4\uE255\u0000\u0000\u0000\u0000\uE265\uE676"+ - "\u0000\u0000\u0000\u0000\uEDBD\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uEA5D\uF195\u0000\u0000\uF1E0"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF17C\uF8BE\uEAEB\u0000\uEBF8\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uF7BE"+ - "\u0000\u0000\u0000\u0000\uE395\uEB3A\uEF72\u0000"+ - "\u0000\uEC64\uE49F\u0000\uEDA8\u0000\u0000\u0000"+ - "\u0000\u0000\uE7D3\u0000\u0000\u0000\u0000\uE4DE"+ - "\u0000\uF548\uF6BC\uE99F\u0000\uEF7C\uED77\u0000"+ - "\u0000\uECF7\u0000\u0000\u0000\u0000\u0000\uF138"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF893\u0000"+ - "\u0000\u0000\u0000\u0000\uEDF2\u0000\u0000\uE396"+ - "\uE43F\uE975\u0000\u0000\u0000\u0000\uE335\uF3B4"+ - "\uF941\uE19A\u0000\u0000\uE9C6\uF861\u0000\uF6DF"+ - "\u0000\u0000\uF838\u0000\u0000\u0000\u0000\u0000"+ - "\uF297\u0000\uEA5E\u0000\u0000\u0000\u0000\uEEF3"+ - "\u0000\u0000\uF6AC\uF0C4\uF1E1\uEB3B\uE9C7\u0000"+ - "\u0000\u0000\u0000\uE443\uE44F\u0000\u0000\u0000"+ - "\uE05C\u0000\u0000\u0000\u0000\uF8BF\u0000\u0000"+ - "\u0000\u0000\uEDFD\uE9E5\uE75D\u0000\u0000\u0000"+ - "\u0000\u0000\uF196\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE397\u0000\u0000\uEF7D\uE362"+ - "\u0000\uE7D8\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF676\u0000\u0000"+ - "\uE8AA\u0000\u0000\u0000\uF6E0\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE769\u0000\uF533\u0000\u0000\uF56D\u0000"+ - "\u0000\u0000\u0000\uF2D1\u0000\u0000\uE7B5\u0000"+ - "\u0000\uF1AB\u0000\uECB7\u0000\u0000\u0000\u0000"+ - "\uF24B\uE1B4\u0000\uEB95\uF05D\u0000\u0000\u0000"+ - "\u0000\uF197\uEF7E\u0000\uE0A9\uF3AF\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE05D\u0000"+ - "\uF139\u0000\uF47B\u0000\uF9EF\u0000\uF7F3\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uEE51\u0000\u0000\uF168\u0000\u0000\u0000\uF1AC"+ - "\u0000\uF05E\u0000\uEF6F\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uEA5F\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE436\u0000\u0000\uEEF4\uE3D6\u0000\u0000\uEE52"+ - "\uECE3\u0000\u0000\u0000\u0000\uED40\u0000\u0000"+ - "\u0000\uE744\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF635\u0000"+ - "\u0000\u0000\u0000\u0000\uF4DE\u0000\u0000\u0000"+ - "\u0000\uE6A5\u0000\u0000\u0000\u0000\uF6E8\u0000"+ - "\u0000\uEF56\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF8E6\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE9E6\u0000\u0000\u0000\uE9A0\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE76A\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE83C\uF040\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uECB8\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE03A\uEBF9\u0000\uF041\u0000\u0000\u0000"+ - "\u0000\uF47C\u0000\u0000\uF87E\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF265\u0000\u0000\u0000\u0000\uF7F4\u0000"+ - "\u0000\uE47C\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF8FB\u0000\u0000"+ - "\u0000\uF9F0\u0000\uEB4D\uE273\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF756\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uEA3E\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uEAC5\u0000\u0000\uEDBE\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF1AD\uF87A\u0000\u0000\uE1EE\uF1A6\u0000\uF1AE"+ - "\uF37D\u0000\uE9A1\u0000\uF1AF\uF99A\u0000\uE77B"+ - "\u0000\u0000\u0000\uE19B\uE1B5\u0000\u0000\u0000"+ - "\u0000\uF839\u0000\uEBDD\u0000\u0000\u0000\u0000"+ - "\uEC65\uF1CF\u0000\u0000\u0000\uE9A2\u0000\u0000"+ - "\uF7CA\u0000\uF078\u0000\uEDED\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uE4EB\u0000\uEFD4"+ - "\uEBFA\uED5C\u0000\uEBE4\uEF57\u0000\u0000\uE26B"+ - "\u0000\u0000\u0000\uE965\u0000\uF6B5\uF995\uF395"+ - "\uE23F\uF3B5\uF2D2\uEF58\uF0F1\u0000\u0000\u0000"+ - "\u0000\u0000\uE0D4\uEB4E\uECF8\uF079\uF942\u0000"+ - "\u0000\u0000\u0000\u0000\uEB96\u0000\uE2E0\u0000"+ - "\uF235\u0000\u0000\uF83A\uEE53\uEBB2\uE03B\u0000"+ - "\uECE4\uEFBB\u0000\u0000\u0000\u0000\u0000\uEC66"+ - "\uF4F2\u0000\uF266\uF042\uE398\uF169\uE85B\uE2A8"+ - "\u0000\u0000\u0000\u0000\uE9A3\u0000\u0000\u0000"+ - "\uE76B\u0000\uF7CE\uEFD5\uECD1\u0000\u0000\uE44C"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE73C\uF4CC"+ - "\u0000\uE1FB\uF666\u0000\uEEF5\uEF91\uECF9\uE44B"+ - "\uF4F3\uECFB\u0000\uEA60\uE240\u0000\uE699\uF3D9"+ - "\u0000\u0000\u0000\u0000\u0000\uF5C1\uE954\u0000"+ - "\uF5BB\u0000\uEA61\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE976\u0000\u0000\uEA62\u0000\u0000\uF1E2"+ - "\uF298\uF05F\uF37E\uECFC\u0000\uE4DF\uE4F4\uEBB3"+ - "\u0000\uEBB4\u0000\u0000\u0000\u0000\uF563\u0000"+ - "\u0000\uEAC6\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uEFD6\u0000\u0000\u0000"+ - "\uE8AB\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF636\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uECB9\uF0C5\uF539\uE1B6\uE49B\u0000\uE83D\uE473"+ - "\uE2D1\u0000\u0000\u0000\u0000\uE0DC\uE19C\u0000"+ - "\uE2DD\u0000\u0000\uEF39\u0000\uECBB\uECBA\u0000"+ - "\u0000\uEB6A\u0000\u0000\u0000\uF299\u0000\u0000"+ - "\u0000\u0000\u0000\uE943\u0000\u0000\u0000\u0000"+ - "\uE4F5\u0000\uE6A6\u0000\uF645\uE6DB\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uEBD5\u0000\u0000\uE57A"+ - "\u0000\uEAA3\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF9DF\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE399\uF1D4\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE0AA\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uED6B\u0000\uEBFB\uE0A2\u0000\u0000\u0000"+ - "\u0000\uE4E0\u0000\uED4F\u0000\uF8C0\u0000\uE84E"+ - "\uED5D\u0000\uE649\u0000\u0000\u0000\uF2C0\u0000"+ - "\uEBFC\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF649\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uEAC7\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uED41\u0000\u0000\u0000\u0000\u0000\u0000\uE977"+ - "\uE978\u0000\u0000\u0000\uF866\u0000\uE4F6\u0000"+ - "\u0000\u0000\u0000\uF3DA\u0000\uF894\u0000\u0000"; - - private final static String innerIndex2= - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uEC9F"+ - "\u0000\u0000\u0000\u0000\u0000\uE5CF\uE39A\u0000"+ - "\u0000\uE1DF\u0000\u0000\uF5CB\u0000\uED92\uE0AB"+ - "\u0000\uE6C4\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uECA0"+ - "\u0000\uE9DA\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE83E\uE07E\u0000\u0000\u0000"+ - "\uE5B9\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uECA1\u0000\u0000\uEF73\u0000\u0000\uF4AB"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE2A9"+ - "\u0000\u0000\u0000\uE4F7\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uE593\u0000\u0000"+ - "\uE274\u0000\uEF94\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uEDF5\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uEEAE\u0000\uE64A\u0000\uEAEC\uED50\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uEF74\u0000\u0000"+ - "\u0000\u0000\uE745\u0000\u0000\u0000\uED6C\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF549\uF3B6\u0000"+ - "\u0000\uEC6E\uEBB5\u0000\u0000\uE1EF\uF3A7\uE275"+ - "\uE0DD\u0000\u0000\uE7E3\u0000\u0000\uF4AC\u0000"+ - "\u0000\uE39B\uF13B\uEA63\uF6E9\u0000\u0000\uF7F5"+ - "\u0000\u0000\u0000\u0000\u0000\uEBDE\uE0EE\u0000"+ - "\u0000\u0000\uECBC\uF766\u0000\u0000\uE8EE\u0000"+ - "\u0000\u0000\u0000\u0000\uF9F1\u0000\u0000\u0000"+ - "\u0000\uF6B6\u0000\u0000\u0000\u0000\uF56E\u0000"+ - "\u0000\uF47D\u0000\uE8D9\u0000\uF338\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uEBFD\u0000\u0000"+ - "\u0000\u0000\u0000\uEA64\u0000\uEB3C\u0000\u0000"+ - "\u0000\u0000\u0000\uF1E3\u0000\u0000\uE4E1\u0000"+ - "\uEAC8\u0000\u0000\u0000\u0000\uE7B6\u0000\uF9AC"+ - "\uF2D3\u0000\u0000\u0000\uED51\uF77B\u0000\uE8AC"+ - "\u0000\u0000\u0000\u0000\uF956\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uE73D\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uF64A"+ - "\u0000\uE8DF\uE4D3\uF757\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE05E\uF751\uE444\u0000\u0000\uE944"+ - "\uF849\uE05F\u0000\uF943\uF07A\uF07B\uE39C\u0000"+ - "\u0000\u0000\u0000\u0000\uF1E4\u0000\u0000\uE9E7"+ - "\u0000\u0000\uEAC9\u0000\u0000\u0000\u0000\uEAED"+ - "\u0000\u0000\u0000\u0000\u0000\uF24C\u0000\uF2C1"+ - "\u0000\u0000\uE162\u0000\uE9A4\u0000\u0000\u0000"+ - "\uEACA\u0000\u0000\u0000\u0000\u0000\uE4F8\uF3A8"+ - "\u0000\u0000\u0000\uE1B7\u0000\uF2D4\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uED6D\uEAEE\uE0AC"+ - "\uEFBC\u0000\u0000\u0000\u0000\u0000\uF07C\u0000"+ - "\u0000\u0000\uEACB\u0000\u0000\u0000\u0000\u0000"+ - "\uF7BF\uE63F\uE5C6\u0000\u0000\u0000\u0000\u0000"+ - "\uE2AA\u0000\u0000\uE239\u0000\u0000\uE69A\u0000"+ - "\u0000\u0000\uF3B7\uF29A\u0000\u0000\u0000\uE7D9"+ - "\uF4DF\u0000\uF758\uE256\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE5E6\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF576\u0000\u0000\uEE55\uF2D5"+ - "\u0000\u0000\uE0EF\uF96F\u0000\u0000\u0000\u0000"+ - "\u0000\uE937\u0000\u0000\uE677\u0000\u0000\u0000"+ - "\u0000\u0000\uF759\u0000\u0000\u0000\u0000\uECD2"+ - "\u0000\uECBD\u0000\uE2E1\uF350\uF16A\u0000\uE9D7"+ - "\uF8F0\u0000\u0000\uF13C\u0000\u0000\u0000\uF339"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF867\uF8C1"+ - "\u0000\uE450\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uEDB0\u0000\u0000\u0000\uF1E5\u0000\u0000"+ - "\u0000\u0000\uE0AD\u0000\uF7B0\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF6A5\u0000\uE0AE\u0000\uE83F\u0000\uE746\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE4A7\uF8B2"+ - "\u0000\uF9C4\u0000\uF13D\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF8A1\u0000\u0000\u0000\uEDE9\uEFEE"+ - "\u0000\uF4F4\uF795\uF351\uEA3F\uF740\u0000\u0000"+ - "\uF4E0\uEEAF\u0000\u0000\u0000\u0000\u0000\uE8AD"+ - "\u0000\uEE45\u0000\u0000\uF7A8\u0000\u0000\uE9D8"+ - "\uEF69\uF2D6\u0000\u0000\u0000\uE4E2\u0000\uEC6F"+ - "\u0000\u0000\uF970\uE6C8\uF9AD\u0000\u0000\u0000"+ - "\uEAEF\uE163\uE4F9\u0000\u0000\u0000\u0000\uE592"+ - "\uE8C7\uEA65\u0000\u0000\u0000\u0000\uF396\u0000"+ - "\uE5D0\uEDD9\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF957\uE966\uEC70\u0000\u0000\u0000\uE840\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF4A3\u0000\uE4EC"+ - "\u0000\uF55B\u0000\u0000\u0000\uF9C5\u0000\u0000"+ - "\u0000\u0000\u0000\uECFD\u0000\uF7B1\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE39D\uF16B\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF5BC\uF434"+ - "\uE75E\uE75F\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF5F7\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF671\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uE447\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF8EC\u0000\uE9C8"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uED78"+ - "\u0000\u0000\uE451\u0000\u0000\u0000\uF767\u0000"+ - "\u0000\u0000\u0000\u0000\uE64B\uEA66\u0000\u0000"+ - "\uF6BD\uF13E\u0000\u0000\u0000\uE371\u0000\uEB97"+ - "\uF043\u0000\uE266\u0000\u0000\u0000\u0000\uE135"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF198\uEC71\uECBE\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF958\u0000\u0000"+ - "\uE1F0\u0000\uF7F6\u0000\u0000\uEAF0\u0000\u0000"+ - "\u0000\uEDBF\u0000\u0000\u0000\uE24F\u0000\u0000"+ - "\u0000\u0000\uF971\uF1B0\uF9D1\uF64B\u0000\u0000"+ - "\uF7CF\uF0DA\uE051\u0000\uE448\uE1F1\u0000\uECD3"+ - "\uF9E6\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uEE7D\u0000\u0000"+ - "\u0000\uECFA\u0000\u0000\uF33A\uF7D0\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uF972\u0000\uF737\u0000"+ - "\u0000\u0000\uEBE5\uF29B\u0000\u0000\u0000\uEEF6"+ - "\uF07D\u0000\u0000\uF944\uF5C2\u0000\u0000\uE6DC"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF397\u0000\uE9E8\uE4ED\uF5FC\u0000\uE84F\u0000"+ - "\uE19D\u0000\u0000\u0000\uE4FA\uF534\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF2D7\u0000\uE553"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF8E3\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF8ED\u0000\uEB3D\u0000\u0000\uF07E"+ - "\uF8B3\uED52\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF677\uE46D\u0000\uEACC\u0000\u0000\uF959\u0000"+ - "\u0000\uEDA9\uEB98\uF643\u0000\u0000\u0000\u0000"+ - "\u0000\uEBFE\u0000\u0000\u0000\u0000\uE0F0\u0000"+ - "\uF091\uF092\u0000\u0000\u0000\uE850\uF744\uF0F2"+ - "\u0000\u0000\u0000\u0000\u0000\uED53\u0000\u0000"+ - "\u0000\u0000\uEFD7\uED93\u0000\u0000\u0000\uE091"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE267"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF95A\u0000\u0000\u0000\uF4E1\u0000\u0000\uE0C4"+ - "\u0000\u0000\u0000\u0000\uECE5\u0000\uE0C5\uF044"+ - "\u0000\u0000\uEFBD\u0000\uE6C9\u0000\u0000\uF0DB"+ - "\uF1B1\u0000\uE153\uF6BE\uF95B\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF796\u0000\uE7B7\u0000\u0000"+ - "\uF4D3\uF4D4\u0000\u0000\u0000\uF6E4\u0000\uF6D1"+ - "\u0000\u0000\uE747\uE241\uE052\u0000\u0000\uF8B4"+ - "\uE0C6\u0000\u0000\uF398\u0000\u0000\uE5E7\u0000"+ - "\uF060\u0000\u0000\u0000\u0000\u0000\uE164\uE0AF"+ - "\u0000\u0000\u0000\u0000\u0000\uF53A\uEFAF\u0000"+ - "\u0000\uF5C3\uEFD8\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE9E9\u0000\u0000\u0000\uF3F3\u0000"+ - "\uE5FB\uEA4B\u0000\u0000\uF59D\u0000\u0000\u0000"+ - "\uF9F3\uF9F2\uF6A6\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE9C9\u0000\u0000\uE563"+ - "\u0000\uE138\u0000\uE851\uE165\u0000\uE7E4\u0000"+ - "\u0000\u0000\uF85A\u0000\u0000\u0000\uEDE3\u0000"+ - "\u0000\u0000\uE4BC\u0000\u0000\u0000\uE092\u0000"+ - "\u0000\u0000\u0000\uE354\u0000\u0000\u0000\uE060"+ - "\uF83B\uF0EB\uEEF8\uE7E5\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE3D7\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF4A4\u0000\u0000\u0000\uE59D\uF973"+ - "\uF868\u0000\uF4D5\u0000\uE2AB\u0000\u0000\uF0F3"+ - "\uE5FC\u0000\u0000\u0000\u0000\u0000\u0000\uE4D4"+ - "\uE1FC\u0000\uE7E6\u0000\uEC9B\uEC31\uF0D4\u0000"+ - "\uEB99\uED42\uE19E\u0000\u0000\u0000\uF8E4\u0000"+ - "\u0000\u0000\uF53B\u0000\u0000\u0000\u0000\uE34D"+ - "\u0000\uE093\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF2B8\u0000\u0000\u0000\uE6C0\u0000"+ - "\uF29C\uF9F4\u0000\u0000\uE4E3\u0000\uF8C2\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE5E8\uE8AE"+ - "\uEBB6\uF747\u0000\u0000\u0000\u0000\u0000\uEB4F"+ - "\uF8C3\uE9EA\u0000\uEC32\u0000\uF236\u0000\u0000"+ - "\u0000\u0000\u0000\uF678\u0000\u0000\u0000\u0000"+ - "\uF697\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE9CA\u0000"+ - "\u0000\uE372\u0000\u0000\u0000\u0000\uE9A6\u0000"+ - "\u0000\uE9EB\u0000\u0000\uED9B\u0000\u0000\uECAF"+ - "\uE39E\u0000\u0000\u0000\uF59E\u0000\u0000\u0000"+ - "\u0000\uE14C\uF6EA\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uEDE4\uEAF1\u0000\u0000\uF6E1\u0000\uF7F7"+ - "\uF2B9\u0000\u0000\uF768\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF7A9\u0000\u0000\u0000\u0000"+ - "\u0000\uF769\u0000\u0000\u0000\uF24D\u0000\u0000"+ - "\u0000\uE756\u0000\u0000\uED73\uF5CE\u0000\u0000"+ - "\u0000\u0000\uE9D9\u0000\u0000\u0000\u0000\uE7E7"+ - "\uE449\uE5C3\u0000\u0000\uE875\uE860\u0000\uE3D9"+ - "\uE268\u0000\uE0DE\uF53C\uE89D\u0000\uF679\uEF95"+ - "\uE2AC\uF392\u0000\uF59F\uE8C8\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE250\uECD4\uE3CF\uF3F5"+ - "\u0000\uE1F2\u0000\uE2EB\u0000\u0000\u0000\uE1B8"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uECA6\uE3DA"+ - "\u0000\uF435\u0000\u0000\u0000\u0000\u0000\uF436"+ - "\u0000\uED5E\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE4FB\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF3A9\u0000\u0000\u0000\uF459"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF2D8\uEE59\u0000\uE748\uF895\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF4B5\u0000\u0000\uF734\u0000\u0000\uE3F3"+ - "\uEE58\u0000\u0000\u0000\u0000\uF76A\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE979"+ - "\uEA67\u0000\u0000\u0000\u0000\u0000\uE0DF\u0000"+ - "\u0000\u0000\uE2EC\u0000\u0000\u0000\u0000\uF56F"+ - "\u0000\u0000\uE3F4\uE44A\u0000\u0000\u0000\uEAF2"+ - "\u0000\u0000\u0000\uEBB7\u0000\u0000\u0000\u0000"+ - "\uEC33\uE4FC\u0000\u0000\uF1E6\u0000\u0000\u0000"+ - "\u0000\u0000\uE8C9\u0000\u0000\u0000\uED9C\u0000"+ - "\uE2DE\u0000\u0000\uE260\u0000\u0000\u0000\u0000"+ - "\uE5D3\uF4F5\uF6AE\u0000\u0000\uF2C8\u0000\uE1F3"+ - "\uF5CF\uEDF3\uF352\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE061\u0000\u0000\u0000\uF093\u0000\uE336\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE7DA"+ - "\uF33B\u0000\u0000\u0000\u0000\u0000\uF0E7\u0000"+ - "\u0000\u0000\uEDC0\uF945\u0000\u0000\u0000\u0000"+ - "\u0000\uED54\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uE139\uF9C6\u0000"+ - "\u0000\u0000\u0000\u0000\uF045\u0000\uEDAA\uEABA"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uEBDF\u0000\uE861"+ - "\u0000\u0000\u0000\u0000\uEBB8\u0000\uEF96\uE4FD"+ - "\u0000\u0000\u0000\u0000\uEC34\u0000\u0000\u0000"+ - "\u0000\u0000\uF45A\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE876\uF6B3\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF9CD\u0000\u0000\u0000\uF4B6\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF267\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF5C4\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE734\u0000\u0000\u0000\u0000\u0000\uF437"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE7B8\uE7B9\uF2C9\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE65E\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF6CB\uEAAE\uEF97\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE445\u0000\u0000\u0000\uE4D5\u0000"+ - "\u0000\u0000\u0000\u0000\uF55C\uE89E\u0000\u0000"+ - "\u0000\u0000\u0000\uE7E8\u0000\uF6EB\uF5C9\u0000"+ - "\uF4BC\u0000\uE862\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE4B5\u0000\u0000\u0000\u0000"+ - "\u0000\uEF46\u0000\u0000\uE65F\uF54A\u0000\uF6C9"+ - "\u0000\u0000\uE13A\u0000\u0000\uF353\uE166\u0000"+ - "\u0000\u0000\uE363\u0000\uE4BD\u0000\u0000\u0000"+ - "\uE8FB\u0000\uE0E0\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE4E4\uF699\u0000\u0000\uE5BA\uF4CD\uE0E1"+ - "\u0000\u0000\u0000\u0000\uF0F4\u0000\u0000\u0000"+ - "\u0000\u0000\uF53D\u0000\uF93A\u0000\u0000\u0000"+ - "\u0000\u0000\uF6EC\u0000\u0000\u0000\uEF98\u0000"+ - "\uE877\u0000\u0000\u0000\uF6CC\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uEDC1\u0000\u0000\u0000\u0000\uEB7E\u0000\u0000"+ - "\u0000\u0000\u0000\uE5FD\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE276\uF93B\uE5BB\u0000\u0000\uF438"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uEC35\uE1B9"+ - "\uF094\uE0C7\u0000\uE1F4\u0000\u0000\uE8AF\uF2D9"+ - "\u0000\u0000\u0000\u0000\u0000\uE1BA\u0000\u0000"+ - "\uF99B\u0000\u0000\u0000\u0000\uEAF3\uE277\uE852"+ - "\u0000\uE2AD\u0000\u0000\u0000\u0000\uEEF9\uF738"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF4E2\u0000"+ - "\u0000\u0000\uE094\uEAA4\u0000\u0000\uE554\u0000"+ - "\u0000\u0000\u0000\u0000\uE167\uEDC2\u0000\u0000"+ - "\u0000\u0000\uE1BB\u0000\uF2DA\uF268\u0000\uE9A7"+ - "\uEC36\u0000\u0000\u0000\u0000\u0000\uEB50\u0000"+ - "\u0000\u0000\uE640\uF75A\u0000\uF99C\u0000\uE7FE"+ - "\u0000\u0000\u0000\u0000\uEA40\u0000\u0000\u0000"+ - "\uE9EC\uE878\u0000\u0000\u0000\u0000\u0000\uE570"+ - "\u0000\uE69B\u0000\uE1D7\uEA68\u0000\u0000\uF49A"+ - "\u0000\uED66\u0000\u0000\uE355\uF53E\u0000\uE9A8"+ - "\u0000\u0000\u0000\uF1C5\uF4D6\u0000\u0000\uEA69"+ - "\uECE6\u0000\u0000\u0000\u0000\u0000\u0000\uE4A8"+ - "\u0000\uE8B0\u0000\u0000\uEDDA\uECBF\u0000\u0000"+ - "\u0000\uE8B1\u0000\u0000\u0000\uE5E9\u0000\u0000"+ - "\u0000\u0000\u0000\uEB51\uF2DB\u0000\u0000\uF379"+ - "\u0000\u0000\uE6B2\u0000\u0000\u0000\u0000\uE39F"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE7E9\u0000\u0000\uE3A0\u0000\uF17D\uE4A9\u0000"+ - "\uF439\uF354\u0000\u0000\uEC72\uEFEF\u0000\u0000"+ - "\u0000\uF7D1\u0000\u0000\uEFD9\u0000\u0000\u0000"+ - "\u0000\u0000\uEF6A\uE853\uE854\uE555\u0000\uEEFA"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE1E0\uECB0"+ - "\u0000\uE8B2\uF8C4\u0000\uF4E3\u0000\uE7A5\uF8E7"+ - "\uE9CB\uE364\u0000\uEE46\uEB3E\uF9DA\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE945\uEB9A"+ - "\uEEB1\u0000\u0000\u0000\u0000\uF5F0\u0000\uE76C"+ - "\uF1C6\u0000\u0000\u0000\u0000\uEBB9\u0000\uECC0"+ - "\uF7C0\uEFF0\u0000\u0000\uE7DB\u0000\uF4E4\u0000"+ - "\u0000\u0000\uE946\uED79\u0000\u0000\u0000\u0000"+ - "\u0000\uF355\uECC1\uF95C\uF95D\u0000\u0000\u0000"+ - "\u0000\uF45B\u0000\uF45C\u0000\u0000\u0000\uED5F"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF3DB\u0000\uF869\u0000\uF3B8\uF9F5\uEB9B"+ - "\u0000\u0000\u0000\u0000\uEEFB\uF947\uF974\uF8C5"+ - "\uECE7\uE749\u0000\uF69A\u0000\u0000\uE955\uE168"+ - "\u0000\u0000\u0000\uEB3F\uF577\u0000\uF2DC\uE2FC"+ - "\uF2DD\u0000\uF43A\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uF9BE\u0000\u0000\uE03C"+ - "\uF9BB\uF9C7\u0000\u0000\u0000\u0000\uEEB2\u0000"+ - "\uF061\uEAF4\u0000\u0000\u0000\u0000\uE3EC\uED6E"+ - "\uEDC3\u0000\u0000\u0000\u0000\uE7A6\u0000\u0000"+ - "\uE1BC\u0000\uF4E5\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF1D5\u0000\u0000\uE7BA\u0000"+ - "\u0000\u0000\uF1E7\uF8B5\uF77C\u0000\u0000\u0000"+ - "\u0000\uEB77\u0000\uE169\u0000\u0000\uE556\u0000"+ - "\u0000\u0000\u0000\u0000\uEEA5\u0000\uE5F5\uE4BE"+ - "\u0000\uF99D\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uED94\u0000"+ - "\u0000\uEAF5\u0000\u0000\uEF9A\uF77D\u0000\u0000"+ - "\uE257\u0000\u0000\u0000\u0000\u0000\uF9F6\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uEF68\u0000\uE1D8\uEED6\uE16A\u0000\u0000\uE073"+ - "\uEAF6\uF357\uF356\u0000\uE74A\u0000\uF3F4\uF592"+ - "\uF5CC\u0000\u0000\uF975\u0000\u0000\u0000\u0000"+ - "\uF055\uF095\u0000\uE9DB\u0000\uE967\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uEA9F\uF49B\u0000\uE5C7"+ - "\u0000\u0000\u0000\uE760\u0000\uF358\uE3A1\uE3A2"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE7D4\uE678"+ - "\uE7CA\u0000\uE841\uE757\uE972\uF4CE\uF5F4\u0000"+ - "\u0000\uF3B9\u0000\u0000\uE863\u0000\uF67A\u0000"+ - "\u0000\u0000\uE2F5\u0000\u0000\uF9AE\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE062\u0000"+ - "\u0000\uEAB4\u0000\u0000\u0000\u0000\uE6DD\uF84A"+ - "\uF237\uF5BD\u0000\uF797\u0000\u0000\uF1E8\u0000"+ - "\u0000\u0000\u0000\u0000\uE571\u0000\uE3A3\uEBD6"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF7F8\u0000\uE8CA"+ - "\uE0F9\uE564\u0000\uE7DC\u0000\uF24E\u0000\uF6ED"+ - "\u0000\u0000\u0000\uE47E\u0000\u0000\uEBE6\uF6F9"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE9ED"+ - "\u0000\uEF6B\u0000\uE8B3\u0000\u0000\u0000\uE3F7"+ - "\uEB40\u0000\u0000\uE572\u0000\uF667\u0000\uE6F9"+ - "\u0000\u0000\uE76D\u0000\uE1FD\uF43B\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE1BD"+ - "\uF752\u0000\u0000\uF43C\u0000\u0000\uE03D\uE03E"+ - "\uE2AE\u0000\u0000\u0000\u0000\u0000\uECC2\u0000"+ - "\u0000\u0000\u0000\u0000\uE947\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE8DA"+ - "\uE7BB\uE095\uF663\uEE9A\uF097\u0000\u0000\u0000"+ - "\u0000\u0000\uF098\u0000\u0000\uF69B\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE2AF\u0000\u0000\uE063\u0000\u0000\uE03F"+ - "\uE440\uF3BA\u0000\uE6B3\uECC3\uF4FD\uEA6A\u0000"+ - "\u0000\u0000\u0000\uEA6B\u0000\u0000\uF2DE\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uEC73\uF29D\u0000\u0000\uEAF7\uE6CA"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE278\uE8DB\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF3BB\u0000\u0000\u0000\u0000\uEFF1"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF847\uE356\u0000\u0000\uE13B\uF238\u0000\u0000"+ - "\uE0FA\uF7F9\uE19F\uE4FE\u0000\u0000\u0000\u0000"+ - "\uED60\u0000\u0000\u0000\u0000\u0000\uF47E\u0000"+ - "\uE565\uEACD\u0000\uF948\uE3D0\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF45D\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF6D2\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE064"+ - "\u0000\uE5D9\u0000\u0000\u0000\uE76E\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE1D9"+ - "\u0000\u0000\u0000\uF239\uF64C\u0000\u0000\uE16B"+ - "\u0000\u0000\u0000\u0000\u0000\uF359\u0000\uF99E"+ - "\u0000\uEF59\uF5A0\u0000\u0000\u0000\u0000\uEEFC"+ - "\uE6DE\u0000\u0000\u0000\u0000\uEA6C\u0000\uF33C"+ - "\uE1A0\uE1E1\u0000\uEBBA\u0000\uE8EF\uE842\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE3A5\uE948\u0000\u0000"+ - "\u0000\uE798\u0000\uE3A4\u0000\uE1E2\u0000\u0000"+ - "\u0000\u0000\uE97A\u0000\u0000\uF399\u0000\uF35A"+ - "\uE34E\u0000\uE9DC\u0000\u0000\u0000\u0000\uE566"+ - "\uE4D6\u0000\u0000\u0000\u0000\u0000\u0000\uF1D0"+ - "\uE1A1\u0000\u0000\u0000\u0000\u0000\uEAB5\u0000"+ - "\u0000\u0000\uEAF8\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE531\uE242\u0000\u0000\u0000\u0000\u0000"+ - "\uEF5A\u0000\u0000\u0000\u0000\uF0F5\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uECD5\uF5D0\u0000"+ - "\u0000\u0000\uF5A1\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE7A7"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uEDAB\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uEE5B\u0000\uF5F1"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uEDC5\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF7A3\uEB6B\uF67B\u0000\uE0F1"+ - "\u0000\uE7EA\uF5A2\u0000\u0000\u0000\uE6D1\u0000"+ - "\uE3F8\uF09A\uF09B\uE843\u0000\u0000\u0000\u0000"+ - "\uF2DF\u0000\u0000\uF3EF\u0000\uEDF6\uF24F\uEC74"+ - "\u0000\u0000\u0000\u0000\u0000\uE34F\u0000\uF83C"+ - "\uF5D1\uEEB3\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uEFBE\u0000\u0000"+ - "\u0000\u0000\u0000\uF45E\uE8B4\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF95E\u0000\uE9EE"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uEEB4\u0000"+ - "\u0000\u0000\u0000\u0000\uE6B4\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF6B4\u0000\u0000\u0000\u0000"+ - "\u0000\uE1BE\u0000\uE879\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE2B0\uF6D9\uF4E6\u0000\u0000"+ - "\uE269\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE23A\u0000\uE0C8\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE337\u0000\uF35B\u0000\uE357"+ - "\u0000\u0000\uED55\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE8E0\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE5DA\u0000\uE6A7\u0000\u0000\u0000\uF250"+ - "\u0000\uF798\u0000\u0000\u0000\u0000\uF5D2\uF1E9"+ - "\u0000\uE7BC\u0000\uEDC6\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF5A3\u0000\u0000"+ - "\uE864\uEC37\uF8FC\u0000\u0000\uF3DC\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE096\u0000\u0000\u0000"+ - "\uEF9C\u0000\u0000\uE279\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uEFF8\uEC75\u0000\u0000\u0000\u0000"+ - "\uE349\uE594\u0000\u0000\u0000\u0000\u0000\uE3A6"+ - "\u0000\uEACE\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF996\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE4AA\u0000\u0000\u0000\uE13C\u0000\u0000\u0000"+ - "\u0000\uF2E0\u0000\u0000\u0000\uEDE5\uE365\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE8FC"+ - "\u0000\u0000\u0000\u0000\uF976\u0000\u0000\u0000"+ - "\u0000\u0000\uE0FE\uF1EA\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uEA41\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF7E3\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE532\uE2F6\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE660\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE5EA\uF3EE\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF85B\u0000"+ - "\u0000\u0000\u0000\uEDA1\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE5B1\u0000\u0000\u0000"+ - "\u0000\u0000\uE2ED\u0000\uF1EB\u0000\u0000\u0000"+ - "\u0000\u0000\uE5B2\u0000\u0000\u0000\uE5BC\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF9E2\uF4AD\u0000\uF9DB\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uEFB0\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE3A7\u0000\u0000\uF9E3\uE243\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF9E4\uF85E"+ - "\u0000\u0000\u0000\u0000\uE040\u0000\uF6A7\u0000"+ - "\uE2B1\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uEE32"+ - "\u0000\uF946\uF43D\uF2E1\uF4AE\uE956\uE7EB\u0000"+ - "\u0000\u0000\uEF70\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uEBA8\u0000\u0000\u0000\u0000\uE5F6"+ - "\uE2FD\u0000\u0000\uEA6D\u0000\u0000\u0000\uE7D1"+ - "\u0000\u0000\u0000\uED7A\uF45F\u0000\uF6BF\u0000"+ - "\u0000\uEC76\uEC38\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uECD6\u0000"+ - "\uF1D1\u0000\u0000\u0000\u0000\u0000\uEFF9\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE641\uEA42"+ - "\u0000\u0000\uEB78\u0000\u0000\uE4AB\u0000\uF0DC"+ - "\u0000\u0000\uEAAF\u0000\uE053\u0000\u0000\uF29E"+ - "\u0000\uF9C3\u0000\u0000\u0000\uF0F6\uE2B2\u0000"+ - "\u0000\u0000\u0000\uE7EC\u0000\uE7BD\u0000\uE76F"+ - "\u0000\u0000\uE548\uF0BE\uE9EF\u0000\uE9F0\uE9F1"+ - "\uE9F2\u0000\u0000\uE7BE\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF8C6\uE2B3\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF29F\u0000\u0000\u0000\u0000\u0000\u0000\uED3B"+ - "\u0000\uE855\u0000\uE77C\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE3A8\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uEC39\u0000\u0000\uEA4C"+ - "\uEEB5\u0000\u0000\u0000\u0000\u0000\uE8F0\u0000"+ - "\uF2E2\uF3F0\uE2B4\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE8F1\u0000"+ - "\uEB41\u0000\u0000\u0000\u0000\uEAA5\u0000\uF7D2"+ - "\u0000\u0000\uEEFD\u0000\u0000\uEE33\uF8F1\uE0B0"+ - "\uF43E\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE1E7\u0000\uEF6C\u0000\u0000\uEED7\u0000\u0000"+ - "\uF6C0\u0000\uE373\u0000\u0000\u0000\uE831\u0000"+ - "\u0000\u0000\uE14D\u0000\u0000\uE3A9\uE9CC\u0000"+ - "\u0000\uECFE\uE3AA\uEF3A\u0000\uF046\uF7FA\uEE5C"+ - "\uF668\u0000\u0000\u0000\uE557\u0000\u0000\u0000"+ - "\uE7CB\u0000\uE7D2\uE4CB\uE799\uE839\uF5F8\u0000"+ - "\u0000\uEA6E\uF43F\uF739\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE758\u0000\u0000\uF251\u0000"+ - "\u0000\u0000\u0000\uF7C1\u0000\u0000\u0000\u0000"+ - "\uE9F3\uF09C\u0000\uF64D\uEBBB\uE1BF\uF564\uEE5D"+ - "\u0000\uF95F\uF8A2\u0000\uEB6C\u0000\u0000\u0000"+ - "\u0000\uF54B\uE865\u0000\uF7B2\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF8F2\u0000\uE8F6\u0000\uEA6F"+ - "\u0000\u0000\u0000\uE8F2\u0000\u0000\u0000\u0000"+ - "\u0000\uF76C\uF6EE\uF0E8\u0000\uE49C\u0000\u0000"+ - "\uF3BC\u0000\u0000\uF86A\u0000\u0000\uE87A\uE856"+ - "\uF6C1\u0000\u0000\uEEB6\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"; - - private final static String innerIndex3= - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uEDC7\uE63C\u0000\u0000\u0000"+ - "\u0000\uE957\u0000\u0000\u0000\u0000\u0000\uEBA9"+ - "\u0000\uEC3A\u0000\uE5A6\u0000\u0000\uE567\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF460\u0000\uF09D"+ - "\u0000\uEB6D\uF8F3\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF3BD\u0000\u0000\uEC77\uF9D7\u0000"+ - "\uE258\uF047\u0000\uF950\u0000\uF9E7\uF6EF\u0000"+ - "\u0000\uE6B5\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF2BA\uF3DD\u0000\uEA43\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uEF5B\u0000\u0000\uF76D\u0000"+ - "\u0000\uF8C7\uE5C8\u0000\uE6DF\u0000\uE9A9\u0000"+ - "\u0000\u0000\u0000\u0000\uEFB1\u0000\u0000\uF83D"+ - "\uF669\uF896\u0000\u0000\u0000\u0000\u0000\uF73A"+ - "\u0000\u0000\u0000\u0000\u0000\uEE7E\u0000\uE16C"+ - "\uEBBC\uEB91\u0000\u0000\uEFBF\uF99F\uEE5E\u0000"+ - "\u0000\uEBD7\u0000\uEE5F\u0000\uF593\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uED95"+ - "\u0000\u0000\uED9D\u0000\u0000\uF7E4\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF2E3\u0000\u0000\uE2EE\uF64E\uEB42\uF9A0\uE3AB"+ - "\u0000\u0000\u0000\uE6FA\u0000\u0000\u0000\uF8C8"+ - "\u0000\uEC67\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE533\uF39A\uE6A8\u0000\u0000\u0000\uEBE7\u0000"+ - "\u0000\uE4BF\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF2E4\u0000\uE6C5\uF0E2\u0000\u0000\uF977\u0000"+ - "\u0000\uED32\u0000\uEC78\u0000\uEE60\u0000\uF8E8"+ - "\uF578\uEDF4\uF54C\uF565\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uEAB6"+ - "\u0000\uF949\uF252\uE097\u0000\u0000\u0000\uF2E5"+ - "\uE0E2\uE534\u0000\uEA70\uE89F\uED56\uEF4E\u0000"+ - "\u0000\u0000\u0000\uEB6E\uF644\uF062\u0000\uF7FB"+ - "\u0000\u0000\uEB52\u0000\uE074\u0000\uEEB7\u0000"+ - "\uF09F\u0000\uE7DD\u0000\uE844\uF23A\uF8E9\u0000"+ - "\u0000\u0000\u0000\uE8CB\uE845\u0000\u0000\u0000"+ - "\u0000\u0000\uF3BE\u0000\u0000\uE4AC\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF8C9\u0000"+ - "\uEACF\u0000\u0000\uE4C0\uECD7\u0000\uF2E6\uF960"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uEFC0"+ - "\u0000\u0000\u0000\uF5D3\u0000\u0000\uF16C\uF6B7"+ - "\u0000\u0000\uF048\uE3F9\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE958\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF049\u0000\u0000\u0000\u0000\u0000\uF3DE\u0000"+ - "\u0000\u0000\u0000\u0000\uE6B6\uE2B5\u0000\uE7A8"+ - "\u0000\u0000\uF17E\u0000\u0000\uE9AA\u0000\u0000"+ - "\u0000\u0000\uE1A2\uEF3E\u0000\u0000\u0000\uEBBD"+ - "\u0000\uF461\u0000\u0000\u0000\u0000\uEFC1\u0000"+ - "\u0000\u0000\uE49E\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE8B5\u0000\uF4E7\uE7A0\u0000\u0000"+ - "\u0000\uF961\u0000\uF1B2\uF53F\u0000\uF8A3\u0000"+ - "\u0000\uF951\u0000\uF23B\uE535\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uF594"+ - "\u0000\u0000\u0000\u0000\uF269\u0000\u0000\u0000"+ - "\uF8CA\u0000\u0000\u0000\u0000\u0000\uE1E3\uE74B"+ - "\u0000\uEDDB\uF799\u0000\u0000\u0000\uF664\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE6A9"+ - "\u0000\uE0C9\u0000\u0000\uEE61\uF35C\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE73E\u0000\uF7D3\uE5FE\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE74C\uF440\u0000\u0000\u0000"+ - "\u0000\uEC3B\uF4E8\u0000\u0000\u0000\u0000\u0000"+ - "\uF2C2\u0000\u0000\u0000\u0000\u0000\u0000\uF1EC"+ - "\u0000\uEEB8\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE8A0\u0000\u0000\uE14E\u0000\u0000\uF49E"+ - "\uE87B\u0000\uEC68\uF1D6\u0000\u0000\uE661\uEB43"+ - "\u0000\u0000\uF962\u0000\uF0C8\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uE4C1\uF35D\u0000"+ - "\uE2F7\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF1D2\u0000\uE568\uE959\uE6F1\u0000"+ - "\u0000\uEABB\u0000\u0000\uF4A5\u0000\u0000\u0000"+ - "\uF55D\u0000\u0000\u0000\u0000\uF3BF\uF741\u0000"+ - "\uEFFA\u0000\u0000\u0000\uF8CB\u0000\u0000\uE065"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF7D4\uF6CA\u0000\u0000\uE658"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF978\uF4BD"+ - "\u0000\uF2A0\u0000\uEEFE\u0000\u0000\u0000\u0000"+ - "\u0000\uE4C2\u0000\u0000\u0000\u0000\uE4B6\u0000"+ - "\uE13D\uF69C\uE642\uE468\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uEED8\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uECA5\u0000\u0000"+ - "\u0000\u0000\uEEB9\u0000\u0000\u0000\u0000\uF33D"+ - "\uF8CC\uF0A1\u0000\u0000\uE536\u0000\u0000\u0000"+ - "\u0000\uF8CD\u0000\uE5BD\uF3DF\u0000\u0000\uF69D"+ - "\u0000\uEA44\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE5EB\u0000"+ - "\u0000\uEDC8\u0000\u0000\u0000\uF8A4\uE549\u0000"+ - "\u0000\uEA71\u0000\uED33\u0000\u0000\u0000\uE6B7"+ - "\u0000\uF77E\u0000\u0000\u0000\uEA45\u0000\u0000"+ - "\uE662\u0000\uF7D5\uEEBA\uF0D5\uE5F7\uF2E7\uEBBE"+ - "\u0000\u0000\u0000\uF83E\u0000\u0000\u0000\uE679"+ - "\uE67E\u0000\u0000\u0000\u0000\u0000\u0000\uEEBB"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uF15B"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE5B3\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE244\u0000\u0000\u0000"+ - "\uF8A5\uEBEE\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF6A8\u0000\u0000\u0000\u0000\uF8CE\u0000\u0000"+ - "\u0000\u0000\u0000\uE74D\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF8FD\u0000\u0000\u0000\u0000"+ - "\uF979\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE2B6\u0000\u0000\u0000\uF1C7\uF23C\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uE16D\u0000\u0000"+ - "\u0000\u0000\uF637\u0000\u0000\u0000\uEE9C\u0000"+ - "\u0000\u0000\uF5A4\u0000\u0000\u0000\u0000\u0000"+ - "\uF9DC\uF1B3\uE259\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF2E8\u0000\u0000\uEBBF\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF86B\uE0E3\uF6A9\u0000\uF8A6"+ - "\u0000\u0000\u0000\uE949\u0000\u0000\u0000\uF3C0"+ - "\uF1C8\uF2C3\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE63D\u0000\u0000\uF9CE\u0000\u0000\u0000\uEF31"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF8F4\uE5A7\u0000\u0000\u0000\uF3F6\u0000\uEE63"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE16E\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF742\u0000\u0000\u0000\uE97B\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uF9B6\u0000\u0000\u0000"+ - "\u0000\uEDEA\u0000\u0000\uF3E0\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE8CC\uE9CD\u0000\u0000\u0000\uE558\u0000"+ - "\u0000\uE7ED\u0000\u0000\u0000\u0000\uF5A5\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uEE9D\u0000\u0000\u0000\u0000\u0000\uEE64\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uF9C8"+ - "\u0000\uE631\uF9BF\u0000\uF963\u0000\uF2A1\u0000"+ - "\uEEBC\u0000\u0000\u0000\u0000\u0000\uE3EE\u0000"+ - "\u0000\uEE65\u0000\u0000\uEFF2\u0000\uEAB0\u0000"+ - "\u0000\u0000\u0000\u0000\uE770\uF94A\uF9AF\uF35E"+ - "\u0000\uE8E1\u0000\u0000\uEDC9\u0000\uF1B4\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uEB53\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uECD8\u0000\u0000\u0000"+ - "\u0000\uEFFB\uF038\u0000\u0000\u0000\u0000\uF9B7"+ - "\u0000\u0000\uF8A7\u0000\uEFC2\u0000\u0000\u0000"+ - "\u0000\uF9F7\u0000\u0000\u0000\u0000\u0000\uEC69"+ - "\u0000\u0000\uE97C\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uEF32\u0000\u0000\u0000"+ - "\u0000\uEE92\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF9F8\uF9F9\u0000\u0000\u0000\uF64F\u0000"+ - "\u0000\uEEA7\u0000\uEE67\u0000\u0000\u0000\u0000"+ - "\uE595\uE559\u0000\u0000\u0000\u0000\uE69C\u0000"+ - "\uE6F2\u0000\uEBC0\u0000\uE8E2\uEE68\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uEEBD"+ - "\u0000\u0000\u0000\u0000\u0000\uF35F\uF4BE\uEC3C"+ - "\u0000\u0000\u0000\u0000\u0000\uF5B7\uEB92\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF9B8\uECE8\u0000\uE537\uEF9E"+ - "\uF862\u0000\u0000\u0000\u0000\u0000\uF791\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE663\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE5B4\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF360\u0000\uF6F0\uF243\u0000\u0000"+ - "\uF04A\u0000\uF063\u0000\u0000\uF1C9\uE9AB\u0000"+ - "\u0000\u0000\uEDAC\uF9A1\u0000\uEAD0\uF143\u0000"+ - "\uEAD1\u0000\u0000\u0000\u0000\u0000\uF1ED\uF748"+ - "\uF6FA\u0000\u0000\u0000\uF73B\u0000\u0000\u0000"+ - "\u0000\u0000\uF570\u0000\u0000\u0000\u0000\u0000"+ - "\uE54A\uED43\u0000\uEFDA\u0000\uEA46\u0000\uE7BF"+ - "\u0000\uE7C0\uE691\u0000\u0000\u0000\u0000\uE7CC"+ - "\u0000\uE83A\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uEAE5\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF6E5\u0000\u0000\u0000\uE142\u0000\u0000"+ - "\uEAF9\uE6E0\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE54B\u0000\u0000\u0000\u0000\uF9FA"+ - "\u0000\u0000\u0000\u0000\uE143\u0000\u0000\uE8F3"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uEAD2\u0000\uE25A\u0000\uF26A\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uED74\u0000"+ - "\uF8CF\u0000\u0000\u0000\u0000\u0000\u0000\uE2B7"+ - "\u0000\uF253\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE27A\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uEC3D\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE6E1\uF897\u0000\u0000\uE5C9\uF73C\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uEED9\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF4E9\u0000"+ - "\u0000\u0000\u0000\uE77D\uECC4\uF393\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uEF75\u0000\u0000"+ - "\u0000\uEB9C\uF254\uE7DE\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF0A2\uF0A3"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF952\uF04B"+ - "\u0000\u0000\u0000\u0000\uEF3B\uEA72\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF1EF\u0000\uEF33\u0000\u0000\u0000\u0000\uE2F1"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE54C\u0000\uF97A\u0000\u0000\u0000\u0000\u0000"+ - "\uEEBE\u0000\uF994\u0000\u0000\uE644\u0000\u0000"+ - "\uEC3E\u0000\uE4B7\uF85C\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uF86C\u0000\uF1B5\uEBE3"+ - "\u0000\uEF3C\u0000\uEF6D\u0000\u0000\uF2E9\u0000"+ - "\u0000\u0000\u0000\u0000\uF54D\u0000\uE2B8\uEFDB"+ - "\uE3AC\u0000\u0000\u0000\u0000\u0000\u0000\uE857"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uF0C9"+ - "\u0000\uEF5C\u0000\u0000\u0000\uEA47\u0000\u0000"+ - "\u0000\u0000\uE64C\uE4E5\u0000\u0000\u0000\u0000"+ - "\u0000\uF86D\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE866\u0000\uE041\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE858\uEAA6\u0000\uF7B3\uF462\u0000\uE054"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE25B\u0000"+ - "\u0000\uE1F5\u0000\u0000\u0000\uF9B0\uE5A8\u0000"+ - "\uF3C1\u0000\u0000\uEC79\uE95A\uF144\uF850\u0000"+ - "\u0000\uF8A8\uE338\u0000\u0000\uE87C\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE7EE"+ - "\u0000\uEB9D\u0000\u0000\u0000\uF2EA\uF86E\u0000"+ - "\u0000\uEB54\u0000\uE2B9\u0000\uE5CA\uE6E2\uEC3F"+ - "\u0000\uE6B8\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uEF5D\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF66A\u0000\u0000\u0000\u0000"+ - "\uF2A2\uEC6A\uF69E\u0000\u0000\uF8D0\uE3AD\u0000"+ - "\uE1E4\u0000\uE3AE\uE97D\uEF5E\u0000\uF39B\uE245"+ - "\uEE9E\u0000\u0000\uE6FB\uE366\uE9F5\uF6F1\u0000"+ - "\uF69F\u0000\uE8F7\u0000\u0000\u0000\u0000\uF8EA"+ - "\uEFDC\uE7C1\u0000\uF5F2\uEB55\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF064\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF7C2\u0000\uF04C"+ - "\u0000\uE455\uF8D1\uEEC0\uF0A5\u0000\uEAFA\uECA2"+ - "\uE6B9\u0000\uEFC3\u0000\uEF9F\uEF3F\u0000\u0000"+ - "\uF463\uF8A9\uE735\u0000\u0000\u0000\u0000\uE5CB"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE358\u0000"+ - "\u0000\u0000\uE3AF\uE6E3\u0000\u0000\u0000\uEB56"+ - "\u0000\uE632\u0000\uF1F0\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE6F3\u0000\u0000\u0000\uF964\u0000\uE867\uE16F"+ - "\u0000\uF464\u0000\uE3B0\u0000\uE170\u0000\uE8FD"+ - "\uF4BF\u0000\uF361\u0000\u0000\u0000\u0000\u0000"+ - "\uF94B\u0000\uEC40\u0000\u0000\uEE35\u0000\u0000"+ - "\u0000\uEC6B\u0000\u0000\u0000\uEADE\u0000\uEB57"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF491\u0000"+ - "\u0000\u0000\uE171\u0000\u0000\u0000\u0000\uE67A"+ - "\u0000\u0000\u0000\u0000\uEEC2\u0000\u0000\u0000"+ - "\uE246\u0000\uF4C0\u0000\uE1FE\u0000\u0000\u0000"+ - "\uF8D2\u0000\uF79A\uF6FB\u0000\u0000\uEF4F\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uEF47\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uF1B6"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE94A\u0000\u0000\uE144\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF3F7\u0000\u0000\u0000\uEF48\u0000\u0000"+ - "\uE098\u0000\uED34\uF566\u0000\u0000\u0000\uEAE6"+ - "\u0000\u0000\u0000\uEAA7\u0000\uEAE7\uEBC1\u0000"+ - "\uEFC4\u0000\u0000\uE95B\uEFC5\u0000\u0000\u0000"+ - "\uF2A3\uF0A6\uE0A3\uECE9\u0000\u0000\u0000\uE3FB"+ - "\uF2A4\u0000\uF2EB\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE344"+ - "\u0000\u0000\u0000\u0000\uE1A3\u0000\u0000\uEF76"+ - "\u0000\uF2A5\u0000\uE4CC\uE87D\u0000\u0000\u0000"+ - "\u0000\uE6BA\u0000\uF465\uF5E5\uE7EF\u0000\u0000"+ - "\u0000\u0000\uF7B4\u0000\u0000\uE5D4\uF9CF\u0000"+ - "\u0000\u0000\uE8E3\u0000\u0000\u0000\u0000\uF3E1"+ - "\uF146\u0000\u0000\u0000\u0000\uF8FE\uE4D7\u0000"+ - "\uE3B1\u0000\uE0B1\u0000\u0000\u0000\u0000\uE3B2"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE0B2\uF3C2"+ - "\u0000\u0000\uF571\uF7B5\u0000\u0000\uEBC3\uEBC2"+ - "\u0000\uF0F7\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uEAA8\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uE0CA\u0000\u0000"+ - "\u0000\u0000\u0000\uEE49\u0000\u0000\u0000\u0000"+ - "\u0000\uF76E\uF7AA\uE099\u0000\uF1B7\u0000\u0000"+ - "\uE4B8\uF466\u0000\u0000\uE569\uF255\uF492\u0000"+ - "\u0000\u0000\uE042\u0000\u0000\uE94B\u0000\uF3F8"+ - "\u0000\u0000\u0000\u0000\u0000\uF147\u0000\u0000"+ - "\u0000\u0000\uEDCA\u0000\uF650\uF9DD\u0000\u0000"+ - "\uE573\uE172\u0000\uF6D4\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE6E5\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE4C3\u0000\uE736\u0000\uF651\u0000\u0000\u0000"+ - "\u0000\u0000\uE9F6\u0000\uE1C0\u0000\u0000\u0000"+ - "\uEDDC\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uEDCB\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uEBC4\u0000\u0000\u0000\u0000\u0000\uEF40"+ - "\uF540\uF4EA\uE87E\u0000\uE6BB\u0000\uEC41\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE6AA\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE69D\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uED6F\u0000\uE066\u0000"+ - "\u0000\u0000\uF0A8\u0000\u0000\u0000\uE8FE\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF652\u0000\u0000\uF2BB\u0000\u0000\u0000"+ - "\u0000\uE59F\u0000\u0000\uEB58\u0000\u0000\u0000"+ - "\uEF49\u0000\uF2A6\u0000\u0000\u0000\u0000\u0000"+ - "\uE1A4\u0000\u0000\uE596\uE8A1\uE8DC\uE8DD\u0000"+ - "\u0000\u0000\u0000\u0000\uF26C\u0000\uE0CB\uF965"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE27B\u0000"+ - "\uE1C1\u0000\u0000\uF8D3\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF7AB\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF5D4\u0000\u0000\u0000\u0000\uE7A9"+ - "\u0000\u0000\uEFDD\uE8CD\u0000\u0000\uE9CE\u0000"+ - "\uEEC3\u0000\uF15C\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF7EC\u0000\u0000\u0000\uE0CC\u0000"+ - "\u0000\u0000\u0000\uEB9E\uE538\u0000\uF1D3\uE791"+ - "\u0000\uF467\u0000\uE09A\uE891\u0000\u0000\uE664"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE7CD\u0000"+ - "\u0000\u0000\uE77E\u0000\uF451\u0000\u0000\u0000"+ - "\uEAD3\u0000\u0000\u0000\uE892\u0000\uEC7A\u0000"+ - "\u0000\uEB9F\u0000\u0000\uE79A\u0000\u0000\u0000"+ - "\uF6AF\uE846\u0000\uE067\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF468\u0000"+ - "\uE79B\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF86F\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE2EF"+ - "\uE7C2\u0000\uF362\u0000\uED61\u0000\u0000\u0000"+ - "\uF4B7\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF870\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF2EC\u0000\u0000\u0000\u0000"+ - "\u0000\uEC42\u0000\uE54D\u0000\u0000\uE7CE\u0000"+ - "\u0000\u0000\u0000\uF572\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE539\u0000\u0000\u0000\u0000\uE1C2\uEEDA"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF469\u0000\u0000\u0000\u0000"+ - "\u0000\uE7AA\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE74E\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uE93D\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uEC7B\uE69E\u0000\u0000"+ - "\uE09B\u0000\u0000\uE56A\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF567\uE131\u0000\u0000\uE2BA"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uF5B8"+ - "\u0000\u0000\u0000\uE7C3\uE378\u0000\u0000\u0000"+ - "\u0000\u0000\uECC5\uF0F8\u0000\uF441\u0000\u0000"+ - "\u0000\uE2BB\u0000\u0000\u0000\uE4AD\uEF71\uE27C"+ - "\u0000\u0000\u0000\uEB44\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uEA73\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE9F7\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF442\uF4F6\uF66B"+ - "\u0000\u0000\u0000\u0000\uE6FE\u0000\u0000\u0000"+ - "\u0000\u0000\uF76F\u0000\uF6F2\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uE339\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uEE6A"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF5A6\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE6BC\uE173\u0000\u0000\uEE6B"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE9DD\u0000\u0000\u0000"+ - "\u0000\uE3B3\u0000\u0000\u0000\u0000\u0000\uF2ED"+ - "\u0000\u0000\u0000\u0000\uE66E\uED96\uEBEF\u0000"+ - "\u0000\uE9F8\u0000\u0000\u0000\u0000\u0000\uEF5F"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE075\u0000\u0000\u0000\uE931"+ - "\u0000\uEB45\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF93C\uF93D\uE737\u0000\u0000\u0000"+ - "\u0000\uF1B8\u0000\u0000\u0000\uE8B6\u0000\u0000"+ - "\u0000\u0000\uE692\uF4AF\u0000\u0000\uE1A5\u0000"+ - "\uE893\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE738\u0000\u0000\u0000\uE174\u0000\u0000\uE3B4"+ - "\u0000\u0000\u0000\u0000\u0000\uE068\u0000\u0000"+ - "\u0000\u0000\u0000\uE894\u0000\u0000\u0000\u0000"+ - "\u0000\uF5A7\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF5A8\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uEE36\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE5EC\uE5F8\uE895\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uECC6\u0000\u0000\u0000\uEA74\u0000"+ - "\uEA75\uE3B5\u0000\u0000\u0000\u0000\u0000\uE3B6"+ - "\uE3B7\uF443\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uEFDE\u0000\u0000\u0000\u0000\u0000\uF363\uF444"+ - "\u0000\u0000\uF364\uE0E4\uF8D4\uF5E6\uECEA\u0000"+ - "\uEA76\u0000\u0000\u0000\u0000\uEAD4\u0000\u0000"+ - "\uF79B\u0000\u0000\u0000\u0000\uF33E\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE3B8\u0000\u0000\u0000\u0000\uE66F"+ - "\u0000\uE367\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF931\uF2EE\uE968"+ - "\u0000\uEFDF\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uEDDD\uF9FB"+ - "\u0000\u0000\uEB59\u0000\u0000\u0000\uE659\u0000"+ - "\u0000\uE53A\u0000\uEDCC\u0000\u0000\u0000\u0000"+ - "\u0000\uEFE0\u0000\u0000\u0000\uE368\uF932\uE54E"+ - "\uEC43\uEA77\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE94C\uE446\uF5D5\u0000\u0000\u0000\u0000"+ - "\u0000\uE231\uF5A9\u0000\u0000\uE9F9\u0000\u0000"+ - "\uE9FA\u0000\u0000\u0000\u0000\u0000\u0000\uF365"+ - "\u0000\u0000\u0000\u0000\uF66F\u0000\uF46A\uED7B"+ - "\u0000\uF493\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF149\u0000\u0000\u0000\u0000"+ - "\uF9FC\u0000\u0000\u0000\u0000\uEBAA\u0000\u0000"+ - "\uE069\u0000\u0000\uF2EF\u0000\uF5AA\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uF19B\u0000\u0000\uF73D"+ - "\u0000\uF452\uF653\u0000\uE6D2\u0000\u0000\uF7A2"+ - "\uF366\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF39C\u0000"+ - "\u0000\uF670\u0000\u0000\u0000\u0000\uEFF3\uF453"+ - "\u0000\u0000\u0000\uE53B\uE043\uE1A6\u0000\uE1C3"+ - "\uE1DA\u0000\u0000\u0000\u0000\u0000\uE7CF\u0000"+ - "\u0000\uF654\u0000\u0000\u0000\uF26D\uEEC4\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uEC44"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uEAE2\uEEDB\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uEF41\u0000\uF93E\u0000\u0000\u0000\u0000"+ - "\uEDCD\u0000\u0000\u0000\uF87B\u0000\uE2BC\u0000"+ - "\u0000\uE2E2\uE1F6\u0000\u0000\uF2F0\u0000\uF54E"+ - "\u0000\uE55D\u0000\u0000\uF4B8\u0000\u0000\u0000"+ - "\uEFA1\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF494\uF4EB\u0000\uF367\u0000\u0000"+ - "\uE2D7\u0000\u0000\u0000\u0000\u0000\u0000\uE2DF"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uEF50\uEF51\u0000\u0000\u0000\uE2E3\uEFA2"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE33A\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uF4C1\uE33B\u0000\uE574"+ - "\u0000\u0000\uF2BC\uE731\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE7DF"+ - "\u0000\uF4D7\u0000\u0000\u0000\uE94D\u0000\uE175"+ - "\uF1F1\u0000\u0000\uF3E2\u0000\uE56B\u0000\u0000"+ - "\u0000\u0000\uEC45\u0000\u0000\uE076\u0000\uE4AE"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE176\u0000"+ - "\u0000\uF3D3\uF5E7\u0000\u0000\u0000\u0000\uE06A"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uF8EE"+ - "\u0000\uEBC5\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uEAE9\u0000\uF26E\u0000\u0000\uF6C2\u0000"+ - "\uE732\u0000\u0000\u0000\u0000\u0000\uE9AC\u0000"+ - "\u0000\u0000\u0000\u0000\uF33F\uE64D\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uEBAB\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF7B6\u0000"+ - "\u0000\uE597\u0000\uE359\uF2A7\uEC7C\u0000\uE8EA"+ - "\uE25C\uF5E8\uF6D5\u0000\uE4CD\u0000\uF4FE\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE345\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uEBA0\u0000\uEAFB\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uEE6D\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uEF34\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE0CD"+ - "\u0000\u0000\u0000\uF2A8\u0000\u0000\u0000\uF244"+ - "\u0000\u0000\u0000\u0000\uE868\uE3B9\u0000\uEAA9"+ - "\u0000\u0000\uF4B0\u0000\u0000\uE154\u0000\u0000"+ - "\u0000\uE247\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF2A9\u0000\u0000"+ - "\u0000\uEAD5\u0000\u0000\uF1D7\u0000\u0000\u0000"+ - "\uF256\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF2BD\uF966\u0000\u0000\uE8F4\u0000\uF2AA\uF749"+ - "\u0000\uF5E9\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uECD9\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uEBC6\u0000\u0000\u0000\uE54F\u0000\u0000\u0000"+ - "\u0000\uEA78\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uF37A"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF4C2\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE4AF\u0000"+ - "\u0000\uE06B\u0000\u0000\u0000\u0000\u0000\uF967"+ - "\u0000\u0000\uF1D8\uEBC7\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF568\uE643\uE9AD"+ - "\u0000\u0000\u0000\uE5BE\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uF3C3\uF26F\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE67B\u0000\u0000\u0000\uF569\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE6E6\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE847\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE9FB\u0000\u0000\u0000\u0000"+ - "\u0000\uE9CF\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE733\u0000\u0000\uE869\u0000\uF368"+ - "\uF2C4\u0000\u0000\u0000\u0000\u0000\u0000\uEBD8"+ - "\u0000\u0000\u0000\u0000\u0000\uF3D4\u0000\uF1F2"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE5DB\u0000"+ - "\u0000\uE5DC\uF4C4\uE0D7\u0000\u0000\u0000\u0000"+ - "\u0000\uEC46\u0000\u0000\u0000\u0000\uF2F1\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF8D5\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE4D8\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE9D0\uF369"+ - "\uE0B3\u0000\u0000\u0000\u0000\u0000\u0000\uE5DD"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE1A7\u0000\u0000\uE33C\u0000"; - - private final static String innerIndex4= - "\uE3BA\u0000\uF3C4\u0000\uEDB3\uF8F5\uEFE1\uF9E0"+ - "\uF94C\u0000\uE832\uE833\u0000\uE431\u0000\u0000"+ - "\uE491\u0000\u0000\u0000\uEC7D\u0000\u0000\uEA79"+ - "\uE26C\uF445\uE374\uE9D1\u0000\u0000\u0000\u0000"+ - "\uEBC8\uE8B7\uEAE3\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF1B9\uF3C5\u0000\uF4CF\uE6AB"+ - "\uEBAC\u0000\u0000\uECEB\u0000\uF257\u0000\u0000"+ - "\u0000\uEBC9\uE09C\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF39D\uF871\uF36A\uE177\uE896\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE14F\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE27D\u0000"+ - "\u0000\uE5A9\uF872\u0000\u0000\u0000\uE375\u0000"+ - "\uF0D6\u0000\uF16F\u0000\u0000\u0000\uEAFC\u0000"+ - "\u0000\uF6D6\uEA7A\uE0B4\u0000\u0000\uF2BE\u0000"+ - "\u0000\uE145\u0000\u0000\u0000\u0000\u0000\uE2BD"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF2F2\uEC47"+ - "\u0000\u0000\u0000\uE178\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uF39E\u0000\u0000\u0000"+ - "\uE670\u0000\uF3C6\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uEC48\uF0AB\u0000\u0000"+ - "\u0000\uE0B5\uE761\u0000\uF55E\uF4F7\u0000\u0000"+ - "\uE6C6\u0000\uE3BB\uF6AA\u0000\uF1CA\uE6D3\uE79C"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uF655"+ - "\u0000\u0000\uE3CC\uE9FC\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uEAFD\u0000"+ - "\uF7E5\u0000\uEB5A\u0000\u0000\uF49F\uE4B0\u0000"+ - "\uF595\uE859\u0000\uEE6E\u0000\u0000\u0000\u0000"+ - "\uF74A\uEF60\u0000\u0000\uE79D\u0000\u0000\uF065"+ - "\u0000\u0000\u0000\u0000\uE633\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF656\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF46B\uED9E\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uEF42\u0000\u0000"+ - "\u0000\u0000\u0000\uE86A\u0000\uF46C\uF8D6\uEFB2"+ - "\u0000\uF23D\u0000\uF873\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE97E\u0000\u0000\uF5EA\uEE70"+ - "\u0000\uF39F\u0000\u0000\u0000\u0000\u0000\uE6AC"+ - "\u0000\u0000\u0000\u0000\u0000\uF5C5\uF270\u0000"+ - "\u0000\uE8E5\u0000\uE9DE\u0000\u0000\uE7F0\uEFA3"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF3F9\u0000\uF454\uEB5B\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uEFA4\u0000"+ - "\u0000\uEC49\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uECB1\uF97B\uE1A8\u0000\uE146\u0000\u0000"+ - "\uF36B\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uEE4A\u0000\u0000\uE1A9\u0000\u0000\u0000"+ - "\u0000\u0000\uF4C3\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uEBD9\u0000\u0000\uF2AB"+ - "\u0000\u0000\u0000\uEEC5\u0000\u0000\uEB79\u0000"+ - "\uF4C5\u0000\u0000\uE550\uE5BF\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE9AE\u0000"+ - "\uF7FC\u0000\uE150\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uEDA2\u0000\u0000\u0000"+ - "\uE248\u0000\u0000\u0000\uE762\uF7D6\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF3AA\uE261\u0000\u0000\uF657\u0000"+ - "\uE8EB\u0000\uEAFE\u0000\u0000\uE771\u0000\uF6F3"+ - "\u0000\uE6E7\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uE5A0\u0000\u0000"+ - "\uE3BC\u0000\uEDCF\u0000\uE0B6\u0000\uE848\u0000"+ - "\u0000\u0000\u0000\u0000\uE1C4\u0000\u0000\u0000"+ - "\u0000\u0000\uE64E\u0000\u0000\u0000\uEC4A\u0000"+ - "\u0000\u0000\u0000\u0000\uE2D8\u0000\u0000\u0000"+ - "\uEB5C\uF0F9\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF9FD\u0000\u0000\u0000\u0000\u0000"+ - "\uE6E8\uE0D8\u0000\u0000\u0000\uEFE2\u0000\u0000"+ - "\u0000\uEF4A\u0000\u0000\u0000\uECC7\u0000\u0000"+ - "\u0000\u0000\uF15D\u0000\uF15E\u0000\uE64F\u0000"+ - "\u0000\u0000\uECA7\u0000\uEAD6\uF9E8\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uF271"+ - "\uF638\uE9FD\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF74B\u0000\uEF61\u0000\u0000\u0000\u0000"+ - "\uF7D7\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE27E\u0000\u0000\uF15F\u0000\u0000\u0000"+ - "\uEFA5\uE665\u0000\uE1C5\u0000\uF1BA\uE3BD\u0000"+ - "\u0000\uE2BE\u0000\u0000\uF14B\u0000\u0000\u0000"+ - "\uE441\u0000\u0000\u0000\u0000\uE179\u0000\uE7C4"+ - "\uEFFC\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uE3BE\u0000\u0000"+ - "\u0000\u0000\u0000\uF14C\u0000\u0000\uEDAD\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF6B0\u0000\uE17A"+ - "\u0000\u0000\u0000\uE4C4\u0000\u0000\uE650\u0000"+ - "\u0000\u0000\uE69F\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uEBA1\u0000"+ - "\uEA4D\u0000\uF639\u0000\u0000\u0000\uE834\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE634"+ - "\uF5C6\u0000\uEBA2\uEFC6\u0000\u0000\u0000\uF455"+ - "\u0000\u0000\u0000\u0000\u0000\uF579\uE67C\uF0D3"+ - "\u0000\u0000\u0000\u0000\uF14D\uEC6C\uEA7B\uF36C"+ - "\u0000\uF0BF\u0000\uE6CE\uE3BF\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF5AB\u0000"+ - "\u0000\u0000\u0000\uF7FD\u0000\uE06C\u0000\u0000"+ - "\u0000\uE1C6\uF446\u0000\u0000\uE9FE\u0000\u0000"+ - "\u0000\uE147\uE8B8\u0000\u0000\u0000\u0000\uE379"+ - "\u0000\uE26D\uF0C0\u0000\uF9A2\u0000\u0000\u0000"+ - "\u0000\u0000\uF75B\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF066\uF3B0\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE8CE\u0000\uF6C3\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE8CF\uE0A4\u0000\u0000\uF770\u0000"+ - "\u0000\uF8D7\u0000\u0000\uF0CA\uEB31\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE25D\u0000\u0000\uE56C\u0000\u0000\u0000"+ - "\uF9D8\u0000\u0000\u0000\u0000\uE498\u0000\u0000"+ - "\u0000\u0000\uF447\u0000\u0000\uF898\uF63A\uF899"+ - "\uE776\u0000\uF541\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uEF62\u0000\uE055\uE17B\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uEC7E\u0000\u0000\u0000\u0000"+ - "\u0000\uEC4B\u0000\uF6AD\u0000\u0000\u0000\uF771"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF4EC\u0000\u0000\u0000\u0000\uEA31\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uED9F\u0000\u0000\uECEC\u0000"+ - "\uE9AF\uE9B0\u0000\u0000\uE0B7\uEF63\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uEBA3\uE470\u0000"+ - "\u0000\u0000\u0000\uF3A0\u0000\u0000\u0000\u0000"+ - "\uEFA6\uE0F2\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF1F3\uE969\uEB5D\u0000\u0000\u0000\u0000\uF6DA"+ - "\uE8B9\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE13E\u0000\uE86B\u0000\u0000\u0000\u0000\uE1C7"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE9B1\u0000\uE73F\uECA3\u0000\u0000"+ - "\uE291\u0000\u0000\uF495\u0000\u0000\u0000\u0000"+ - "\uF743\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uEB5E\u0000\uF5FD\u0000\u0000"+ - "\u0000\u0000\uF0EC\u0000\u0000\uE4C5\uF97C\uE46B"+ - "\uE57B\u0000\uEA32\u0000\u0000\u0000\uEDE6\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF340\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE5C4\u0000\u0000\u0000\u0000\u0000\u0000\uF1F4"+ - "\u0000\u0000\u0000\uECED\u0000\uEF52\u0000\uF1F5"+ - "\uE6FC\u0000\uF1BB\u0000\u0000\uF63B\u0000\u0000"+ - "\u0000\u0000\u0000\uF448\uF658\u0000\u0000\u0000"+ - "\u0000\u0000\uE4E6\uF46D\uE2BF\u0000\uF0AC\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uE2C0\u0000\uEE38"+ - "\uF9E9\u0000\uE2C1\u0000\uEB6F\uEA7C\u0000\u0000"+ - "\u0000\u0000\uEB32\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF54F\uEC91\u0000\uE7F1\uF3C7"+ - "\u0000\uE0B8\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF7FE\uE8BA\uE897\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF67C\uE86C\uF874"+ - "\u0000\uEB5F\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE9B2\u0000\u0000\u0000\u0000\uEE39\u0000\uF2F3"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF4ED\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uF0FA\u0000\uF7E6\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE06D\uE5DE"+ - "\u0000\uE06E\uEAE4\u0000\u0000\u0000\uEE9F\u0000"+ - "\uF5AC\u0000\u0000\u0000\u0000\u0000\uED97\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uEFE3\u0000\uF1CB\uE2E4\u0000"+ - "\u0000\u0000\uE763\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE9B3\uE57C\u0000\u0000\uF449\u0000\uEAB7"+ - "\u0000\u0000\u0000\u0000\u0000\uE0CE\uF8D8\u0000"+ - "\u0000\uE369\u0000\u0000\uE9D2\uF6F4\uEEDC\uED35"+ - "\u0000\uF933\u0000\uE8BB\u0000\u0000\u0000\uF44A"+ - "\uEFFD\uE35A\u0000\uF5D6\uE7C5\uED44\u0000\uF1A7"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF04D\uEEA0\u0000\uF6C4\uF5AD\u0000\uE7E0"+ - "\u0000\u0000\u0000\uE044\u0000\u0000\uF772\uE2C2"+ - "\u0000\uF14E\u0000\u0000\u0000\uEDB4\uE1C8\uF258"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uEEC8\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uE1C9\uF7B7\u0000"+ - "\u0000\uF3E8\uE7F2\uE8F5\uE045\uE7C6\u0000\u0000"+ - "\u0000\uE759\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE7AB"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF1BC\u0000\u0000\uE764\u0000\u0000\u0000\uE96A"+ - "\u0000\uEC4C\u0000\u0000\uF97D\uF170\uE4A0\u0000"+ - "\uEFC7\uEE3A\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uEC92\u0000\u0000\u0000\u0000\u0000\u0000\uF84B"+ - "\u0000\uF5AE\uF8AA\u0000\u0000\u0000\u0000\uF19D"+ - "\u0000\uF14F\uF968\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE575\u0000\u0000\u0000\uF7C3"+ - "\u0000\u0000\u0000\uF272\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE6E9\uF1F6\u0000\u0000\u0000\uEA7D\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE17C\u0000"+ - "\uECEE\u0000\u0000\u0000\u0000\u0000\uEF64\u0000"+ - "\u0000\u0000\uF89A\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE9B4\uED45\uE740\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uE765\u0000\u0000"+ - "\u0000\uF57A\u0000\u0000\u0000\uE249\u0000\u0000"+ - "\u0000\uE671\uE2D2\u0000\uE346\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE232\u0000\u0000\uF4EE\u0000"+ - "\u0000\u0000\u0000\u0000\uF4F8\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE95C\u0000\uE35B\u0000\u0000\u0000\uF934"+ - "\uE1CA\uE6D4\uEA33\u0000\uED70\u0000\u0000\u0000"+ - "\u0000\uF259\u0000\u0000\u0000\uEC6D\u0000\u0000"+ - "\u0000\u0000\u0000\uF5FE\uE53C\u0000\u0000\u0000"+ - "\u0000\u0000\uE5D1\u0000\uE792\uF753\uF067\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF5D7\u0000\u0000\uE74F\u0000\u0000\u0000"+ - "\u0000\uF9C0\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF0AD\u0000\u0000\u0000\u0000\uE5AA\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uEEA8\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uF25A"+ - "\u0000\u0000\u0000\uE077\u0000\u0000\u0000\u0000"+ - "\u0000\uF773\u0000\uE56D\u0000\u0000\uF068\u0000"+ - "\u0000\u0000\u0000\uF8D9\uF1F7\u0000\u0000\uEDB5"+ - "\u0000\u0000\u0000\u0000\u0000\uE33D\u0000\u0000"+ - "\u0000\u0000\uF3F1\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uEC4D\u0000\u0000\u0000\uECC8\u0000\u0000\u0000"+ - "\u0000\uE7D5\u0000\u0000\uEAAA\u0000\u0000\u0000"+ - "\u0000\uE8BC\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF774\u0000\u0000\u0000\u0000\u0000"+ - "\uF3FA\u0000\u0000\uEDB6\uF4EF\u0000\u0000\uF8DA"+ - "\uEBE0\u0000\uE7AC\u0000\uF5EB\u0000\uEB46\u0000"+ - "\u0000\uEFC8\u0000\uE0CF\u0000\uECC9\u0000\u0000"+ - "\u0000\uEA7E\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uEC4E\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE991\u0000\uE635\u0000"+ - "\u0000\u0000\u0000\u0000\uEC93\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE6A0\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE7A1\u0000\uE750\uE96B\u0000\u0000\uF1BD"+ - "\uEAB8\u0000\uF035\u0000\u0000\u0000\uE6AD\u0000"+ - "\u0000\uF4F9\u0000\uF1F8\u0000\uF5C7\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uEBCA\uF0E3\u0000\uF46E"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF75C\u0000\uF069"+ - "\u0000\uE4C6\u0000\uE8E6\u0000\u0000\u0000\u0000"+ - "\u0000\uF5AF\u0000\u0000\u0000\u0000\uE292\u0000"+ - "\u0000\u0000\u0000\uEFFE\u0000\u0000\u0000\u0000"+ - "\u0000\uF8B6\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uEC94\u0000\u0000\u0000\u0000"+ - "\uE2F2\uF6B9\uE7F3\u0000\u0000\uEBCB\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE86D\u0000\u0000\uE849"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uF0FB"+ - "\u0000\uE0B9\u0000\u0000\uF1F9\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uEB70\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF550\u0000"+ - "\uF9BC\uEAB1\uECEF\u0000\u0000\u0000\u0000\uEB33"+ - "\uF9B9\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF341\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE1CB\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF1BE\u0000\u0000\u0000\uE5C0\uECF0\uF1FA"+ - "\u0000\u0000\u0000\u0000\u0000\uEFE4\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE5ED\uEEDD\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE598\uEDB7\u0000\u0000"+ - "\u0000\uE8E7\uEC4F\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uF25B"+ - "\u0000\u0000\uE6F4\uF36D\u0000\u0000\u0000\uE23B"+ - "\u0000\u0000\uEEDE\u0000\u0000\u0000\uE666\uEBCC"+ - "\u0000\u0000\uEF43\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uEDEE\uE932"+ - "\u0000\u0000\uEB60\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uE5B5\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE5A1"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF8DB\u0000"+ - "\uF7CB\u0000\u0000\u0000\uE0F3\uF535\u0000\u0000"+ - "\u0000\u0000\u0000\uF858\uE667\u0000\uEFE5\uF8DC"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uF9D0"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF8F6\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE835\u0000\uE8BD\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF172\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE1F7\uF36E\u0000\u0000\u0000"+ - "\u0000\uF659\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uEA91"+ - "\u0000\u0000\u0000\uE4B1\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uF97E\u0000\u0000\u0000"+ - "\u0000\uEF53\u0000\uF3C8\u0000\u0000\u0000\uE293"+ - "\u0000\u0000\u0000\u0000\uF7ED\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF496\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uED46\u0000"+ - "\uF5B9\u0000\uE992\uECF1\u0000\u0000\u0000\u0000"+ - "\uEF35\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF44B\u0000\uEA34\u0000\uE85C\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE079\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uECDA\u0000\uF969"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uF06A"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF7C4\u0000"+ - "\uECA4\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uF8DD\u0000\uF2CA\u0000"+ - "\uEF54\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE5CC\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF0D7\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE7AD"+ - "\u0000\u0000\uF8AB\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE4D9\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE5A2\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uF66E\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE898\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uEB61\u0000\u0000\uEFA8"+ - "\u0000\u0000\uF5F9\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF83F\u0000\uF0FC\u0000\u0000\uEB7A\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uECB2\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE5C5"+ - "\u0000\u0000\uF3E3\uE5EE\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE1CC\u0000\u0000\u0000\u0000\uF1D9\u0000"+ - "\u0000\u0000\u0000\uE751\u0000\u0000\u0000\u0000"+ - "\uF87C\u0000\u0000\u0000\u0000\u0000\uF3EB\u0000"+ - "\u0000\u0000\u0000\u0000\uF84C\uEE72\u0000\u0000"+ - "\u0000\u0000\uF875\uEC9C\u0000\u0000\u0000\uE046"+ - "\u0000\uED47\u0000\uF06B\u0000\uF5FA\u0000\u0000"+ - "\u0000\uF8AC\uE2C3\uF0FD\u0000\u0000\u0000\u0000"+ - "\uF79C\u0000\u0000\uEAB9\u0000\u0000\u0000\u0000"+ - "\uEBF1\u0000\uE434\u0000\u0000\u0000\u0000\uF5FB"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE36A\uE36B"+ - "\u0000\uF04E\uE7B1\u0000\u0000\u0000\u0000\u0000"+ - "\uE047\u0000\u0000\uE4E7\u0000\uF775\u0000\u0000"+ - "\u0000\u0000\uE4B2\u0000\u0000\u0000\uEC50\uF46F"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE1E5\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF7AC\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE1CD\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF23E\uE63E\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE6EA"+ - "\u0000\u0000\u0000\u0000\uEEE0\uF0AE\u0000\u0000"+ - "\u0000\uE2D9\u0000\u0000\uE95D\uF1FB\u0000\uEA92"+ - "\u0000\uE6EB\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uEA35\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uEAD7\uE8D0\uE8D1\u0000\u0000"+ - "\uE5A3\u0000\u0000\u0000\u0000\uF342\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE96C"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE078\u0000\uF776\uE95E\u0000\u0000\u0000\u0000"+ - "\uF06C\uE8D2\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uEFB3\u0000\u0000"+ - "\u0000\u0000\uF6DB\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uECA8\u0000"+ - "\uE6AE\u0000\u0000\uEB71\u0000\u0000\u0000\u0000"+ - "\u0000\uE0BA\u0000\u0000\uEDD1\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE36C"+ - "\u0000\u0000\u0000\u0000\uE5C1\u0000\u0000\u0000"+ - "\u0000\u0000\uE75A\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uECA9\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uEB34"+ - "\u0000\uEFA9\u0000\uE4C7\u0000\u0000\uE96D\uF73E"+ - "\u0000\u0000\u0000\uE148\u0000\u0000\u0000\uE33E"+ - "\u0000\u0000\u0000\uE794\u0000\u0000\uECCA\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE13F\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE53D\uF661\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE35C\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE056\u0000\u0000\uE5C2\u0000\u0000"+ - "\uE24A\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE057\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF840\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uEAD8\u0000\u0000\u0000"+ - "\uF5BA\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uEDEB\u0000\uF2F4\uE9B5\u0000\u0000\u0000\u0000"+ - "\uE1AA\u0000\uECF2\u0000\uF8F7\u0000\uF6D0\u0000"+ - "\u0000\u0000\u0000\uF9BA\u0000\u0000\uF9E1\uF6A0"+ - "\uE3C0\u0000\u0000\uEF55\u0000\uED48\u0000\uEBE8"+ - "\u0000\u0000\u0000\uE151\u0000\uE47D\u0000\u0000"+ - "\u0000\u0000\uE8BE\u0000\u0000\uEB72\u0000\u0000"+ - "\u0000\uF859\u0000\u0000\uEBCD\u0000\uE048\u0000"+ - "\u0000\u0000\uF470\uF3C9\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uEA93\u0000\u0000\u0000\uF36F\uF754\u0000\u0000"+ - "\u0000\u0000\u0000\uF25C\u0000\u0000\uEA94\u0000"+ - "\uEEC9\u0000\uEC95\uEEE1\u0000\u0000\uECCB\u0000"+ - "\u0000\uECCC\u0000\u0000\u0000\uE2F8\uF2AC\u0000"+ - "\uF9FE\uF935\uF841\uEAD9\u0000\uEB62\u0000\u0000"+ - "\u0000\uF56A\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF3CA\u0000\uE233"+ - "\u0000\u0000\u0000\u0000\uF44C\uF173\u0000\u0000"+ - "\u0000\u0000\u0000\uEB35\u0000\uF6AB\u0000\u0000"+ - "\uF0AF\u0000\u0000\u0000\u0000\u0000\uEDDE\u0000"+ - "\uEBA4\uE1AB\u0000\uE7F4\uEF36\uE1CE\uEBE9\u0000"+ - "\uF991\u0000\uEB73\u0000\u0000\u0000\u0000\u0000"+ - "\uEC51\u0000\uE234\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uEA36\u0000\u0000\uF0FE\u0000\uF0DD\uF370"+ - "\u0000\u0000\uF56B\u0000\uEC96\u0000\u0000\uE4C8"+ - "\u0000\u0000\u0000\uF57B\u0000\uF245\u0000\uF5D8"+ - "\u0000\u0000\uE5DF\u0000\u0000\u0000\uE675\u0000"+ - "\u0000\u0000\u0000\uF0B0\uF573\u0000\u0000\u0000"+ - "\u0000\uECCD\u0000\u0000\u0000\u0000\uF596\uF842"+ - "\u0000\u0000\uF2F5\uE06F\u0000\uF0B1\uF1BF\u0000"+ - "\u0000\uF9C9\u0000\u0000\u0000\u0000\uED36\uF7A4"+ - "\uF343\u0000\uEDEC\u0000\u0000\u0000\uE3E7\u0000"+ - "\uE7C7\uED67\uF06D\u0000\uE599\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE84A\u0000"+ - "\uE85D\u0000\u0000\u0000\uF7CC\u0000\uEBDA\uE8BF"+ - "\u0000\uE155\uF160\uE0BB\u0000\uEA95\u0000\u0000"+ - "\uEFAA\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE7C8\u0000\u0000\uF273\uE6BD\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE2C4\u0000\u0000\u0000\u0000"+ - "\u0000\uE35D\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF936\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF3FB\u0000\u0000\u0000\u0000\uF9D2\uE3C1"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uECDB\u0000\uE4C9\u0000\uE95F\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE17D\u0000"+ - "\u0000\u0000\u0000\u0000\uEA37\u0000\u0000\uEE4B"+ - "\uF131\u0000\u0000\u0000\uE149\u0000\u0000\uF8DE"+ - "\u0000\u0000\u0000\u0000\u0000\uEEE2\u0000\u0000"+ - "\uE551\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE938\u0000\u0000\u0000\u0000\u0000"+ - "\uEC52\u0000\uF4D8\uEDD3\u0000\u0000\uF4D9\u0000"+ - "\u0000\u0000\uF4C6\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE1DB"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE1AC"+ - "\u0000\uF953\u0000\u0000\u0000\u0000\uE577\u0000"+ - "\uE3C2\u0000\uF7A5\u0000\uEF65\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uECCE\u0000\u0000"+ - "\u0000\u0000\uE55A\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uEADA\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF8DF\uEEE3\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF79D\uECCF\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF5B0\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE777\u0000\uE7C9\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF73F\uF2F6\u0000"+ - "\uE9B6\uF23F\uE1F8\u0000\u0000\u0000\u0000\uEA48"+ - "\uF937\uF6FC\uF6B1\uE24B\uF531\u0000\u0000\uF25D"+ - "\uEBAE\u0000\u0000\uF153\uE2FE\u0000\uF74F\uE772"+ - "\uE4E8\u0000\u0000\uEA38\uF574\uF152\u0000\uE7F5"+ - "\uF7C5\uE9D3\uE693\uF19E\uF992\u0000\u0000\uF1C0"+ - "\uE049\u0000\uF274\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF471\u0000\uEA49\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE694\u0000\uEA96\u0000\uEADB\u0000"+ - "\uE8D3\u0000\uF877\uE773\uF551\u0000\uE9B7\u0000"+ - "\u0000\u0000\uF497\u0000\u0000\uE53E\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE695\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE9B8\uE2C5\uEADF\u0000\u0000"; - - private final static String innerIndex5= - "\u0000\u0000\u0000\u0000\uF44E\uF631\u0000\uF0CB"+ - "\uF3FC\u0000\uF4C7\u0000\u0000\uEB7B\u0000\u0000"+ - "\u0000\u0000\u0000\uF1FC\u0000\u0000\uEBDB\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uF275\u0000\uEA97\u0000"+ - "\u0000\u0000\u0000\uF863\u0000\u0000\u0000\u0000"+ - "\uF3CB\u0000\u0000\uE33F\uE9B9\u0000\u0000\uE3C3"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF5B1\u0000\u0000"+ - "\u0000\u0000\uF056\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF371\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF63C\u0000\u0000\u0000\u0000"+ - "\uF5D9\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF37B\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE9BA\u0000\u0000\u0000\uF44F\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF6C5\u0000"+ - "\u0000\u0000\u0000\uE8A2\uF498\u0000\u0000\uE04A"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF6F5\u0000\uE0E5\u0000\u0000"+ - "\u0000\uF276\u0000\uEB63\u0000\u0000\u0000\u0000"+ - "\uE235\u0000\u0000\u0000\u0000\u0000\u0000\uE668"+ - "\u0000\u0000\u0000\uE53F\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uEFC9\u0000\u0000\u0000\u0000\uE4CE"+ - "\uF552\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE0E6\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF3A1\u0000\u0000\u0000\u0000\u0000"+ - "\uF0B2\u0000\u0000\u0000\u0000\uF3A2\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF0B3\u0000\uF344\u0000\u0000\uE0F4"+ - "\uE540\uF4B2\uF8B7\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF5EC\u0000\u0000\u0000\u0000\u0000\uF277"+ - "\uF542\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uF5ED\u0000\uE2F3\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF372\u0000\u0000\u0000\u0000\u0000\uF25E"+ - "\u0000\u0000\uF3CC\u0000\u0000\uEDB8\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE6F5\uECF3\uE2E5\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE2C6\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF4B3\uED68\uE2F9\uE2DA\u0000\u0000"+ - "\u0000\u0000\uF85D\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uEE73"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF472\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF5EE\u0000\u0000\uE04B\u0000\u0000\uECDC\u0000"+ - "\u0000\u0000\u0000\uE294\u0000\uE669\u0000\u0000"+ - "\u0000\uF240\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF575\uE752\uE960\uE17E\u0000\u0000"+ - "\u0000\u0000\u0000\uE5E0\uF65A\uF9CA\uE766\uF55F"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE636\uE94E"+ - "\u0000\uE8D4\uE6C7\u0000\u0000\u0000\u0000\uF4A0"+ - "\u0000\u0000\u0000\uF3CD\u0000\u0000\u0000\u0000"+ - "\uEC53\uE96E\u0000\uE96F\u0000\u0000\uF2AD\uEE3B"+ - "\u0000\u0000\u0000\u0000\uF7DD\uF04F\u0000\u0000"+ - "\u0000\uF2AE\u0000\u0000\u0000\uF560\uE295\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uEE3C\u0000\uE26E"+ - "\u0000\u0000\uE5F9\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uECF4\uE1D0\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE5B8\u0000\u0000\uF6FD\u0000"+ - "\uE939\u0000\u0000\u0000\u0000\uEA98\u0000\uE93A"+ - "\uF473\uEFB4\uE46C\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uEFE6\u0000\u0000\uECF6\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uEECA\u0000"+ - "\u0000\uE35E\u0000\u0000\uE899\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE04C\u0000"+ - "\u0000\u0000\uF278\uE86E\u0000\uF499\u0000\u0000"+ - "\uEC9D\u0000\uE136\u0000\u0000\u0000\u0000\uE84B"+ - "\u0000\uF279\u0000\u0000\u0000\uF5DA\u0000\u0000"+ - "\uF6DC\uEBEA\uE251\uE541\u0000\uF9B1\uEE4D\u0000"+ - "\uF8AD\u0000\u0000\uF777\u0000\uEBCE\u0000\uF6E2"+ - "\uF5EF\uE2C7\u0000\u0000\uE542\uE191\u0000\uE578"+ - "\u0000\uF25F\uF6D7\u0000\u0000\uEB36\uE651\uEBDC"+ - "\uF373\uF3E4\uE993\uE637\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF597\u0000"+ - "\u0000\uF3CE\uF474\u0000\u0000\uE340\u0000\u0000"+ - "\uF191\u0000\u0000\u0000\uF7BA\u0000\uF0B5\u0000"+ - "\u0000\uE57D\uEC54\u0000\u0000\u0000\u0000\uEFE7"+ - "\u0000\u0000\uF0B4\uF031\u0000\uF74C\uE236\u0000"+ - "\uF7C6\uF96A\u0000\uE543\uE4B9\uF06E\u0000\u0000"+ - "\u0000\uEFAB\u0000\u0000\uEBE1\uE4CF\uF598\u0000"+ - "\uF050\uEBCF\u0000\uE14A\u0000\u0000\u0000\u0000"+ - "\u0000\uF27A\u0000\u0000\u0000\uF374\uF4B4\uE57E"+ - "\u0000\u0000\uF450\u0000\u0000\uF3E5\u0000\uF553"+ - "\uEB64\u0000\uF0B6\u0000\uE6A1\uE0E8\u0000\uF7AD"+ - "\uEFAD\uE774\uF843\uEC55\uF94D\u0000\u0000\uF154"+ - "\uE741\u0000\uE93B\u0000\u0000\u0000\u0000\uE5A4"+ - "\u0000\uF0E9\u0000\u0000\u0000\uEF4B\u0000\u0000"+ - "\u0000\uE767\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF8AE\uE3E1\u0000\u0000\uE8C0\u0000"+ - "\uF5BE\u0000\uEA99\u0000\u0000\u0000\u0000\uE09D"+ - "\uF6C6\uE2C8\u0000\u0000\u0000\uEBD0\u0000\u0000"+ - "\uF260\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uEFF4\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE296\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE5CD\u0000"+ - "\u0000\uE2DB\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE9BB\u0000\u0000\u0000\u0000\uE23C\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uEFE8\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uE544\u0000\u0000"+ - "\u0000\u0000\uED57\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF5DB\u0000\u0000\uF851\u0000\u0000"+ - "\u0000\uEA39\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE59A"+ - "\u0000\u0000\u0000\u0000\u0000\uF2F7\u0000\u0000"+ - "\u0000\u0000\uE4B3\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF0B7\uF2F8\uF5DC\uF1CC\uE8D5\uF3CF\u0000"+ - "\u0000\u0000\uF3D0\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF5B2\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE7AE\uE5AC\u0000\uEC56\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF9A3\u0000\uF8E5"+ - "\uEAAB\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uEC97"+ - "\u0000\uF63D\u0000\uF5B3\u0000\uF345\u0000\u0000"+ - "\u0000\u0000\uEBA5\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uF5DD\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF132\uF1FD\u0000\uF5B4\uF8B8"+ - "\u0000\uE8A3\u0000\u0000\uE65A\uE0D9\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uEDD4\u0000\u0000\u0000\u0000\u0000\u0000\uF4FA"+ - "\u0000\uF0B8\u0000\uEB47\uE6EC\uF3EC\uEDAF\uE5E1"+ - "\uE6ED\uE3D1\u0000\u0000\u0000\u0000\u0000\uEBF2"+ - "\uF2F9\u0000\u0000\u0000\uE9BC\uF66C\u0000\u0000"+ - "\u0000\u0000\u0000\uF375\u0000\u0000\u0000\uF554"+ - "\u0000\u0000\uEFE9\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF4FB\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uE591\u0000\u0000"+ - "\uE132\uF6FE\uEABC\u0000\u0000\u0000\u0000\uF0CD"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE347\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE652\u0000\u0000\u0000"+ - "\u0000\u0000\uEF3D\u0000\u0000\u0000\u0000\uF2AF"+ - "\uE0A5\u0000\u0000\u0000\u0000\uE0E9\u0000\u0000"+ - "\u0000\uF878\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE156"+ - "\u0000\u0000\u0000\uEE77\u0000\u0000\uF057\u0000"+ - "\u0000\u0000\uE8A4\u0000\uE2C9\uEC9E\uF2FA\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF0DE\u0000\u0000\uF5C8\u0000\uE56E\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uEB65\u0000\uF2B0\u0000\u0000\uEC57\u0000"+ - "\uE7AF\u0000\u0000\u0000\uF7E7\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uEEE5\u0000\u0000\uE2CA\uEBD1"+ - "\u0000\uEC58\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uF2FB\u0000\u0000\uF89B"+ - "\u0000\u0000\uE994\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uEB37\u0000\u0000\u0000"+ - "\u0000\u0000\uF778\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE0EA\u0000\u0000\u0000\uE0BC\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE672\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF5DE\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF5DF\u0000\uF246\u0000\u0000\u0000\uEC98\uE4CA"+ - "\uF2FC\uE3C4\uF2B1\u0000\uE3C5\u0000\uE36E\u0000"+ - "\uE7E1\u0000\u0000\uEB48\u0000\u0000\uE1D1\uF4B9"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uEECC\u0000\uE638\uE237\u0000\uE545\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uED58\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE4B4\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF0B9\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uE0F5\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uF66D\u0000\uF3A3\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE157\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uEFCA\u0000\uEBF0\u0000"+ - "\u0000\u0000\uF5E0\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF8AF\u0000\u0000\u0000\uE0D1"+ - "\u0000\u0000\u0000\u0000\uF8E0\uF475\u0000\u0000"+ - "\uF192\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF37C\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF27B\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uEFCB\u0000"+ - "\u0000\uE192\u0000\u0000\uE6AF\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF4A1\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uF997\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF3A4\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uEB66\u0000\u0000"+ - "\u0000\u0000\u0000\uF2B2\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF561\u0000\u0000"+ - "\uF6A1\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uF3D1\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE09E\uE09F\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE25E\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF4C8\u0000\uF4BA"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uF1FE"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE836\u0000\u0000\uEB7C\u0000\u0000\u0000\u0000"+ - "\u0000\uF75D\u0000\uE0D2\u0000\u0000\u0000\uF0CE"+ - "\u0000\uF7D8\uF7D9\uE070\uE85A\u0000\u0000\u0000"+ - "\uE0A6\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE058\uF7EE\uE8EC\u0000\u0000"+ - "\uE341\u0000\u0000\u0000\u0000\uE5EF\u0000\u0000"+ - "\u0000\uEE95\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uEEA2\uED69\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uED71"+ - "\u0000\u0000\uF954\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uF7EF\uE2F4\uF6E6\u0000"+ - "\u0000\u0000\u0000\u0000\uE24C\u0000\u0000\u0000"+ - "\u0000\uF555\uE933\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE9BD\u0000\u0000\u0000"+ - "\u0000\uF556\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF731\u0000\u0000\u0000\uEF66\u0000"+ - "\u0000\u0000\uE8C1\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF376\u0000\u0000\u0000\uED49"+ - "\uF67D\u0000\uF7AE\u0000\uE9BE\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE6B0\uE778\uE0BD\u0000\u0000"+ - "\uF7DA\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF75E\uF7F0\uEB7D\uECB3\uF543"+ - "\u0000\u0000\uF052\uF476\uF346\u0000\u0000\u0000"+ - "\u0000\u0000\uE8D6\u0000\u0000\u0000\u0000\u0000"+ - "\uF0E4\u0000\u0000\uF477\u0000\uE6D5\uE546\uF7E8"+ - "\uE6C1\u0000\u0000\u0000\u0000\uEDD5\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uEFEA\uE6CC\u0000"+ - "\u0000\u0000\uE4E9\uEC59\u0000\uF96B\uE1AD\u0000"+ - "\u0000\u0000\u0000\u0000\uE140\uF032\u0000\u0000"+ - "\uED98\uE350\u0000\uF347\uF231\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE6F6\u0000\u0000\u0000\uEC5A"+ - "\uEC5B\u0000\uF85F\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF0DF\u0000\u0000\u0000\u0000\u0000\uE65B"+ - "\u0000\u0000\u0000\uF544\u0000\u0000\u0000\u0000"+ - "\uF1CD\uED62\u0000\u0000\uF039\uED4A\uF4A2\uE1D2"+ - "\u0000\uF65B\u0000\uF3E6\uF1C1\uEF4C\uF261\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF377\uEC5C\u0000"+ - "\u0000\uED3A\u0000\uF5E1\uF1DA\u0000\u0000\u0000"+ - "\u0000\u0000\uE6EE\uE3F1\u0000\u0000\u0000\u0000"+ - "\uEFEB\uEFEC\uEB74\u0000\u0000\u0000\u0000\uE837"+ - "\uE9D4\u0000\uF033\u0000\u0000\u0000\uE653\uE696"+ - "\u0000\uE86F\u0000\uF2B3\u0000\u0000\u0000\u0000"+ - "\uEC5D\u0000\u0000\u0000\u0000\u0000\uF2FD\uF478"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF2C5\u0000\uEEE7\u0000\u0000\uE6FD\u0000"+ - "\u0000\uEECE\u0000\u0000\uEADC\u0000\uF7C7\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE7F6"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uEAAC\u0000\uE66A\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE934\u0000\u0000\u0000\uF348\u0000\u0000"+ - "\u0000\u0000\uE5FA\u0000\uED99\u0000\u0000\u0000"+ - "\uE654\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF57C\u0000\u0000\u0000\u0000\uF2FE\u0000"+ - "\u0000\u0000\u0000\u0000\uF331\u0000\uEA3A\u0000"+ - "\u0000\uE84C\uE79E\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF864\u0000\u0000\u0000\uF175\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uF938\u0000\u0000\uF176"+ - "\u0000\u0000\uE75B\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF8B9\u0000\uED63\u0000\uE1F9"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE2D3\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE07A\u0000\u0000\uE2D4\u0000\uF74D\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF557\u0000"+ - "\u0000\u0000\u0000\uF06F\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF7DB\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE547\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF0E5\u0000\u0000\uEBD2\u0000"+ - "\u0000\u0000\u0000\uF034\u0000\u0000\u0000\uF852"+ - "\uF8E1\uF87D\uF332\uE193\u0000\uF833\uEC99\u0000"+ - "\uEC5E\u0000\uEFF5\u0000\uEBEB\u0000\u0000\u0000"+ - "\uEEE8\uEF67\uE89A\uE55B\u0000\u0000\u0000\uF6F6"+ - "\uE655\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uE579\u0000\u0000"+ - "\uF89C\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE194\uF6DD\u0000\uEA4A\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE238\u0000"+ - "\u0000\u0000\u0000\u0000\uF349\uEDA0\uED59\u0000"+ - "\u0000\u0000\u0000\u0000\uED64\u0000\u0000\u0000"+ - "\uF053\u0000\uF2B4\u0000\u0000\u0000\uE6BE\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF8E2\u0000\uE1D3"+ - "\u0000\u0000\u0000\uF2B5\u0000\u0000\u0000\uF879"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF7A6\u0000\u0000\u0000\u0000\u0000\u0000\uEABD"+ - "\u0000\uF6C7\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uF79F\u0000\u0000\uF79E"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uEA3B\uE8E8\u0000\u0000\uECDD"+ - "\u0000\uEBE2\uE3C6\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF660\uF0E6\uE89B"+ - "\u0000\u0000\u0000\u0000\uF157\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uEA9A\uF779\uECDE\u0000"+ - "\u0000\u0000\u0000\uE297\u0000\u0000\u0000\u0000"+ - "\u0000\uF853\uEDD7\u0000\uF158\u0000\u0000\u0000"+ - "\uF4C9\u0000\u0000\uED4B\u0000\u0000\u0000\u0000"+ - "\uEE3E\u0000\u0000\u0000\u0000\u0000\uF2B6\u0000"+ - "\uE94F\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE24D\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uE753\u0000\u0000"+ - "\u0000\uE35F\u0000\uE2FA\uF4CA\uEB67\u0000\u0000"+ - "\u0000\uE3C7\uEFAE\u0000\uEF4D\u0000\u0000\uF854"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uEC5F\u0000"+ - "\u0000\uF855\u0000\u0000\u0000\uF7B8\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uE970\u0000\u0000"+ - "\uF8B0\u0000\u0000\u0000\uE739\uEDDF\uF7A7\u0000"+ - "\u0000\uF67E\u0000\uF65C\uEC9A\u0000\u0000\u0000"+ - "\u0000\uF193\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE870\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF3D2\uE45C\uE2CB\u0000\u0000\uE04D\u0000\u0000"+ - "\u0000\uE9BF\u0000\u0000\u0000\uF691\u0000\uEA9B"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF844\u0000\u0000"+ - "\u0000\uE5AD\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uF3E7"+ - "\u0000\uEA4E\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE950\u0000\u0000\u0000\u0000\u0000\uE3C8\uE3C9"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF74E\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE0F6\u0000\u0000\u0000\u0000"+ - "\uE59B\u0000\u0000\u0000\u0000\u0000\uF5E2\uEBD3"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE779\u0000\u0000\uF7A0\u0000\uE2CC\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF9A4\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uE298\u0000\uF860"+ - "\u0000\u0000\uE195\uEE4E\u0000\u0000\u0000\uF63E"+ - "\u0000\u0000\uE5F0\u0000\u0000\uE3CA\u0000\u0000"+ - "\u0000\uF94E\uE5F1\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE1E9\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uF845\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uEC60\uF599\u0000\u0000\u0000"+ - "\uE1D4\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uEEA3\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uE8A5\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uEC61\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE6A2"+ - "\u0000\u0000\uF6E3\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uF036\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE331\u0000\u0000\u0000"+ - "\u0000\uE26A\uF8EB\uE8A6\uE8DE\uE775\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uF070"+ - "\u0000\u0000\u0000\u0000\uE73A\u0000\u0000\u0000"+ - "\u0000\u0000\uEDE0\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE66B"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF2C6\u0000"+ - "\u0000\uF77A\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uED65"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE299\u0000\u0000\uEB68\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE6EF\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uF57D\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE1E6\u0000\u0000\u0000"+ - "\uE196\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF5E3\u0000\u0000"+ - "\uED5A\u0000\uE971\u0000\u0000\uF7C8\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF94F\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uEF37\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE754\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE0BE"+ - "\u0000\uE93E\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE6F7"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uF378\u0000\uE9C0"+ - "\u0000\uE2CD\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uE995\uE7B0\u0000\uEE79\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"; - - private final static String innerIndex6= - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uED4C\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF054\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\uED7C\u0000"+ - "\uED75\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uF8F8\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE14B\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uED4D\u0000\u0000"+ - "\uE1DC\uE7F7\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE9DF\u0000\u0000\u0000"+ - "\u0000\u0000\uF1CE\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uE7D0\u0000\u0000\u0000\u0000\u0000\uEDA3"+ - "\u0000\u0000\u0000\u0000\uF7CD\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE1AE\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uE2CE"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF63F\u0000\u0000\u0000\u0000\u0000"+ - "\uF9D3\uF0ED\uE66C\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uEDA4\u0000\u0000\u0000\uE5B6\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uE66D\u0000\u0000"+ - "\u0000\uF7E9\u0000\u0000\u0000\uEEA4\u0000\uE673"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uE3CB\uE674\u0000\u0000\u0000\uE5F2"+ - "\u0000\u0000\u0000\u0000\u0000\uEA9C\u0000\uE6F8"+ - "\u0000\u0000\u0000\u0000\u0000\uE77A\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE2D5\uE79F\u0000\u0000"+ - "\u0000\u0000\u0000\uE73B\u0000\u0000\uF9CB\u0000"+ - "\u0000\u0000\u0000\uF96C\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uEB38\uE5F3\u0000"+ - "\u0000\uF9D9\u0000\u0000\uE133\u0000\u0000\u0000"+ - "\uE7F9\u0000\u0000\uE4EA\uF5F5\u0000\uF2C7\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE4DA\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE84D\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uEF38"+ - "\uE93F\u0000\u0000\u0000\u0000\u0000\uF333\u0000"+ - "\u0000\u0000\u0000\uE1D5\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uEB39\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\uEA3C\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\uF34A\uF241\u0000\u0000\uF242\u0000"+ - "\u0000\u0000\uF65D\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uF262"+ - "\u0000\uE656\u0000\u0000\u0000\u0000\u0000\uEB75"+ - "\u0000\u0000\uF4BB\u0000\uEDE1\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\uED5B"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\uE6A3\u0000\u0000"+ - "\uE8C2\u0000\u0000\u0000\u0000\uE0A0\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\uE2CF\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u8861\u8862\u8863\u8864\u8865\u8866\u8867\u8868"+ - "\u8869\u886A\u886B\u886C\u886D\u886E\u886F\u8870"+ - "\u8871\u8873\u8874\u8875\u8876\u8877\u8878\u8879"+ - "\u887A\u887B\u887C\u887D\u8881\u8882\u8883\u8884"+ - "\u8885\u8886\u8887\u8888\u8889\u888A\u888B\u888C"+ - "\u888D\u888E\u888F\u8890\u8891\u8893\u8894\u8895"+ - "\u8896\u8897\u8898\u8899\u889A\u889B\u889C\u889D"+ - "\u88A1\u88A2\u88A3\u88A4\u88A5\u88A6\u88A7\u88A8"+ - "\u88A9\u88AA\u88AB\u88AC\u88AD\u88AE\u88AF\u88B0"+ - "\u88B1\u88B3\u88B4\u88B5\u88B6\u88B7\u88B8\u88B9"+ - "\u88BA\u88BB\u88BC\u88BD\u88C1\u88C2\u88C3\u88C4"+ - "\u88C5\u88C6\u88C7\u88C8\u88C9\u88CA\u88CB\u88CC"+ - "\u88CD\u88CE\u88CF\u88D0\u88D1\u88D3\u88D4\u88D5"+ - "\u88D6\u88D7\u88D8\u88D9\u88DA\u88DB\u88DC\u88DD"+ - "\u88E1\u88E2\u88E3\u88E4\u88E5\u88E6\u88E7\u88E8"+ - "\u88E9\u88EA\u88EB\u88EC\u88ED\u88EE\u88EF\u88F0"+ - "\u88F1\u88F3\u88F4\u88F5\u88F6\u88F7\u88F8\u88F9"+ - "\u88FA\u88FB\u88FC\u88FD\u8941\u8942\u8943\u8944"+ - "\u8945\u8946\u8947\u8948\u8949\u894A\u894B\u894C"+ - "\u894D\u894E\u894F\u8950\u8951\u8953\u8954\u8955"+ - "\u8956\u8957\u8958\u8959\u895A\u895B\u895C\u895D"+ - "\u8961\u8962\u8963\u8964\u8965\u8966\u8967\u8968"+ - "\u8969\u896A\u896B\u896C\u896D\u896E\u896F\u8970"+ - "\u8971\u8973\u8974\u8975\u8976\u8977\u8978\u8979"+ - "\u897A\u897B\u897C\u897D\u8981\u8982\u8983\u8984"+ - "\u8985\u8986\u8987\u8988\u8989\u898A\u898B\u898C"+ - "\u898D\u898E\u898F\u8990\u8991\u8993\u8994\u8995"+ - "\u8996\u8997\u8998\u8999\u899A\u899B\u899C\u899D"+ - "\u89A1\u89A2\u89A3\u89A4\u89A5\u89A6\u89A7\u89A8"+ - "\u89A9\u89AA\u89AB\u89AC\u89AD\u89AE\u89AF\u89B0"+ - "\u89B1\u89B3\u89B4\u89B5\u89B6\u89B7\u89B8\u89B9"+ - "\u89BA\u89BB\u89BC\u89BD\u89C1\u89C2\u89C3\u89C4"+ - "\u89C5\u89C6\u89C7\u89C8\u89C9\u89CA\u89CB\u89CC"+ - "\u89CD\u89CE\u89CF\u89D0\u89D1\u89D3\u89D4\u89D5"+ - "\u89D6\u89D7\u89D8\u89D9\u89DA\u89DB\u89DC\u89DD"+ - "\u89E1\u89E2\u89E3\u89E4\u89E5\u89E6\u89E7\u89E8"+ - "\u89E9\u89EA\u89EB\u89EC\u89ED\u89EE\u89EF\u89F0"+ - "\u89F1\u89F3\u89F4\u89F5\u89F6\u89F7\u89F8\u89F9"+ - "\u89FA\u89FB\u89FC\u89FD\u8A41\u8A42\u8A43\u8A44"+ - "\u8A45\u8A46\u8A47\u8A48\u8A49\u8A4A\u8A4B\u8A4C"+ - "\u8A4D\u8A4E\u8A4F\u8A50\u8A51\u8A53\u8A54\u8A55"+ - "\u8A56\u8A57\u8A58\u8A59\u8A5A\u8A5B\u8A5C\u8A5D"+ - "\u8A61\u8A62\u8A63\u8A64\u8A65\u8A66\u8A67\u8A68"+ - "\u8A69\u8A6A\u8A6B\u8A6C\u8A6D\u8A6E\u8A6F\u8A70"+ - "\u8A71\u8A73\u8A74\u8A75\u8A76\u8A77\u8A78\u8A79"+ - "\u8A7A\u8A7B\u8A7C\u8A7D\u8A81\u8A82\u8A83\u8A84"+ - "\u8A85\u8A86\u8A87\u8A88\u8A89\u8A8A\u8A8B\u8A8C"+ - "\u8A8D\u8A8E\u8A8F\u8A90\u8A91\u8A93\u8A94\u8A95"+ - "\u8A96\u8A97\u8A98\u8A99\u8A9A\u8A9B\u8A9C\u8A9D"+ - "\u8AA1\u8AA2\u8AA3\u8AA4\u8AA5\u8AA6\u8AA7\u8AA8"+ - "\u8AA9\u8AAA\u8AAB\u8AAC\u8AAD\u8AAE\u8AAF\u8AB0"+ - "\u8AB1\u8AB3\u8AB4\u8AB5\u8AB6\u8AB7\u8AB8\u8AB9"+ - "\u8ABA\u8ABB\u8ABC\u8ABD\u8AC1\u8AC2\u8AC3\u8AC4"+ - "\u8AC5\u8AC6\u8AC7\u8AC8\u8AC9\u8ACA\u8ACB\u8ACC"+ - "\u8ACD\u8ACE\u8ACF\u8AD0\u8AD1\u8AD3\u8AD4\u8AD5"+ - "\u8AD6\u8AD7\u8AD8\u8AD9\u8ADA\u8ADB\u8ADC\u8ADD"+ - "\u8AE1\u8AE2\u8AE3\u8AE4\u8AE5\u8AE6\u8AE7\u8AE8"+ - "\u8AE9\u8AEA\u8AEB\u8AEC\u8AED\u8AEE\u8AEF\u8AF0"+ - "\u8AF1\u8AF3\u8AF4\u8AF5\u8AF6\u8AF7\u8AF8\u8AF9"+ - "\u8AFA\u8AFB\u8AFC\u8AFD\u8B41\u8B42\u8B43\u8B44"+ - "\u8B45\u8B46\u8B47\u8B48\u8B49\u8B4A\u8B4B\u8B4C"+ - "\u8B4D\u8B4E\u8B4F\u8B50\u8B51\u8B53\u8B54\u8B55"+ - "\u8B56\u8B57\u8B58\u8B59\u8B5A\u8B5B\u8B5C\u8B5D"+ - "\u8B61\u8B62\u8B63\u8B64\u8B65\u8B66\u8B67\u8B68"+ - "\u8B69\u8B6A\u8B6B\u8B6C\u8B6D\u8B6E\u8B6F\u8B70"+ - "\u8B71\u8B73\u8B74\u8B75\u8B76\u8B77\u8B78\u8B79"+ - "\u8B7A\u8B7B\u8B7C\u8B7D\u8B81\u8B82\u8B83\u8B84"+ - "\u8B85\u8B86\u8B87\u8B88\u8B89\u8B8A\u8B8B\u8B8C"+ - "\u8B8D\u8B8E\u8B8F\u8B90\u8B91\u8B93\u8B94\u8B95"+ - "\u8B96\u8B97\u8B98\u8B99\u8B9A\u8B9B\u8B9C\u8B9D"+ - "\u8BA1\u8BA2\u8BA3\u8BA4\u8BA5\u8BA6\u8BA7\u8BA8"+ - "\u8BA9\u8BAA\u8BAB\u8BAC\u8BAD\u8BAE\u8BAF\u8BB0"+ - "\u8BB1\u8BB3\u8BB4\u8BB5\u8BB6\u8BB7\u8BB8\u8BB9"+ - "\u8BBA\u8BBB\u8BBC\u8BBD\u8C61\u8C62\u8C63\u8C64"+ - "\u8C65\u8C66\u8C67\u8C68\u8C69\u8C6A\u8C6B\u8C6C"+ - "\u8C6D\u8C6E\u8C6F\u8C70\u8C71\u8C73\u8C74\u8C75"+ - "\u8C76\u8C77\u8C78\u8C79\u8C7A\u8C7B\u8C7C\u8C7D"+ - "\u8C81\u8C82\u8C83\u8C84\u8C85\u8C86\u8C87\u8C88"+ - "\u8C89\u8C8A\u8C8B\u8C8C\u8C8D\u8C8E\u8C8F\u8C90"+ - "\u8C91\u8C93\u8C94\u8C95\u8C96\u8C97\u8C98\u8C99"+ - "\u8C9A\u8C9B\u8C9C\u8C9D\u8CA1\u8CA2\u8CA3\u8CA4"+ - "\u8CA5\u8CA6\u8CA7\u8CA8\u8CA9\u8CAA\u8CAB\u8CAC"+ - "\u8CAD\u8CAE\u8CAF\u8CB0\u8CB1\u8CB3\u8CB4\u8CB5"+ - "\u8CB6\u8CB7\u8CB8\u8CB9\u8CBA\u8CBB\u8CBC\u8CBD"+ - "\u8CC1\u8CC2\u8CC3\u8CC4\u8CC5\u8CC6\u8CC7\u8CC8"+ - "\u8CC9\u8CCA\u8CCB\u8CCC\u8CCD\u8CCE\u8CCF\u8CD0"+ - "\u8CD1\u8CD3\u8CD4\u8CD5\u8CD6\u8CD7\u8CD8\u8CD9"+ - "\u8CDA\u8CDB\u8CDC\u8CDD\u8CE1\u8CE2\u8CE3\u8CE4"+ - "\u8CE5\u8CE6\u8CE7\u8CE8\u8CE9\u8CEA\u8CEB\u8CEC"+ - "\u8CED\u8CEE\u8CEF\u8CF0\u8CF1\u8CF3\u8CF4\u8CF5"+ - "\u8CF6\u8CF7\u8CF8\u8CF9\u8CFA\u8CFB\u8CFC\u8CFD"+ - "\u8D41\u8D42\u8D43\u8D44\u8D45\u8D46\u8D47\u8D48"+ - "\u8D49\u8D4A\u8D4B\u8D4C\u8D4D\u8D4E\u8D4F\u8D50"+ - "\u8D51\u8D53\u8D54\u8D55\u8D56\u8D57\u8D58\u8D59"+ - "\u8D5A\u8D5B\u8D5C\u8D5D\u8D61\u8D62\u8D63\u8D64"+ - "\u8D65\u8D66\u8D67\u8D68\u8D69\u8D6A\u8D6B\u8D6C"+ - "\u8D6D\u8D6E\u8D6F\u8D70\u8D71\u8D73\u8D74\u8D75"+ - "\u8D76\u8D77\u8D78\u8D79\u8D7A\u8D7B\u8D7C\u8D7D"+ - "\u8D81\u8D82\u8D83\u8D84\u8D85\u8D86\u8D87\u8D88"+ - "\u8D89\u8D8A\u8D8B\u8D8C\u8D8D\u8D8E\u8D8F\u8D90"+ - "\u8D91\u8D93\u8D94\u8D95\u8D96\u8D97\u8D98\u8D99"+ - "\u8D9A\u8D9B\u8D9C\u8D9D\u8DA1\u8DA2\u8DA3\u8DA4"+ - "\u8DA5\u8DA6\u8DA7\u8DA8\u8DA9\u8DAA\u8DAB\u8DAC"+ - "\u8DAD\u8DAE\u8DAF\u8DB0\u8DB1\u8DB3\u8DB4\u8DB5"+ - "\u8DB6\u8DB7\u8DB8\u8DB9\u8DBA\u8DBB\u8DBC\u8DBD"+ - "\u8DC1\u8DC2\u8DC3\u8DC4\u8DC5\u8DC6\u8DC7\u8DC8"+ - "\u8DC9\u8DCA\u8DCB\u8DCC\u8DCD\u8DCE\u8DCF\u8DD0"+ - "\u8DD1\u8DD3\u8DD4\u8DD5\u8DD6\u8DD7\u8DD8\u8DD9"+ - "\u8DDA\u8DDB\u8DDC\u8DDD\u8DE1\u8DE2\u8DE3\u8DE4"+ - "\u8DE5\u8DE6\u8DE7\u8DE8\u8DE9\u8DEA\u8DEB\u8DEC"+ - "\u8DED\u8DEE\u8DEF\u8DF0\u8DF1\u8DF3\u8DF4\u8DF5"+ - "\u8DF6\u8DF7\u8DF8\u8DF9\u8DFA\u8DFB\u8DFC\u8DFD"+ - "\u8E41\u8E42\u8E43\u8E44\u8E45\u8E46\u8E47\u8E48"+ - "\u8E49\u8E4A\u8E4B\u8E4C\u8E4D\u8E4E\u8E4F\u8E50"+ - "\u8E51\u8E53\u8E54\u8E55\u8E56\u8E57\u8E58\u8E59"+ - "\u8E5A\u8E5B\u8E5C\u8E5D\u8E61\u8E62\u8E63\u8E64"+ - "\u8E65\u8E66\u8E67\u8E68\u8E69\u8E6A\u8E6B\u8E6C"+ - "\u8E6D\u8E6E\u8E6F\u8E70\u8E71\u8E73\u8E74\u8E75"+ - "\u8E76\u8E77\u8E78\u8E79\u8E7A\u8E7B\u8E7C\u8E7D"+ - "\u8E81\u8E82\u8E83\u8E84\u8E85\u8E86\u8E87\u8E88"+ - "\u8E89\u8E8A\u8E8B\u8E8C\u8E8D\u8E8E\u8E8F\u8E90"+ - "\u8E91\u8E93\u8E94\u8E95\u8E96\u8E97\u8E98\u8E99"+ - "\u8E9A\u8E9B\u8E9C\u8E9D\u8EA1\u8EA2\u8EA3\u8EA4"+ - "\u8EA5\u8EA6\u8EA7\u8EA8\u8EA9\u8EAA\u8EAB\u8EAC"+ - "\u8EAD\u8EAE\u8EAF\u8EB0\u8EB1\u8EB3\u8EB4\u8EB5"+ - "\u8EB6\u8EB7\u8EB8\u8EB9\u8EBA\u8EBB\u8EBC\u8EBD"+ - "\u8EC1\u8EC2\u8EC3\u8EC4\u8EC5\u8EC6\u8EC7\u8EC8"+ - "\u8EC9\u8ECA\u8ECB\u8ECC\u8ECD\u8ECE\u8ECF\u8ED0"+ - "\u8ED1\u8ED3\u8ED4\u8ED5\u8ED6\u8ED7\u8ED8\u8ED9"+ - "\u8EDA\u8EDB\u8EDC\u8EDD\u8EE1\u8EE2\u8EE3\u8EE4"+ - "\u8EE5\u8EE6\u8EE7\u8EE8\u8EE9\u8EEA\u8EEB\u8EEC"+ - "\u8EED\u8EEE\u8EEF\u8EF0\u8EF1\u8EF3\u8EF4\u8EF5"+ - "\u8EF6\u8EF7\u8EF8\u8EF9\u8EFA\u8EFB\u8EFC\u8EFD"+ - "\u8F41\u8F42\u8F43\u8F44\u8F45\u8F46\u8F47\u8F48"+ - "\u8F49\u8F4A\u8F4B\u8F4C\u8F4D\u8F4E\u8F4F\u8F50"+ - "\u8F51\u8F53\u8F54\u8F55\u8F56\u8F57\u8F58\u8F59"+ - "\u8F5A\u8F5B\u8F5C\u8F5D\u8F61\u8F62\u8F63\u8F64"+ - "\u8F65\u8F66\u8F67\u8F68\u8F69\u8F6A\u8F6B\u8F6C"+ - "\u8F6D\u8F6E\u8F6F\u8F70\u8F71\u8F73\u8F74\u8F75"+ - "\u8F76\u8F77\u8F78\u8F79\u8F7A\u8F7B\u8F7C\u8F7D"+ - "\u8F81\u8F82\u8F83\u8F84\u8F85\u8F86\u8F87\u8F88"+ - "\u8F89\u8F8A\u8F8B\u8F8C\u8F8D\u8F8E\u8F8F\u8F90"+ - "\u8F91\u8F93\u8F94\u8F95\u8F96\u8F97\u8F98\u8F99"+ - "\u8F9A\u8F9B\u8F9C\u8F9D\u8FA1\u8FA2\u8FA3\u8FA4"+ - "\u8FA5\u8FA6\u8FA7\u8FA8\u8FA9\u8FAA\u8FAB\u8FAC"+ - "\u8FAD\u8FAE\u8FAF\u8FB0\u8FB1\u8FB3\u8FB4\u8FB5"+ - "\u8FB6\u8FB7\u8FB8\u8FB9\u8FBA\u8FBB\u8FBC\u8FBD"+ - "\u9061\u9062\u9063\u9064\u9065\u9066\u9067\u9068"+ - "\u9069\u906A\u906B\u906C\u906D\u906E\u906F\u9070"+ - "\u9071\u9073\u9074\u9075\u9076\u9077\u9078\u9079"+ - "\u907A\u907B\u907C\u907D\u9081\u9082\u9083\u9084"+ - "\u9085\u9086\u9087\u9088\u9089\u908A\u908B\u908C"+ - "\u908D\u908E\u908F\u9090\u9091\u9093\u9094\u9095"+ - "\u9096\u9097\u9098\u9099\u909A\u909B\u909C\u909D"+ - "\u90A1\u90A2\u90A3\u90A4\u90A5\u90A6\u90A7\u90A8"+ - "\u90A9\u90AA\u90AB\u90AC\u90AD\u90AE\u90AF\u90B0"+ - "\u90B1\u90B3\u90B4\u90B5\u90B6\u90B7\u90B8\u90B9"+ - "\u90BA\u90BB\u90BC\u90BD\u90C1\u90C2\u90C3\u90C4"+ - "\u90C5\u90C6\u90C7\u90C8\u90C9\u90CA\u90CB\u90CC"+ - "\u90CD\u90CE\u90CF\u90D0\u90D1\u90D3\u90D4\u90D5"+ - "\u90D6\u90D7\u90D8\u90D9\u90DA\u90DB\u90DC\u90DD"+ - "\u90E1\u90E2\u90E3\u90E4\u90E5\u90E6\u90E7\u90E8"+ - "\u90E9\u90EA\u90EB\u90EC\u90ED\u90EE\u90EF\u90F0"+ - "\u90F1\u90F3\u90F4\u90F5\u90F6\u90F7\u90F8\u90F9"+ - "\u90FA\u90FB\u90FC\u90FD\u9141\u9142\u9143\u9144"+ - "\u9145\u9146\u9147\u9148\u9149\u914A\u914B\u914C"+ - "\u914D\u914E\u914F\u9150\u9151\u9153\u9154\u9155"+ - "\u9156\u9157\u9158\u9159\u915A\u915B\u915C\u915D"+ - "\u9161\u9162\u9163\u9164\u9165\u9166\u9167\u9168"+ - "\u9169\u916A\u916B\u916C\u916D\u916E\u916F\u9170"+ - "\u9171\u9173\u9174\u9175\u9176\u9177\u9178\u9179"+ - "\u917A\u917B\u917C\u917D\u9181\u9182\u9183\u9184"+ - "\u9185\u9186\u9187\u9188\u9189\u918A\u918B\u918C"+ - "\u918D\u918E\u918F\u9190\u9191\u9193\u9194\u9195"+ - "\u9196\u9197\u9198\u9199\u919A\u919B\u919C\u919D"+ - "\u91A1\u91A2\u91A3\u91A4\u91A5\u91A6\u91A7\u91A8"+ - "\u91A9\u91AA\u91AB\u91AC\u91AD\u91AE\u91AF\u91B0"+ - "\u91B1\u91B3\u91B4\u91B5\u91B6\u91B7\u91B8\u91B9"+ - "\u91BA\u91BB\u91BC\u91BD\u91C1\u91C2\u91C3\u91C4"+ - "\u91C5\u91C6\u91C7\u91C8\u91C9\u91CA\u91CB\u91CC"+ - "\u91CD\u91CE\u91CF\u91D0\u91D1\u91D3\u91D4\u91D5"+ - "\u91D6\u91D7\u91D8\u91D9\u91DA\u91DB\u91DC\u91DD"+ - "\u91E1\u91E2\u91E3\u91E4\u91E5\u91E6\u91E7\u91E8"+ - "\u91E9\u91EA\u91EB\u91EC\u91ED\u91EE\u91EF\u91F0"+ - "\u91F1\u91F3\u91F4\u91F5\u91F6\u91F7\u91F8\u91F9"+ - "\u91FA\u91FB\u91FC\u91FD\u9241\u9242\u9243\u9244"+ - "\u9245\u9246\u9247\u9248\u9249\u924A\u924B\u924C"+ - "\u924D\u924E\u924F\u9250\u9251\u9253\u9254\u9255"+ - "\u9256\u9257\u9258\u9259\u925A\u925B\u925C\u925D"+ - "\u9261\u9262\u9263\u9264\u9265\u9266\u9267\u9268"+ - "\u9269\u926A\u926B\u926C\u926D\u926E\u926F\u9270"+ - "\u9271\u9273\u9274\u9275\u9276\u9277\u9278\u9279"+ - "\u927A\u927B\u927C\u927D\u9281\u9282\u9283\u9284"+ - "\u9285\u9286\u9287\u9288\u9289\u928A\u928B\u928C"+ - "\u928D\u928E\u928F\u9290\u9291\u9293\u9294\u9295"+ - "\u9296\u9297\u9298\u9299\u929A\u929B\u929C\u929D"+ - "\u92A1\u92A2\u92A3\u92A4\u92A5\u92A6\u92A7\u92A8"+ - "\u92A9\u92AA\u92AB\u92AC\u92AD\u92AE\u92AF\u92B0"+ - "\u92B1\u92B3\u92B4\u92B5\u92B6\u92B7\u92B8\u92B9"+ - "\u92BA\u92BB\u92BC\u92BD\u92C1\u92C2\u92C3\u92C4"+ - "\u92C5\u92C6\u92C7\u92C8\u92C9\u92CA\u92CB\u92CC"+ - "\u92CD\u92CE\u92CF\u92D0\u92D1\u92D3\u92D4\u92D5"+ - "\u92D6\u92D7\u92D8\u92D9\u92DA\u92DB\u92DC\u92DD"+ - "\u92E1\u92E2\u92E3\u92E4\u92E5\u92E6\u92E7\u92E8"+ - "\u92E9\u92EA\u92EB\u92EC\u92ED\u92EE\u92EF\u92F0"+ - "\u92F1\u92F3\u92F4\u92F5\u92F6\u92F7\u92F8\u92F9"+ - "\u92FA\u92FB\u92FC\u92FD\u9341\u9342\u9343\u9344"+ - "\u9345\u9346\u9347\u9348\u9349\u934A\u934B\u934C"+ - "\u934D\u934E\u934F\u9350\u9351\u9353\u9354\u9355"+ - "\u9356\u9357\u9358\u9359\u935A\u935B\u935C\u935D"+ - "\u9361\u9362\u9363\u9364\u9365\u9366\u9367\u9368"+ - "\u9369\u936A\u936B\u936C\u936D\u936E\u936F\u9370"+ - "\u9371\u9373\u9374\u9375\u9376\u9377\u9378\u9379"+ - "\u937A\u937B\u937C\u937D\u9381\u9382\u9383\u9384"+ - "\u9385\u9386\u9387\u9388\u9389\u938A\u938B\u938C"+ - "\u938D\u938E\u938F\u9390\u9391\u9393\u9394\u9395"+ - "\u9396\u9397\u9398\u9399\u939A\u939B\u939C\u939D"+ - "\u93A1\u93A2\u93A3\u93A4\u93A5\u93A6\u93A7\u93A8"+ - "\u93A9\u93AA\u93AB\u93AC\u93AD\u93AE\u93AF\u93B0"+ - "\u93B1\u93B3\u93B4\u93B5\u93B6\u93B7\u93B8\u93B9"+ - "\u93BA\u93BB\u93BC\u93BD\u9461\u9462\u9463\u9464"+ - "\u9465\u9466\u9467\u9468\u9469\u946A\u946B\u946C"+ - "\u946D\u946E\u946F\u9470\u9471\u9473\u9474\u9475"+ - "\u9476\u9477\u9478\u9479\u947A\u947B\u947C\u947D"+ - "\u9481\u9482\u9483\u9484\u9485\u9486\u9487\u9488"+ - "\u9489\u948A\u948B\u948C\u948D\u948E\u948F\u9490"+ - "\u9491\u9493\u9494\u9495\u9496\u9497\u9498\u9499"+ - "\u949A\u949B\u949C\u949D\u94A1\u94A2\u94A3\u94A4"+ - "\u94A5\u94A6\u94A7\u94A8\u94A9\u94AA\u94AB\u94AC"+ - "\u94AD\u94AE\u94AF\u94B0\u94B1\u94B3\u94B4\u94B5"+ - "\u94B6\u94B7\u94B8\u94B9\u94BA\u94BB\u94BC\u94BD"+ - "\u94C1\u94C2\u94C3\u94C4\u94C5\u94C6\u94C7\u94C8"+ - "\u94C9\u94CA\u94CB\u94CC\u94CD\u94CE\u94CF\u94D0"+ - "\u94D1\u94D3\u94D4\u94D5\u94D6\u94D7\u94D8\u94D9"+ - "\u94DA\u94DB\u94DC\u94DD\u94E1\u94E2\u94E3\u94E4"+ - "\u94E5\u94E6\u94E7\u94E8\u94E9\u94EA\u94EB\u94EC"+ - "\u94ED\u94EE\u94EF\u94F0\u94F1\u94F3\u94F4\u94F5"+ - "\u94F6\u94F7\u94F8\u94F9\u94FA\u94FB\u94FC\u94FD"+ - "\u9541\u9542\u9543\u9544\u9545\u9546\u9547\u9548"+ - "\u9549\u954A\u954B\u954C\u954D\u954E\u954F\u9550"+ - "\u9551\u9553\u9554\u9555\u9556\u9557\u9558\u9559"+ - "\u955A\u955B\u955C\u955D\u9561\u9562\u9563\u9564"+ - "\u9565\u9566\u9567\u9568\u9569\u956A\u956B\u956C"+ - "\u956D\u956E\u956F\u9570\u9571\u9573\u9574\u9575"+ - "\u9576\u9577\u9578\u9579\u957A\u957B\u957C\u957D"+ - "\u9581\u9582\u9583\u9584\u9585\u9586\u9587\u9588"+ - "\u9589\u958A\u958B\u958C\u958D\u958E\u958F\u9590"+ - "\u9591\u9593\u9594\u9595\u9596\u9597\u9598\u9599"+ - "\u959A\u959B\u959C\u959D\u95A1\u95A2\u95A3\u95A4"+ - "\u95A5\u95A6\u95A7\u95A8\u95A9\u95AA\u95AB\u95AC"+ - "\u95AD\u95AE\u95AF\u95B0\u95B1\u95B3\u95B4\u95B5"+ - "\u95B6\u95B7\u95B8\u95B9\u95BA\u95BB\u95BC\u95BD"+ - "\u95C1\u95C2\u95C3\u95C4\u95C5\u95C6\u95C7\u95C8"+ - "\u95C9\u95CA\u95CB\u95CC\u95CD\u95CE\u95CF\u95D0"+ - "\u95D1\u95D3\u95D4\u95D5\u95D6\u95D7\u95D8\u95D9"+ - "\u95DA\u95DB\u95DC\u95DD\u95E1\u95E2\u95E3\u95E4"+ - "\u95E5\u95E6\u95E7\u95E8\u95E9\u95EA\u95EB\u95EC"+ - "\u95ED\u95EE\u95EF\u95F0\u95F1\u95F3\u95F4\u95F5"+ - "\u95F6\u95F7\u95F8\u95F9\u95FA\u95FB\u95FC\u95FD"+ - "\u9641\u9642\u9643\u9644\u9645\u9646\u9647\u9648"+ - "\u9649\u964A\u964B\u964C\u964D\u964E\u964F\u9650"+ - "\u9651\u9653\u9654\u9655\u9656\u9657\u9658\u9659"+ - "\u965A\u965B\u965C\u965D\u9661\u9662\u9663\u9664"+ - "\u9665\u9666\u9667\u9668\u9669\u966A\u966B\u966C"+ - "\u966D\u966E\u966F\u9670\u9671\u9673\u9674\u9675"+ - "\u9676\u9677\u9678\u9679\u967A\u967B\u967C\u967D"+ - "\u9681\u9682\u9683\u9684\u9685\u9686\u9687\u9688"+ - "\u9689\u968A\u968B\u968C\u968D\u968E\u968F\u9690"+ - "\u9691\u9693\u9694\u9695\u9696\u9697\u9698\u9699"+ - "\u969A\u969B\u969C\u969D\u96A1\u96A2\u96A3\u96A4"+ - "\u96A5\u96A6\u96A7\u96A8\u96A9\u96AA\u96AB\u96AC"+ - "\u96AD\u96AE\u96AF\u96B0\u96B1\u96B3\u96B4\u96B5"+ - "\u96B6\u96B7\u96B8\u96B9\u96BA\u96BB\u96BC\u96BD"+ - "\u96C1\u96C2\u96C3\u96C4\u96C5\u96C6\u96C7\u96C8"+ - "\u96C9\u96CA\u96CB\u96CC\u96CD\u96CE\u96CF\u96D0"+ - "\u96D1\u96D3\u96D4\u96D5\u96D6\u96D7\u96D8\u96D9"+ - "\u96DA\u96DB\u96DC\u96DD\u96E1\u96E2\u96E3\u96E4"+ - "\u96E5\u96E6\u96E7\u96E8\u96E9\u96EA\u96EB\u96EC"+ - "\u96ED\u96EE\u96EF\u96F0\u96F1\u96F3\u96F4\u96F5"+ - "\u96F6\u96F7\u96F8\u96F9\u96FA\u96FB\u96FC\u96FD"+ - "\u9741\u9742\u9743\u9744\u9745\u9746\u9747\u9748"+ - "\u9749\u974A\u974B\u974C\u974D\u974E\u974F\u9750"+ - "\u9751\u9753\u9754\u9755\u9756\u9757\u9758\u9759"+ - "\u975A\u975B\u975C\u975D\u9761\u9762\u9763\u9764"+ - "\u9765\u9766\u9767\u9768\u9769\u976A\u976B\u976C"+ - "\u976D\u976E\u976F\u9770\u9771\u9773\u9774\u9775"+ - "\u9776\u9777\u9778\u9779\u977A\u977B\u977C\u977D"+ - "\u9781\u9782\u9783\u9784\u9785\u9786\u9787\u9788"+ - "\u9789\u978A\u978B\u978C\u978D\u978E\u978F\u9790"+ - "\u9791\u9793\u9794\u9795\u9796\u9797\u9798\u9799"+ - "\u979A\u979B\u979C\u979D\u97A1\u97A2\u97A3\u97A4"+ - "\u97A5\u97A6\u97A7\u97A8\u97A9\u97AA\u97AB\u97AC"+ - "\u97AD\u97AE\u97AF\u97B0\u97B1\u97B3\u97B4\u97B5"+ - "\u97B6\u97B7\u97B8\u97B9\u97BA\u97BB\u97BC\u97BD"+ - "\u9861\u9862\u9863\u9864\u9865\u9866\u9867\u9868"+ - "\u9869\u986A\u986B\u986C\u986D\u986E\u986F\u9870"+ - "\u9871\u9873\u9874\u9875\u9876\u9877\u9878\u9879"+ - "\u987A\u987B\u987C\u987D\u9881\u9882\u9883\u9884"+ - "\u9885\u9886\u9887\u9888\u9889\u988A\u988B\u988C"+ - "\u988D\u988E\u988F\u9890\u9891\u9893\u9894\u9895"+ - "\u9896\u9897\u9898\u9899\u989A\u989B\u989C\u989D"+ - "\u98A1\u98A2\u98A3\u98A4\u98A5\u98A6\u98A7\u98A8"+ - "\u98A9\u98AA\u98AB\u98AC\u98AD\u98AE\u98AF\u98B0"+ - "\u98B1\u98B3\u98B4\u98B5\u98B6\u98B7\u98B8\u98B9"+ - "\u98BA\u98BB\u98BC\u98BD\u98C1\u98C2\u98C3\u98C4"+ - "\u98C5\u98C6\u98C7\u98C8\u98C9\u98CA\u98CB\u98CC"+ - "\u98CD\u98CE\u98CF\u98D0\u98D1\u98D3\u98D4\u98D5"+ - "\u98D6\u98D7\u98D8\u98D9\u98DA\u98DB\u98DC\u98DD"+ - "\u98E1\u98E2\u98E3\u98E4\u98E5\u98E6\u98E7\u98E8"+ - "\u98E9\u98EA\u98EB\u98EC\u98ED\u98EE\u98EF\u98F0"+ - "\u98F1\u98F3\u98F4\u98F5\u98F6\u98F7\u98F8\u98F9"+ - "\u98FA\u98FB\u98FC\u98FD\u9941\u9942\u9943\u9944"+ - "\u9945\u9946\u9947\u9948\u9949\u994A\u994B\u994C"+ - "\u994D\u994E\u994F\u9950\u9951\u9953\u9954\u9955"+ - "\u9956\u9957\u9958\u9959\u995A\u995B\u995C\u995D"+ - "\u9961\u9962\u9963\u9964\u9965\u9966\u9967\u9968"+ - "\u9969\u996A\u996B\u996C\u996D\u996E\u996F\u9970"+ - "\u9971\u9973\u9974\u9975\u9976\u9977\u9978\u9979"+ - "\u997A\u997B\u997C\u997D\u9981\u9982\u9983\u9984"+ - "\u9985\u9986\u9987\u9988\u9989\u998A\u998B\u998C"+ - "\u998D\u998E\u998F\u9990\u9991\u9993\u9994\u9995"+ - "\u9996\u9997\u9998\u9999\u999A\u999B\u999C\u999D"+ - "\u99A1\u99A2\u99A3\u99A4\u99A5\u99A6\u99A7\u99A8"+ - "\u99A9\u99AA\u99AB\u99AC\u99AD\u99AE\u99AF\u99B0"+ - "\u99B1\u99B3\u99B4\u99B5\u99B6\u99B7\u99B8\u99B9"+ - "\u99BA\u99BB\u99BC\u99BD\u99C1\u99C2\u99C3\u99C4"+ - "\u99C5\u99C6\u99C7\u99C8\u99C9\u99CA\u99CB\u99CC"+ - "\u99CD\u99CE\u99CF\u99D0\u99D1\u99D3\u99D4\u99D5"+ - "\u99D6\u99D7\u99D8\u99D9\u99DA\u99DB\u99DC\u99DD"+ - "\u99E1\u99E2\u99E3\u99E4\u99E5\u99E6\u99E7\u99E8"+ - "\u99E9\u99EA\u99EB\u99EC\u99ED\u99EE\u99EF\u99F0"+ - "\u99F1\u99F3\u99F4\u99F5\u99F6\u99F7\u99F8\u99F9"+ - "\u99FA\u99FB\u99FC\u99FD\u9A41\u9A42\u9A43\u9A44"+ - "\u9A45\u9A46\u9A47\u9A48\u9A49\u9A4A\u9A4B\u9A4C"+ - "\u9A4D\u9A4E\u9A4F\u9A50\u9A51\u9A53\u9A54\u9A55"+ - "\u9A56\u9A57\u9A58\u9A59\u9A5A\u9A5B\u9A5C\u9A5D"+ - "\u9A61\u9A62\u9A63\u9A64\u9A65\u9A66\u9A67\u9A68"+ - "\u9A69\u9A6A\u9A6B\u9A6C\u9A6D\u9A6E\u9A6F\u9A70"+ - "\u9A71\u9A73\u9A74\u9A75\u9A76\u9A77\u9A78\u9A79"+ - "\u9A7A\u9A7B\u9A7C\u9A7D\u9A81\u9A82\u9A83\u9A84"+ - "\u9A85\u9A86\u9A87\u9A88\u9A89\u9A8A\u9A8B\u9A8C"+ - "\u9A8D\u9A8E\u9A8F\u9A90\u9A91\u9A93\u9A94\u9A95"+ - "\u9A96\u9A97\u9A98\u9A99\u9A9A\u9A9B\u9A9C\u9A9D"+ - "\u9AA1\u9AA2\u9AA3\u9AA4\u9AA5\u9AA6\u9AA7\u9AA8"+ - "\u9AA9\u9AAA\u9AAB\u9AAC\u9AAD\u9AAE\u9AAF\u9AB0"+ - "\u9AB1\u9AB3\u9AB4\u9AB5\u9AB6\u9AB7\u9AB8\u9AB9"+ - "\u9ABA\u9ABB\u9ABC\u9ABD\u9AC1\u9AC2\u9AC3\u9AC4"+ - "\u9AC5\u9AC6\u9AC7\u9AC8\u9AC9\u9ACA\u9ACB\u9ACC"+ - "\u9ACD\u9ACE\u9ACF\u9AD0\u9AD1\u9AD3\u9AD4\u9AD5"+ - "\u9AD6\u9AD7\u9AD8\u9AD9\u9ADA\u9ADB\u9ADC\u9ADD"+ - "\u9AE1\u9AE2\u9AE3\u9AE4\u9AE5\u9AE6\u9AE7\u9AE8"+ - "\u9AE9\u9AEA\u9AEB\u9AEC\u9AED\u9AEE\u9AEF\u9AF0"+ - "\u9AF1\u9AF3\u9AF4\u9AF5\u9AF6\u9AF7\u9AF8\u9AF9"+ - "\u9AFA\u9AFB\u9AFC\u9AFD\u9B41\u9B42\u9B43\u9B44"+ - "\u9B45\u9B46\u9B47\u9B48\u9B49\u9B4A\u9B4B\u9B4C"+ - "\u9B4D\u9B4E\u9B4F\u9B50\u9B51\u9B53\u9B54\u9B55"+ - "\u9B56\u9B57\u9B58\u9B59\u9B5A\u9B5B\u9B5C\u9B5D"+ - "\u9B61\u9B62\u9B63\u9B64\u9B65\u9B66\u9B67\u9B68"+ - "\u9B69\u9B6A\u9B6B\u9B6C\u9B6D\u9B6E\u9B6F\u9B70"+ - "\u9B71\u9B73\u9B74\u9B75\u9B76\u9B77\u9B78\u9B79"+ - "\u9B7A\u9B7B\u9B7C\u9B7D\u9B81\u9B82\u9B83\u9B84"+ - "\u9B85\u9B86\u9B87\u9B88\u9B89\u9B8A\u9B8B\u9B8C"+ - "\u9B8D\u9B8E\u9B8F\u9B90\u9B91\u9B93\u9B94\u9B95"+ - "\u9B96\u9B97\u9B98\u9B99\u9B9A\u9B9B\u9B9C\u9B9D"+ - "\u9BA1\u9BA2\u9BA3\u9BA4\u9BA5\u9BA6\u9BA7\u9BA8"+ - "\u9BA9\u9BAA\u9BAB\u9BAC\u9BAD\u9BAE\u9BAF\u9BB0"+ - "\u9BB1\u9BB3\u9BB4\u9BB5\u9BB6\u9BB7\u9BB8\u9BB9"+ - "\u9BBA\u9BBB\u9BBC\u9BBD\u9C61\u9C62\u9C63\u9C64"+ - "\u9C65\u9C66\u9C67\u9C68\u9C69\u9C6A\u9C6B\u9C6C"+ - "\u9C6D\u9C6E\u9C6F\u9C70\u9C71\u9C73\u9C74\u9C75"+ - "\u9C76\u9C77\u9C78\u9C79\u9C7A\u9C7B\u9C7C\u9C7D"+ - "\u9C81\u9C82\u9C83\u9C84\u9C85\u9C86\u9C87\u9C88"+ - "\u9C89\u9C8A\u9C8B\u9C8C\u9C8D\u9C8E\u9C8F\u9C90"+ - "\u9C91\u9C93\u9C94\u9C95\u9C96\u9C97\u9C98\u9C99"+ - "\u9C9A\u9C9B\u9C9C\u9C9D\u9CA1\u9CA2\u9CA3\u9CA4"+ - "\u9CA5\u9CA6\u9CA7\u9CA8\u9CA9\u9CAA\u9CAB\u9CAC"+ - "\u9CAD\u9CAE\u9CAF\u9CB0\u9CB1\u9CB3\u9CB4\u9CB5"+ - "\u9CB6\u9CB7\u9CB8\u9CB9\u9CBA\u9CBB\u9CBC\u9CBD"+ - "\u9CC1\u9CC2\u9CC3\u9CC4\u9CC5\u9CC6\u9CC7\u9CC8"+ - "\u9CC9\u9CCA\u9CCB\u9CCC\u9CCD\u9CCE\u9CCF\u9CD0"+ - "\u9CD1\u9CD3\u9CD4\u9CD5\u9CD6\u9CD7\u9CD8\u9CD9"+ - "\u9CDA\u9CDB\u9CDC\u9CDD\u9CE1\u9CE2\u9CE3\u9CE4"+ - "\u9CE5\u9CE6\u9CE7\u9CE8\u9CE9\u9CEA\u9CEB\u9CEC"+ - "\u9CED\u9CEE\u9CEF\u9CF0\u9CF1\u9CF3\u9CF4\u9CF5"+ - "\u9CF6\u9CF7\u9CF8\u9CF9\u9CFA\u9CFB\u9CFC\u9CFD"+ - "\u9D41\u9D42\u9D43\u9D44\u9D45\u9D46\u9D47\u9D48"+ - "\u9D49\u9D4A\u9D4B\u9D4C\u9D4D\u9D4E\u9D4F\u9D50"+ - "\u9D51\u9D53\u9D54\u9D55\u9D56\u9D57\u9D58\u9D59"+ - "\u9D5A\u9D5B\u9D5C\u9D5D\u9D61\u9D62\u9D63\u9D64"+ - "\u9D65\u9D66\u9D67\u9D68\u9D69\u9D6A\u9D6B\u9D6C"+ - "\u9D6D\u9D6E\u9D6F\u9D70\u9D71\u9D73\u9D74\u9D75"+ - "\u9D76\u9D77\u9D78\u9D79\u9D7A\u9D7B\u9D7C\u9D7D"+ - "\u9D81\u9D82\u9D83\u9D84\u9D85\u9D86\u9D87\u9D88"+ - "\u9D89\u9D8A\u9D8B\u9D8C\u9D8D\u9D8E\u9D8F\u9D90"+ - "\u9D91\u9D93\u9D94\u9D95\u9D96\u9D97\u9D98\u9D99"+ - "\u9D9A\u9D9B\u9D9C\u9D9D\u9DA1\u9DA2\u9DA3\u9DA4"+ - "\u9DA5\u9DA6\u9DA7\u9DA8\u9DA9\u9DAA\u9DAB\u9DAC"+ - "\u9DAD\u9DAE\u9DAF\u9DB0\u9DB1\u9DB3\u9DB4\u9DB5"+ - "\u9DB6\u9DB7\u9DB8\u9DB9\u9DBA\u9DBB\u9DBC\u9DBD"+ - "\u9DC1\u9DC2\u9DC3\u9DC4\u9DC5\u9DC6\u9DC7\u9DC8"+ - "\u9DC9\u9DCA\u9DCB\u9DCC\u9DCD\u9DCE\u9DCF\u9DD0"+ - "\u9DD1\u9DD3\u9DD4\u9DD5\u9DD6\u9DD7\u9DD8\u9DD9"+ - "\u9DDA\u9DDB\u9DDC\u9DDD\u9DE1\u9DE2\u9DE3\u9DE4"+ - "\u9DE5\u9DE6\u9DE7\u9DE8\u9DE9\u9DEA\u9DEB\u9DEC"+ - "\u9DED\u9DEE\u9DEF\u9DF0\u9DF1\u9DF3\u9DF4\u9DF5"+ - "\u9DF6\u9DF7\u9DF8\u9DF9\u9DFA\u9DFB\u9DFC\u9DFD"+ - "\u9E41\u9E42\u9E43\u9E44\u9E45\u9E46\u9E47\u9E48"+ - "\u9E49\u9E4A\u9E4B\u9E4C\u9E4D\u9E4E\u9E4F\u9E50"+ - "\u9E51\u9E53\u9E54\u9E55\u9E56\u9E57\u9E58\u9E59"+ - "\u9E5A\u9E5B\u9E5C\u9E5D\u9E61\u9E62\u9E63\u9E64"+ - "\u9E65\u9E66\u9E67\u9E68\u9E69\u9E6A\u9E6B\u9E6C"+ - "\u9E6D\u9E6E\u9E6F\u9E70\u9E71\u9E73\u9E74\u9E75"+ - "\u9E76\u9E77\u9E78\u9E79\u9E7A\u9E7B\u9E7C\u9E7D"+ - "\u9E81\u9E82\u9E83\u9E84\u9E85\u9E86\u9E87\u9E88"+ - "\u9E89\u9E8A\u9E8B\u9E8C\u9E8D\u9E8E\u9E8F\u9E90"+ - "\u9E91\u9E93\u9E94\u9E95\u9E96\u9E97\u9E98\u9E99"; - - private final static String innerIndex7= - "\u9E9A\u9E9B\u9E9C\u9E9D\u9EA1\u9EA2\u9EA3\u9EA4"+ - "\u9EA5\u9EA6\u9EA7\u9EA8\u9EA9\u9EAA\u9EAB\u9EAC"+ - "\u9EAD\u9EAE\u9EAF\u9EB0\u9EB1\u9EB3\u9EB4\u9EB5"+ - "\u9EB6\u9EB7\u9EB8\u9EB9\u9EBA\u9EBB\u9EBC\u9EBD"+ - "\u9EC1\u9EC2\u9EC3\u9EC4\u9EC5\u9EC6\u9EC7\u9EC8"+ - "\u9EC9\u9ECA\u9ECB\u9ECC\u9ECD\u9ECE\u9ECF\u9ED0"+ - "\u9ED1\u9ED3\u9ED4\u9ED5\u9ED6\u9ED7\u9ED8\u9ED9"+ - "\u9EDA\u9EDB\u9EDC\u9EDD\u9EE1\u9EE2\u9EE3\u9EE4"+ - "\u9EE5\u9EE6\u9EE7\u9EE8\u9EE9\u9EEA\u9EEB\u9EEC"+ - "\u9EED\u9EEE\u9EEF\u9EF0\u9EF1\u9EF3\u9EF4\u9EF5"+ - "\u9EF6\u9EF7\u9EF8\u9EF9\u9EFA\u9EFB\u9EFC\u9EFD"+ - "\u9F41\u9F42\u9F43\u9F44\u9F45\u9F46\u9F47\u9F48"+ - "\u9F49\u9F4A\u9F4B\u9F4C\u9F4D\u9F4E\u9F4F\u9F50"+ - "\u9F51\u9F53\u9F54\u9F55\u9F56\u9F57\u9F58\u9F59"+ - "\u9F5A\u9F5B\u9F5C\u9F5D\u9F61\u9F62\u9F63\u9F64"+ - "\u9F65\u9F66\u9F67\u9F68\u9F69\u9F6A\u9F6B\u9F6C"+ - "\u9F6D\u9F6E\u9F6F\u9F70\u9F71\u9F73\u9F74\u9F75"+ - "\u9F76\u9F77\u9F78\u9F79\u9F7A\u9F7B\u9F7C\u9F7D"+ - "\u9F81\u9F82\u9F83\u9F84\u9F85\u9F86\u9F87\u9F88"+ - "\u9F89\u9F8A\u9F8B\u9F8C\u9F8D\u9F8E\u9F8F\u9F90"+ - "\u9F91\u9F93\u9F94\u9F95\u9F96\u9F97\u9F98\u9F99"+ - "\u9F9A\u9F9B\u9F9C\u9F9D\u9FA1\u9FA2\u9FA3\u9FA4"+ - "\u9FA5\u9FA6\u9FA7\u9FA8\u9FA9\u9FAA\u9FAB\u9FAC"+ - "\u9FAD\u9FAE\u9FAF\u9FB0\u9FB1\u9FB3\u9FB4\u9FB5"+ - "\u9FB6\u9FB7\u9FB8\u9FB9\u9FBA\u9FBB\u9FBC\u9FBD"+ - "\uA061\uA062\uA063\uA064\uA065\uA066\uA067\uA068"+ - "\uA069\uA06A\uA06B\uA06C\uA06D\uA06E\uA06F\uA070"+ - "\uA071\uA073\uA074\uA075\uA076\uA077\uA078\uA079"+ - "\uA07A\uA07B\uA07C\uA07D\uA081\uA082\uA083\uA084"+ - "\uA085\uA086\uA087\uA088\uA089\uA08A\uA08B\uA08C"+ - "\uA08D\uA08E\uA08F\uA090\uA091\uA093\uA094\uA095"+ - "\uA096\uA097\uA098\uA099\uA09A\uA09B\uA09C\uA09D"+ - "\uA0A1\uA0A2\uA0A3\uA0A4\uA0A5\uA0A6\uA0A7\uA0A8"+ - "\uA0A9\uA0AA\uA0AB\uA0AC\uA0AD\uA0AE\uA0AF\uA0B0"+ - "\uA0B1\uA0B3\uA0B4\uA0B5\uA0B6\uA0B7\uA0B8\uA0B9"+ - "\uA0BA\uA0BB\uA0BC\uA0BD\uA0C1\uA0C2\uA0C3\uA0C4"+ - "\uA0C5\uA0C6\uA0C7\uA0C8\uA0C9\uA0CA\uA0CB\uA0CC"+ - "\uA0CD\uA0CE\uA0CF\uA0D0\uA0D1\uA0D3\uA0D4\uA0D5"+ - "\uA0D6\uA0D7\uA0D8\uA0D9\uA0DA\uA0DB\uA0DC\uA0DD"+ - "\uA0E1\uA0E2\uA0E3\uA0E4\uA0E5\uA0E6\uA0E7\uA0E8"+ - "\uA0E9\uA0EA\uA0EB\uA0EC\uA0ED\uA0EE\uA0EF\uA0F0"+ - "\uA0F1\uA0F3\uA0F4\uA0F5\uA0F6\uA0F7\uA0F8\uA0F9"+ - "\uA0FA\uA0FB\uA0FC\uA0FD\uA141\uA142\uA143\uA144"+ - "\uA145\uA146\uA147\uA148\uA149\uA14A\uA14B\uA14C"+ - "\uA14D\uA14E\uA14F\uA150\uA151\uA153\uA154\uA155"+ - "\uA156\uA157\uA158\uA159\uA15A\uA15B\uA15C\uA15D"+ - "\uA161\uA162\uA163\uA164\uA165\uA166\uA167\uA168"+ - "\uA169\uA16A\uA16B\uA16C\uA16D\uA16E\uA16F\uA170"+ - "\uA171\uA173\uA174\uA175\uA176\uA177\uA178\uA179"+ - "\uA17A\uA17B\uA17C\uA17D\uA181\uA182\uA183\uA184"+ - "\uA185\uA186\uA187\uA188\uA189\uA18A\uA18B\uA18C"+ - "\uA18D\uA18E\uA18F\uA190\uA191\uA193\uA194\uA195"+ - "\uA196\uA197\uA198\uA199\uA19A\uA19B\uA19C\uA19D"+ - "\uA1A1\uA1A2\uA1A3\uA1A4\uA1A5\uA1A6\uA1A7\uA1A8"+ - "\uA1A9\uA1AA\uA1AB\uA1AC\uA1AD\uA1AE\uA1AF\uA1B0"+ - "\uA1B1\uA1B3\uA1B4\uA1B5\uA1B6\uA1B7\uA1B8\uA1B9"+ - "\uA1BA\uA1BB\uA1BC\uA1BD\uA1C1\uA1C2\uA1C3\uA1C4"+ - "\uA1C5\uA1C6\uA1C7\uA1C8\uA1C9\uA1CA\uA1CB\uA1CC"+ - "\uA1CD\uA1CE\uA1CF\uA1D0\uA1D1\uA1D3\uA1D4\uA1D5"+ - "\uA1D6\uA1D7\uA1D8\uA1D9\uA1DA\uA1DB\uA1DC\uA1DD"+ - "\uA1E1\uA1E2\uA1E3\uA1E4\uA1E5\uA1E6\uA1E7\uA1E8"+ - "\uA1E9\uA1EA\uA1EB\uA1EC\uA1ED\uA1EE\uA1EF\uA1F0"+ - "\uA1F1\uA1F3\uA1F4\uA1F5\uA1F6\uA1F7\uA1F8\uA1F9"+ - "\uA1FA\uA1FB\uA1FC\uA1FD\uA241\uA242\uA243\uA244"+ - "\uA245\uA246\uA247\uA248\uA249\uA24A\uA24B\uA24C"+ - "\uA24D\uA24E\uA24F\uA250\uA251\uA253\uA254\uA255"+ - "\uA256\uA257\uA258\uA259\uA25A\uA25B\uA25C\uA25D"+ - "\uA261\uA262\uA263\uA264\uA265\uA266\uA267\uA268"+ - "\uA269\uA26A\uA26B\uA26C\uA26D\uA26E\uA26F\uA270"+ - "\uA271\uA273\uA274\uA275\uA276\uA277\uA278\uA279"+ - "\uA27A\uA27B\uA27C\uA27D\uA281\uA282\uA283\uA284"+ - "\uA285\uA286\uA287\uA288\uA289\uA28A\uA28B\uA28C"+ - "\uA28D\uA28E\uA28F\uA290\uA291\uA293\uA294\uA295"+ - "\uA296\uA297\uA298\uA299\uA29A\uA29B\uA29C\uA29D"+ - "\uA2A1\uA2A2\uA2A3\uA2A4\uA2A5\uA2A6\uA2A7\uA2A8"+ - "\uA2A9\uA2AA\uA2AB\uA2AC\uA2AD\uA2AE\uA2AF\uA2B0"+ - "\uA2B1\uA2B3\uA2B4\uA2B5\uA2B6\uA2B7\uA2B8\uA2B9"+ - "\uA2BA\uA2BB\uA2BC\uA2BD\uA2C1\uA2C2\uA2C3\uA2C4"+ - "\uA2C5\uA2C6\uA2C7\uA2C8\uA2C9\uA2CA\uA2CB\uA2CC"+ - "\uA2CD\uA2CE\uA2CF\uA2D0\uA2D1\uA2D3\uA2D4\uA2D5"+ - "\uA2D6\uA2D7\uA2D8\uA2D9\uA2DA\uA2DB\uA2DC\uA2DD"+ - "\uA2E1\uA2E2\uA2E3\uA2E4\uA2E5\uA2E6\uA2E7\uA2E8"+ - "\uA2E9\uA2EA\uA2EB\uA2EC\uA2ED\uA2EE\uA2EF\uA2F0"+ - "\uA2F1\uA2F3\uA2F4\uA2F5\uA2F6\uA2F7\uA2F8\uA2F9"+ - "\uA2FA\uA2FB\uA2FC\uA2FD\uA341\uA342\uA343\uA344"+ - "\uA345\uA346\uA347\uA348\uA349\uA34A\uA34B\uA34C"+ - "\uA34D\uA34E\uA34F\uA350\uA351\uA353\uA354\uA355"+ - "\uA356\uA357\uA358\uA359\uA35A\uA35B\uA35C\uA35D"+ - "\uA361\uA362\uA363\uA364\uA365\uA366\uA367\uA368"+ - "\uA369\uA36A\uA36B\uA36C\uA36D\uA36E\uA36F\uA370"+ - "\uA371\uA373\uA374\uA375\uA376\uA377\uA378\uA379"+ - "\uA37A\uA37B\uA37C\uA37D\uA381\uA382\uA383\uA384"+ - "\uA385\uA386\uA387\uA388\uA389\uA38A\uA38B\uA38C"+ - "\uA38D\uA38E\uA38F\uA390\uA391\uA393\uA394\uA395"+ - "\uA396\uA397\uA398\uA399\uA39A\uA39B\uA39C\uA39D"+ - "\uA3A1\uA3A2\uA3A3\uA3A4\uA3A5\uA3A6\uA3A7\uA3A8"+ - "\uA3A9\uA3AA\uA3AB\uA3AC\uA3AD\uA3AE\uA3AF\uA3B0"+ - "\uA3B1\uA3B3\uA3B4\uA3B5\uA3B6\uA3B7\uA3B8\uA3B9"+ - "\uA3BA\uA3BB\uA3BC\uA3BD\uA461\uA462\uA463\uA464"+ - "\uA465\uA466\uA467\uA468\uA469\uA46A\uA46B\uA46C"+ - "\uA46D\uA46E\uA46F\uA470\uA471\uA473\uA474\uA475"+ - "\uA476\uA477\uA478\uA479\uA47A\uA47B\uA47C\uA47D"+ - "\uA481\uA482\uA483\uA484\uA485\uA486\uA487\uA488"+ - "\uA489\uA48A\uA48B\uA48C\uA48D\uA48E\uA48F\uA490"+ - "\uA491\uA493\uA494\uA495\uA496\uA497\uA498\uA499"+ - "\uA49A\uA49B\uA49C\uA49D\uA4A1\uA4A2\uA4A3\uA4A4"+ - "\uA4A5\uA4A6\uA4A7\uA4A8\uA4A9\uA4AA\uA4AB\uA4AC"+ - "\uA4AD\uA4AE\uA4AF\uA4B0\uA4B1\uA4B3\uA4B4\uA4B5"+ - "\uA4B6\uA4B7\uA4B8\uA4B9\uA4BA\uA4BB\uA4BC\uA4BD"+ - "\uA4C1\uA4C2\uA4C3\uA4C4\uA4C5\uA4C6\uA4C7\uA4C8"+ - "\uA4C9\uA4CA\uA4CB\uA4CC\uA4CD\uA4CE\uA4CF\uA4D0"+ - "\uA4D1\uA4D3\uA4D4\uA4D5\uA4D6\uA4D7\uA4D8\uA4D9"+ - "\uA4DA\uA4DB\uA4DC\uA4DD\uA4E1\uA4E2\uA4E3\uA4E4"+ - "\uA4E5\uA4E6\uA4E7\uA4E8\uA4E9\uA4EA\uA4EB\uA4EC"+ - "\uA4ED\uA4EE\uA4EF\uA4F0\uA4F1\uA4F3\uA4F4\uA4F5"+ - "\uA4F6\uA4F7\uA4F8\uA4F9\uA4FA\uA4FB\uA4FC\uA4FD"+ - "\uA541\uA542\uA543\uA544\uA545\uA546\uA547\uA548"+ - "\uA549\uA54A\uA54B\uA54C\uA54D\uA54E\uA54F\uA550"+ - "\uA551\uA553\uA554\uA555\uA556\uA557\uA558\uA559"+ - "\uA55A\uA55B\uA55C\uA55D\uA561\uA562\uA563\uA564"+ - "\uA565\uA566\uA567\uA568\uA569\uA56A\uA56B\uA56C"+ - "\uA56D\uA56E\uA56F\uA570\uA571\uA573\uA574\uA575"+ - "\uA576\uA577\uA578\uA579\uA57A\uA57B\uA57C\uA57D"+ - "\uA581\uA582\uA583\uA584\uA585\uA586\uA587\uA588"+ - "\uA589\uA58A\uA58B\uA58C\uA58D\uA58E\uA58F\uA590"+ - "\uA591\uA593\uA594\uA595\uA596\uA597\uA598\uA599"+ - "\uA59A\uA59B\uA59C\uA59D\uA5A1\uA5A2\uA5A3\uA5A4"+ - "\uA5A5\uA5A6\uA5A7\uA5A8\uA5A9\uA5AA\uA5AB\uA5AC"+ - "\uA5AD\uA5AE\uA5AF\uA5B0\uA5B1\uA5B3\uA5B4\uA5B5"+ - "\uA5B6\uA5B7\uA5B8\uA5B9\uA5BA\uA5BB\uA5BC\uA5BD"+ - "\uA5C1\uA5C2\uA5C3\uA5C4\uA5C5\uA5C6\uA5C7\uA5C8"+ - "\uA5C9\uA5CA\uA5CB\uA5CC\uA5CD\uA5CE\uA5CF\uA5D0"+ - "\uA5D1\uA5D3\uA5D4\uA5D5\uA5D6\uA5D7\uA5D8\uA5D9"+ - "\uA5DA\uA5DB\uA5DC\uA5DD\uA5E1\uA5E2\uA5E3\uA5E4"+ - "\uA5E5\uA5E6\uA5E7\uA5E8\uA5E9\uA5EA\uA5EB\uA5EC"+ - "\uA5ED\uA5EE\uA5EF\uA5F0\uA5F1\uA5F3\uA5F4\uA5F5"+ - "\uA5F6\uA5F7\uA5F8\uA5F9\uA5FA\uA5FB\uA5FC\uA5FD"+ - "\uA641\uA642\uA643\uA644\uA645\uA646\uA647\uA648"+ - "\uA649\uA64A\uA64B\uA64C\uA64D\uA64E\uA64F\uA650"+ - "\uA651\uA653\uA654\uA655\uA656\uA657\uA658\uA659"+ - "\uA65A\uA65B\uA65C\uA65D\uA661\uA662\uA663\uA664"+ - "\uA665\uA666\uA667\uA668\uA669\uA66A\uA66B\uA66C"+ - "\uA66D\uA66E\uA66F\uA670\uA671\uA673\uA674\uA675"+ - "\uA676\uA677\uA678\uA679\uA67A\uA67B\uA67C\uA67D"+ - "\uA681\uA682\uA683\uA684\uA685\uA686\uA687\uA688"+ - "\uA689\uA68A\uA68B\uA68C\uA68D\uA68E\uA68F\uA690"+ - "\uA691\uA693\uA694\uA695\uA696\uA697\uA698\uA699"+ - "\uA69A\uA69B\uA69C\uA69D\uA6A1\uA6A2\uA6A3\uA6A4"+ - "\uA6A5\uA6A6\uA6A7\uA6A8\uA6A9\uA6AA\uA6AB\uA6AC"+ - "\uA6AD\uA6AE\uA6AF\uA6B0\uA6B1\uA6B3\uA6B4\uA6B5"+ - "\uA6B6\uA6B7\uA6B8\uA6B9\uA6BA\uA6BB\uA6BC\uA6BD"+ - "\uA6C1\uA6C2\uA6C3\uA6C4\uA6C5\uA6C6\uA6C7\uA6C8"+ - "\uA6C9\uA6CA\uA6CB\uA6CC\uA6CD\uA6CE\uA6CF\uA6D0"+ - "\uA6D1\uA6D3\uA6D4\uA6D5\uA6D6\uA6D7\uA6D8\uA6D9"+ - "\uA6DA\uA6DB\uA6DC\uA6DD\uA6E1\uA6E2\uA6E3\uA6E4"+ - "\uA6E5\uA6E6\uA6E7\uA6E8\uA6E9\uA6EA\uA6EB\uA6EC"+ - "\uA6ED\uA6EE\uA6EF\uA6F0\uA6F1\uA6F3\uA6F4\uA6F5"+ - "\uA6F6\uA6F7\uA6F8\uA6F9\uA6FA\uA6FB\uA6FC\uA6FD"+ - "\uA741\uA742\uA743\uA744\uA745\uA746\uA747\uA748"+ - "\uA749\uA74A\uA74B\uA74C\uA74D\uA74E\uA74F\uA750"+ - "\uA751\uA753\uA754\uA755\uA756\uA757\uA758\uA759"+ - "\uA75A\uA75B\uA75C\uA75D\uA761\uA762\uA763\uA764"+ - "\uA765\uA766\uA767\uA768\uA769\uA76A\uA76B\uA76C"+ - "\uA76D\uA76E\uA76F\uA770\uA771\uA773\uA774\uA775"+ - "\uA776\uA777\uA778\uA779\uA77A\uA77B\uA77C\uA77D"+ - "\uA781\uA782\uA783\uA784\uA785\uA786\uA787\uA788"+ - "\uA789\uA78A\uA78B\uA78C\uA78D\uA78E\uA78F\uA790"+ - "\uA791\uA793\uA794\uA795\uA796\uA797\uA798\uA799"+ - "\uA79A\uA79B\uA79C\uA79D\uA7A1\uA7A2\uA7A3\uA7A4"+ - "\uA7A5\uA7A6\uA7A7\uA7A8\uA7A9\uA7AA\uA7AB\uA7AC"+ - "\uA7AD\uA7AE\uA7AF\uA7B0\uA7B1\uA7B3\uA7B4\uA7B5"+ - "\uA7B6\uA7B7\uA7B8\uA7B9\uA7BA\uA7BB\uA7BC\uA7BD"+ - "\uA861\uA862\uA863\uA864\uA865\uA866\uA867\uA868"+ - "\uA869\uA86A\uA86B\uA86C\uA86D\uA86E\uA86F\uA870"+ - "\uA871\uA873\uA874\uA875\uA876\uA877\uA878\uA879"+ - "\uA87A\uA87B\uA87C\uA87D\uA881\uA882\uA883\uA884"+ - "\uA885\uA886\uA887\uA888\uA889\uA88A\uA88B\uA88C"+ - "\uA88D\uA88E\uA88F\uA890\uA891\uA893\uA894\uA895"+ - "\uA896\uA897\uA898\uA899\uA89A\uA89B\uA89C\uA89D"+ - "\uA8A1\uA8A2\uA8A3\uA8A4\uA8A5\uA8A6\uA8A7\uA8A8"+ - "\uA8A9\uA8AA\uA8AB\uA8AC\uA8AD\uA8AE\uA8AF\uA8B0"+ - "\uA8B1\uA8B3\uA8B4\uA8B5\uA8B6\uA8B7\uA8B8\uA8B9"+ - "\uA8BA\uA8BB\uA8BC\uA8BD\uA8C1\uA8C2\uA8C3\uA8C4"+ - "\uA8C5\uA8C6\uA8C7\uA8C8\uA8C9\uA8CA\uA8CB\uA8CC"+ - "\uA8CD\uA8CE\uA8CF\uA8D0\uA8D1\uA8D3\uA8D4\uA8D5"+ - "\uA8D6\uA8D7\uA8D8\uA8D9\uA8DA\uA8DB\uA8DC\uA8DD"+ - "\uA8E1\uA8E2\uA8E3\uA8E4\uA8E5\uA8E6\uA8E7\uA8E8"+ - "\uA8E9\uA8EA\uA8EB\uA8EC\uA8ED\uA8EE\uA8EF\uA8F0"+ - "\uA8F1\uA8F3\uA8F4\uA8F5\uA8F6\uA8F7\uA8F8\uA8F9"+ - "\uA8FA\uA8FB\uA8FC\uA8FD\uA941\uA942\uA943\uA944"+ - "\uA945\uA946\uA947\uA948\uA949\uA94A\uA94B\uA94C"+ - "\uA94D\uA94E\uA94F\uA950\uA951\uA953\uA954\uA955"+ - "\uA956\uA957\uA958\uA959\uA95A\uA95B\uA95C\uA95D"+ - "\uA961\uA962\uA963\uA964\uA965\uA966\uA967\uA968"+ - "\uA969\uA96A\uA96B\uA96C\uA96D\uA96E\uA96F\uA970"+ - "\uA971\uA973\uA974\uA975\uA976\uA977\uA978\uA979"+ - "\uA97A\uA97B\uA97C\uA97D\uA981\uA982\uA983\uA984"+ - "\uA985\uA986\uA987\uA988\uA989\uA98A\uA98B\uA98C"+ - "\uA98D\uA98E\uA98F\uA990\uA991\uA993\uA994\uA995"+ - "\uA996\uA997\uA998\uA999\uA99A\uA99B\uA99C\uA99D"+ - "\uA9A1\uA9A2\uA9A3\uA9A4\uA9A5\uA9A6\uA9A7\uA9A8"+ - "\uA9A9\uA9AA\uA9AB\uA9AC\uA9AD\uA9AE\uA9AF\uA9B0"+ - "\uA9B1\uA9B3\uA9B4\uA9B5\uA9B6\uA9B7\uA9B8\uA9B9"+ - "\uA9BA\uA9BB\uA9BC\uA9BD\uA9C1\uA9C2\uA9C3\uA9C4"+ - "\uA9C5\uA9C6\uA9C7\uA9C8\uA9C9\uA9CA\uA9CB\uA9CC"+ - "\uA9CD\uA9CE\uA9CF\uA9D0\uA9D1\uA9D3\uA9D4\uA9D5"+ - "\uA9D6\uA9D7\uA9D8\uA9D9\uA9DA\uA9DB\uA9DC\uA9DD"+ - "\uA9E1\uA9E2\uA9E3\uA9E4\uA9E5\uA9E6\uA9E7\uA9E8"+ - "\uA9E9\uA9EA\uA9EB\uA9EC\uA9ED\uA9EE\uA9EF\uA9F0"+ - "\uA9F1\uA9F3\uA9F4\uA9F5\uA9F6\uA9F7\uA9F8\uA9F9"+ - "\uA9FA\uA9FB\uA9FC\uA9FD\uAA41\uAA42\uAA43\uAA44"+ - "\uAA45\uAA46\uAA47\uAA48\uAA49\uAA4A\uAA4B\uAA4C"+ - "\uAA4D\uAA4E\uAA4F\uAA50\uAA51\uAA53\uAA54\uAA55"+ - "\uAA56\uAA57\uAA58\uAA59\uAA5A\uAA5B\uAA5C\uAA5D"+ - "\uAA61\uAA62\uAA63\uAA64\uAA65\uAA66\uAA67\uAA68"+ - "\uAA69\uAA6A\uAA6B\uAA6C\uAA6D\uAA6E\uAA6F\uAA70"+ - "\uAA71\uAA73\uAA74\uAA75\uAA76\uAA77\uAA78\uAA79"+ - "\uAA7A\uAA7B\uAA7C\uAA7D\uAA81\uAA82\uAA83\uAA84"+ - "\uAA85\uAA86\uAA87\uAA88\uAA89\uAA8A\uAA8B\uAA8C"+ - "\uAA8D\uAA8E\uAA8F\uAA90\uAA91\uAA93\uAA94\uAA95"+ - "\uAA96\uAA97\uAA98\uAA99\uAA9A\uAA9B\uAA9C\uAA9D"+ - "\uAAA1\uAAA2\uAAA3\uAAA4\uAAA5\uAAA6\uAAA7\uAAA8"+ - "\uAAA9\uAAAA\uAAAB\uAAAC\uAAAD\uAAAE\uAAAF\uAAB0"+ - "\uAAB1\uAAB3\uAAB4\uAAB5\uAAB6\uAAB7\uAAB8\uAAB9"+ - "\uAABA\uAABB\uAABC\uAABD\uAAC1\uAAC2\uAAC3\uAAC4"+ - "\uAAC5\uAAC6\uAAC7\uAAC8\uAAC9\uAACA\uAACB\uAACC"+ - "\uAACD\uAACE\uAACF\uAAD0\uAAD1\uAAD3\uAAD4\uAAD5"+ - "\uAAD6\uAAD7\uAAD8\uAAD9\uAADA\uAADB\uAADC\uAADD"+ - "\uAAE1\uAAE2\uAAE3\uAAE4\uAAE5\uAAE6\uAAE7\uAAE8"+ - "\uAAE9\uAAEA\uAAEB\uAAEC\uAAED\uAAEE\uAAEF\uAAF0"+ - "\uAAF1\uAAF3\uAAF4\uAAF5\uAAF6\uAAF7\uAAF8\uAAF9"+ - "\uAAFA\uAAFB\uAAFC\uAAFD\uAB41\uAB42\uAB43\uAB44"+ - "\uAB45\uAB46\uAB47\uAB48\uAB49\uAB4A\uAB4B\uAB4C"+ - "\uAB4D\uAB4E\uAB4F\uAB50\uAB51\uAB53\uAB54\uAB55"+ - "\uAB56\uAB57\uAB58\uAB59\uAB5A\uAB5B\uAB5C\uAB5D"+ - "\uAB61\uAB62\uAB63\uAB64\uAB65\uAB66\uAB67\uAB68"+ - "\uAB69\uAB6A\uAB6B\uAB6C\uAB6D\uAB6E\uAB6F\uAB70"+ - "\uAB71\uAB73\uAB74\uAB75\uAB76\uAB77\uAB78\uAB79"+ - "\uAB7A\uAB7B\uAB7C\uAB7D\uAB81\uAB82\uAB83\uAB84"+ - "\uAB85\uAB86\uAB87\uAB88\uAB89\uAB8A\uAB8B\uAB8C"+ - "\uAB8D\uAB8E\uAB8F\uAB90\uAB91\uAB93\uAB94\uAB95"+ - "\uAB96\uAB97\uAB98\uAB99\uAB9A\uAB9B\uAB9C\uAB9D"+ - "\uABA1\uABA2\uABA3\uABA4\uABA5\uABA6\uABA7\uABA8"+ - "\uABA9\uABAA\uABAB\uABAC\uABAD\uABAE\uABAF\uABB0"+ - "\uABB1\uABB3\uABB4\uABB5\uABB6\uABB7\uABB8\uABB9"+ - "\uABBA\uABBB\uABBC\uABBD\uAC61\uAC62\uAC63\uAC64"+ - "\uAC65\uAC66\uAC67\uAC68\uAC69\uAC6A\uAC6B\uAC6C"+ - "\uAC6D\uAC6E\uAC6F\uAC70\uAC71\uAC73\uAC74\uAC75"+ - "\uAC76\uAC77\uAC78\uAC79\uAC7A\uAC7B\uAC7C\uAC7D"+ - "\uAC81\uAC82\uAC83\uAC84\uAC85\uAC86\uAC87\uAC88"+ - "\uAC89\uAC8A\uAC8B\uAC8C\uAC8D\uAC8E\uAC8F\uAC90"+ - "\uAC91\uAC93\uAC94\uAC95\uAC96\uAC97\uAC98\uAC99"+ - "\uAC9A\uAC9B\uAC9C\uAC9D\uACA1\uACA2\uACA3\uACA4"+ - "\uACA5\uACA6\uACA7\uACA8\uACA9\uACAA\uACAB\uACAC"+ - "\uACAD\uACAE\uACAF\uACB0\uACB1\uACB3\uACB4\uACB5"+ - "\uACB6\uACB7\uACB8\uACB9\uACBA\uACBB\uACBC\uACBD"+ - "\uACC1\uACC2\uACC3\uACC4\uACC5\uACC6\uACC7\uACC8"+ - "\uACC9\uACCA\uACCB\uACCC\uACCD\uACCE\uACCF\uACD0"+ - "\uACD1\uACD3\uACD4\uACD5\uACD6\uACD7\uACD8\uACD9"+ - "\uACDA\uACDB\uACDC\uACDD\uACE1\uACE2\uACE3\uACE4"+ - "\uACE5\uACE6\uACE7\uACE8\uACE9\uACEA\uACEB\uACEC"+ - "\uACED\uACEE\uACEF\uACF0\uACF1\uACF3\uACF4\uACF5"+ - "\uACF6\uACF7\uACF8\uACF9\uACFA\uACFB\uACFC\uACFD"+ - "\uAD41\uAD42\uAD43\uAD44\uAD45\uAD46\uAD47\uAD48"+ - "\uAD49\uAD4A\uAD4B\uAD4C\uAD4D\uAD4E\uAD4F\uAD50"+ - "\uAD51\uAD53\uAD54\uAD55\uAD56\uAD57\uAD58\uAD59"+ - "\uAD5A\uAD5B\uAD5C\uAD5D\uAD61\uAD62\uAD63\uAD64"+ - "\uAD65\uAD66\uAD67\uAD68\uAD69\uAD6A\uAD6B\uAD6C"+ - "\uAD6D\uAD6E\uAD6F\uAD70\uAD71\uAD73\uAD74\uAD75"+ - "\uAD76\uAD77\uAD78\uAD79\uAD7A\uAD7B\uAD7C\uAD7D"+ - "\uAD81\uAD82\uAD83\uAD84\uAD85\uAD86\uAD87\uAD88"+ - "\uAD89\uAD8A\uAD8B\uAD8C\uAD8D\uAD8E\uAD8F\uAD90"+ - "\uAD91\uAD93\uAD94\uAD95\uAD96\uAD97\uAD98\uAD99"+ - "\uAD9A\uAD9B\uAD9C\uAD9D\uADA1\uADA2\uADA3\uADA4"+ - "\uADA5\uADA6\uADA7\uADA8\uADA9\uADAA\uADAB\uADAC"+ - "\uADAD\uADAE\uADAF\uADB0\uADB1\uADB3\uADB4\uADB5"+ - "\uADB6\uADB7\uADB8\uADB9\uADBA\uADBB\uADBC\uADBD"+ - "\uADC1\uADC2\uADC3\uADC4\uADC5\uADC6\uADC7\uADC8"+ - "\uADC9\uADCA\uADCB\uADCC\uADCD\uADCE\uADCF\uADD0"+ - "\uADD1\uADD3\uADD4\uADD5\uADD6\uADD7\uADD8\uADD9"+ - "\uADDA\uADDB\uADDC\uADDD\uADE1\uADE2\uADE3\uADE4"+ - "\uADE5\uADE6\uADE7\uADE8\uADE9\uADEA\uADEB\uADEC"+ - "\uADED\uADEE\uADEF\uADF0\uADF1\uADF3\uADF4\uADF5"+ - "\uADF6\uADF7\uADF8\uADF9\uADFA\uADFB\uADFC\uADFD"+ - "\uAE41\uAE42\uAE43\uAE44\uAE45\uAE46\uAE47\uAE48"+ - "\uAE49\uAE4A\uAE4B\uAE4C\uAE4D\uAE4E\uAE4F\uAE50"+ - "\uAE51\uAE53\uAE54\uAE55\uAE56\uAE57\uAE58\uAE59"+ - "\uAE5A\uAE5B\uAE5C\uAE5D\uAE61\uAE62\uAE63\uAE64"+ - "\uAE65\uAE66\uAE67\uAE68\uAE69\uAE6A\uAE6B\uAE6C"+ - "\uAE6D\uAE6E\uAE6F\uAE70\uAE71\uAE73\uAE74\uAE75"+ - "\uAE76\uAE77\uAE78\uAE79\uAE7A\uAE7B\uAE7C\uAE7D"+ - "\uAE81\uAE82\uAE83\uAE84\uAE85\uAE86\uAE87\uAE88"+ - "\uAE89\uAE8A\uAE8B\uAE8C\uAE8D\uAE8E\uAE8F\uAE90"+ - "\uAE91\uAE93\uAE94\uAE95\uAE96\uAE97\uAE98\uAE99"+ - "\uAE9A\uAE9B\uAE9C\uAE9D\uAEA1\uAEA2\uAEA3\uAEA4"+ - "\uAEA5\uAEA6\uAEA7\uAEA8\uAEA9\uAEAA\uAEAB\uAEAC"+ - "\uAEAD\uAEAE\uAEAF\uAEB0\uAEB1\uAEB3\uAEB4\uAEB5"+ - "\uAEB6\uAEB7\uAEB8\uAEB9\uAEBA\uAEBB\uAEBC\uAEBD"+ - "\uAEC1\uAEC2\uAEC3\uAEC4\uAEC5\uAEC6\uAEC7\uAEC8"+ - "\uAEC9\uAECA\uAECB\uAECC\uAECD\uAECE\uAECF\uAED0"+ - "\uAED1\uAED3\uAED4\uAED5\uAED6\uAED7\uAED8\uAED9"+ - "\uAEDA\uAEDB\uAEDC\uAEDD\uAEE1\uAEE2\uAEE3\uAEE4"+ - "\uAEE5\uAEE6\uAEE7\uAEE8\uAEE9\uAEEA\uAEEB\uAEEC"+ - "\uAEED\uAEEE\uAEEF\uAEF0\uAEF1\uAEF3\uAEF4\uAEF5"+ - "\uAEF6\uAEF7\uAEF8\uAEF9\uAEFA\uAEFB\uAEFC\uAEFD"+ - "\uAF41\uAF42\uAF43\uAF44\uAF45\uAF46\uAF47\uAF48"+ - "\uAF49\uAF4A\uAF4B\uAF4C\uAF4D\uAF4E\uAF4F\uAF50"+ - "\uAF51\uAF53\uAF54\uAF55\uAF56\uAF57\uAF58\uAF59"+ - "\uAF5A\uAF5B\uAF5C\uAF5D\uAF61\uAF62\uAF63\uAF64"+ - "\uAF65\uAF66\uAF67\uAF68\uAF69\uAF6A\uAF6B\uAF6C"+ - "\uAF6D\uAF6E\uAF6F\uAF70\uAF71\uAF73\uAF74\uAF75"+ - "\uAF76\uAF77\uAF78\uAF79\uAF7A\uAF7B\uAF7C\uAF7D"+ - "\uAF81\uAF82\uAF83\uAF84\uAF85\uAF86\uAF87\uAF88"+ - "\uAF89\uAF8A\uAF8B\uAF8C\uAF8D\uAF8E\uAF8F\uAF90"+ - "\uAF91\uAF93\uAF94\uAF95\uAF96\uAF97\uAF98\uAF99"+ - "\uAF9A\uAF9B\uAF9C\uAF9D\uAFA1\uAFA2\uAFA3\uAFA4"+ - "\uAFA5\uAFA6\uAFA7\uAFA8\uAFA9\uAFAA\uAFAB\uAFAC"+ - "\uAFAD\uAFAE\uAFAF\uAFB0\uAFB1\uAFB3\uAFB4\uAFB5"+ - "\uAFB6\uAFB7\uAFB8\uAFB9\uAFBA\uAFBB\uAFBC\uAFBD"+ - "\uB061\uB062\uB063\uB064\uB065\uB066\uB067\uB068"+ - "\uB069\uB06A\uB06B\uB06C\uB06D\uB06E\uB06F\uB070"+ - "\uB071\uB073\uB074\uB075\uB076\uB077\uB078\uB079"+ - "\uB07A\uB07B\uB07C\uB07D\uB081\uB082\uB083\uB084"+ - "\uB085\uB086\uB087\uB088\uB089\uB08A\uB08B\uB08C"+ - "\uB08D\uB08E\uB08F\uB090\uB091\uB093\uB094\uB095"+ - "\uB096\uB097\uB098\uB099\uB09A\uB09B\uB09C\uB09D"+ - "\uB0A1\uB0A2\uB0A3\uB0A4\uB0A5\uB0A6\uB0A7\uB0A8"+ - "\uB0A9\uB0AA\uB0AB\uB0AC\uB0AD\uB0AE\uB0AF\uB0B0"+ - "\uB0B1\uB0B3\uB0B4\uB0B5\uB0B6\uB0B7\uB0B8\uB0B9"+ - "\uB0BA\uB0BB\uB0BC\uB0BD\uB0C1\uB0C2\uB0C3\uB0C4"+ - "\uB0C5\uB0C6\uB0C7\uB0C8\uB0C9\uB0CA\uB0CB\uB0CC"+ - "\uB0CD\uB0CE\uB0CF\uB0D0\uB0D1\uB0D3\uB0D4\uB0D5"+ - "\uB0D6\uB0D7\uB0D8\uB0D9\uB0DA\uB0DB\uB0DC\uB0DD"+ - "\uB0E1\uB0E2\uB0E3\uB0E4\uB0E5\uB0E6\uB0E7\uB0E8"+ - "\uB0E9\uB0EA\uB0EB\uB0EC\uB0ED\uB0EE\uB0EF\uB0F0"+ - "\uB0F1\uB0F3\uB0F4\uB0F5\uB0F6\uB0F7\uB0F8\uB0F9"+ - "\uB0FA\uB0FB\uB0FC\uB0FD\uB141\uB142\uB143\uB144"+ - "\uB145\uB146\uB147\uB148\uB149\uB14A\uB14B\uB14C"+ - "\uB14D\uB14E\uB14F\uB150\uB151\uB153\uB154\uB155"+ - "\uB156\uB157\uB158\uB159\uB15A\uB15B\uB15C\uB15D"+ - "\uB161\uB162\uB163\uB164\uB165\uB166\uB167\uB168"+ - "\uB169\uB16A\uB16B\uB16C\uB16D\uB16E\uB16F\uB170"+ - "\uB171\uB173\uB174\uB175\uB176\uB177\uB178\uB179"+ - "\uB17A\uB17B\uB17C\uB17D\uB181\uB182\uB183\uB184"+ - "\uB185\uB186\uB187\uB188\uB189\uB18A\uB18B\uB18C"+ - "\uB18D\uB18E\uB18F\uB190\uB191\uB193\uB194\uB195"+ - "\uB196\uB197\uB198\uB199\uB19A\uB19B\uB19C\uB19D"+ - "\uB1A1\uB1A2\uB1A3\uB1A4\uB1A5\uB1A6\uB1A7\uB1A8"+ - "\uB1A9\uB1AA\uB1AB\uB1AC\uB1AD\uB1AE\uB1AF\uB1B0"+ - "\uB1B1\uB1B3\uB1B4\uB1B5\uB1B6\uB1B7\uB1B8\uB1B9"+ - "\uB1BA\uB1BB\uB1BC\uB1BD\uB1C1\uB1C2\uB1C3\uB1C4"+ - "\uB1C5\uB1C6\uB1C7\uB1C8\uB1C9\uB1CA\uB1CB\uB1CC"+ - "\uB1CD\uB1CE\uB1CF\uB1D0\uB1D1\uB1D3\uB1D4\uB1D5"+ - "\uB1D6\uB1D7\uB1D8\uB1D9\uB1DA\uB1DB\uB1DC\uB1DD"+ - "\uB1E1\uB1E2\uB1E3\uB1E4\uB1E5\uB1E6\uB1E7\uB1E8"+ - "\uB1E9\uB1EA\uB1EB\uB1EC\uB1ED\uB1EE\uB1EF\uB1F0"+ - "\uB1F1\uB1F3\uB1F4\uB1F5\uB1F6\uB1F7\uB1F8\uB1F9"+ - "\uB1FA\uB1FB\uB1FC\uB1FD\uB241\uB242\uB243\uB244"+ - "\uB245\uB246\uB247\uB248\uB249\uB24A\uB24B\uB24C"+ - "\uB24D\uB24E\uB24F\uB250\uB251\uB253\uB254\uB255"+ - "\uB256\uB257\uB258\uB259\uB25A\uB25B\uB25C\uB25D"+ - "\uB261\uB262\uB263\uB264\uB265\uB266\uB267\uB268"+ - "\uB269\uB26A\uB26B\uB26C\uB26D\uB26E\uB26F\uB270"+ - "\uB271\uB273\uB274\uB275\uB276\uB277\uB278\uB279"+ - "\uB27A\uB27B\uB27C\uB27D\uB281\uB282\uB283\uB284"+ - "\uB285\uB286\uB287\uB288\uB289\uB28A\uB28B\uB28C"+ - "\uB28D\uB28E\uB28F\uB290\uB291\uB293\uB294\uB295"+ - "\uB296\uB297\uB298\uB299\uB29A\uB29B\uB29C\uB29D"+ - "\uB2A1\uB2A2\uB2A3\uB2A4\uB2A5\uB2A6\uB2A7\uB2A8"+ - "\uB2A9\uB2AA\uB2AB\uB2AC\uB2AD\uB2AE\uB2AF\uB2B0"+ - "\uB2B1\uB2B3\uB2B4\uB2B5\uB2B6\uB2B7\uB2B8\uB2B9"+ - "\uB2BA\uB2BB\uB2BC\uB2BD\uB2C1\uB2C2\uB2C3\uB2C4"+ - "\uB2C5\uB2C6\uB2C7\uB2C8\uB2C9\uB2CA\uB2CB\uB2CC"+ - "\uB2CD\uB2CE\uB2CF\uB2D0\uB2D1\uB2D3\uB2D4\uB2D5"+ - "\uB2D6\uB2D7\uB2D8\uB2D9\uB2DA\uB2DB\uB2DC\uB2DD"+ - "\uB2E1\uB2E2\uB2E3\uB2E4\uB2E5\uB2E6\uB2E7\uB2E8"+ - "\uB2E9\uB2EA\uB2EB\uB2EC\uB2ED\uB2EE\uB2EF\uB2F0"+ - "\uB2F1\uB2F3\uB2F4\uB2F5\uB2F6\uB2F7\uB2F8\uB2F9"+ - "\uB2FA\uB2FB\uB2FC\uB2FD\uB341\uB342\uB343\uB344"+ - "\uB345\uB346\uB347\uB348\uB349\uB34A\uB34B\uB34C"+ - "\uB34D\uB34E\uB34F\uB350\uB351\uB353\uB354\uB355"+ - "\uB356\uB357\uB358\uB359\uB35A\uB35B\uB35C\uB35D"+ - "\uB361\uB362\uB363\uB364\uB365\uB366\uB367\uB368"+ - "\uB369\uB36A\uB36B\uB36C\uB36D\uB36E\uB36F\uB370"+ - "\uB371\uB373\uB374\uB375\uB376\uB377\uB378\uB379"+ - "\uB37A\uB37B\uB37C\uB37D\uB381\uB382\uB383\uB384"+ - "\uB385\uB386\uB387\uB388\uB389\uB38A\uB38B\uB38C"+ - "\uB38D\uB38E\uB38F\uB390\uB391\uB393\uB394\uB395"+ - "\uB396\uB397\uB398\uB399\uB39A\uB39B\uB39C\uB39D"+ - "\uB3A1\uB3A2\uB3A3\uB3A4\uB3A5\uB3A6\uB3A7\uB3A8"+ - "\uB3A9\uB3AA\uB3AB\uB3AC\uB3AD\uB3AE\uB3AF\uB3B0"+ - "\uB3B1\uB3B3\uB3B4\uB3B5\uB3B6\uB3B7\uB3B8\uB3B9"+ - "\uB3BA\uB3BB\uB3BC\uB3BD\uB461\uB462\uB463\uB464"+ - "\uB465\uB466\uB467\uB468\uB469\uB46A\uB46B\uB46C"+ - "\uB46D\uB46E\uB46F\uB470\uB471\uB473\uB474\uB475"+ - "\uB476\uB477\uB478\uB479\uB47A\uB47B\uB47C\uB47D"+ - "\uB481\uB482\uB483\uB484\uB485\uB486\uB487\uB488"+ - "\uB489\uB48A\uB48B\uB48C\uB48D\uB48E\uB48F\uB490"+ - "\uB491\uB493\uB494\uB495\uB496\uB497\uB498\uB499"+ - "\uB49A\uB49B\uB49C\uB49D\uB4A1\uB4A2\uB4A3\uB4A4"+ - "\uB4A5\uB4A6\uB4A7\uB4A8\uB4A9\uB4AA\uB4AB\uB4AC"+ - "\uB4AD\uB4AE\uB4AF\uB4B0\uB4B1\uB4B3\uB4B4\uB4B5"+ - "\uB4B6\uB4B7\uB4B8\uB4B9\uB4BA\uB4BB\uB4BC\uB4BD"+ - "\uB4C1\uB4C2\uB4C3\uB4C4\uB4C5\uB4C6\uB4C7\uB4C8"+ - "\uB4C9\uB4CA\uB4CB\uB4CC\uB4CD\uB4CE\uB4CF\uB4D0"+ - "\uB4D1\uB4D3\uB4D4\uB4D5\uB4D6\uB4D7\uB4D8\uB4D9"+ - "\uB4DA\uB4DB\uB4DC\uB4DD\uB4E1\uB4E2\uB4E3\uB4E4"+ - "\uB4E5\uB4E6\uB4E7\uB4E8\uB4E9\uB4EA\uB4EB\uB4EC"+ - "\uB4ED\uB4EE\uB4EF\uB4F0\uB4F1\uB4F3\uB4F4\uB4F5"+ - "\uB4F6\uB4F7\uB4F8\uB4F9\uB4FA\uB4FB\uB4FC\uB4FD"+ - "\uB541\uB542\uB543\uB544\uB545\uB546\uB547\uB548"+ - "\uB549\uB54A\uB54B\uB54C\uB54D\uB54E\uB54F\uB550"+ - "\uB551\uB553\uB554\uB555\uB556\uB557\uB558\uB559"+ - "\uB55A\uB55B\uB55C\uB55D\uB561\uB562\uB563\uB564"+ - "\uB565\uB566\uB567\uB568\uB569\uB56A\uB56B\uB56C"+ - "\uB56D\uB56E\uB56F\uB570\uB571\uB573\uB574\uB575"+ - "\uB576\uB577\uB578\uB579\uB57A\uB57B\uB57C\uB57D"+ - "\uB581\uB582\uB583\uB584\uB585\uB586\uB587\uB588"+ - "\uB589\uB58A\uB58B\uB58C\uB58D\uB58E\uB58F\uB590"+ - "\uB591\uB593\uB594\uB595\uB596\uB597\uB598\uB599"+ - "\uB59A\uB59B\uB59C\uB59D\uB5A1\uB5A2\uB5A3\uB5A4"+ - "\uB5A5\uB5A6\uB5A7\uB5A8\uB5A9\uB5AA\uB5AB\uB5AC"+ - "\uB5AD\uB5AE\uB5AF\uB5B0\uB5B1\uB5B3\uB5B4\uB5B5"+ - "\uB5B6\uB5B7\uB5B8\uB5B9\uB5BA\uB5BB\uB5BC\uB5BD"+ - "\uB5C1\uB5C2\uB5C3\uB5C4\uB5C5\uB5C6\uB5C7\uB5C8"+ - "\uB5C9\uB5CA\uB5CB\uB5CC\uB5CD\uB5CE\uB5CF\uB5D0"+ - "\uB5D1\uB5D3\uB5D4\uB5D5\uB5D6\uB5D7\uB5D8\uB5D9"+ - "\uB5DA\uB5DB\uB5DC\uB5DD\uB5E1\uB5E2\uB5E3\uB5E4"+ - "\uB5E5\uB5E6\uB5E7\uB5E8\uB5E9\uB5EA\uB5EB\uB5EC"+ - "\uB5ED\uB5EE\uB5EF\uB5F0\uB5F1\uB5F3\uB5F4\uB5F5"+ - "\uB5F6\uB5F7\uB5F8\uB5F9\uB5FA\uB5FB\uB5FC\uB5FD"+ - "\uB641\uB642\uB643\uB644\uB645\uB646\uB647\uB648"+ - "\uB649\uB64A\uB64B\uB64C\uB64D\uB64E\uB64F\uB650"+ - "\uB651\uB653\uB654\uB655\uB656\uB657\uB658\uB659"+ - "\uB65A\uB65B\uB65C\uB65D\uB661\uB662\uB663\uB664"+ - "\uB665\uB666\uB667\uB668\uB669\uB66A\uB66B\uB66C"+ - "\uB66D\uB66E\uB66F\uB670\uB671\uB673\uB674\uB675"+ - "\uB676\uB677\uB678\uB679\uB67A\uB67B\uB67C\uB67D"+ - "\uB681\uB682\uB683\uB684\uB685\uB686\uB687\uB688"+ - "\uB689\uB68A\uB68B\uB68C\uB68D\uB68E\uB68F\uB690"+ - "\uB691\uB693\uB694\uB695\uB696\uB697\uB698\uB699"+ - "\uB69A\uB69B\uB69C\uB69D\uB6A1\uB6A2\uB6A3\uB6A4"+ - "\uB6A5\uB6A6\uB6A7\uB6A8\uB6A9\uB6AA\uB6AB\uB6AC"+ - "\uB6AD\uB6AE\uB6AF\uB6B0\uB6B1\uB6B3\uB6B4\uB6B5"+ - "\uB6B6\uB6B7\uB6B8\uB6B9\uB6BA\uB6BB\uB6BC\uB6BD"+ - "\uB6C1\uB6C2\uB6C3\uB6C4\uB6C5\uB6C6\uB6C7\uB6C8"+ - "\uB6C9\uB6CA\uB6CB\uB6CC\uB6CD\uB6CE\uB6CF\uB6D0"+ - "\uB6D1\uB6D3\uB6D4\uB6D5\uB6D6\uB6D7\uB6D8\uB6D9"+ - "\uB6DA\uB6DB\uB6DC\uB6DD\uB6E1\uB6E2\uB6E3\uB6E4"+ - "\uB6E5\uB6E6\uB6E7\uB6E8\uB6E9\uB6EA\uB6EB\uB6EC"+ - "\uB6ED\uB6EE\uB6EF\uB6F0\uB6F1\uB6F3\uB6F4\uB6F5"+ - "\uB6F6\uB6F7\uB6F8\uB6F9\uB6FA\uB6FB\uB6FC\uB6FD"+ - "\uB741\uB742\uB743\uB744\uB745\uB746\uB747\uB748"+ - "\uB749\uB74A\uB74B\uB74C\uB74D\uB74E\uB74F\uB750"+ - "\uB751\uB753\uB754\uB755\uB756\uB757\uB758\uB759"+ - "\uB75A\uB75B\uB75C\uB75D\uB761\uB762\uB763\uB764"+ - "\uB765\uB766\uB767\uB768\uB769\uB76A\uB76B\uB76C"+ - "\uB76D\uB76E\uB76F\uB770\uB771\uB773\uB774\uB775"+ - "\uB776\uB777\uB778\uB779\uB77A\uB77B\uB77C\uB77D"+ - "\uB781\uB782\uB783\uB784\uB785\uB786\uB787\uB788"+ - "\uB789\uB78A\uB78B\uB78C\uB78D\uB78E\uB78F\uB790"+ - "\uB791\uB793\uB794\uB795\uB796\uB797\uB798\uB799"+ - "\uB79A\uB79B\uB79C\uB79D\uB7A1\uB7A2\uB7A3\uB7A4"+ - "\uB7A5\uB7A6\uB7A7\uB7A8\uB7A9\uB7AA\uB7AB\uB7AC"+ - "\uB7AD\uB7AE\uB7AF\uB7B0\uB7B1\uB7B3\uB7B4\uB7B5"+ - "\uB7B6\uB7B7\uB7B8\uB7B9\uB7BA\uB7BB\uB7BC\uB7BD"+ - "\uB861\uB862\uB863\uB864\uB865\uB866\uB867\uB868"+ - "\uB869\uB86A\uB86B\uB86C\uB86D\uB86E\uB86F\uB870"+ - "\uB871\uB873\uB874\uB875\uB876\uB877\uB878\uB879"+ - "\uB87A\uB87B\uB87C\uB87D\uB881\uB882\uB883\uB884"+ - "\uB885\uB886\uB887\uB888\uB889\uB88A\uB88B\uB88C"+ - "\uB88D\uB88E\uB88F\uB890\uB891\uB893\uB894\uB895"+ - "\uB896\uB897\uB898\uB899\uB89A\uB89B\uB89C\uB89D"+ - "\uB8A1\uB8A2\uB8A3\uB8A4\uB8A5\uB8A6\uB8A7\uB8A8"+ - "\uB8A9\uB8AA\uB8AB\uB8AC\uB8AD\uB8AE\uB8AF\uB8B0"+ - "\uB8B1\uB8B3\uB8B4\uB8B5\uB8B6\uB8B7\uB8B8\uB8B9"+ - "\uB8BA\uB8BB\uB8BC\uB8BD\uB8C1\uB8C2\uB8C3\uB8C4"+ - "\uB8C5\uB8C6\uB8C7\uB8C8\uB8C9\uB8CA\uB8CB\uB8CC"+ - "\uB8CD\uB8CE\uB8CF\uB8D0\uB8D1\uB8D3\uB8D4\uB8D5"+ - "\uB8D6\uB8D7\uB8D8\uB8D9\uB8DA\uB8DB\uB8DC\uB8DD"+ - "\uB8E1\uB8E2\uB8E3\uB8E4\uB8E5\uB8E6\uB8E7\uB8E8"+ - "\uB8E9\uB8EA\uB8EB\uB8EC\uB8ED\uB8EE\uB8EF\uB8F0"+ - "\uB8F1\uB8F3\uB8F4\uB8F5\uB8F6\uB8F7\uB8F8\uB8F9"+ - "\uB8FA\uB8FB\uB8FC\uB8FD\uB941\uB942\uB943\uB944"+ - "\uB945\uB946\uB947\uB948\uB949\uB94A\uB94B\uB94C"+ - "\uB94D\uB94E\uB94F\uB950\uB951\uB953\uB954\uB955"+ - "\uB956\uB957\uB958\uB959\uB95A\uB95B\uB95C\uB95D"+ - "\uB961\uB962\uB963\uB964\uB965\uB966\uB967\uB968"+ - "\uB969\uB96A\uB96B\uB96C\uB96D\uB96E\uB96F\uB970"+ - "\uB971\uB973\uB974\uB975\uB976\uB977\uB978\uB979"+ - "\uB97A\uB97B\uB97C\uB97D\uB981\uB982\uB983\uB984"+ - "\uB985\uB986\uB987\uB988\uB989\uB98A\uB98B\uB98C"+ - "\uB98D\uB98E\uB98F\uB990\uB991\uB993\uB994\uB995"+ - "\uB996\uB997\uB998\uB999\uB99A\uB99B\uB99C\uB99D"+ - "\uB9A1\uB9A2\uB9A3\uB9A4\uB9A5\uB9A6\uB9A7\uB9A8"+ - "\uB9A9\uB9AA\uB9AB\uB9AC\uB9AD\uB9AE\uB9AF\uB9B0"+ - "\uB9B1\uB9B3\uB9B4\uB9B5\uB9B6\uB9B7\uB9B8\uB9B9"+ - "\uB9BA\uB9BB\uB9BC\uB9BD\uB9C1\uB9C2\uB9C3\uB9C4"+ - "\uB9C5\uB9C6\uB9C7\uB9C8\uB9C9\uB9CA\uB9CB\uB9CC"+ - "\uB9CD\uB9CE\uB9CF\uB9D0\uB9D1\uB9D3\uB9D4\uB9D5"+ - "\uB9D6\uB9D7\uB9D8\uB9D9\uB9DA\uB9DB\uB9DC\uB9DD"+ - "\uB9E1\uB9E2\uB9E3\uB9E4\uB9E5\uB9E6\uB9E7\uB9E8"+ - "\uB9E9\uB9EA\uB9EB\uB9EC\uB9ED\uB9EE\uB9EF\uB9F0"+ - "\uB9F1\uB9F3\uB9F4\uB9F5\uB9F6\uB9F7\uB9F8\uB9F9"+ - "\uB9FA\uB9FB\uB9FC\uB9FD\uBA41\uBA42\uBA43\uBA44"+ - "\uBA45\uBA46\uBA47\uBA48\uBA49\uBA4A\uBA4B\uBA4C"+ - "\uBA4D\uBA4E\uBA4F\uBA50\uBA51\uBA53\uBA54\uBA55"+ - "\uBA56\uBA57\uBA58\uBA59\uBA5A\uBA5B\uBA5C\uBA5D"+ - "\uBA61\uBA62\uBA63\uBA64\uBA65\uBA66\uBA67\uBA68"+ - "\uBA69\uBA6A\uBA6B\uBA6C\uBA6D\uBA6E\uBA6F\uBA70"+ - "\uBA71\uBA73\uBA74\uBA75\uBA76\uBA77\uBA78\uBA79"+ - "\uBA7A\uBA7B\uBA7C\uBA7D\uBA81\uBA82\uBA83\uBA84"; - - private final static String innerIndex8= - "\uBA85\uBA86\uBA87\uBA88\uBA89\uBA8A\uBA8B\uBA8C"+ - "\uBA8D\uBA8E\uBA8F\uBA90\uBA91\uBA93\uBA94\uBA95"+ - "\uBA96\uBA97\uBA98\uBA99\uBA9A\uBA9B\uBA9C\uBA9D"+ - "\uBAA1\uBAA2\uBAA3\uBAA4\uBAA5\uBAA6\uBAA7\uBAA8"+ - "\uBAA9\uBAAA\uBAAB\uBAAC\uBAAD\uBAAE\uBAAF\uBAB0"+ - "\uBAB1\uBAB3\uBAB4\uBAB5\uBAB6\uBAB7\uBAB8\uBAB9"+ - "\uBABA\uBABB\uBABC\uBABD\uBAC1\uBAC2\uBAC3\uBAC4"+ - "\uBAC5\uBAC6\uBAC7\uBAC8\uBAC9\uBACA\uBACB\uBACC"+ - "\uBACD\uBACE\uBACF\uBAD0\uBAD1\uBAD3\uBAD4\uBAD5"+ - "\uBAD6\uBAD7\uBAD8\uBAD9\uBADA\uBADB\uBADC\uBADD"+ - "\uBAE1\uBAE2\uBAE3\uBAE4\uBAE5\uBAE6\uBAE7\uBAE8"+ - "\uBAE9\uBAEA\uBAEB\uBAEC\uBAED\uBAEE\uBAEF\uBAF0"+ - "\uBAF1\uBAF3\uBAF4\uBAF5\uBAF6\uBAF7\uBAF8\uBAF9"+ - "\uBAFA\uBAFB\uBAFC\uBAFD\uBB41\uBB42\uBB43\uBB44"+ - "\uBB45\uBB46\uBB47\uBB48\uBB49\uBB4A\uBB4B\uBB4C"+ - "\uBB4D\uBB4E\uBB4F\uBB50\uBB51\uBB53\uBB54\uBB55"+ - "\uBB56\uBB57\uBB58\uBB59\uBB5A\uBB5B\uBB5C\uBB5D"+ - "\uBB61\uBB62\uBB63\uBB64\uBB65\uBB66\uBB67\uBB68"+ - "\uBB69\uBB6A\uBB6B\uBB6C\uBB6D\uBB6E\uBB6F\uBB70"+ - "\uBB71\uBB73\uBB74\uBB75\uBB76\uBB77\uBB78\uBB79"+ - "\uBB7A\uBB7B\uBB7C\uBB7D\uBB81\uBB82\uBB83\uBB84"+ - "\uBB85\uBB86\uBB87\uBB88\uBB89\uBB8A\uBB8B\uBB8C"+ - "\uBB8D\uBB8E\uBB8F\uBB90\uBB91\uBB93\uBB94\uBB95"+ - "\uBB96\uBB97\uBB98\uBB99\uBB9A\uBB9B\uBB9C\uBB9D"+ - "\uBBA1\uBBA2\uBBA3\uBBA4\uBBA5\uBBA6\uBBA7\uBBA8"+ - "\uBBA9\uBBAA\uBBAB\uBBAC\uBBAD\uBBAE\uBBAF\uBBB0"+ - "\uBBB1\uBBB3\uBBB4\uBBB5\uBBB6\uBBB7\uBBB8\uBBB9"+ - "\uBBBA\uBBBB\uBBBC\uBBBD\uBC61\uBC62\uBC63\uBC64"+ - "\uBC65\uBC66\uBC67\uBC68\uBC69\uBC6A\uBC6B\uBC6C"+ - "\uBC6D\uBC6E\uBC6F\uBC70\uBC71\uBC73\uBC74\uBC75"+ - "\uBC76\uBC77\uBC78\uBC79\uBC7A\uBC7B\uBC7C\uBC7D"+ - "\uBC81\uBC82\uBC83\uBC84\uBC85\uBC86\uBC87\uBC88"+ - "\uBC89\uBC8A\uBC8B\uBC8C\uBC8D\uBC8E\uBC8F\uBC90"+ - "\uBC91\uBC93\uBC94\uBC95\uBC96\uBC97\uBC98\uBC99"+ - "\uBC9A\uBC9B\uBC9C\uBC9D\uBCA1\uBCA2\uBCA3\uBCA4"+ - "\uBCA5\uBCA6\uBCA7\uBCA8\uBCA9\uBCAA\uBCAB\uBCAC"+ - "\uBCAD\uBCAE\uBCAF\uBCB0\uBCB1\uBCB3\uBCB4\uBCB5"+ - "\uBCB6\uBCB7\uBCB8\uBCB9\uBCBA\uBCBB\uBCBC\uBCBD"+ - "\uBCC1\uBCC2\uBCC3\uBCC4\uBCC5\uBCC6\uBCC7\uBCC8"+ - "\uBCC9\uBCCA\uBCCB\uBCCC\uBCCD\uBCCE\uBCCF\uBCD0"+ - "\uBCD1\uBCD3\uBCD4\uBCD5\uBCD6\uBCD7\uBCD8\uBCD9"+ - "\uBCDA\uBCDB\uBCDC\uBCDD\uBCE1\uBCE2\uBCE3\uBCE4"+ - "\uBCE5\uBCE6\uBCE7\uBCE8\uBCE9\uBCEA\uBCEB\uBCEC"+ - "\uBCED\uBCEE\uBCEF\uBCF0\uBCF1\uBCF3\uBCF4\uBCF5"+ - "\uBCF6\uBCF7\uBCF8\uBCF9\uBCFA\uBCFB\uBCFC\uBCFD"+ - "\uBD41\uBD42\uBD43\uBD44\uBD45\uBD46\uBD47\uBD48"+ - "\uBD49\uBD4A\uBD4B\uBD4C\uBD4D\uBD4E\uBD4F\uBD50"+ - "\uBD51\uBD53\uBD54\uBD55\uBD56\uBD57\uBD58\uBD59"+ - "\uBD5A\uBD5B\uBD5C\uBD5D\uBD61\uBD62\uBD63\uBD64"+ - "\uBD65\uBD66\uBD67\uBD68\uBD69\uBD6A\uBD6B\uBD6C"+ - "\uBD6D\uBD6E\uBD6F\uBD70\uBD71\uBD73\uBD74\uBD75"+ - "\uBD76\uBD77\uBD78\uBD79\uBD7A\uBD7B\uBD7C\uBD7D"+ - "\uBD81\uBD82\uBD83\uBD84\uBD85\uBD86\uBD87\uBD88"+ - "\uBD89\uBD8A\uBD8B\uBD8C\uBD8D\uBD8E\uBD8F\uBD90"+ - "\uBD91\uBD93\uBD94\uBD95\uBD96\uBD97\uBD98\uBD99"+ - "\uBD9A\uBD9B\uBD9C\uBD9D\uBDA1\uBDA2\uBDA3\uBDA4"+ - "\uBDA5\uBDA6\uBDA7\uBDA8\uBDA9\uBDAA\uBDAB\uBDAC"+ - "\uBDAD\uBDAE\uBDAF\uBDB0\uBDB1\uBDB3\uBDB4\uBDB5"+ - "\uBDB6\uBDB7\uBDB8\uBDB9\uBDBA\uBDBB\uBDBC\uBDBD"+ - "\uBDC1\uBDC2\uBDC3\uBDC4\uBDC5\uBDC6\uBDC7\uBDC8"+ - "\uBDC9\uBDCA\uBDCB\uBDCC\uBDCD\uBDCE\uBDCF\uBDD0"+ - "\uBDD1\uBDD3\uBDD4\uBDD5\uBDD6\uBDD7\uBDD8\uBDD9"+ - "\uBDDA\uBDDB\uBDDC\uBDDD\uBDE1\uBDE2\uBDE3\uBDE4"+ - "\uBDE5\uBDE6\uBDE7\uBDE8\uBDE9\uBDEA\uBDEB\uBDEC"+ - "\uBDED\uBDEE\uBDEF\uBDF0\uBDF1\uBDF3\uBDF4\uBDF5"+ - "\uBDF6\uBDF7\uBDF8\uBDF9\uBDFA\uBDFB\uBDFC\uBDFD"+ - "\uBE41\uBE42\uBE43\uBE44\uBE45\uBE46\uBE47\uBE48"+ - "\uBE49\uBE4A\uBE4B\uBE4C\uBE4D\uBE4E\uBE4F\uBE50"+ - "\uBE51\uBE53\uBE54\uBE55\uBE56\uBE57\uBE58\uBE59"+ - "\uBE5A\uBE5B\uBE5C\uBE5D\uBE61\uBE62\uBE63\uBE64"+ - "\uBE65\uBE66\uBE67\uBE68\uBE69\uBE6A\uBE6B\uBE6C"+ - "\uBE6D\uBE6E\uBE6F\uBE70\uBE71\uBE73\uBE74\uBE75"+ - "\uBE76\uBE77\uBE78\uBE79\uBE7A\uBE7B\uBE7C\uBE7D"+ - "\uBE81\uBE82\uBE83\uBE84\uBE85\uBE86\uBE87\uBE88"+ - "\uBE89\uBE8A\uBE8B\uBE8C\uBE8D\uBE8E\uBE8F\uBE90"+ - "\uBE91\uBE93\uBE94\uBE95\uBE96\uBE97\uBE98\uBE99"+ - "\uBE9A\uBE9B\uBE9C\uBE9D\uBEA1\uBEA2\uBEA3\uBEA4"+ - "\uBEA5\uBEA6\uBEA7\uBEA8\uBEA9\uBEAA\uBEAB\uBEAC"+ - "\uBEAD\uBEAE\uBEAF\uBEB0\uBEB1\uBEB3\uBEB4\uBEB5"+ - "\uBEB6\uBEB7\uBEB8\uBEB9\uBEBA\uBEBB\uBEBC\uBEBD"+ - "\uBEC1\uBEC2\uBEC3\uBEC4\uBEC5\uBEC6\uBEC7\uBEC8"+ - "\uBEC9\uBECA\uBECB\uBECC\uBECD\uBECE\uBECF\uBED0"+ - "\uBED1\uBED3\uBED4\uBED5\uBED6\uBED7\uBED8\uBED9"+ - "\uBEDA\uBEDB\uBEDC\uBEDD\uBEE1\uBEE2\uBEE3\uBEE4"+ - "\uBEE5\uBEE6\uBEE7\uBEE8\uBEE9\uBEEA\uBEEB\uBEEC"+ - "\uBEED\uBEEE\uBEEF\uBEF0\uBEF1\uBEF3\uBEF4\uBEF5"+ - "\uBEF6\uBEF7\uBEF8\uBEF9\uBEFA\uBEFB\uBEFC\uBEFD"+ - "\uBF41\uBF42\uBF43\uBF44\uBF45\uBF46\uBF47\uBF48"+ - "\uBF49\uBF4A\uBF4B\uBF4C\uBF4D\uBF4E\uBF4F\uBF50"+ - "\uBF51\uBF53\uBF54\uBF55\uBF56\uBF57\uBF58\uBF59"+ - "\uBF5A\uBF5B\uBF5C\uBF5D\uBF61\uBF62\uBF63\uBF64"+ - "\uBF65\uBF66\uBF67\uBF68\uBF69\uBF6A\uBF6B\uBF6C"+ - "\uBF6D\uBF6E\uBF6F\uBF70\uBF71\uBF73\uBF74\uBF75"+ - "\uBF76\uBF77\uBF78\uBF79\uBF7A\uBF7B\uBF7C\uBF7D"+ - "\uBF81\uBF82\uBF83\uBF84\uBF85\uBF86\uBF87\uBF88"+ - "\uBF89\uBF8A\uBF8B\uBF8C\uBF8D\uBF8E\uBF8F\uBF90"+ - "\uBF91\uBF93\uBF94\uBF95\uBF96\uBF97\uBF98\uBF99"+ - "\uBF9A\uBF9B\uBF9C\uBF9D\uBFA1\uBFA2\uBFA3\uBFA4"+ - "\uBFA5\uBFA6\uBFA7\uBFA8\uBFA9\uBFAA\uBFAB\uBFAC"+ - "\uBFAD\uBFAE\uBFAF\uBFB0\uBFB1\uBFB3\uBFB4\uBFB5"+ - "\uBFB6\uBFB7\uBFB8\uBFB9\uBFBA\uBFBB\uBFBC\uBFBD"+ - "\uC061\uC062\uC063\uC064\uC065\uC066\uC067\uC068"+ - "\uC069\uC06A\uC06B\uC06C\uC06D\uC06E\uC06F\uC070"+ - "\uC071\uC073\uC074\uC075\uC076\uC077\uC078\uC079"+ - "\uC07A\uC07B\uC07C\uC07D\uC081\uC082\uC083\uC084"+ - "\uC085\uC086\uC087\uC088\uC089\uC08A\uC08B\uC08C"+ - "\uC08D\uC08E\uC08F\uC090\uC091\uC093\uC094\uC095"+ - "\uC096\uC097\uC098\uC099\uC09A\uC09B\uC09C\uC09D"+ - "\uC0A1\uC0A2\uC0A3\uC0A4\uC0A5\uC0A6\uC0A7\uC0A8"+ - "\uC0A9\uC0AA\uC0AB\uC0AC\uC0AD\uC0AE\uC0AF\uC0B0"+ - "\uC0B1\uC0B3\uC0B4\uC0B5\uC0B6\uC0B7\uC0B8\uC0B9"+ - "\uC0BA\uC0BB\uC0BC\uC0BD\uC0C1\uC0C2\uC0C3\uC0C4"+ - "\uC0C5\uC0C6\uC0C7\uC0C8\uC0C9\uC0CA\uC0CB\uC0CC"+ - "\uC0CD\uC0CE\uC0CF\uC0D0\uC0D1\uC0D3\uC0D4\uC0D5"+ - "\uC0D6\uC0D7\uC0D8\uC0D9\uC0DA\uC0DB\uC0DC\uC0DD"+ - "\uC0E1\uC0E2\uC0E3\uC0E4\uC0E5\uC0E6\uC0E7\uC0E8"+ - "\uC0E9\uC0EA\uC0EB\uC0EC\uC0ED\uC0EE\uC0EF\uC0F0"+ - "\uC0F1\uC0F3\uC0F4\uC0F5\uC0F6\uC0F7\uC0F8\uC0F9"+ - "\uC0FA\uC0FB\uC0FC\uC0FD\uC141\uC142\uC143\uC144"+ - "\uC145\uC146\uC147\uC148\uC149\uC14A\uC14B\uC14C"+ - "\uC14D\uC14E\uC14F\uC150\uC151\uC153\uC154\uC155"+ - "\uC156\uC157\uC158\uC159\uC15A\uC15B\uC15C\uC15D"+ - "\uC161\uC162\uC163\uC164\uC165\uC166\uC167\uC168"+ - "\uC169\uC16A\uC16B\uC16C\uC16D\uC16E\uC16F\uC170"+ - "\uC171\uC173\uC174\uC175\uC176\uC177\uC178\uC179"+ - "\uC17A\uC17B\uC17C\uC17D\uC181\uC182\uC183\uC184"+ - "\uC185\uC186\uC187\uC188\uC189\uC18A\uC18B\uC18C"+ - "\uC18D\uC18E\uC18F\uC190\uC191\uC193\uC194\uC195"+ - "\uC196\uC197\uC198\uC199\uC19A\uC19B\uC19C\uC19D"+ - "\uC1A1\uC1A2\uC1A3\uC1A4\uC1A5\uC1A6\uC1A7\uC1A8"+ - "\uC1A9\uC1AA\uC1AB\uC1AC\uC1AD\uC1AE\uC1AF\uC1B0"+ - "\uC1B1\uC1B3\uC1B4\uC1B5\uC1B6\uC1B7\uC1B8\uC1B9"+ - "\uC1BA\uC1BB\uC1BC\uC1BD\uC1C1\uC1C2\uC1C3\uC1C4"+ - "\uC1C5\uC1C6\uC1C7\uC1C8\uC1C9\uC1CA\uC1CB\uC1CC"+ - "\uC1CD\uC1CE\uC1CF\uC1D0\uC1D1\uC1D3\uC1D4\uC1D5"+ - "\uC1D6\uC1D7\uC1D8\uC1D9\uC1DA\uC1DB\uC1DC\uC1DD"+ - "\uC1E1\uC1E2\uC1E3\uC1E4\uC1E5\uC1E6\uC1E7\uC1E8"+ - "\uC1E9\uC1EA\uC1EB\uC1EC\uC1ED\uC1EE\uC1EF\uC1F0"+ - "\uC1F1\uC1F3\uC1F4\uC1F5\uC1F6\uC1F7\uC1F8\uC1F9"+ - "\uC1FA\uC1FB\uC1FC\uC1FD\uC241\uC242\uC243\uC244"+ - "\uC245\uC246\uC247\uC248\uC249\uC24A\uC24B\uC24C"+ - "\uC24D\uC24E\uC24F\uC250\uC251\uC253\uC254\uC255"+ - "\uC256\uC257\uC258\uC259\uC25A\uC25B\uC25C\uC25D"+ - "\uC261\uC262\uC263\uC264\uC265\uC266\uC267\uC268"+ - "\uC269\uC26A\uC26B\uC26C\uC26D\uC26E\uC26F\uC270"+ - "\uC271\uC273\uC274\uC275\uC276\uC277\uC278\uC279"+ - "\uC27A\uC27B\uC27C\uC27D\uC281\uC282\uC283\uC284"+ - "\uC285\uC286\uC287\uC288\uC289\uC28A\uC28B\uC28C"+ - "\uC28D\uC28E\uC28F\uC290\uC291\uC293\uC294\uC295"+ - "\uC296\uC297\uC298\uC299\uC29A\uC29B\uC29C\uC29D"+ - "\uC2A1\uC2A2\uC2A3\uC2A4\uC2A5\uC2A6\uC2A7\uC2A8"+ - "\uC2A9\uC2AA\uC2AB\uC2AC\uC2AD\uC2AE\uC2AF\uC2B0"+ - "\uC2B1\uC2B3\uC2B4\uC2B5\uC2B6\uC2B7\uC2B8\uC2B9"+ - "\uC2BA\uC2BB\uC2BC\uC2BD\uC2C1\uC2C2\uC2C3\uC2C4"+ - "\uC2C5\uC2C6\uC2C7\uC2C8\uC2C9\uC2CA\uC2CB\uC2CC"+ - "\uC2CD\uC2CE\uC2CF\uC2D0\uC2D1\uC2D3\uC2D4\uC2D5"+ - "\uC2D6\uC2D7\uC2D8\uC2D9\uC2DA\uC2DB\uC2DC\uC2DD"+ - "\uC2E1\uC2E2\uC2E3\uC2E4\uC2E5\uC2E6\uC2E7\uC2E8"+ - "\uC2E9\uC2EA\uC2EB\uC2EC\uC2ED\uC2EE\uC2EF\uC2F0"+ - "\uC2F1\uC2F3\uC2F4\uC2F5\uC2F6\uC2F7\uC2F8\uC2F9"+ - "\uC2FA\uC2FB\uC2FC\uC2FD\uC341\uC342\uC343\uC344"+ - "\uC345\uC346\uC347\uC348\uC349\uC34A\uC34B\uC34C"+ - "\uC34D\uC34E\uC34F\uC350\uC351\uC353\uC354\uC355"+ - "\uC356\uC357\uC358\uC359\uC35A\uC35B\uC35C\uC35D"+ - "\uC361\uC362\uC363\uC364\uC365\uC366\uC367\uC368"+ - "\uC369\uC36A\uC36B\uC36C\uC36D\uC36E\uC36F\uC370"+ - "\uC371\uC373\uC374\uC375\uC376\uC377\uC378\uC379"+ - "\uC37A\uC37B\uC37C\uC37D\uC381\uC382\uC383\uC384"+ - "\uC385\uC386\uC387\uC388\uC389\uC38A\uC38B\uC38C"+ - "\uC38D\uC38E\uC38F\uC390\uC391\uC393\uC394\uC395"+ - "\uC396\uC397\uC398\uC399\uC39A\uC39B\uC39C\uC39D"+ - "\uC3A1\uC3A2\uC3A3\uC3A4\uC3A5\uC3A6\uC3A7\uC3A8"+ - "\uC3A9\uC3AA\uC3AB\uC3AC\uC3AD\uC3AE\uC3AF\uC3B0"+ - "\uC3B1\uC3B3\uC3B4\uC3B5\uC3B6\uC3B7\uC3B8\uC3B9"+ - "\uC3BA\uC3BB\uC3BC\uC3BD\uC461\uC462\uC463\uC464"+ - "\uC465\uC466\uC467\uC468\uC469\uC46A\uC46B\uC46C"+ - "\uC46D\uC46E\uC46F\uC470\uC471\uC473\uC474\uC475"+ - "\uC476\uC477\uC478\uC479\uC47A\uC47B\uC47C\uC47D"+ - "\uC481\uC482\uC483\uC484\uC485\uC486\uC487\uC488"+ - "\uC489\uC48A\uC48B\uC48C\uC48D\uC48E\uC48F\uC490"+ - "\uC491\uC493\uC494\uC495\uC496\uC497\uC498\uC499"+ - "\uC49A\uC49B\uC49C\uC49D\uC4A1\uC4A2\uC4A3\uC4A4"+ - "\uC4A5\uC4A6\uC4A7\uC4A8\uC4A9\uC4AA\uC4AB\uC4AC"+ - "\uC4AD\uC4AE\uC4AF\uC4B0\uC4B1\uC4B3\uC4B4\uC4B5"+ - "\uC4B6\uC4B7\uC4B8\uC4B9\uC4BA\uC4BB\uC4BC\uC4BD"+ - "\uC4C1\uC4C2\uC4C3\uC4C4\uC4C5\uC4C6\uC4C7\uC4C8"+ - "\uC4C9\uC4CA\uC4CB\uC4CC\uC4CD\uC4CE\uC4CF\uC4D0"+ - "\uC4D1\uC4D3\uC4D4\uC4D5\uC4D6\uC4D7\uC4D8\uC4D9"+ - "\uC4DA\uC4DB\uC4DC\uC4DD\uC4E1\uC4E2\uC4E3\uC4E4"+ - "\uC4E5\uC4E6\uC4E7\uC4E8\uC4E9\uC4EA\uC4EB\uC4EC"+ - "\uC4ED\uC4EE\uC4EF\uC4F0\uC4F1\uC4F3\uC4F4\uC4F5"+ - "\uC4F6\uC4F7\uC4F8\uC4F9\uC4FA\uC4FB\uC4FC\uC4FD"+ - "\uC541\uC542\uC543\uC544\uC545\uC546\uC547\uC548"+ - "\uC549\uC54A\uC54B\uC54C\uC54D\uC54E\uC54F\uC550"+ - "\uC551\uC553\uC554\uC555\uC556\uC557\uC558\uC559"+ - "\uC55A\uC55B\uC55C\uC55D\uC561\uC562\uC563\uC564"+ - "\uC565\uC566\uC567\uC568\uC569\uC56A\uC56B\uC56C"+ - "\uC56D\uC56E\uC56F\uC570\uC571\uC573\uC574\uC575"+ - "\uC576\uC577\uC578\uC579\uC57A\uC57B\uC57C\uC57D"+ - "\uC581\uC582\uC583\uC584\uC585\uC586\uC587\uC588"+ - "\uC589\uC58A\uC58B\uC58C\uC58D\uC58E\uC58F\uC590"+ - "\uC591\uC593\uC594\uC595\uC596\uC597\uC598\uC599"+ - "\uC59A\uC59B\uC59C\uC59D\uC5A1\uC5A2\uC5A3\uC5A4"+ - "\uC5A5\uC5A6\uC5A7\uC5A8\uC5A9\uC5AA\uC5AB\uC5AC"+ - "\uC5AD\uC5AE\uC5AF\uC5B0\uC5B1\uC5B3\uC5B4\uC5B5"+ - "\uC5B6\uC5B7\uC5B8\uC5B9\uC5BA\uC5BB\uC5BC\uC5BD"+ - "\uC5C1\uC5C2\uC5C3\uC5C4\uC5C5\uC5C6\uC5C7\uC5C8"+ - "\uC5C9\uC5CA\uC5CB\uC5CC\uC5CD\uC5CE\uC5CF\uC5D0"+ - "\uC5D1\uC5D3\uC5D4\uC5D5\uC5D6\uC5D7\uC5D8\uC5D9"+ - "\uC5DA\uC5DB\uC5DC\uC5DD\uC5E1\uC5E2\uC5E3\uC5E4"+ - "\uC5E5\uC5E6\uC5E7\uC5E8\uC5E9\uC5EA\uC5EB\uC5EC"+ - "\uC5ED\uC5EE\uC5EF\uC5F0\uC5F1\uC5F3\uC5F4\uC5F5"+ - "\uC5F6\uC5F7\uC5F8\uC5F9\uC5FA\uC5FB\uC5FC\uC5FD"+ - "\uC641\uC642\uC643\uC644\uC645\uC646\uC647\uC648"+ - "\uC649\uC64A\uC64B\uC64C\uC64D\uC64E\uC64F\uC650"+ - "\uC651\uC653\uC654\uC655\uC656\uC657\uC658\uC659"+ - "\uC65A\uC65B\uC65C\uC65D\uC661\uC662\uC663\uC664"+ - "\uC665\uC666\uC667\uC668\uC669\uC66A\uC66B\uC66C"+ - "\uC66D\uC66E\uC66F\uC670\uC671\uC673\uC674\uC675"+ - "\uC676\uC677\uC678\uC679\uC67A\uC67B\uC67C\uC67D"+ - "\uC681\uC682\uC683\uC684\uC685\uC686\uC687\uC688"+ - "\uC689\uC68A\uC68B\uC68C\uC68D\uC68E\uC68F\uC690"+ - "\uC691\uC693\uC694\uC695\uC696\uC697\uC698\uC699"+ - "\uC69A\uC69B\uC69C\uC69D\uC6A1\uC6A2\uC6A3\uC6A4"+ - "\uC6A5\uC6A6\uC6A7\uC6A8\uC6A9\uC6AA\uC6AB\uC6AC"+ - "\uC6AD\uC6AE\uC6AF\uC6B0\uC6B1\uC6B3\uC6B4\uC6B5"+ - "\uC6B6\uC6B7\uC6B8\uC6B9\uC6BA\uC6BB\uC6BC\uC6BD"+ - "\uC6C1\uC6C2\uC6C3\uC6C4\uC6C5\uC6C6\uC6C7\uC6C8"+ - "\uC6C9\uC6CA\uC6CB\uC6CC\uC6CD\uC6CE\uC6CF\uC6D0"+ - "\uC6D1\uC6D3\uC6D4\uC6D5\uC6D6\uC6D7\uC6D8\uC6D9"+ - "\uC6DA\uC6DB\uC6DC\uC6DD\uC6E1\uC6E2\uC6E3\uC6E4"+ - "\uC6E5\uC6E6\uC6E7\uC6E8\uC6E9\uC6EA\uC6EB\uC6EC"+ - "\uC6ED\uC6EE\uC6EF\uC6F0\uC6F1\uC6F3\uC6F4\uC6F5"+ - "\uC6F6\uC6F7\uC6F8\uC6F9\uC6FA\uC6FB\uC6FC\uC6FD"+ - "\uC741\uC742\uC743\uC744\uC745\uC746\uC747\uC748"+ - "\uC749\uC74A\uC74B\uC74C\uC74D\uC74E\uC74F\uC750"+ - "\uC751\uC753\uC754\uC755\uC756\uC757\uC758\uC759"+ - "\uC75A\uC75B\uC75C\uC75D\uC761\uC762\uC763\uC764"+ - "\uC765\uC766\uC767\uC768\uC769\uC76A\uC76B\uC76C"+ - "\uC76D\uC76E\uC76F\uC770\uC771\uC773\uC774\uC775"+ - "\uC776\uC777\uC778\uC779\uC77A\uC77B\uC77C\uC77D"+ - "\uC781\uC782\uC783\uC784\uC785\uC786\uC787\uC788"+ - "\uC789\uC78A\uC78B\uC78C\uC78D\uC78E\uC78F\uC790"+ - "\uC791\uC793\uC794\uC795\uC796\uC797\uC798\uC799"+ - "\uC79A\uC79B\uC79C\uC79D\uC7A1\uC7A2\uC7A3\uC7A4"+ - "\uC7A5\uC7A6\uC7A7\uC7A8\uC7A9\uC7AA\uC7AB\uC7AC"+ - "\uC7AD\uC7AE\uC7AF\uC7B0\uC7B1\uC7B3\uC7B4\uC7B5"+ - "\uC7B6\uC7B7\uC7B8\uC7B9\uC7BA\uC7BB\uC7BC\uC7BD"+ - "\uC861\uC862\uC863\uC864\uC865\uC866\uC867\uC868"+ - "\uC869\uC86A\uC86B\uC86C\uC86D\uC86E\uC86F\uC870"+ - "\uC871\uC873\uC874\uC875\uC876\uC877\uC878\uC879"+ - "\uC87A\uC87B\uC87C\uC87D\uC881\uC882\uC883\uC884"+ - "\uC885\uC886\uC887\uC888\uC889\uC88A\uC88B\uC88C"+ - "\uC88D\uC88E\uC88F\uC890\uC891\uC893\uC894\uC895"+ - "\uC896\uC897\uC898\uC899\uC89A\uC89B\uC89C\uC89D"+ - "\uC8A1\uC8A2\uC8A3\uC8A4\uC8A5\uC8A6\uC8A7\uC8A8"+ - "\uC8A9\uC8AA\uC8AB\uC8AC\uC8AD\uC8AE\uC8AF\uC8B0"+ - "\uC8B1\uC8B3\uC8B4\uC8B5\uC8B6\uC8B7\uC8B8\uC8B9"+ - "\uC8BA\uC8BB\uC8BC\uC8BD\uC8C1\uC8C2\uC8C3\uC8C4"+ - "\uC8C5\uC8C6\uC8C7\uC8C8\uC8C9\uC8CA\uC8CB\uC8CC"+ - "\uC8CD\uC8CE\uC8CF\uC8D0\uC8D1\uC8D3\uC8D4\uC8D5"+ - "\uC8D6\uC8D7\uC8D8\uC8D9\uC8DA\uC8DB\uC8DC\uC8DD"+ - "\uC8E1\uC8E2\uC8E3\uC8E4\uC8E5\uC8E6\uC8E7\uC8E8"+ - "\uC8E9\uC8EA\uC8EB\uC8EC\uC8ED\uC8EE\uC8EF\uC8F0"+ - "\uC8F1\uC8F3\uC8F4\uC8F5\uC8F6\uC8F7\uC8F8\uC8F9"+ - "\uC8FA\uC8FB\uC8FC\uC8FD\uC941\uC942\uC943\uC944"+ - "\uC945\uC946\uC947\uC948\uC949\uC94A\uC94B\uC94C"+ - "\uC94D\uC94E\uC94F\uC950\uC951\uC953\uC954\uC955"+ - "\uC956\uC957\uC958\uC959\uC95A\uC95B\uC95C\uC95D"+ - "\uC961\uC962\uC963\uC964\uC965\uC966\uC967\uC968"+ - "\uC969\uC96A\uC96B\uC96C\uC96D\uC96E\uC96F\uC970"+ - "\uC971\uC973\uC974\uC975\uC976\uC977\uC978\uC979"+ - "\uC97A\uC97B\uC97C\uC97D\uC981\uC982\uC983\uC984"+ - "\uC985\uC986\uC987\uC988\uC989\uC98A\uC98B\uC98C"+ - "\uC98D\uC98E\uC98F\uC990\uC991\uC993\uC994\uC995"+ - "\uC996\uC997\uC998\uC999\uC99A\uC99B\uC99C\uC99D"+ - "\uC9A1\uC9A2\uC9A3\uC9A4\uC9A5\uC9A6\uC9A7\uC9A8"+ - "\uC9A9\uC9AA\uC9AB\uC9AC\uC9AD\uC9AE\uC9AF\uC9B0"+ - "\uC9B1\uC9B3\uC9B4\uC9B5\uC9B6\uC9B7\uC9B8\uC9B9"+ - "\uC9BA\uC9BB\uC9BC\uC9BD\uC9C1\uC9C2\uC9C3\uC9C4"+ - "\uC9C5\uC9C6\uC9C7\uC9C8\uC9C9\uC9CA\uC9CB\uC9CC"+ - "\uC9CD\uC9CE\uC9CF\uC9D0\uC9D1\uC9D3\uC9D4\uC9D5"+ - "\uC9D6\uC9D7\uC9D8\uC9D9\uC9DA\uC9DB\uC9DC\uC9DD"+ - "\uC9E1\uC9E2\uC9E3\uC9E4\uC9E5\uC9E6\uC9E7\uC9E8"+ - "\uC9E9\uC9EA\uC9EB\uC9EC\uC9ED\uC9EE\uC9EF\uC9F0"+ - "\uC9F1\uC9F3\uC9F4\uC9F5\uC9F6\uC9F7\uC9F8\uC9F9"+ - "\uC9FA\uC9FB\uC9FC\uC9FD\uCA41\uCA42\uCA43\uCA44"+ - "\uCA45\uCA46\uCA47\uCA48\uCA49\uCA4A\uCA4B\uCA4C"+ - "\uCA4D\uCA4E\uCA4F\uCA50\uCA51\uCA53\uCA54\uCA55"+ - "\uCA56\uCA57\uCA58\uCA59\uCA5A\uCA5B\uCA5C\uCA5D"+ - "\uCA61\uCA62\uCA63\uCA64\uCA65\uCA66\uCA67\uCA68"+ - "\uCA69\uCA6A\uCA6B\uCA6C\uCA6D\uCA6E\uCA6F\uCA70"+ - "\uCA71\uCA73\uCA74\uCA75\uCA76\uCA77\uCA78\uCA79"+ - "\uCA7A\uCA7B\uCA7C\uCA7D\uCA81\uCA82\uCA83\uCA84"+ - "\uCA85\uCA86\uCA87\uCA88\uCA89\uCA8A\uCA8B\uCA8C"+ - "\uCA8D\uCA8E\uCA8F\uCA90\uCA91\uCA93\uCA94\uCA95"+ - "\uCA96\uCA97\uCA98\uCA99\uCA9A\uCA9B\uCA9C\uCA9D"+ - "\uCAA1\uCAA2\uCAA3\uCAA4\uCAA5\uCAA6\uCAA7\uCAA8"+ - "\uCAA9\uCAAA\uCAAB\uCAAC\uCAAD\uCAAE\uCAAF\uCAB0"+ - "\uCAB1\uCAB3\uCAB4\uCAB5\uCAB6\uCAB7\uCAB8\uCAB9"+ - "\uCABA\uCABB\uCABC\uCABD\uCAC1\uCAC2\uCAC3\uCAC4"+ - "\uCAC5\uCAC6\uCAC7\uCAC8\uCAC9\uCACA\uCACB\uCACC"+ - "\uCACD\uCACE\uCACF\uCAD0\uCAD1\uCAD3\uCAD4\uCAD5"+ - "\uCAD6\uCAD7\uCAD8\uCAD9\uCADA\uCADB\uCADC\uCADD"+ - "\uCAE1\uCAE2\uCAE3\uCAE4\uCAE5\uCAE6\uCAE7\uCAE8"+ - "\uCAE9\uCAEA\uCAEB\uCAEC\uCAED\uCAEE\uCAEF\uCAF0"+ - "\uCAF1\uCAF3\uCAF4\uCAF5\uCAF6\uCAF7\uCAF8\uCAF9"+ - "\uCAFA\uCAFB\uCAFC\uCAFD\uCB41\uCB42\uCB43\uCB44"+ - "\uCB45\uCB46\uCB47\uCB48\uCB49\uCB4A\uCB4B\uCB4C"+ - "\uCB4D\uCB4E\uCB4F\uCB50\uCB51\uCB53\uCB54\uCB55"+ - "\uCB56\uCB57\uCB58\uCB59\uCB5A\uCB5B\uCB5C\uCB5D"+ - "\uCB61\uCB62\uCB63\uCB64\uCB65\uCB66\uCB67\uCB68"+ - "\uCB69\uCB6A\uCB6B\uCB6C\uCB6D\uCB6E\uCB6F\uCB70"+ - "\uCB71\uCB73\uCB74\uCB75\uCB76\uCB77\uCB78\uCB79"+ - "\uCB7A\uCB7B\uCB7C\uCB7D\uCB81\uCB82\uCB83\uCB84"+ - "\uCB85\uCB86\uCB87\uCB88\uCB89\uCB8A\uCB8B\uCB8C"+ - "\uCB8D\uCB8E\uCB8F\uCB90\uCB91\uCB93\uCB94\uCB95"+ - "\uCB96\uCB97\uCB98\uCB99\uCB9A\uCB9B\uCB9C\uCB9D"+ - "\uCBA1\uCBA2\uCBA3\uCBA4\uCBA5\uCBA6\uCBA7\uCBA8"+ - "\uCBA9\uCBAA\uCBAB\uCBAC\uCBAD\uCBAE\uCBAF\uCBB0"+ - "\uCBB1\uCBB3\uCBB4\uCBB5\uCBB6\uCBB7\uCBB8\uCBB9"+ - "\uCBBA\uCBBB\uCBBC\uCBBD\uCC61\uCC62\uCC63\uCC64"+ - "\uCC65\uCC66\uCC67\uCC68\uCC69\uCC6A\uCC6B\uCC6C"+ - "\uCC6D\uCC6E\uCC6F\uCC70\uCC71\uCC73\uCC74\uCC75"+ - "\uCC76\uCC77\uCC78\uCC79\uCC7A\uCC7B\uCC7C\uCC7D"+ - "\uCC81\uCC82\uCC83\uCC84\uCC85\uCC86\uCC87\uCC88"+ - "\uCC89\uCC8A\uCC8B\uCC8C\uCC8D\uCC8E\uCC8F\uCC90"+ - "\uCC91\uCC93\uCC94\uCC95\uCC96\uCC97\uCC98\uCC99"+ - "\uCC9A\uCC9B\uCC9C\uCC9D\uCCA1\uCCA2\uCCA3\uCCA4"+ - "\uCCA5\uCCA6\uCCA7\uCCA8\uCCA9\uCCAA\uCCAB\uCCAC"+ - "\uCCAD\uCCAE\uCCAF\uCCB0\uCCB1\uCCB3\uCCB4\uCCB5"+ - "\uCCB6\uCCB7\uCCB8\uCCB9\uCCBA\uCCBB\uCCBC\uCCBD"+ - "\uCCC1\uCCC2\uCCC3\uCCC4\uCCC5\uCCC6\uCCC7\uCCC8"+ - "\uCCC9\uCCCA\uCCCB\uCCCC\uCCCD\uCCCE\uCCCF\uCCD0"+ - "\uCCD1\uCCD3\uCCD4\uCCD5\uCCD6\uCCD7\uCCD8\uCCD9"+ - "\uCCDA\uCCDB\uCCDC\uCCDD\uCCE1\uCCE2\uCCE3\uCCE4"+ - "\uCCE5\uCCE6\uCCE7\uCCE8\uCCE9\uCCEA\uCCEB\uCCEC"+ - "\uCCED\uCCEE\uCCEF\uCCF0\uCCF1\uCCF3\uCCF4\uCCF5"+ - "\uCCF6\uCCF7\uCCF8\uCCF9\uCCFA\uCCFB\uCCFC\uCCFD"+ - "\uCD41\uCD42\uCD43\uCD44\uCD45\uCD46\uCD47\uCD48"+ - "\uCD49\uCD4A\uCD4B\uCD4C\uCD4D\uCD4E\uCD4F\uCD50"+ - "\uCD51\uCD53\uCD54\uCD55\uCD56\uCD57\uCD58\uCD59"+ - "\uCD5A\uCD5B\uCD5C\uCD5D\uCD61\uCD62\uCD63\uCD64"+ - "\uCD65\uCD66\uCD67\uCD68\uCD69\uCD6A\uCD6B\uCD6C"+ - "\uCD6D\uCD6E\uCD6F\uCD70\uCD71\uCD73\uCD74\uCD75"+ - "\uCD76\uCD77\uCD78\uCD79\uCD7A\uCD7B\uCD7C\uCD7D"+ - "\uCD81\uCD82\uCD83\uCD84\uCD85\uCD86\uCD87\uCD88"+ - "\uCD89\uCD8A\uCD8B\uCD8C\uCD8D\uCD8E\uCD8F\uCD90"+ - "\uCD91\uCD93\uCD94\uCD95\uCD96\uCD97\uCD98\uCD99"+ - "\uCD9A\uCD9B\uCD9C\uCD9D\uCDA1\uCDA2\uCDA3\uCDA4"+ - "\uCDA5\uCDA6\uCDA7\uCDA8\uCDA9\uCDAA\uCDAB\uCDAC"+ - "\uCDAD\uCDAE\uCDAF\uCDB0\uCDB1\uCDB3\uCDB4\uCDB5"+ - "\uCDB6\uCDB7\uCDB8\uCDB9\uCDBA\uCDBB\uCDBC\uCDBD"+ - "\uCDC1\uCDC2\uCDC3\uCDC4\uCDC5\uCDC6\uCDC7\uCDC8"+ - "\uCDC9\uCDCA\uCDCB\uCDCC\uCDCD\uCDCE\uCDCF\uCDD0"+ - "\uCDD1\uCDD3\uCDD4\uCDD5\uCDD6\uCDD7\uCDD8\uCDD9"+ - "\uCDDA\uCDDB\uCDDC\uCDDD\uCDE1\uCDE2\uCDE3\uCDE4"+ - "\uCDE5\uCDE6\uCDE7\uCDE8\uCDE9\uCDEA\uCDEB\uCDEC"+ - "\uCDED\uCDEE\uCDEF\uCDF0\uCDF1\uCDF3\uCDF4\uCDF5"+ - "\uCDF6\uCDF7\uCDF8\uCDF9\uCDFA\uCDFB\uCDFC\uCDFD"+ - "\uCE41\uCE42\uCE43\uCE44\uCE45\uCE46\uCE47\uCE48"+ - "\uCE49\uCE4A\uCE4B\uCE4C\uCE4D\uCE4E\uCE4F\uCE50"+ - "\uCE51\uCE53\uCE54\uCE55\uCE56\uCE57\uCE58\uCE59"+ - "\uCE5A\uCE5B\uCE5C\uCE5D\uCE61\uCE62\uCE63\uCE64"+ - "\uCE65\uCE66\uCE67\uCE68\uCE69\uCE6A\uCE6B\uCE6C"+ - "\uCE6D\uCE6E\uCE6F\uCE70\uCE71\uCE73\uCE74\uCE75"+ - "\uCE76\uCE77\uCE78\uCE79\uCE7A\uCE7B\uCE7C\uCE7D"+ - "\uCE81\uCE82\uCE83\uCE84\uCE85\uCE86\uCE87\uCE88"+ - "\uCE89\uCE8A\uCE8B\uCE8C\uCE8D\uCE8E\uCE8F\uCE90"+ - "\uCE91\uCE93\uCE94\uCE95\uCE96\uCE97\uCE98\uCE99"+ - "\uCE9A\uCE9B\uCE9C\uCE9D\uCEA1\uCEA2\uCEA3\uCEA4"+ - "\uCEA5\uCEA6\uCEA7\uCEA8\uCEA9\uCEAA\uCEAB\uCEAC"+ - "\uCEAD\uCEAE\uCEAF\uCEB0\uCEB1\uCEB3\uCEB4\uCEB5"+ - "\uCEB6\uCEB7\uCEB8\uCEB9\uCEBA\uCEBB\uCEBC\uCEBD"+ - "\uCEC1\uCEC2\uCEC3\uCEC4\uCEC5\uCEC6\uCEC7\uCEC8"+ - "\uCEC9\uCECA\uCECB\uCECC\uCECD\uCECE\uCECF\uCED0"+ - "\uCED1\uCED3\uCED4\uCED5\uCED6\uCED7\uCED8\uCED9"+ - "\uCEDA\uCEDB\uCEDC\uCEDD\uCEE1\uCEE2\uCEE3\uCEE4"+ - "\uCEE5\uCEE6\uCEE7\uCEE8\uCEE9\uCEEA\uCEEB\uCEEC"+ - "\uCEED\uCEEE\uCEEF\uCEF0\uCEF1\uCEF3\uCEF4\uCEF5"+ - "\uCEF6\uCEF7\uCEF8\uCEF9\uCEFA\uCEFB\uCEFC\uCEFD"+ - "\uCF41\uCF42\uCF43\uCF44\uCF45\uCF46\uCF47\uCF48"+ - "\uCF49\uCF4A\uCF4B\uCF4C\uCF4D\uCF4E\uCF4F\uCF50"+ - "\uCF51\uCF53\uCF54\uCF55\uCF56\uCF57\uCF58\uCF59"+ - "\uCF5A\uCF5B\uCF5C\uCF5D\uCF61\uCF62\uCF63\uCF64"+ - "\uCF65\uCF66\uCF67\uCF68\uCF69\uCF6A\uCF6B\uCF6C"+ - "\uCF6D\uCF6E\uCF6F\uCF70\uCF71\uCF73\uCF74\uCF75"+ - "\uCF76\uCF77\uCF78\uCF79\uCF7A\uCF7B\uCF7C\uCF7D"+ - "\uCF81\uCF82\uCF83\uCF84\uCF85\uCF86\uCF87\uCF88"+ - "\uCF89\uCF8A\uCF8B\uCF8C\uCF8D\uCF8E\uCF8F\uCF90"+ - "\uCF91\uCF93\uCF94\uCF95\uCF96\uCF97\uCF98\uCF99"+ - "\uCF9A\uCF9B\uCF9C\uCF9D\uCFA1\uCFA2\uCFA3\uCFA4"+ - "\uCFA5\uCFA6\uCFA7\uCFA8\uCFA9\uCFAA\uCFAB\uCFAC"+ - "\uCFAD\uCFAE\uCFAF\uCFB0\uCFB1\uCFB3\uCFB4\uCFB5"+ - "\uCFB6\uCFB7\uCFB8\uCFB9\uCFBA\uCFBB\uCFBC\uCFBD"+ - "\uD061\uD062\uD063\uD064\uD065\uD066\uD067\uD068"+ - "\uD069\uD06A\uD06B\uD06C\uD06D\uD06E\uD06F\uD070"+ - "\uD071\uD073\uD074\uD075\uD076\uD077\uD078\uD079"+ - "\uD07A\uD07B\uD07C\uD07D\uD081\uD082\uD083\uD084"+ - "\uD085\uD086\uD087\uD088\uD089\uD08A\uD08B\uD08C"+ - "\uD08D\uD08E\uD08F\uD090\uD091\uD093\uD094\uD095"+ - "\uD096\uD097\uD098\uD099\uD09A\uD09B\uD09C\uD09D"+ - "\uD0A1\uD0A2\uD0A3\uD0A4\uD0A5\uD0A6\uD0A7\uD0A8"+ - "\uD0A9\uD0AA\uD0AB\uD0AC\uD0AD\uD0AE\uD0AF\uD0B0"+ - "\uD0B1\uD0B3\uD0B4\uD0B5\uD0B6\uD0B7\uD0B8\uD0B9"+ - "\uD0BA\uD0BB\uD0BC\uD0BD\uD0C1\uD0C2\uD0C3\uD0C4"+ - "\uD0C5\uD0C6\uD0C7\uD0C8\uD0C9\uD0CA\uD0CB\uD0CC"+ - "\uD0CD\uD0CE\uD0CF\uD0D0\uD0D1\uD0D3\uD0D4\uD0D5"+ - "\uD0D6\uD0D7\uD0D8\uD0D9\uD0DA\uD0DB\uD0DC\uD0DD"+ - "\uD0E1\uD0E2\uD0E3\uD0E4\uD0E5\uD0E6\uD0E7\uD0E8"+ - "\uD0E9\uD0EA\uD0EB\uD0EC\uD0ED\uD0EE\uD0EF\uD0F0"+ - "\uD0F1\uD0F3\uD0F4\uD0F5\uD0F6\uD0F7\uD0F8\uD0F9"+ - "\uD0FA\uD0FB\uD0FC\uD0FD\uD141\uD142\uD143\uD144"+ - "\uD145\uD146\uD147\uD148\uD149\uD14A\uD14B\uD14C"+ - "\uD14D\uD14E\uD14F\uD150\uD151\uD153\uD154\uD155"+ - "\uD156\uD157\uD158\uD159\uD15A\uD15B\uD15C\uD15D"+ - "\uD161\uD162\uD163\uD164\uD165\uD166\uD167\uD168"+ - "\uD169\uD16A\uD16B\uD16C\uD16D\uD16E\uD16F\uD170"+ - "\uD171\uD173\uD174\uD175\uD176\uD177\uD178\uD179"+ - "\uD17A\uD17B\uD17C\uD17D\uD181\uD182\uD183\uD184"+ - "\uD185\uD186\uD187\uD188\uD189\uD18A\uD18B\uD18C"+ - "\uD18D\uD18E\uD18F\uD190\uD191\uD193\uD194\uD195"+ - "\uD196\uD197\uD198\uD199\uD19A\uD19B\uD19C\uD19D"+ - "\uD1A1\uD1A2\uD1A3\uD1A4\uD1A5\uD1A6\uD1A7\uD1A8"+ - "\uD1A9\uD1AA\uD1AB\uD1AC\uD1AD\uD1AE\uD1AF\uD1B0"+ - "\uD1B1\uD1B3\uD1B4\uD1B5\uD1B6\uD1B7\uD1B8\uD1B9"+ - "\uD1BA\uD1BB\uD1BC\uD1BD\uD1C1\uD1C2\uD1C3\uD1C4"+ - "\uD1C5\uD1C6\uD1C7\uD1C8\uD1C9\uD1CA\uD1CB\uD1CC"+ - "\uD1CD\uD1CE\uD1CF\uD1D0\uD1D1\uD1D3\uD1D4\uD1D5"+ - "\uD1D6\uD1D7\uD1D8\uD1D9\uD1DA\uD1DB\uD1DC\uD1DD"+ - "\uD1E1\uD1E2\uD1E3\uD1E4\uD1E5\uD1E6\uD1E7\uD1E8"+ - "\uD1E9\uD1EA\uD1EB\uD1EC\uD1ED\uD1EE\uD1EF\uD1F0"+ - "\uD1F1\uD1F3\uD1F4\uD1F5\uD1F6\uD1F7\uD1F8\uD1F9"+ - "\uD1FA\uD1FB\uD1FC\uD1FD\uD241\uD242\uD243\uD244"+ - "\uD245\uD246\uD247\uD248\uD249\uD24A\uD24B\uD24C"+ - "\uD24D\uD24E\uD24F\uD250\uD251\uD253\uD254\uD255"+ - "\uD256\uD257\uD258\uD259\uD25A\uD25B\uD25C\uD25D"+ - "\uD261\uD262\uD263\uD264\uD265\uD266\uD267\uD268"+ - "\uD269\uD26A\uD26B\uD26C\uD26D\uD26E\uD26F\uD270"+ - "\uD271\uD273\uD274\uD275\uD276\uD277\uD278\uD279"+ - "\uD27A\uD27B\uD27C\uD27D\uD281\uD282\uD283\uD284"+ - "\uD285\uD286\uD287\uD288\uD289\uD28A\uD28B\uD28C"+ - "\uD28D\uD28E\uD28F\uD290\uD291\uD293\uD294\uD295"+ - "\uD296\uD297\uD298\uD299\uD29A\uD29B\uD29C\uD29D"+ - "\uD2A1\uD2A2\uD2A3\uD2A4\uD2A5\uD2A6\uD2A7\uD2A8"+ - "\uD2A9\uD2AA\uD2AB\uD2AC\uD2AD\uD2AE\uD2AF\uD2B0"+ - "\uD2B1\uD2B3\uD2B4\uD2B5\uD2B6\uD2B7\uD2B8\uD2B9"+ - "\uD2BA\uD2BB\uD2BC\uD2BD\uD2C1\uD2C2\uD2C3\uD2C4"+ - "\uD2C5\uD2C6\uD2C7\uD2C8\uD2C9\uD2CA\uD2CB\uD2CC"+ - "\uD2CD\uD2CE\uD2CF\uD2D0\uD2D1\uD2D3\uD2D4\uD2D5"+ - "\uD2D6\uD2D7\uD2D8\uD2D9\uD2DA\uD2DB\uD2DC\uD2DD"+ - "\uD2E1\uD2E2\uD2E3\uD2E4\uD2E5\uD2E6\uD2E7\uD2E8"+ - "\uD2E9\uD2EA\uD2EB\uD2EC\uD2ED\uD2EE\uD2EF\uD2F0"+ - "\uD2F1\uD2F3\uD2F4\uD2F5\uD2F6\uD2F7\uD2F8\uD2F9"+ - "\uD2FA\uD2FB\uD2FC\uD2FD\uD341\uD342\uD343\uD344"+ - "\uD345\uD346\uD347\uD348\uD349\uD34A\uD34B\uD34C"+ - "\uD34D\uD34E\uD34F\uD350\uD351\uD353\uD354\uD355"+ - "\uD356\uD357\uD358\uD359\uD35A\uD35B\uD35C\uD35D"+ - "\uD361\uD362\uD363\uD364\uD365\uD366\uD367\uD368"+ - "\uD369\uD36A\uD36B\uD36C\uD36D\uD36E\uD36F\uD370"+ - "\uD371\uD373\uD374\uD375\uD376\uD377\uD378\uD379"+ - "\uD37A\uD37B\uD37C\uD37D\uD381\uD382\uD383\uD384"+ - "\uD385\uD386\uD387\uD388\uD389\uD38A\uD38B\uD38C"+ - "\uD38D\uD38E\uD38F\uD390\uD391\uD393\uD394\uD395"+ - "\uD396\uD397\uD398\uD399\uD39A\uD39B\uD39C\uD39D"+ - "\uD3A1\uD3A2\uD3A3\uD3A4\uD3A5\uD3A6\uD3A7\uD3A8"+ - "\uD3A9\uD3AA\uD3AB\uD3AC\uD3AD\uD3AE\uD3AF\uD3B0"+ - "\uD3B1\uD3B3\uD3B4\uD3B5\uD3B6\uD3B7\uD3B8\uD3B9"+ - "\uD3BA\uD3BB\uD3BC\uD3BD\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uE0D0\uE0D6\uE0E7\uE1CF\uE1E8\uE23D\uE2FB\uE332"+ - "\uE348\uE360\uE36D\uE3D4\uE3D5\uE3D8\uE3DB\uE3DC"+ - "\uE3DD\uE3DE\uE3DF\uE3E0\uE3E2\uE3E3\uE3E4\uE3E5"+ - "\uE3E6\uE3E8\uE3E9\uE3EA\uE3EB\uE3ED\uE3EF\uE3F0"+ - "\uE3F2\uE3F6\uE3FA\uE3FC\uE3FD\uE3FE\uE432\uE433"+ - "\uE437\uE438\uE439\uE43A\uE43B\uE43D\uE442\uE44E"+ - "\uE452\uE453\uE454\uE456\uE457\uE458\uE459\uE45A"+ - "\uE45B\uE45D\uE45E\uE45F\uE460\uE461\uE462\uE463"+ - "\uE464\uE465\uE466\uE467\uE469\uE46A\uE46E\uE46F"+ - "\uE471\uE472\uE474\uE475\uE476\uE477\uE478\uE479"+ - "\uE47A\uE47B\uE492\uE493\uE494\uE495\uE496\uE497"+ - "\uE499\uE49A\uE576\uE59E\uE5A5\uE5AB\uE5AE\uE648"+ - "\uE65D\uE6CB\uE6E4\uE8C5\uE8E4\uE935\uE9A5\uE9D5"+ - "\uE9F4\uEA9E\uEAA0\uEAB3\uEAE1\uEAE8\uEB93\uEBAD"+ - "\uEBED\uECF5\uED31\uED39\uEDAE\uEDB1\uEDB2\uEDB9"+ - "\uEDBB\uEDBC\uEDC4\uEDCE\uEDD0\uEDD2\uEDD6\uEDFA"+ - "\uEDFB\uEDFC\uEDFE\uEE31\uEE34\uEE37\uEE3D\uEE3F"+ - "\uEE40\uEE41\uEE43\uEE47\uEE48\uEE4C\uEE54\uEE56"+ - "\uEE57\uEE5A\uEE62\uEE66\uEE69\uEE6C\uEE6F\uEE71"+ - "\uEE74\uEE75\uEE76\uEE78\uEE7A\uEE7B\uEE7C\uEE91"+ - "\uEE93\uEE94\uEE97\uEE98\uEE99\uEE9B\uEEA1\uEEA6"+ - "\uEEA9\uEEAA\uEEAC\uEEAD\uEEB0\uEEBF\uEEC1\uEEC6"+ - "\uEEC7\uEECB\uEECD\uEECF\uEED0\uEED3\uEEDF\uEEE4"+ - "\uEEE6\uEEF7\uEF77\uEF78\uEF92\uEF93\uEF99\uEF9B"+ - "\uEF9D\uEFA0\uEFA7\uEFAC\uEFCC\uEFF7\uF051\uF075"+ - "\uF096\uF099\uF09E\uF0A0\uF0A4\uF0A7\uF0A9\uF0AA"+ - "\uF0BA\uF0BB\uF0BD\uF0C1\uF0C2\uF0C6\uF0C7\uF0CC"+ - "\uF0CF\uF0D0\uF0D1\uF0D2\uF0D8\uF136\uF137\uF13A"+ - "\uF13F\uF140\uF141\uF142\uF145\uF148\uF14A\uF150"+ - "\uF151\uF155\uF156\uF159\uF15A\uF165\uF16D\uF16E"+ - "\uF171\uF174\uF177\uF178\uF199\uF19A\uF19C\uF1A1"+ - "\uF1A2\uF1A3\uF1EE\uF26B\uF44D\uF49C\uF4B1\uF537"; - - private final static String innerIndex9= - "\uF57E\uF696\uF698\uF6B8\uF6C8\uF6D3\uF76B\uF792"+ - "\uF831\uF832\uF876\uF939\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\uDA31\uDA32\uDA33\uDA34\uDA35\uDA36\uDA37"+ - "\uDA38\uDA39\uDA3A\uDA3B\uDA3C\uDA3D\uDA3E\uDA3F"+ - "\uDA40\uDA41\uDA42\uDA43\uDA44\uDA45\uDA46\uDA47"+ - "\uDA48\uDA49\uDA4A\uDA4B\uDA4C\uDA4D\uDA4E\uDA4F"+ - "\uDA50\uDA51\uDA52\uDA53\uDA54\uDA55\uDA56\uDA57"+ - "\uDA58\uDA59\uDA5A\uDA5B\uDA5C\uDA5D\uDA5E\uDA5F"+ - "\uDA60\uDA61\uDA62\uDA63\uDA64\uDA65\uDA66\uDA67"+ - "\uDA68\uDA69\uDA6A\uDA6B\uD93C\uDA6D\uDA6E\uDA6F"+ - "\uDA70\uDA71\uDA72\uDA73\uDA74\uDA75\uDA76\uDA77"+ - "\uDA78\uDA79\uDA7A\uDA7B\uDA7C\uDA7D\uDA7E\uDA91"+ - "\uDA92\uDA93\uDA94\uDA95\uDA96\uDA97\uDA98\uDA99"+ - "\uDA9A\uDA9B\uDA9C\uDA9D\uDA9E\uDA9F\uD9A6\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\uD95B\uD95C\uD9A0\uDAA0\u0000\uD95D\uDA6C\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+ - "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"; - - private final static short index1[] = { - 1, 2, 3, 4, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 6, 7, 8, 9, 10, 11, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 13, 14, 15, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 18, - 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, - 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, - 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, - 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, - 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 99, 100, 101, 102, - 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, - 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, - 135, 136, 137, 138, 139, 140, 141, 142, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 143, 144, 0, 0, 0, 0, 145 - }; - - String index2[] = { - innerIndex0, - innerIndex1, - innerIndex2, - innerIndex3, - innerIndex4, - innerIndex5, - innerIndex6, - innerIndex7, - innerIndex8, - innerIndex9 - }; } From 0470f91e7fa8158f8b28f26b28e3c7327ffde074 Mon Sep 17 00:00:00 2001 From: Xueming Shen Date: Wed, 8 Apr 2009 10:40:56 -0700 Subject: [PATCH 27/91] 6827921: ByteToCharBig5.java should use nio data tables instead of its own copy To use the data tables from sun.nio.cs.ext.Big5 Reviewed-by: alanb --- .../share/classes/sun/io/ByteToCharBig5.java | 2173 +---------------- 1 file changed, 6 insertions(+), 2167 deletions(-) diff --git a/jdk/src/share/classes/sun/io/ByteToCharBig5.java b/jdk/src/share/classes/sun/io/ByteToCharBig5.java index 1857023a791..50951e46a58 100644 --- a/jdk/src/share/classes/sun/io/ByteToCharBig5.java +++ b/jdk/src/share/classes/sun/io/ByteToCharBig5.java @@ -26,6 +26,8 @@ package sun.io; +import sun.nio.cs.ext.Big5; + /** * Tables and data to convert Big5 to Unicode * @@ -34,2179 +36,16 @@ package sun.io; public class ByteToCharBig5 extends ByteToCharDoubleByte { + private final static Big5 nioCoder = new Big5(); + public String getCharacterEncoding() { return "Big5"; } public ByteToCharBig5() { - super.index1 = index1; - super.index2 = index2; + super.index1 = nioCoder.getDecoderIndex1(); + super.index2 = nioCoder.getDecoderIndex2(); start = 0x40; end = 0xFE; } - - private final static String innerIndex0= - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u3000"+ - "\uFF0C\u3001\u3002\uFF0E\u2022\uFF1B\uFF1A\uFF1F"+ - "\uFF01\uFE30\u2026\u2025\uFE50\uFF64\uFE52\u00B7"+ - "\uFE54\uFE55\uFE56\uFE57\uFF5C\u2013\uFE31\u2014"+ - "\uFE33\uFF3F\uFE34\uFE4F\uFF08\uFF09\uFE35\uFE36"+ - "\uFF5B\uFF5D\uFE37\uFE38\u3014\u3015\uFE39\uFE3A"+ - "\u3010\u3011\uFE3B\uFE3C\u300A\u300B\uFE3D\uFE3E"+ - "\u3008\u3009\uFE3F\uFE40\u300C\u300D\uFE41\uFE42"+ - "\u300E\u300F\uFE43\uFE44\uFE59\uFE5A\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFE5B\uFE5C\uFE5D\uFE5E\u2018\u2019\u201C\u201D"+ - "\u301D\u301E\u2035\u2032\uFF03\uFF06\uFF0A\u203B"+ - "\u00A7\u3003\u25CB\u25CF\u25B3\u25B2\u25CE\u2606"+ - "\u2605\u25C7\u25C6\u25A1\u25A0\u25BD\u25BC\u32A3"+ - "\u2105\u203E\uFFFD\uFF3F\uFFFD\uFE49\uFE4A\uFE4D"+ - "\uFE4E\uFE4B\uFE4C\uFE5F\uFE60\uFE61\uFF0B\uFF0D"+ - "\u00D7\u00F7\u00B1\u221A\uFF1C\uFF1E\uFF1D\u2266"+ - "\u2267\u2260\u221E\u2252\u2261\uFE62\uFE63\uFE64"+ - "\uFE65\uFE66\u223C\u2229\u222A\u22A5\u2220\u221F"+ - "\u22BF\u33D2\u33D1\u222B\u222E\u2235\u2234\u2640"+ - "\u2642\u2641\u2609\u2191\u2193\u2190\u2192\u2196"+ - "\u2197\u2199\u2198\u2225\u2223\u2571\u2572\uFF0F"+ - "\uFF3C\uFF04\u00A5\u3012\u00A2\u00A3\uFF05\uFF20"+ - "\u2103\u2109\uFE69\uFE6A\uFE6B\u33D5\u339C\u339D"+ - "\u339E\u33CE\u33A1\u338E\u338F\u33C4\u00B0\u5159"+ - "\u515B\u515E\u515D\u5161\u5163\u55E7\u74E9\u7CCE"+ - "\u2581\u2582\u2583\u2584\u2585\u2586\u2587\u2588"+ - "\u258F\u258E\u258D\u258C\u258B\u258A\u2589\u253C"+ - "\u2534\u252C\u2524\u251C\u2594\u2500\u2502\u2595"+ - "\u250C\u2510\u2514\u2518\u256D\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u256E"+ - "\u2570\u256F\u2550\u255E\u256A\u2561\u25E2\u25E3"+ - "\u25E5\u25E4\u2571\u2572\u2573\uFF10\uFF11\uFF12"+ - "\uFF13\uFF14\uFF15\uFF16\uFF17\uFF18\uFF19\u2160"+ - "\u2161\u2162\u2163\u2164\u2165\u2166\u2167\u2168"+ - "\u2169\u3021\u3022\u3023\u3024\u3025\u3026\u3027"+ - "\u3028\u3029\u5341\u5344\u5345\uFF21\uFF22\uFF23"+ - "\uFF24\uFF25\uFF26\uFF27\uFF28\uFF29\uFF2A\uFF2B"+ - "\uFF2C\uFF2D\uFF2E\uFF2F\uFF30\uFF31\uFF32\uFF33"+ - "\uFF34\uFF35\uFF36\uFF37\uFF38\uFF39\uFF3A\uFF41"+ - "\uFF42\uFF43\uFF44\uFF45\uFF46\uFF47\uFF48\uFF49"+ - "\uFF4A\uFF4B\uFF4C\uFF4D\uFF4E\uFF4F\uFF50\uFF51"+ - "\uFF52\uFF53\uFF54\uFF55\uFF56\uFF57\uFF58\uFF59"+ - "\uFF5A\u0391\u0392\u0393\u0394\u0395\u0396\u0397"+ - "\u0398\u0399\u039A\u039B\u039C\u039D\u039E\u039F"+ - "\u03A0\u03A1\u03A3\u03A4\u03A5\u03A6\u03A7\u03A8"+ - "\u03A9\u03B1\u03B2\u03B3\u03B4\u03B5\u03B6\u03B7"+ - "\u03B8\u03B9\u03BA\u03BB\u03BC\u03BD\u03BE\u03BF"+ - "\u03C0\u03C1\u03C3\u03C4\u03C5\u03C6\u03C7\u03C8"+ - "\u03C9\u3105\u3106\u3107\u3108\u3109\u310A\u310B"+ - "\u310C\u310D\u310E\u310F\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u3110\u3111"+ - "\u3112\u3113\u3114\u3115\u3116\u3117\u3118\u3119"+ - "\u311A\u311B\u311C\u311D\u311E\u311F\u3120\u3121"+ - "\u3122\u3123\u3124\u3125\u3126\u3127\u3128\u3129"+ - "\u02D9\u02C9\u02CA\u02C7\u02CB\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\u4E00\u4E59\u4E01\u4E03"+ - "\u4E43\u4E5D\u4E86\u4E8C\u4EBA\u513F\u5165\u516B"+ - "\u51E0\u5200\u5201\u529B\u5315\u5341\u535C\u53C8"+ - "\u4E09\u4E0B\u4E08\u4E0A\u4E2B\u4E38\u51E1\u4E45"+ - "\u4E48\u4E5F\u4E5E\u4E8E\u4EA1\u5140\u5203\u52FA"+ - "\u5343\u53C9\u53E3\u571F\u58EB\u5915\u5927\u5973"+ - "\u5B50\u5B51\u5B53\u5BF8\u5C0F\u5C22\u5C38\u5C71"+ - "\u5DDD\u5DE5\u5DF1\u5DF2\u5DF3\u5DFE\u5E72\u5EFE"+ - "\u5F0B\u5F13\u624D\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u4E11\u4E10\u4E0D"+ - "\u4E2D\u4E30\u4E39\u4E4B\u5C39\u4E88\u4E91\u4E95"+ - "\u4E92\u4E94\u4EA2\u4EC1\u4EC0\u4EC3\u4EC6\u4EC7"+ - "\u4ECD\u4ECA\u4ECB\u4EC4\u5143\u5141\u5167\u516D"+ - "\u516E\u516C\u5197\u51F6\u5206\u5207\u5208\u52FB"+ - "\u52FE\u52FF\u5316\u5339\u5348\u5347\u5345\u535E"+ - "\u5384\u53CB\u53CA\u53CD\u58EC\u5929\u592B\u592A"+ - "\u592D\u5B54\u5C11\u5C24\u5C3A\u5C6F\u5DF4\u5E7B"+ - "\u5EFF\u5F14\u5F15\u5FC3\u6208\u6236\u624B\u624E"+ - "\u652F\u6587\u6597\u65A4\u65B9\u65E5\u66F0\u6708"+ - "\u6728\u6B20\u6B62\u6B79\u6BCB\u6BD4\u6BDB\u6C0F"+ - "\u6C34\u706B\u722A\u7236\u723B\u7247\u7259\u725B"+ - "\u72AC\u738B\u4E19\u4E16\u4E15\u4E14\u4E18\u4E3B"+ - "\u4E4D\u4E4F\u4E4E\u4EE5\u4ED8\u4ED4\u4ED5\u4ED6"+ - "\u4ED7\u4EE3\u4EE4\u4ED9\u4EDE\u5145\u5144\u5189"+ - "\u518A\u51AC\u51F9\u51FA\u51F8\u520A\u52A0\u529F"+ - "\u5305\u5306\u5317\u531D\u4EDF\u534A\u5349\u5361"+ - "\u5360\u536F\u536E\u53BB\u53EF\u53E4\u53F3\u53EC"+ - "\u53EE\u53E9\u53E8\u53FC\u53F8\u53F5\u53EB\u53E6"+ - "\u53EA\u53F2\u53F1\u53F0\u53E5\u53ED\u53FB\u56DB"+ - "\u56DA\u5916\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\u592E\u5931\u5974\u5976"+ - "\u5B55\u5B83\u5C3C\u5DE8\u5DE7\u5DE6\u5E02\u5E03"+ - "\u5E73\u5E7C\u5F01\u5F18\u5F17\u5FC5\u620A\u6253"+ - "\u6254\u6252\u6251\u65A5\u65E6\u672E\u672C\u672A"+ - "\u672B\u672D\u6B63\u6BCD\u6C11\u6C10\u6C38\u6C41"+ - "\u6C40\u6C3E\u72AF\u7384\u7389\u74DC\u74E6\u7518"+ - "\u751F\u7528\u7529\u7530\u7531\u7532\u7533\u758B"+ - "\u767D\u76AE\u76BF\u76EE\u77DB\u77E2\u77F3\u793A"+ - "\u79BE\u7A74\u7ACB\u4E1E\u4E1F\u4E52\u4E53\u4E69"+ - "\u4E99\u4EA4\u4EA6\u4EA5\u4EFF\u4F09\u4F19\u4F0A"+ - "\u4F15\u4F0D\u4F10\u4F11\u4F0F\u4EF2\u4EF6\u4EFB"+ - "\u4EF0\u4EF3\u4EFD\u4F01\u4F0B\u5149\u5147\u5146"+ - "\u5148\u5168\u5171\u518D\u51B0\u5217\u5211\u5212"+ - "\u520E\u5216\u52A3\u5308\u5321\u5320\u5370\u5371"+ - "\u5409\u540F\u540C\u540A\u5410\u5401\u540B\u5404"+ - "\u5411\u540D\u5408\u5403\u540E\u5406\u5412\u56E0"+ - "\u56DE\u56DD\u5733\u5730\u5728\u572D\u572C\u572F"+ - "\u5729\u5919\u591A\u5937\u5938\u5984\u5978\u5983"+ - "\u597D\u5979\u5982\u5981\u5B57\u5B58\u5B87\u5B88"+ - "\u5B85\u5B89\u5BFA\u5C16\u5C79\u5DDE\u5E06\u5E76"+ - "\u5E74\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\u5F0F\u5F1B\u5FD9\u5FD6\u620E"+ - "\u620C\u620D\u6210\u6263\u625B\u6258\u6536\u65E9"+ - "\u65E8\u65EC\u65ED\u66F2\u66F3\u6709\u673D\u6734"+ - "\u6731\u6735\u6B21\u6B64\u6B7B\u6C16\u6C5D\u6C57"+ - "\u6C59\u6C5F\u6C60\u6C50\u6C55\u6C61\u6C5B\u6C4D"+ - "\u6C4E\u7070\u725F\u725D\u767E\u7AF9\u7C73\u7CF8"+ - "\u7F36\u7F8A\u7FBD\u8001\u8003\u800C\u8012\u8033"+ - "\u807F\u8089\u808B\u808C\u81E3\u81EA\u81F3\u81FC"+ - "\u820C\u821B\u821F\u826E\u8272\u827E\u866B\u8840"+ - "\u884C\u8863\u897F\u9621\u4E32\u4EA8\u4F4D\u4F4F"+ - "\u4F47\u4F57\u4F5E\u4F34\u4F5B\u4F55\u4F30\u4F50"+ - "\u4F51\u4F3D\u4F3A\u4F38\u4F43\u4F54\u4F3C\u4F46"+ - "\u4F63\u4F5C\u4F60\u4F2F\u4F4E\u4F36\u4F59\u4F5D"+ - "\u4F48\u4F5A\u514C\u514B\u514D\u5175\u51B6\u51B7"+ - "\u5225\u5224\u5229\u522A\u5228\u52AB\u52A9\u52AA"+ - "\u52AC\u5323\u5373\u5375\u541D\u542D\u541E\u543E"+ - "\u5426\u544E\u5427\u5446\u5443\u5433\u5448\u5442"+ - "\u541B\u5429\u544A\u5439\u543B\u5438\u542E\u5435"+ - "\u5436\u5420\u543C\u5440\u5431\u542B\u541F\u542C"+ - "\u56EA\u56F0\u56E4\u56EB\u574A\u5751\u5740\u574D"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\u5747\u574E\u573E\u5750\u574F\u573B"+ - "\u58EF\u593E\u599D\u5992\u59A8\u599E\u59A3\u5999"+ - "\u5996\u598D\u59A4\u5993\u598A\u59A5\u5B5D\u5B5C"+ - "\u5B5A\u5B5B\u5B8C\u5B8B\u5B8F\u5C2C\u5C40\u5C41"+ - "\u5C3F\u5C3E\u5C90\u5C91\u5C94\u5C8C\u5DEB\u5E0C"+ - "\u5E8F\u5E87\u5E8A\u5EF7\u5F04\u5F1F\u5F64\u5F62"+ - "\u5F77\u5F79\u5FD8\u5FCC\u5FD7\u5FCD\u5FF1\u5FEB"+ - "\u5FF8\u5FEA\u6212\u6211\u6284\u6297\u6296\u6280"+ - "\u6276\u6289\u626D\u628A\u627C\u627E\u6279\u6273"+ - "\u6292\u626F\u6298\u626E\u6295\u6293\u6291\u6286"+ - "\u6539\u653B\u6538\u65F1\u66F4\u675F\u674E\u674F"+ - "\u6750\u6751\u675C\u6756\u675E\u6749\u6746\u6760"+ - "\u6753\u6757\u6B65\u6BCF\u6C42\u6C5E\u6C99\u6C81"+ - "\u6C88\u6C89\u6C85\u6C9B\u6C6A\u6C7A\u6C90\u6C70"+ - "\u6C8C\u6C68\u6C96\u6C92\u6C7D\u6C83\u6C72\u6C7E"+ - "\u6C74\u6C86\u6C76\u6C8D\u6C94\u6C98\u6C82\u7076"+ - "\u707C\u707D\u7078\u7262\u7261\u7260\u72C4\u72C2"+ - "\u7396\u752C\u752B\u7537\u7538\u7682\u76EF\u77E3"+ - "\u79C1\u79C0\u79BF\u7A76\u7CFB\u7F55\u8096\u8093"+ - "\u809D\u8098\u809B\u809A\u80B2\u826F\u8292\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\u828B\u828D\u898B\u89D2\u8A00\u8C37\u8C46"+ - "\u8C55\u8C9D\u8D64\u8D70\u8DB3\u8EAB\u8ECA\u8F9B"+ - "\u8FB0\u8FC2\u8FC6\u8FC5\u8FC4\u5DE1\u9091\u90A2"+ - "\u90AA\u90A6\u90A3\u9149\u91C6\u91CC\u9632\u962E"+ - "\u9631\u962A\u962C\u4E26\u4E56\u4E73\u4E8B\u4E9B"+ - "\u4E9E\u4EAB\u4EAC\u4F6F\u4F9D\u4F8D\u4F73\u4F7F"+ - "\u4F6C\u4F9B\u4F8B\u4F86\u4F83\u4F70\u4F75\u4F88"+ - "\u4F69\u4F7B\u4F96\u4F7E\u4F8F\u4F91\u4F7A\u5154"+ - "\u5152\u5155\u5169\u5177\u5176\u5178\u51BD\u51FD"+ - "\u523B\u5238\u5237\u523A\u5230\u522E\u5236\u5241"+ - "\u52BE\u52BB\u5352\u5354\u5353\u5351\u5366\u5377"+ - "\u5378\u5379\u53D6\u53D4\u53D7\u5473\u5475\u5496"+ - "\u5478\u5495\u5480\u547B\u5477\u5484\u5492\u5486"+ - "\u547C\u5490\u5471\u5476\u548C\u549A\u5462\u5468"+ - "\u548B\u547D\u548E\u56FA\u5783\u5777\u576A\u5769"+ - "\u5761\u5766\u5764\u577C\u591C\u5949\u5947\u5948"+ - "\u5944\u5954\u59BE\u59BB\u59D4\u59B9\u59AE\u59D1"+ - "\u59C6\u59D0\u59CD\u59CB\u59D3\u59CA\u59AF\u59B3"+ - "\u59D2\u59C5\u5B5F\u5B64\u5B63\u5B97\u5B9A\u5B98"+ - "\u5B9C\u5B99\u5B9B\u5C1A\u5C48\u5C45\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\u5C46\u5CB7\u5CA1\u5CB8\u5CA9\u5CAB\u5CB1\u5CB3"+ - "\u5E18\u5E1A\u5E16\u5E15\u5E1B\u5E11\u5E78\u5E9A"+ - "\u5E97\u5E9C\u5E95\u5E96\u5EF6\u5F26\u5F27\u5F29"+ - "\u5F80\u5F81\u5F7F\u5F7C\u5FDD\u5FE0\u5FFD\u5FF5"+ - "\u5FFF\u600F\u6014\u602F\u6035\u6016\u602A\u6015"+ - "\u6021\u6027\u6029\u602B\u601B\u6216\u6215\u623F"+ - "\u623E\u6240\u627F\u62C9\u62CC\u62C4\u62BF\u62C2"+ - "\u62B9\u62D2\u62DB\u62AB\u62D3\u62D4\u62CB\u62C8"+ - "\u62A8\u62BD\u62BC\u62D0\u62D9\u62C7\u62CD\u62B5"+ - "\u62DA\u62B1\u62D8\u62D6\u62D7\u62C6\u62AC\u62CE"+ - "\u653E\u65A7\u65BC\u65FA\u6614\u6613\u660C\u6606"+ - "\u6602\u660E\u6600\u660F\u6615\u660A\u6607\u670D"+ - "\u670B\u676D\u678B\u6795\u6771\u679C\u6773\u6777"+ - "\u6787\u679D\u6797\u676F\u6770\u677F\u6789\u677E"+ - "\u6790\u6775\u679A\u6793\u677C\u676A\u6772\u6B23"+ - "\u6B66\u6B67\u6B7F\u6C13\u6C1B\u6CE3\u6CE8\u6CF3"+ - "\u6CB1\u6CCC\u6CE5\u6CB3\u6CBD\u6CBE\u6CBC\u6CE2"+ - "\u6CAB\u6CD5\u6CD3\u6CB8\u6CC4\u6CB9\u6CC1\u6CAE"+ - "\u6CD7\u6CC5\u6CF1\u6CBF\u6CBB\u6CE1\u6CDB\u6CCA"+ - "\u6CAC\u6CEF\u6CDC\u6CD6\u6CE0\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u7095"+ - "\u708E\u7092\u708A\u7099\u722C\u722D\u7238\u7248"+ - "\u7267\u7269\u72C0\u72CE\u72D9\u72D7\u72D0\u73A9"+ - "\u73A8\u739F\u73AB\u73A5\u753D\u759D\u7599\u759A"+ - "\u7684\u76C2\u76F2\u76F4\u77E5\u77FD\u793E\u7940"+ - "\u7941\u79C9\u79C8\u7A7A\u7A79\u7AFA\u7CFE\u7F54"+ - "\u7F8C\u7F8B\u8005\u80BA\u80A5\u80A2\u80B1\u80A1"+ - "\u80AB\u80A9\u80B4\u80AA\u80AF\u81E5\u81FE\u820D"+ - "\u82B3\u829D\u8299\u82AD\u82BD\u829F\u82B9\u82B1"+ - "\u82AC\u82A5\u82AF\u82B8\u82A3\u82B0\u82BE\u82B7"+ - "\u864E\u8671\u521D\u8868\u8ECB\u8FCE\u8FD4\u8FD1"+ - "\u90B5\u90B8\u90B1\u90B6\u91C7\u91D1\u9577\u9580"+ - "\u961C\u9640\u963F\u963B\u9644\u9642\u96B9\u96E8"+ - "\u9752\u975E\u4E9F\u4EAD\u4EAE\u4FE1\u4FB5\u4FAF"+ - "\u4FBF\u4FE0\u4FD1\u4FCF\u4FDD\u4FC3\u4FB6\u4FD8"+ - "\u4FDF\u4FCA\u4FD7\u4FAE\u4FD0\u4FC4\u4FC2\u4FDA"+ - "\u4FCE\u4FDE\u4FB7\u5157\u5192\u5191\u51A0\u524E"+ - "\u5243\u524A\u524D\u524C\u524B\u5247\u52C7\u52C9"+ - "\u52C3\u52C1\u530D\u5357\u537B\u539A\u53DB\u54AC"+ - "\u54C0\u54A8\u54CE\u54C9\u54B8\u54A6\u54B3\u54C7"+ - "\u54C2\u54BD\u54AA\u54C1\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u54C4\u54C8"+ - "\u54AF\u54AB\u54B1\u54BB\u54A9\u54A7\u54BF\u56FF"+ - "\u5782\u578B\u57A0\u57A3\u57A2\u57CE\u57AE\u5793"+ - "\u5955\u5951\u594F\u594E\u5950\u59DC\u59D8\u59FF"+ - "\u59E3\u59E8\u5A03\u59E5\u59EA\u59DA\u59E6\u5A01"+ - "\u59FB\u5B69\u5BA3\u5BA6\u5BA4\u5BA2\u5BA5\u5C01"+ - "\u5C4E\u5C4F\u5C4D\u5C4B\u5CD9\u5CD2\u5DF7\u5E1D"+ - "\u5E25\u5E1F\u5E7D\u5EA0\u5EA6\u5EFA\u5F08\u5F2D"+ - "\u5F65\u5F88\u5F85\u5F8A\u5F8B\u5F87\u5F8C\u5F89"+ - "\u6012\u601D\u6020\u6025\u600E\u6028\u604D\u6070"+ - "\u6068\u6062\u6046\u6043\u606C\u606B\u606A\u6064"+ - "\u6241\u62DC\u6316\u6309\u62FC\u62ED\u6301\u62EE"+ - "\u62FD\u6307\u62F1\u62F7\u62EF\u62EC\u62FE\u62F4"+ - "\u6311\u6302\u653F\u6545\u65AB\u65BD\u65E2\u6625"+ - "\u662D\u6620\u6627\u662F\u661F\u6628\u6631\u6624"+ - "\u66F7\u67FF\u67D3\u67F1\u67D4\u67D0\u67EC\u67B6"+ - "\u67AF\u67F5\u67E9\u67EF\u67C4\u67D1\u67B4\u67DA"+ - "\u67E5\u67B8\u67CF\u67DE\u67F3\u67B0\u67D9\u67E2"+ - "\u67DD\u67D2\u6B6A\u6B83\u6B86\u6BB5\u6BD2\u6BD7"+ - "\u6C1F\u6CC9\u6D0B\u6D32\u6D2A\u6D41\u6D25\u6D0C"+ - "\u6D31\u6D1E\u6D17\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u6D3B\u6D3D\u6D3E"+ - "\u6D36\u6D1B\u6CF5\u6D39\u6D27\u6D38\u6D29\u6D2E"+ - "\u6D35\u6D0E\u6D2B\u70AB\u70BA\u70B3\u70AC\u70AF"+ - "\u70AD\u70B8\u70AE\u70A4\u7230\u7272\u726F\u7274"+ - "\u72E9\u72E0\u72E1\u73B7\u73CA\u73BB\u73B2\u73CD"+ - "\u73C0\u73B3\u751A\u752D\u754F\u754C\u754E\u754B"+ - "\u75AB\u75A4\u75A5\u75A2\u75A3\u7678\u7686\u7687"+ - "\u7688\u76C8\u76C6\u76C3\u76C5\u7701\u76F9\u76F8"+ - "\u7709\u770B\u76FE\u76FC\u7707\u77DC\u7802\u7814"+ - "\u780C\u780D\u7946\u7949\u7948\u7947\u79B9\u79BA"+ - "\u79D1\u79D2\u79CB\u7A7F\u7A81\u7AFF\u7AFD\u7C7D"+ - "\u7D02\u7D05\u7D00\u7D09\u7D07\u7D04\u7D06\u7F38"+ - "\u7F8E\u7FBF\u8004\u8010\u800D\u8011\u8036\u80D6"+ - "\u80E5\u80DA\u80C3\u80C4\u80CC\u80E1\u80DB\u80CE"+ - "\u80DE\u80E4\u80DD\u81F4\u8222\u82E7\u8303\u8305"+ - "\u82E3\u82DB\u82E6\u8304\u82E5\u8302\u8309\u82D2"+ - "\u82D7\u82F1\u8301\u82DC\u82D4\u82D1\u82DE\u82D3"+ - "\u82DF\u82EF\u8306\u8650\u8679\u867B\u867A\u884D"+ - "\u886B\u8981\u89D4\u8A08\u8A02\u8A03\u8C9E\u8CA0"+ - "\u8D74\u8D73\u8DB4\u8ECD\u8ECC\u8FF0\u8FE6\u8FE2"+ - "\u8FEA\u8FE5\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\u8FED\u8FEB\u8FE4\u8FE8"+ - "\u90CA\u90CE\u90C1\u90C3\u914B\u914A\u91CD\u9582"+ - "\u9650\u964B\u964C\u964D\u9762\u9769\u97CB\u97ED"+ - "\u97F3\u9801\u98A8\u98DB\u98DF\u9996\u9999\u4E58"+ - "\u4EB3\u500C\u500D\u5023\u4FEF\u5026\u5025\u4FF8"+ - "\u5029\u5016\u5006\u503C\u501F\u501A\u5012\u5011"+ - "\u4FFA\u5000\u5014\u5028\u4FF1\u5021\u500B\u5019"+ - "\u5018\u4FF3\u4FEE\u502D\u502A\u4FFE\u502B\u5009"+ - "\u517C\u51A4\u51A5\u51A2\u51CD\u51CC\u51C6\u51CB"+ - "\u5256\u525C\u5254\u525B\u525D\u532A\u537F\u539F"+ - "\u539D\u53DF\u54E8\u5510\u5501\u5537\u54FC\u54E5"+ - "\u54F2\u5506\u54FA\u5514\u54E9\u54ED\u54E1\u5509"+ - "\u54EE\u54EA\u54E6\u5527\u5507\u54FD\u550F\u5703"+ - "\u5704\u57C2\u57D4\u57CB\u57C3\u5809\u590F\u5957"+ - "\u5958\u595A\u5A11\u5A18\u5A1C\u5A1F\u5A1B\u5A13"+ - "\u59EC\u5A20\u5A23\u5A29\u5A25\u5A0C\u5A09\u5B6B"+ - "\u5C58\u5BB0\u5BB3\u5BB6\u5BB4\u5BAE\u5BB5\u5BB9"+ - "\u5BB8\u5C04\u5C51\u5C55\u5C50\u5CED\u5CFD\u5CFB"+ - "\u5CEA\u5CE8\u5CF0\u5CF6\u5D01\u5CF4\u5DEE\u5E2D"+ - "\u5E2B\u5EAB\u5EAD\u5EA7\u5F31\u5F92\u5F91\u5F90"+ - "\u6059\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\u6063\u6065\u6050\u6055\u606D"+ - "\u6069\u606F\u6084\u609F\u609A\u608D\u6094\u608C"+ - "\u6085\u6096\u6247\u62F3\u6308\u62FF\u634E\u633E"+ - "\u632F\u6355\u6342\u6346\u634F\u6349\u633A\u6350"+ - "\u633D\u632A\u632B\u6328\u634D\u634C\u6548\u6549"+ - "\u6599\u65C1\u65C5\u6642\u6649\u664F\u6643\u6652"+ - "\u664C\u6645\u6641\u66F8\u6714\u6715\u6717\u6821"+ - "\u6838\u6848\u6846\u6853\u6839\u6842\u6854\u6829"+ - "\u68B3\u6817\u684C\u6851\u683D\u67F4\u6850\u6840"+ - "\u683C\u6843\u682A\u6845\u6813\u6818\u6841\u6B8A"+ - "\u6B89\u6BB7\u6C23\u6C27\u6C28\u6C26\u6C24\u6CF0"+ - "\u6D6A\u6D95\u6D88\u6D87\u6D66\u6D78\u6D77\u6D59"+ - "\u6D93\u6D6C\u6D89\u6D6E\u6D5A\u6D74\u6D69\u6D8C"+ - "\u6D8A\u6D79\u6D85\u6D65\u6D94\u70CA\u70D8\u70E4"+ - "\u70D9\u70C8\u70CF\u7239\u7279\u72FC\u72F9\u72FD"+ - "\u72F8\u72F7\u7386\u73ED\u7409\u73EE\u73E0\u73EA"+ - "\u73DE\u7554\u755D\u755C\u755A\u7559\u75BE\u75C5"+ - "\u75C7\u75B2\u75B3\u75BD\u75BC\u75B9\u75C2\u75B8"+ - "\u768B\u76B0\u76CA\u76CD\u76CE\u7729\u771F\u7720"+ - "\u7728\u77E9\u7830\u7827\u7838\u781D\u7834\u7837"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\u7825\u782D\u7820\u781F\u7832\u7955"+ - "\u7950\u7960\u795F\u7956\u795E\u795D\u7957\u795A"+ - "\u79E4\u79E3\u79E7\u79DF\u79E6\u79E9\u79D8\u7A84"+ - "\u7A88\u7AD9\u7B06\u7B11\u7C89\u7D21\u7D17\u7D0B"+ - "\u7D0A\u7D20\u7D22\u7D14\u7D10\u7D15\u7D1A\u7D1C"+ - "\u7D0D\u7D19\u7D1B\u7F3A\u7F5F\u7F94\u7FC5\u7FC1"+ - "\u8006\u8018\u8015\u8019\u8017\u803D\u803F\u80F1"+ - "\u8102\u80F0\u8105\u80ED\u80F4\u8106\u80F8\u80F3"+ - "\u8108\u80FD\u810A\u80FC\u80EF\u81ED\u81EC\u8200"+ - "\u8210\u822A\u822B\u8228\u822C\u82BB\u832B\u8352"+ - "\u8354\u834A\u8338\u8350\u8349\u8335\u8334\u834F"+ - "\u8332\u8339\u8336\u8317\u8340\u8331\u8328\u8343"; - - private final static String innerIndex1= - "\u8654\u868A\u86AA\u8693\u86A4\u86A9\u868C\u86A3"+ - "\u869C\u8870\u8877\u8881\u8882\u887D\u8879\u8A18"+ - "\u8A10\u8A0E\u8A0C\u8A15\u8A0A\u8A17\u8A13\u8A16"+ - "\u8A0F\u8A11\u8C48\u8C7A\u8C79\u8CA1\u8CA2\u8D77"+ - "\u8EAC\u8ED2\u8ED4\u8ECF\u8FB1\u9001\u9006\u8FF7"+ - "\u9000\u8FFA\u8FF4\u9003\u8FFD\u9005\u8FF8\u9095"+ - "\u90E1\u90DD\u90E2\u9152\u914D\u914C\u91D8\u91DD"+ - "\u91D7\u91DC\u91D9\u9583\u9662\u9663\u9661\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\u965B\u965D\u9664\u9658\u965E\u96BB\u98E2"+ - "\u99AC\u9AA8\u9AD8\u9B25\u9B32\u9B3C\u4E7E\u507A"+ - "\u507D\u505C\u5047\u5043\u504C\u505A\u5049\u5065"+ - "\u5076\u504E\u5055\u5075\u5074\u5077\u504F\u500F"+ - "\u506F\u506D\u515C\u5195\u51F0\u526A\u526F\u52D2"+ - "\u52D9\u52D8\u52D5\u5310\u530F\u5319\u533F\u5340"+ - "\u533E\u53C3\u66FC\u5546\u556A\u5566\u5544\u555E"+ - "\u5561\u5543\u554A\u5531\u5556\u554F\u5555\u552F"+ - "\u5564\u5538\u552E\u555C\u552C\u5563\u5533\u5541"+ - "\u5557\u5708\u570B\u5709\u57DF\u5805\u580A\u5806"+ - "\u57E0\u57E4\u57FA\u5802\u5835\u57F7\u57F9\u5920"+ - "\u5962\u5A36\u5A41\u5A49\u5A66\u5A6A\u5A40\u5A3C"+ - "\u5A62\u5A5A\u5A46\u5A4A\u5B70\u5BC7\u5BC5\u5BC4"+ - "\u5BC2\u5BBF\u5BC6\u5C09\u5C08\u5C07\u5C60\u5C5C"+ - "\u5C5D\u5D07\u5D06\u5D0E\u5D1B\u5D16\u5D22\u5D11"+ - "\u5D29\u5D14\u5D19\u5D24\u5D27\u5D17\u5DE2\u5E38"+ - "\u5E36\u5E33\u5E37\u5EB7\u5EB8\u5EB6\u5EB5\u5EBE"+ - "\u5F35\u5F37\u5F57\u5F6C\u5F69\u5F6B\u5F97\u5F99"+ - "\u5F9E\u5F98\u5FA1\u5FA0\u5F9C\u607F\u60A3\u6089"+ - "\u60A0\u60A8\u60CB\u60B4\u60E6\u60BD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\u60C5\u60BB\u60B5\u60DC\u60BC\u60D8\u60D5\u60C6"+ - "\u60DF\u60B8\u60DA\u60C7\u621A\u621B\u6248\u63A0"+ - "\u63A7\u6372\u6396\u63A2\u63A5\u6377\u6367\u6398"+ - "\u63AA\u6371\u63A9\u6389\u6383\u639B\u636B\u63A8"+ - "\u6384\u6388\u6399\u63A1\u63AC\u6392\u638F\u6380"+ - "\u637B\u6369\u6368\u637A\u655D\u6556\u6551\u6559"+ - "\u6557\u555F\u654F\u6558\u6555\u6554\u659C\u659B"+ - "\u65AC\u65CF\u65CB\u65CC\u65CE\u665D\u665A\u6664"+ - "\u6668\u6666\u665E\u66F9\u52D7\u671B\u6881\u68AF"+ - "\u68A2\u6893\u68B5\u687F\u6876\u68B1\u68A7\u6897"+ - "\u68B0\u6883\u68C4\u68AD\u6886\u6885\u6894\u689D"+ - "\u68A8\u689F\u68A1\u6882\u6B32\u6BBA\u6BEB\u6BEC"+ - "\u6C2B\u6D8E\u6DBC\u6DF3\u6DD9\u6DB2\u6DE1\u6DCC"+ - "\u6DE4\u6DFB\u6DFA\u6E05\u6DC7\u6DCB\u6DAF\u6DD1"+ - "\u6DAE\u6DDE\u6DF9\u6DB8\u6DF7\u6DF5\u6DC5\u6DD2"+ - "\u6E1A\u6DB5\u6DDA\u6DEB\u6DD8\u6DEA\u6DF1\u6DEE"+ - "\u6DE8\u6DC6\u6DC4\u6DAA\u6DEC\u6DBF\u6DE6\u70F9"+ - "\u7109\u710A\u70FD\u70EF\u723D\u727D\u7281\u731C"+ - "\u731B\u7316\u7313\u7319\u7387\u7405\u740A\u7403"+ - "\u7406\u73FE\u740D\u74E0\u74F6\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u74F7"+ - "\u751C\u7522\u7565\u7566\u7562\u7570\u758F\u75D4"+ - "\u75D5\u75B5\u75CA\u75CD\u768E\u76D4\u76D2\u76DB"+ - "\u7737\u773E\u773C\u7736\u7738\u773A\u786B\u7843"+ - "\u784E\u7965\u7968\u796D\u79FB\u7A92\u7A95\u7B20"+ - "\u7B28\u7B1B\u7B2C\u7B26\u7B19\u7B1E\u7B2E\u7C92"+ - "\u7C97\u7C95\u7D46\u7D43\u7D71\u7D2E\u7D39\u7D3C"+ - "\u7D40\u7D30\u7D33\u7D44\u7D2F\u7D42\u7D32\u7D31"+ - "\u7F3D\u7F9E\u7F9A\u7FCC\u7FCE\u7FD2\u801C\u804A"+ - "\u8046\u812F\u8116\u8123\u812B\u8129\u8130\u8124"+ - "\u8202\u8235\u8237\u8236\u8239\u838E\u839E\u8398"+ - "\u8378\u83A2\u8396\u83BD\u83AB\u8392\u838A\u8393"+ - "\u8389\u83A0\u8377\u837B\u837C\u8386\u83A7\u8655"+ - "\u5F6A\u86C7\u86C0\u86B6\u86C4\u86B5\u86C6\u86CB"+ - "\u86B1\u86AF\u86C9\u8853\u889E\u8888\u88AB\u8892"+ - "\u8896\u888D\u888B\u8993\u898F\u8A2A\u8A1D\u8A23"+ - "\u8A25\u8A31\u8A2D\u8A1F\u8A1B\u8A22\u8C49\u8C5A"+ - "\u8CA9\u8CAC\u8CAB\u8CA8\u8CAA\u8CA7\u8D67\u8D66"+ - "\u8DBE\u8DBA\u8EDB\u8EDF\u9019\u900D\u901A\u9017"+ - "\u9023\u901F\u901D\u9010\u9015\u901E\u9020\u900F"+ - "\u9022\u9016\u901B\u9014\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u90E8\u90ED"+ - "\u90FD\u9157\u91CE\u91F5\u91E6\u91E3\u91E7\u91ED"+ - "\u91E9\u9589\u966A\u9675\u9673\u9678\u9670\u9674"+ - "\u9676\u9677\u966C\u96C0\u96EA\u96E9\u7AE0\u7ADF"+ - "\u9802\u9803\u9B5A\u9CE5\u9E75\u9E7F\u9EA5\u9EBB"+ - "\u50A2\u508D\u5085\u5099\u5091\u5080\u5096\u5098"+ - "\u509A\u6700\u51F1\u5272\u5274\u5275\u5269\u52DE"+ - "\u52DD\u52DB\u535A\u53A5\u557B\u5580\u55A7\u557C"+ - "\u558A\u559D\u5598\u5582\u559C\u55AA\u5594\u5587"+ - "\u558B\u5583\u55B3\u55AE\u559F\u553E\u55B2\u559A"+ - "\u55BB\u55AC\u55B1\u557E\u5589\u55AB\u5599\u570D"+ - "\u582F\u582A\u5834\u5824\u5830\u5831\u5821\u581D"+ - "\u5820\u58F9\u58FA\u5960\u5A77\u5A9A\u5A7F\u5A92"+ - "\u5A9B\u5AA7\u5B73\u5B71\u5BD2\u5BCC\u5BD3\u5BD0"+ - "\u5C0A\u5C0B\u5C31\u5D4C\u5D50\u5D34\u5D47\u5DFD"+ - "\u5E45\u5E3D\u5E40\u5E43\u5E7E\u5ECA\u5EC1\u5EC2"+ - "\u5EC4\u5F3C\u5F6D\u5FA9\u5FAA\u5FA8\u60D1\u60E1"+ - "\u60B2\u60B6\u60E0\u611C\u6123\u60FA\u6115\u60F0"+ - "\u60FB\u60F4\u6168\u60F1\u610E\u60F6\u6109\u6100"+ - "\u6112\u621F\u6249\u63A3\u638C\u63CF\u63C0\u63E9"+ - "\u63C9\u63C6\u63CD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u63D2\u63E3\u63D0"+ - "\u63E1\u63D6\u63ED\u63EE\u6376\u63F4\u63EA\u63DB"+ - "\u6452\u63DA\u63F9\u655E\u6566\u6562\u6563\u6591"+ - "\u6590\u65AF\u666E\u6670\u6674\u6676\u666F\u6691"+ - "\u667A\u667E\u6677\u66FE\u66FF\u671F\u671D\u68FA"+ - "\u68D5\u68E0\u68D8\u68D7\u6905\u68DF\u68F5\u68EE"+ - "\u68E7\u68F9\u68D2\u68F2\u68E3\u68CB\u68CD\u690D"+ - "\u6912\u690E\u68C9\u68DA\u696E\u68FB\u6B3E\u6B3A"+ - "\u6B3D\u6B98\u6B96\u6BBC\u6BEF\u6C2E\u6C2F\u6C2C"+ - "\u6E2F\u6E38\u6E54\u6E21\u6E32\u6E67\u6E4A\u6E20"+ - "\u6E25\u6E23\u6E1B\u6E5B\u6E58\u6E24\u6E56\u6E6E"+ - "\u6E2D\u6E26\u6E6F\u6E34\u6E4D\u6E3A\u6E2C\u6E43"+ - "\u6E1D\u6E3E\u6ECB\u6E89\u6E19\u6E4E\u6E63\u6E44"+ - "\u6E72\u6E69\u6E5F\u7119\u711A\u7126\u7130\u7121"+ - "\u7136\u716E\u711C\u724C\u7284\u7280\u7336\u7325"+ - "\u7334\u7329\u743A\u742A\u7433\u7422\u7425\u7435"+ - "\u7436\u7434\u742F\u741B\u7426\u7428\u7525\u7526"+ - "\u756B\u756A\u75E2\u75DB\u75E3\u75D9\u75D8\u75DE"+ - "\u75E0\u767B\u767C\u7696\u7693\u76B4\u76DC\u774F"+ - "\u77ED\u785D\u786C\u786F\u7A0D\u7A08\u7A0B\u7A05"+ - "\u7A00\u7A98\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\u7A97\u7A96\u7AE5\u7AE3"+ - "\u7B49\u7B56\u7B46\u7B50\u7B52\u7B54\u7B4D\u7B4B"+ - "\u7B4F\u7B51\u7C9F\u7CA5\u7D5E\u7D50\u7D68\u7D55"+ - "\u7D2B\u7D6E\u7D72\u7D61\u7D66\u7D62\u7D70\u7D73"+ - "\u5584\u7FD4\u7FD5\u800B\u8052\u8085\u8155\u8154"+ - "\u814B\u8151\u814E\u8139\u8146\u813E\u814C\u8153"+ - "\u8174\u8212\u821C\u83E9\u8403\u83F8\u840D\u83E0"+ - "\u83C5\u840B\u83C1\u83EF\u83F1\u83F4\u8457\u840A"+ - "\u83F0\u840C\u83CC\u83FD\u83F2\u83CA\u8438\u840E"+ - "\u8404\u83DC\u8407\u83D4\u83DF\u865B\u86DF\u86D9"+ - "\u86ED\u86D4\u86DB\u86E4\u86D0\u86DE\u8857\u88C1"+ - "\u88C2\u88B1\u8983\u8996\u8A3B\u8A60\u8A55\u8A5E"+ - "\u8A3C\u8A41\u8A54\u8A5B\u8A50\u8A46\u8A34\u8A3A"+ - "\u8A36\u8A56\u8C61\u8C82\u8CAF\u8CBC\u8CB3\u8CBD"+ - "\u8CC1\u8CBB\u8CC0\u8CB4\u8CB7\u8CB6\u8CBF\u8CB8"+ - "\u8D8A\u8D85\u8D81\u8DCE\u8DDD\u8DCB\u8DDA\u8DD1"+ - "\u8DCC\u8DDB\u8DC6\u8EFB\u8EF8\u8EFC\u8F9C\u902E"+ - "\u9035\u9031\u9038\u9032\u9036\u9102\u90F5\u9109"+ - "\u90FE\u9163\u9165\u91CF\u9214\u9215\u9223\u9209"+ - "\u921E\u920D\u9210\u9207\u9211\u9594\u958F\u958B"+ - "\u9591\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\u9593\u9592\u958E\u968A\u968E"+ - "\u968B\u967D\u9685\u9686\u968D\u9672\u9684\u96C1"+ - "\u96C5\u96C4\u96C6\u96C7\u96EF\u96F2\u97CC\u9805"+ - "\u9806\u9808\u98E7\u98EA\u98EF\u98E9\u98F2\u98ED"+ - "\u99AE\u99AD\u9EC3\u9ECD\u9ED1\u4E82\u50AD\u50B5"+ - "\u50B2\u50B3\u50C5\u50BE\u50AC\u50B7\u50BB\u50AF"+ - "\u50C7\u527F\u5277\u527D\u52DF\u52E6\u52E4\u52E2"+ - "\u52E3\u532F\u55DF\u55E8\u55D3\u55E6\u55CE\u55DC"+ - "\u55C7\u55D1\u55E3\u55E4\u55EF\u55DA\u55E1\u55C5"+ - "\u55C6\u55E5\u55C9\u5712\u5713\u585E\u5851\u5858"+ - "\u5857\u585A\u5854\u586B\u584C\u586D\u584A\u5862"+ - "\u5852\u584B\u5967\u5AC1\u5AC9\u5ACC\u5ABE\u5ABD"+ - "\u5ABC\u5AB3\u5AC2\u5AB2\u5D69\u5D6F\u5E4C\u5E79"+ - "\u5EC9\u5EC8\u5F12\u5F59\u5FAC\u5FAE\u611A\u610F"+ - "\u6148\u611F\u60F3\u611B\u60F9\u6101\u6108\u614E"+ - "\u614C\u6144\u614D\u613E\u6134\u6127\u610D\u6106"+ - "\u6137\u6221\u6222\u6413\u643E\u641E\u642A\u642D"+ - "\u643D\u642C\u640F\u641C\u6414\u640D\u6436\u6416"+ - "\u6417\u6406\u656C\u659F\u65B0\u6697\u6689\u6687"+ - "\u6688\u6696\u6684\u6698\u668D\u6703\u6994\u696D"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\u695A\u6977\u6960\u6954\u6975\u6930"+ - "\u6982\u694A\u6968\u696B\u695E\u6953\u6979\u6986"+ - "\u695D\u6963\u695B\u6B47\u6B72\u6BC0\u6BBF\u6BD3"+ - "\u6BFD\u6EA2\u6EAF\u6ED3\u6EB6\u6EC2\u6E90\u6E9D"+ - "\u6EC7\u6EC5\u6EA5\u6E98\u6EBC\u6EBA\u6EAB\u6ED1"+ - "\u6E96\u6E9C\u6EC4\u6ED4\u6EAA\u6EA7\u6EB4\u714E"+ - "\u7159\u7169\u7164\u7149\u7167\u715C\u716C\u7166"+ - "\u714C\u7165\u715E\u7146\u7168\u7156\u723A\u7252"+ - "\u7337\u7345\u733F\u733E\u746F\u745A\u7455\u745F"+ - "\u745E\u7441\u743F\u7459\u745B\u745C\u7576\u7578"+ - "\u7600\u75F0\u7601\u75F2\u75F1\u75FA\u75FF\u75F4"+ - "\u75F3\u76DE\u76DF\u775B\u776B\u7766\u775E\u7763"+ - "\u7779\u776A\u776C\u775C\u7765\u7768\u7762\u77EE"+ - "\u788E\u78B0\u7897\u7898\u788C\u7889\u787C\u7891"+ - "\u7893\u787F\u797A\u797F\u7981\u842C\u79BD\u7A1C"+ - "\u7A1A\u7A20\u7A14\u7A1F\u7A1E\u7A9F\u7AA0\u7B77"+ - "\u7BC0\u7B60\u7B6E\u7B67\u7CB1\u7CB3\u7CB5\u7D93"+ - "\u7D79\u7D91\u7D81\u7D8F\u7D5B\u7F6E\u7F69\u7F6A"+ - "\u7F72\u7FA9\u7FA8\u7FA4\u8056\u8058\u8086\u8084"+ - "\u8171\u8170\u8178\u8165\u816E\u8173\u816B\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\u8179\u817A\u8166\u8205\u8247\u8482\u8477"+ - "\u843D\u8431\u8475\u8466\u846B\u8449\u846C\u845B"+ - "\u843C\u8435\u8461\u8463\u8469\u846D\u8446\u865E"+ - "\u865C\u865F\u86F9\u8713\u8708\u8707\u8700\u86FE"+ - "\u86FB\u8702\u8703\u8706\u870A\u8859\u88DF\u88D4"+ - "\u88D9\u88DC\u88D8\u88DD\u88E1\u88CA\u88D5\u88D2"+ - "\u899C\u89E3\u8A6B\u8A72\u8A73\u8A66\u8A69\u8A70"+ - "\u8A87\u8A7C\u8A63\u8AA0\u8A71\u8A85\u8A6D\u8A62"+ - "\u8A6E\u8A6C\u8A79\u8A7B\u8A3E\u8A68\u8C62\u8C8A"+ - "\u8C89\u8CCA\u8CC7\u8CC8\u8CC4\u8CB2\u8CC3\u8CC2"+ - "\u8CC5\u8DE1\u8DDF\u8DE8\u8DEF\u8DF3\u8DFA\u8DEA"+ - "\u8DE4\u8DE6\u8EB2\u8F03\u8F09\u8EFE\u8F0A\u8F9F"+ - "\u8FB2\u904B\u904A\u9053\u9042\u9054\u903C\u9055"+ - "\u9050\u9047\u904F\u904E\u904D\u9051\u903E\u9041"+ - "\u9112\u9117\u916C\u916A\u9169\u91C9\u9237\u9257"+ - "\u9238\u923D\u9240\u923E\u925B\u924B\u9264\u9251"+ - "\u9234\u9249\u924D\u9245\u9239\u923F\u925A\u9598"+ - "\u9698\u9694\u9695\u96CD\u96CB\u96C9\u96CA\u96F7"+ - "\u96FB\u96F9\u96F6\u9756\u9774\u9776\u9810\u9811"+ - "\u9813\u980A\u9812\u980C\u98FC\u98F4\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\u98FD\u98FE\u99B3\u99B1\u99B4\u9AE1\u9CE9\u9E82"+ - "\u9F0E\u9F13\u9F20\u50E7\u50EE\u50E5\u50D6\u50ED"+ - "\u50DA\u50D5\u50CF\u50D1\u50F1\u50CE\u50E9\u5162"+ - "\u51F3\u5283\u5282\u5331\u53AD\u55FE\u5600\u561B"+ - "\u5617\u55FD\u5614\u5606\u5609\u560D\u560E\u55F7"+ - "\u5616\u561F\u5608\u5610\u55F6\u5718\u5716\u5875"+ - "\u587E\u5883\u5893\u588A\u5879\u5885\u587D\u58FD"+ - "\u5925\u5922\u5924\u596A\u5969\u5AE1\u5AE6\u5AE9"+ - "\u5AD7\u5AD6\u5AD8\u5AE3\u5B75\u5BDE\u5BE7\u5BE1"+ - "\u5BE5\u5BE6\u5BE8\u5BE2\u5BE4\u5BDF\u5C0D\u5C62"+ - "\u5D84\u5D87\u5E5B\u5E63\u5E55\u5E57\u5E54\u5ED3"+ - "\u5ED6\u5F0A\u5F46\u5F70\u5FB9\u6147\u613F\u614B"+ - "\u6177\u6162\u6163\u615F\u615A\u6158\u6175\u622A"+ - "\u6487\u6458\u6454\u64A4\u6478\u645F\u647A\u6451"+ - "\u6467\u6434\u646D\u647B\u6572\u65A1\u65D7\u65D6"+ - "\u66A2\u66A8\u669D\u699C\u69A8\u6995\u69C1\u69AE"+ - "\u69D3\u69CB\u699B\u69B7\u69BB\u69AB\u69B4\u69D0"+ - "\u69CD\u69AD\u69CC\u69A6\u69C3\u69A3\u6B49\u6B4C"+ - "\u6C33\u6F33\u6F14\u6EFE\u6F13\u6EF4\u6F29\u6F3E"+ - "\u6F20\u6F2C\u6F0F\u6F02\u6F22\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u6EFF"+ - "\u6EEF\u6F06\u6F31\u6F38\u6F32\u6F23\u6F15\u6F2B"+ - "\u6F2F\u6F88\u6F2A\u6EEC\u6F01\u6EF2\u6ECC\u6EF7"+ - "\u7194\u7199\u717D\u718A\u7184\u7192\u723E\u7292"+ - "\u7296\u7344\u7350\u7464\u7463\u746A\u7470\u746D"+ - "\u7504\u7591\u7627\u760D\u760B\u7609\u7613\u76E1"+ - "\u76E3\u7784\u777D\u777F\u7761\u78C1\u789F\u78A7"+ - "\u78B3\u78A9\u78A3\u798E\u798F\u798D\u7A2E\u7A31"+ - "\u7AAA\u7AA9\u7AED\u7AEF\u7BA1\u7B95\u7B8B\u7B75"+ - "\u7B97\u7B9D\u7B94\u7B8F\u7BB8\u7B87\u7B84\u7CB9"+ - "\u7CBD\u7CBE\u7DBB\u7DB0\u7D9C\u7DBD\u7DBE\u7DA0"+ - "\u7DCA\u7DB4\u7DB2\u7DB1\u7DBA\u7DA2\u7DBF\u7DB5"+ - "\u7DB8\u7DAD\u7DD2\u7DC7\u7DAC\u7F70\u7FE0\u7FE1"+ - "\u7FDF\u805E\u805A\u8087\u8150\u8180\u818F\u8188"+ - "\u818A\u817F\u8182\u81E7\u81FA\u8207\u8214\u821E"+ - "\u824B\u84C9\u84BF\u84C6\u84C4\u8499\u849E\u84B2"+ - "\u849C\u84CB\u84B8\u84C0\u84D3\u8490\u84BC\u84D1"+ - "\u84CA\u873F\u871C\u873B\u8722\u8725\u8734\u8718"+ - "\u8755\u8737\u8729\u88F3\u8902\u88F4\u88F9\u88F8"+ - "\u88FD\u88E8\u891A\u88EF\u8AA6\u8A8C\u8A9E\u8AA3"+ - "\u8A8D\u8AA1\u8A93\u8AA4\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u8AAA\u8AA5"+ - "\u8AA8\u8A98\u8A91\u8A9A\u8AA7\u8C6A\u8C8D\u8C8C"+ - "\u8CD3\u8CD1\u8CD2\u8D6B\u8D99\u8D95\u8DFC\u8F14"+ - "\u8F12\u8F15\u8F13\u8FA3\u9060\u9058\u905C\u9063"+ - "\u9059\u905E\u9062\u905D\u905B\u9119\u9118\u911E"+ - "\u9175\u9178\u9177\u9174\u9278\u9280\u9285\u9298"+ - "\u9296\u927B\u9293\u929C\u92A8\u927C\u9291\u95A1"+ - "\u95A8\u95A9\u95A3\u95A5\u95A4\u9699\u969C\u969B"+ - "\u96CC\u96D2\u9700\u977C\u9785\u97F6\u9817\u9818"+ - "\u98AF\u98B1\u9903\u9905\u990C\u9909\u99C1\u9AAF"+ - "\u9AB0\u9AE6\u9B41\u9B42\u9CF4\u9CF6\u9CF3\u9EBC"+ - "\u9F3B\u9F4A\u5104\u5100\u50FB\u50F5\u50F9\u5102"+ - "\u5108\u5109\u5105\u51DC\u5287\u5288\u5289\u528D"+ - "\u528A\u52F0\u53B2\u562E\u563B\u5639\u5632\u563F"+ - "\u5634\u5629\u5653\u564E\u5657\u5674\u5636\u562F"+ - "\u5630\u5880\u589F\u589E\u58B3\u589C\u58AE\u58A9"+ - "\u58A6\u596D\u5B09\u5AFB\u5B0B\u5AF5\u5B0C\u5B08"+ - "\u5BEE\u5BEC\u5BE9\u5BEB\u5C64\u5C65\u5D9D\u5D94"+ - "\u5E62\u5E5F\u5E61\u5EE2\u5EDA\u5EDF\u5EDD\u5EE3"+ - "\u5EE0\u5F48\u5F71\u5FB7\u5FB5\u6176\u6167\u616E"+ - "\u615D\u6155\u6182\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u617C\u6170\u616B"+ - "\u617E\u61A7\u6190\u61AB\u618E\u61AC\u619A\u61A4"+ - "\u6194\u61AE\u622E\u6469\u646F\u6479\u649E\u64B2"+ - "\u6488\u6490\u64B0\u64A5\u6493\u6495\u64A9\u6492"+ - "\u64AE\u64AD\u64AB\u649A\u64AC\u6499\u64A2\u64B3"+ - "\u6575\u6577\u6578\u66AE\u66AB\u66B4\u66B1\u6A23"+ - "\u6A1F\u69E8\u6A01\u6A1E\u6A19\u69FD\u6A21\u6A13"+ - "\u6A0A\u69F3\u6A02\u6A05\u69ED\u6A11\u6B50\u6B4E"+ - "\u6BA4\u6BC5\u6BC6\u6F3F\u6F7C\u6F84\u6F51\u6F66"+ - "\u6F54\u6F86\u6F6D\u6F5B\u6F78\u6F6E\u6F8E\u6F7A"+ - "\u6F70\u6F64\u6F97\u6F58\u6ED5\u6F6F\u6F60\u6F5F"+ - "\u719F\u71AC\u71B1\u71A8\u7256\u729B\u734E\u7357"+ - "\u7469\u748B\u7483\u747E\u7480\u757F\u7620\u7629"+ - "\u761F\u7624\u7626\u7621\u7622\u769A\u76BA\u76E4"+ - "\u778E\u7787\u778C\u7791\u778B\u78CB\u78C5\u78BA"+ - "\u78CA\u78BE\u78D5\u78BC\u78D0\u7A3F\u7A3C\u7A40"+ - "\u7A3D\u7A37\u7A3B\u7AAF\u7AAE\u7BAD\u7BB1\u7BC4"+ - "\u7BB4\u7BC6\u7BC7\u7BC1\u7BA0\u7BCC\u7CCA\u7DE0"+ - "\u7DF4\u7DEF\u7DFB\u7DD8\u7DEC\u7DDD\u7DE8\u7DE3"+ - "\u7DDA\u7DDE\u7DE9\u7D9E\u7DD9\u7DF2\u7DF9\u7F75"+ - "\u7F77\u7FAF\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\u7FE9\u8026\u819B\u819C"+ - "\u819D\u81A0\u819A\u8198\u8517\u853D\u851A\u84EE"+ - "\u852C\u852D\u8513\u8511\u8523\u8521\u8514\u84EC"+ - "\u8525\u84FF\u8506\u8782\u8774\u8776\u8760\u8766"+ - "\u8778\u8768\u8759\u8757\u874C\u8753\u885B\u885D"+ - "\u8910\u8907\u8912\u8913\u8915\u890A\u8ABC\u8AD2"+ - "\u8AC7\u8AC4\u8A95\u8ACB\u8AF8\u8AB2\u8AC9\u8AC2"+ - "\u8ABF\u8AB0\u8AD6\u8ACD\u8AB6\u8AB9\u8ADB\u8C4C"+ - "\u8C4E\u8C6C\u8CE0\u8CDE\u8CE6\u8CE4\u8CEC\u8CED"+ - "\u8CE2\u8CE3\u8CDC\u8CEA\u8CE1\u8D6D\u8D9F\u8DA3"+ - "\u8E2B\u8E10\u8E1D\u8E22\u8E0F\u8E29\u8E1F\u8E21"+ - "\u8E1E\u8EBA\u8F1D\u8F1B\u8F1F\u8F29\u8F26\u8F2A"+ - "\u8F1C\u8F1E\u8F25\u9069\u906E\u9068\u906D\u9077"+ - "\u9130\u912D\u9127\u9131\u9187\u9189\u918B\u9183"+ - "\u92C5\u92BB\u92B7\u92EA\u92AC\u92E4\u92C1\u92B3"+ - "\u92BC\u92D2\u92C7\u92F0\u92B2\u95AD\u95B1\u9704"+ - "\u9706\u9707\u9709\u9760\u978D\u978B\u978F\u9821"+ - "\u982B\u981C\u98B3\u990A\u9913\u9912\u9918\u99DD"+ - "\u99D0\u99DF\u99DB\u99D1\u99D5\u99D2\u99D9\u9AB7"+ - "\u9AEE\u9AEF\u9B27\u9B45\u9B44\u9B77\u9B6F\u9D06"+ - "\u9D09\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\u9D03\u9EA9\u9EBE\u9ECE\u58A8"+ - "\u9F52\u5112\u5118\u5114\u5110\u5115\u5180\u51AA"+ - "\u51DD\u5291\u5293\u52F3\u5659\u566B\u5679\u5669"+ - "\u5664\u5678\u566A\u5668\u5665\u5671\u566F\u566C"+ - "\u5662\u5676\u58C1\u58BE\u58C7\u58C5\u596E\u5B1D"+ - "\u5B34\u5B78\u5BF0\u5C0E\u5F4A\u61B2\u6191\u61A9"+ - "\u618A\u61CD\u61B6\u61BE\u61CA\u61C8\u6230\u64C5"+ - "\u64C1\u64CB\u64BB\u64BC\u64DA\u64C4\u64C7\u64C2"+ - "\u64CD\u64BF\u64D2\u64D4\u64BE\u6574\u66C6\u66C9"+ - "\u66B9\u66C4\u66C7\u66B8\u6A3D\u6A38\u6A3A\u6A59"+ - "\u6A6B\u6A58\u6A39\u6A44\u6A62\u6A61\u6A4B\u6A47"+ - "\u6A35\u6A5F\u6A48\u6B59\u6B77\u6C05\u6FC2\u6FB1"+ - "\u6FA1\u6FC3\u6FA4\u6FC1\u6FA7\u6FB3\u6FC0\u6FB9"+ - "\u6FB6\u6FA6\u6FA0\u6FB4\u71BE\u71C9\u71D0\u71D2"+ - "\u71C8\u71D5\u71B9\u71CE\u71D9\u71DC\u71C3\u71C4"+ - "\u7368\u749C\u74A3\u7498\u749F\u749E\u74E2\u750C"+ - "\u750D\u7634\u7638\u763A\u76E7\u76E5\u77A0\u779E"+ - "\u779F\u77A5\u78E8\u78DA\u78EC\u78E7\u79A6\u7A4D"+ - "\u7A4E\u7A46\u7A4C\u7A4B\u7ABA\u7BD9\u7C11\u7BC9"+ - "\u7BE4\u7BDB\u7BE1\u7BE9\u7BE6\u7CD5\u7CD6\u7E0A"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\u7E11\u7E08\u7E1B\u7E23\u7E1E\u7E1D"+ - "\u7E09\u7E10\u7F79\u7FB2\u7FF0\u7FF1\u7FEE\u8028"+ - "\u81B3\u81A9\u81A8\u81FB\u8208\u8258\u8259\u854A"+ - "\u8559\u8548\u8568\u8569\u8543\u8549\u856D\u856A"+ - "\u855E\u8783\u879F\u879E\u87A2\u878D\u8861\u892A"+ - "\u8932\u8925\u892B\u8921\u89AA\u89A6\u8AE6\u8AFA"+ - "\u8AEB\u8AF1\u8B00\u8ADC\u8AE7\u8AEE\u8AFE\u8B01"+ - "\u8B02\u8AF7\u8AED\u8AF3\u8AF6\u8AFC\u8C6B\u8C6D"+ - "\u8C93\u8CF4\u8E44\u8E31\u8E34\u8E42\u8E39\u8E35"+ - "\u8F3B\u8F2F\u8F38\u8F33\u8FA8\u8FA6\u9075\u9074"+ - "\u9078\u9072\u907C\u907A\u9134\u9192\u9320\u9336"+ - "\u92F8\u9333\u932F\u9322\u92FC\u932B\u9304\u931A"; - - private final static String innerIndex2= - "\u9310\u9326\u9321\u9315\u932E\u9319\u95BB\u96A7"+ - "\u96A8\u96AA\u96D5\u970E\u9711\u9716\u970D\u9713"+ - "\u970F\u975B\u975C\u9766\u9798\u9830\u9838\u983B"+ - "\u9837\u982D\u9839\u9824\u9910\u9928\u991E\u991B"+ - "\u9921\u991A\u99ED\u99E2\u99F1\u9AB8\u9ABC\u9AFB"+ - "\u9AED\u9B28\u9B91\u9D15\u9D23\u9D26\u9D28\u9D12"+ - "\u9D1B\u9ED8\u9ED4\u9F8D\u9F9C\u512A\u511F\u5121"+ - "\u5132\u52F5\u568E\u5680\u5690\u5685\u5687\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\u568F\u58D5\u58D3\u58D1\u58CE\u5B30\u5B2A"+ - "\u5B24\u5B7A\u5C37\u5C68\u5DBC\u5DBA\u5DBD\u5DB8"+ - "\u5E6B\u5F4C\u5FBD\u61C9\u61C2\u61C7\u61E6\u61CB"+ - "\u6232\u6234\u64CE\u64CA\u64D8\u64E0\u64F0\u64E6"+ - "\u64EC\u64F1\u64E2\u64ED\u6582\u6583\u66D9\u66D6"+ - "\u6A80\u6A94\u6A84\u6AA2\u6A9C\u6ADB\u6AA3\u6A7E"+ - "\u6A97\u6A90\u6AA0\u6B5C\u6BAE\u6BDA\u6C08\u6FD8"+ - "\u6FF1\u6FDF\u6FE0\u6FDB\u6FE4\u6FEB\u6FEF\u6F80"+ - "\u6FEC\u6FE1\u6FE9\u6FD5\u6FEE\u6FF0\u71E7\u71DF"+ - "\u71EE\u71E6\u71E5\u71ED\u71EC\u71F4\u71E0\u7235"+ - "\u7246\u7370\u7372\u74A9\u74B0\u74A6\u74A8\u7646"+ - "\u7642\u764C\u76EA\u77B3\u77AA\u77B0\u77AC\u77A7"+ - "\u77AD\u77EF\u78F7\u78FA\u78F4\u78EF\u7901\u79A7"+ - "\u79AA\u7A57\u7ABF\u7C07\u7C0D\u7BFE\u7BF7\u7C0C"+ - "\u7BE0\u7CE0\u7CDC\u7CDE\u7CE2\u7CDF\u7CD9\u7CDD"+ - "\u7E2E\u7E3E\u7E46\u7E37\u7E32\u7E43\u7E2B\u7E3D"+ - "\u7E31\u7E45\u7E41\u7E34\u7E39\u7E48\u7E35\u7E3F"+ - "\u7E2F\u7F44\u7FF3\u7FFC\u8071\u8072\u8070\u806F"+ - "\u8073\u81C6\u81C3\u81BA\u81C2\u81C0\u81BF\u81BD"+ - "\u81C9\u81BE\u81E8\u8209\u8271\u85AA\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\u8584\u857E\u859C\u8591\u8594\u85AF\u859B\u8587"+ - "\u85A8\u858A\u8667\u87C0\u87D1\u87B3\u87D2\u87C6"+ - "\u87AB\u87BB\u87BA\u87C8\u87CB\u893B\u8936\u8944"+ - "\u8938\u893D\u89AC\u8B0E\u8B17\u8B19\u8B1B\u8B0A"+ - "\u8B20\u8B1D\u8B04\u8B10\u8C41\u8C3F\u8C73\u8CFA"+ - "\u8CFD\u8CFC\u8CF8\u8CFB\u8DA8\u8E49\u8E4B\u8E48"+ - "\u8E4A\u8F44\u8F3E\u8F42\u8F45\u8F3F\u907F\u907D"+ - "\u9084\u9081\u9082\u9080\u9139\u91A3\u919E\u919C"+ - "\u934D\u9382\u9328\u9375\u934A\u9365\u934B\u9318"+ - "\u937E\u936C\u935B\u9370\u935A\u9354\u95CA\u95CB"+ - "\u95CC\u95C8\u95C6\u96B1\u96B8\u96D6\u971C\u971E"+ - "\u97A0\u97D3\u9846\u98B6\u9935\u9A01\u99FF\u9BAE"+ - "\u9BAB\u9BAA\u9BAD\u9D3B\u9D3F\u9E8B\u9ECF\u9EDE"+ - "\u9EDC\u9EDD\u9EDB\u9F3E\u9F4B\u53E2\u5695\u56AE"+ - "\u58D9\u58D8\u5B38\u5F5D\u61E3\u6233\u64F4\u64F2"+ - "\u64FE\u6506\u64FA\u64FB\u64F7\u65B7\u66DC\u6726"+ - "\u6AB3\u6AAC\u6AC3\u6ABB\u6AB8\u6AC2\u6AAE\u6AAF"+ - "\u6B5F\u6B78\u6BAF\u7009\u700B\u6FFE\u7006\u6FFA"+ - "\u7011\u700F\u71FB\u71FC\u71FE\u71F8\u7377\u7375"+ - "\u74A7\u74BF\u7515\u7656\u7658\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u7652"+ - "\u77BD\u77BF\u77BB\u77BC\u790E\u79AE\u7A61\u7A62"+ - "\u7A60\u7AC4\u7AC5\u7C2B\u7C27\u7C2A\u7C1E\u7C23"+ - "\u7C21\u7CE7\u7E54\u7E55\u7E5E\u7E5A\u7E61\u7E52"+ - "\u7E59\u7F48\u7FF9\u7FFB\u8077\u8076\u81CD\u81CF"+ - "\u820A\u85CF\u85A9\u85CD\u85D0\u85C9\u85B0\u85BA"+ - "\u85B9\u85A6\u87EF\u87EC\u87F2\u87E0\u8986\u89B2"+ - "\u89F4\u8B28\u8B39\u8B2C\u8B2B\u8C50\u8D05\u8E59"+ - "\u8E63\u8E66\u8E64\u8E5F\u8E55\u8EC0\u8F49\u8F4D"+ - "\u9087\u9083\u9088\u91AB\u91AC\u91D0\u9394\u938A"+ - "\u9396\u93A2\u93B3\u93AE\u93AC\u93B0\u9398\u939A"+ - "\u9397\u95D4\u95D6\u95D0\u95D5\u96E2\u96DC\u96D9"+ - "\u96DB\u96DE\u9724\u97A3\u97A6\u97AD\u97F9\u984D"+ - "\u984F\u984C\u984E\u9853\u98BA\u993E\u993F\u993D"+ - "\u992E\u99A5\u9A0E\u9AC1\u9B03\u9B06\u9B4F\u9B4E"+ - "\u9B4D\u9BCA\u9BC9\u9BFD\u9BC8\u9BC0\u9D51\u9D5D"+ - "\u9D60\u9EE0\u9F15\u9F2C\u5133\u56A5\u58DE\u58DF"+ - "\u58E2\u5BF5\u9F90\u5EEC\u61F2\u61F7\u61F6\u61F5"+ - "\u6500\u650F\u66E0\u66DD\u6AE5\u6ADD\u6ADA\u6AD3"+ - "\u701B\u701F\u7028\u701A\u701D\u7015\u7018\u7206"+ - "\u720D\u7258\u72A2\u7378\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u737A\u74BD"+ - "\u74CA\u74E3\u7587\u7586\u765F\u7661\u77C7\u7919"+ - "\u79B1\u7A6B\u7A69\u7C3E\u7C3F\u7C38\u7C3D\u7C37"+ - "\u7C40\u7E6B\u7E6D\u7E79\u7E69\u7E6A\u7F85\u7E73"+ - "\u7FB6\u7FB9\u7FB8\u81D8\u85E9\u85DD\u85EA\u85D5"+ - "\u85E4\u85E5\u85F7\u87FB\u8805\u880D\u87F9\u87FE"+ - "\u8960\u895F\u8956\u895E\u8B41\u8B5C\u8B58\u8B49"+ - "\u8B5A\u8B4E\u8B4F\u8B46\u8B59\u8D08\u8D0A\u8E7C"+ - "\u8E72\u8E87\u8E76\u8E6C\u8E7A\u8E74\u8F54\u8F4E"+ - "\u8FAD\u908A\u908B\u91B1\u91AE\u93E1\u93D1\u93DF"+ - "\u93C3\u93C8\u93DC\u93DD\u93D6\u93E2\u93CD\u93D8"+ - "\u93E4\u93D7\u93E8\u95DC\u96B4\u96E3\u972A\u9727"+ - "\u9761\u97DC\u97FB\u985E\u9858\u985B\u98BC\u9945"+ - "\u9949\u9A16\u9A19\u9B0D\u9BE8\u9BE7\u9BD6\u9BDB"+ - "\u9D89\u9D61\u9D72\u9D6A\u9D6C\u9E92\u9E97\u9E93"+ - "\u9EB4\u52F8\u56A8\u56B7\u56B6\u56B4\u56BC\u58E4"+ - "\u5B40\u5B43\u5B7D\u5BF6\u5DC9\u61F8\u61FA\u6518"+ - "\u6514\u6519\u66E6\u6727\u6AEC\u703E\u7030\u7032"+ - "\u7210\u737B\u74CF\u7662\u7665\u7926\u792A\u792C"+ - "\u792B\u7AC7\u7AF6\u7C4C\u7C43\u7C4D\u7CEF\u7CF0"+ - "\u8FAE\u7E7D\u7E7C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u7E82\u7F4C\u8000"+ - "\u81DA\u8266\u85FB\u85F9\u8611\u85FA\u8606\u860B"+ - "\u8607\u860A\u8814\u8815\u8964\u89BA\u89F8\u8B70"+ - "\u8B6C\u8B66\u8B6F\u8B5F\u8B6B\u8D0F\u8D0D\u8E89"+ - "\u8E81\u8E85\u8E82\u91B4\u91CB\u9418\u9403\u93FD"+ - "\u95E1\u9730\u98C4\u9952\u9951\u99A8\u9A2B\u9A30"+ - "\u9A37\u9A35\u9C13\u9C0D\u9E79\u9EB5\u9EE8\u9F2F"+ - "\u9F5F\u9F63\u9F61\u5137\u5138\u56C1\u56C0\u56C2"+ - "\u5914\u5C6C\u5DCD\u61FC\u61FE\u651D\u651C\u6595"+ - "\u66E9\u6AFB\u6B04\u6AFA\u6BB2\u704C\u721B\u72A7"+ - "\u74D6\u74D4\u7669\u77D3\u7C50\u7E8F\u7E8C\u7FBC"+ - "\u8617\u862D\u861A\u8823\u8822\u8821\u881F\u896A"+ - "\u896C\u89BD\u8B74\u8B77\u8B7D\u8D13\u8E8A\u8E8D"+ - "\u8E8B\u8F5F\u8FAF\u91BA\u942E\u9433\u9435\u943A"+ - "\u9438\u9432\u942B\u95E2\u9738\u9739\u9732\u97FF"+ - "\u9867\u9865\u9957\u9A45\u9A43\u9A40\u9A3E\u9ACF"+ - "\u9B54\u9B51\u9C2D\u9C25\u9DAF\u9DB4\u9DC2\u9DB8"+ - "\u9E9D\u9EEF\u9F19\u9F5C\u9F66\u9F67\u513C\u513B"+ - "\u56C8\u56CA\u56C9\u5B7F\u5DD4\u5DD2\u5F4E\u61FF"+ - "\u6524\u6B0A\u6B61\u7051\u7058\u7380\u74E4\u758A"+ - "\u766E\u766C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\u79B3\u7C60\u7C5F\u807E"+ - "\u807D\u81DF\u8972\u896F\u89FC\u8B80\u8D16\u8D17"+ - "\u8E91\u8E93\u8F61\u9148\u9444\u9451\u9452\u973D"+ - "\u973E\u97C3\u97C1\u986B\u9955\u9A55\u9A4D\u9AD2"+ - "\u9B1A\u9C49\u9C31\u9C3E\u9C3B\u9DD3\u9DD7\u9F34"+ - "\u9F6C\u9F6A\u9F94\u56CC\u5DD6\u6200\u6523\u652B"+ - "\u652A\u66EC\u6B10\u74DA\u7ACA\u7C64\u7C63\u7C65"+ - "\u7E93\u7E96\u7E94\u81E2\u8638\u863F\u8831\u8B8A"+ - "\u9090\u908F\u9463\u9460\u9464\u9768\u986F\u995C"+ - "\u9A5A\u9A5B\u9A57\u9AD3\u9AD4\u9AD1\u9C54\u9C57"+ - "\u9C56\u9DE5\u9E9F\u9EF4\u56D1\u58E9\u652C\u705E"+ - "\u7671\u7672\u77D7\u7F50\u7F88\u8836\u8839\u8862"+ - "\u8B93\u8B92\u8B96\u8277\u8D1B\u91C0\u946A\u9742"+ - "\u9748\u9744\u97C6\u9870\u9A5F\u9B22\u9B58\u9C5F"+ - "\u9DF9\u9DFA\u9E7C\u9E7D\u9F07\u9F77\u9F72\u5EF3"+ - "\u6B16\u7063\u7C6C\u7C6E\u883B\u89C0\u8EA1\u91C1"+ - "\u9472\u9470\u9871\u995E\u9AD6\u9B23\u9ECC\u7064"+ - "\u77DA\u8B9A\u9477\u97C9\u9A62\u9A65\u7E9C\u8B9C"+ - "\u8EAA\u91C5\u947D\u947E\u947C\u9C77\u9C78\u9EF7"+ - "\u8C54\u947F\u9E1A\u7228\u9A6A\u9B31\u9E1B\u9E1E"+ - "\u7C72\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\u30FE\u309D\u309E\u3005\u3041"+ - "\u3042\u3043\u3044\u3045\u3046\u3047\u3048\u3049"+ - "\u304A\u304B\u304C\u304D\u304E\u304F\u3050\u3051"+ - "\u3052\u3053\u3054\u3055\u3056\u3057\u3058\u3059"+ - "\u305A\u305B\u305C\u305D\u305E\u305F\u3060\u3061"+ - "\u3062\u3063\u3064\u3065\u3066\u3067\u3068\u3069"+ - "\u306A\u306B\u306C\u306D\u306E\u306F\u3070\u3071"+ - "\u3072\u3073\u3074\u3075\u3076\u3077\u3078\u3079"+ - "\u307A\u307B\u307C\u307D\u307E\u307F\u3080\u3081"+ - "\u3082\u3083\u3084\u3085\u3086\u3087\u3088\u3089"+ - "\u308A\u308B\u308C\u308D\u308E\u308F\u3090\u3091"+ - "\u3092\u3093\u30A1\u30A2\u30A3\u30A4\u30A5\u30A6"+ - "\u30A7\u30A8\u30A9\u30AA\u30AB\u30AC\u30AD\u30AE"+ - "\u30AF\u30B0\u30B1\u30B2\u30B3\u30B4\u30B5\u30B6"+ - "\u30B7\u30B8\u30B9\u30BA\u30BB\u30BC\u30BD\u30BE"+ - "\u30BF\u30C0\u30C1\u30C2\u30C3\u30C4\u30C5\u30C6"+ - "\u30C7\u30C8\u30C9\u30CA\u30CB\u30CC\u30CD\u30CE"+ - "\u30CF\u30D0\u30D1\u30D2\u30D3\u30D4\u30D5\u30D6"+ - "\u30D7\u30D8\u30D9\u30DA\u30DB\u30DC\u30DD\u30DE"+ - "\u30DF\u30E0\u30E1\u30E2\u30E3\u30E4\u30E5\u30E6"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\u30E7\u30E8\u30E9\u30EA\u30EB\u30EC"+ - "\u30ED\u30EE\u30EF\u30F0\u30F1\u30F2\u30F3\u30F4"+ - "\u30F5\u30F6\u0414\u0415\u0401\u0416\u0417\u0418"+ - "\u0419\u041A\u041B\u041C\u0423\u0424\u0425\u0426"+ - "\u0427\u0428\u0429\u042A\u042B\u042C\u042D\u042E"+ - "\u042F\u0430\u0431\u0432\u0433\u0434\u0435\u0451"+ - "\u0436\u0437\u0438\u0439\u043A\u043B\u043C\u043D"+ - "\u043E\u043F\u0440\u0441\u0442\u0443\u0444\u0445"+ - "\u0446\u0447\u0448\u0449\u044A\u044B\u044C\u044D"+ - "\u044E\u044F\u2460\u2461\u2462\u2463\u2464\u2465"+ - "\u2466\u2467\u2468\u2469\u2474\u2475\u2476\u2477"+ - "\u2478\u2479\u247A\u247B\u247C\u247D\uFFFD\uFFFD"+ - "\u4E42\u4E5C\u51F5\u531A\u5382\u4E07\u4E0C\u4E47"+ - "\u4E8D\u56D7\uFA0C\u5C6E\u5F73\u4E0F\u5187\u4E0E"+ - "\u4E2E\u4E93\u4EC2\u4EC9\u4EC8\u5198\u52FC\u536C"+ - "\u53B9\u5720\u5903\u592C\u5C10\u5DFF\u65E1\u6BB3"+ - "\u6BCC\u6C14\u723F\u4E31\u4E3C\u4EE8\u4EDC\u4EE9"+ - "\u4EE1\u4EDD\u4EDA\u520C\u531C\u534C\u5722\u5723"+ - "\u5917\u592F\u5B81\u5B84\u5C12\u5C3B\u5C74\u5C73"+ - "\u5E04\u5E80\u5E82\u5FC9\u6209\u6250\u6C15\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\u6C36\u6C43\u6C3F\u6C3B\u72AE\u72B0\u738A"+ - "\u79B8\u808A\u961E\u4F0E\u4F18\u4F2C\u4EF5\u4F14"+ - "\u4EF1\u4F00\u4EF7\u4F08\u4F1D\u4F02\u4F05\u4F22"+ - "\u4F13\u4F04\u4EF4\u4F12\u51B1\u5213\u5209\u5210"+ - "\u52A6\u5322\u531F\u534D\u538A\u5407\u56E1\u56DF"+ - "\u572E\u572A\u5734\u593C\u5980\u597C\u5985\u597B"+ - "\u597E\u5977\u597F\u5B56\u5C15\u5C25\u5C7C\u5C7A"+ - "\u5C7B\u5C7E\u5DDF\u5E75\u5E84\u5F02\u5F1A\u5F74"+ - "\u5FD5\u5FD4\u5FCF\u625C\u625E\u6264\u6261\u6266"+ - "\u6262\u6259\u6260\u625A\u6265\u65EF\u65EE\u673E"+ - "\u6739\u6738\u673B\u673A\u673F\u673C\u6733\u6C18"+ - "\u6C46\u6C52\u6C5C\u6C4F\u6C4A\u6C54\u6C4B\u6C4C"+ - "\u7071\u725E\u72B4\u72B5\u738E\u752A\u767F\u7A75"+ - "\u7F51\u8278\u827C\u8280\u827D\u827F\u864D\u897E"+ - "\u9099\u9097\u9098\u909B\u9094\u9622\u9624\u9620"+ - "\u9623\u4F56\u4F3B\u4F62\u4F49\u4F53\u4F64\u4F3E"+ - "\u4F67\u4F52\u4F5F\u4F41\u4F58\u4F2D\u4F33\u4F3F"+ - "\u4F61\u518F\u51B9\u521C\u521E\u5221\u52AD\u52AE"+ - "\u5309\u5363\u5372\u538E\u538F\u5430\u5437\u542A"+ - "\u5454\u5445\u5419\u541C\u5425\u5418\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\u543D\u544F\u5441\u5428\u5424\u5447\u56EE\u56E7"+ - "\u56E5\u5741\u5745\u574C\u5749\u574B\u5752\u5906"+ - "\u5940\u59A6\u5998\u59A0\u5997\u598E\u59A2\u5990"+ - "\u598F\u59A7\u59A1\u5B8E\u5B92\u5C28\u5C2A\u5C8D"+ - "\u5C8F\u5C88\u5C8B\u5C89\u5C92\u5C8A\u5C86\u5C93"+ - "\u5C95\u5DE0\u5E0A\u5E0E\u5E8B\u5E89\u5E8C\u5E88"+ - "\u5E8D\u5F05\u5F1D\u5F78\u5F76\u5FD2\u5FD1\u5FD0"+ - "\u5FED\u5FE8\u5FEE\u5FF3\u5FE1\u5FE4\u5FE3\u5FFA"+ - "\u5FEF\u5FF7\u5FFB\u6000\u5FF4\u623A\u6283\u628C"+ - "\u628E\u628F\u6294\u6287\u6271\u627B\u627A\u6270"+ - "\u6281\u6288\u6277\u627D\u6272\u6274\u6537\u65F0"+ - "\u65F4\u65F3\u65F2\u65F5\u6745\u6747\u6759\u6755"+ - "\u674C\u6748\u675D\u674D\u675A\u674B\u6BD0\u6C19"+ - "\u6C1A\u6C78\u6C67\u6C6B\u6C84\u6C8B\u6C8F\u6C71"+ - "\u6C6F\u6C69\u6C9A\u6C6D\u6C87\u6C95\u6C9C\u6C66"+ - "\u6C73\u6C65\u6C7B\u6C8E\u7074\u707A\u7263\u72BF"+ - "\u72BD\u72C3\u72C6\u72C1\u72BA\u72C5\u7395\u7397"+ - "\u7393\u7394\u7392\u753A\u7539\u7594\u7595\u7681"+ - "\u793D\u8034\u8095\u8099\u8090\u8092\u809C\u8290"+ - "\u828F\u8285\u828E\u8291\u8293\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u828A"+ - "\u8283\u8284\u8C78\u8FC9\u8FBF\u909F\u90A1\u90A5"+ - "\u909E\u90A7\u90A0\u9630\u9628\u962F\u962D\u4E33"+ - "\u4F98\u4F7C\u4F85\u4F7D\u4F80\u4F87\u4F76\u4F74"+ - "\u4F89\u4F84\u4F77\u4F4C\u4F97\u4F6A\u4F9A\u4F79"+ - "\u4F81\u4F78\u4F90\u4F9C\u4F94\u4F9E\u4F92\u4F82"+ - "\u4F95\u4F6B\u4F6E\u519E\u51BC\u51BE\u5235\u5232"+ - "\u5233\u5246\u5231\u52BC\u530A\u530B\u533C\u5392"+ - "\u5394\u5487\u547F\u5481\u5491\u5482\u5488\u546B"+ - "\u547A\u547E\u5465\u546C\u5474\u5466\u548D\u546F"+ - "\u5461\u5460\u5498\u5463\u5467\u5464\u56F7\u56F9"+ - "\u576F\u5772\u576D\u576B\u5771\u5770\u5776\u5780"+ - "\u5775\u577B\u5773\u5774\u5762\u5768\u577D\u590C"+ - "\u5945\u59B5\u59BA\u59CF\u59CE\u59B2\u59CC\u59C1"+ - "\u59B6\u59BC\u59C3\u59D6\u59B1\u59BD\u59C0\u59C8"+ - "\u59B4\u59C7\u5B62\u5B65\u5B93\u5B95\u5C44\u5C47"+ - "\u5CAE\u5CA4\u5CA0\u5CB5\u5CAF\u5CA8\u5CAC\u5C9F"+ - "\u5CA3\u5CAD\u5CA2\u5CAA\u5CA7\u5C9D\u5CA5\u5CB6"+ - "\u5CB0\u5CA6\u5E17\u5E14\u5E19\u5F28\u5F22\u5F23"+ - "\u5F24\u5F54\u5F82\u5F7E\u5F7D\u5FDE\u5FE5\u602D"+ - "\u6026\u6019\u6032\u600B\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u6034\u600A"+ - "\u6017\u6033\u601A\u601E\u602C\u6022\u600D\u6010"+ - "\u602E\u6013\u6011\u600C\u6009\u601C\u6214\u623D"+ - "\u62AD\u62B4\u62D1\u62BE\u62AA\u62B6\u62CA\u62AE"+ - "\u62B3\u62AF\u62BB\u62A9\u62B0\u62B8\u653D\u65A8"+ - "\u65BB\u6609\u65FC\u6604\u6612\u6608\u65FB\u6603"+ - "\u660B\u660D\u6605\u65FD\u6611\u6610\u66F6\u670A"+ - "\u6785\u676C\u678E\u6792\u6776\u677B\u6798\u6786"+ - "\u6784\u6774\u678D\u678C\u677A\u679F\u6791\u6799"+ - "\u6783\u677D\u6781\u6778\u6779\u6794\u6B25\u6B80"+ - "\u6B7E\u6BDE\u6C1D\u6C93\u6CEC\u6CEB\u6CEE\u6CD9"+ - "\u6CB6\u6CD4\u6CAD\u6CE7\u6CB7\u6CD0\u6CC2\u6CBA"+ - "\u6CC3\u6CC6\u6CED\u6CF2\u6CD2\u6CDD\u6CB4\u6C8A"+ - "\u6C9D\u6C80\u6CDE\u6CC0\u6D30\u6CCD\u6CC7\u6CB0"+ - "\u6CF9\u6CCF\u6CE9\u6CD1\u7094\u7098\u7085\u7093"+ - "\u7086\u7084\u7091\u7096\u7082\u709A\u7083\u726A"+ - "\u72D6\u72CB\u72D8\u72C9\u72DC\u72D2\u72D4\u72DA"+ - "\u72CC\u72D1\u73A4\u73A1\u73AD\u73A6\u73A2\u73A0"+ - "\u73AC\u739D\u74DD\u74E8\u753F\u7540\u753E\u758C"+ - "\u7598\u76AF\u76F3\u76F1\u76F0\u76F5\u77F8\u77FC"+ - "\u77F9\u77FB\u77FA\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u77F7\u7942\u793F"+ - "\u79C5\u7A78\u7A7B\u7AFB\u7C75\u7CFD\u8035\u808F"+ - "\u80AE\u80A3\u80B8\u80B5\u80AD\u8220\u82A0\u82C0"+ - "\u82AB\u829A\u8298\u829B\u82B5\u82A7\u82AE\u82BC"+ - "\u829E\u82BA\u82B4\u82A8\u82A1\u82A9\u82C2\u82A4"+ - "\u82C3\u82B6\u82A2\u8670\u866F\u866D\u866E\u8C56"+ - "\u8FD2\u8FCB\u8FD3\u8FCD\u8FD6\u8FD5\u8FD7\u90B2"+ - "\u90B4\u90AF\u90B3\u90B0\u9639\u963D\u963C\u963A"+ - "\u9643\u4FCD\u4FC5\u4FD3\u4FB2\u4FC9\u4FCB\u4FC1"+ - "\u4FD4\u4FDC\u4FD9\u4FBB\u4FB3\u4FDB\u4FC7\u4FD6"+ - "\u4FBA\u4FC0\u4FB9\u4FEC\u5244\u5249\u52C0\u52C2"+ - "\u533D\u537C\u5397\u5396\u5399\u5398\u54BA\u54A1"+ - "\u54AD\u54A5\u54CF\u54C3\u830D\u54B7\u54AE\u54D6"+ - "\u54B6\u54C5\u54C6\u54A0\u5470\u54BC\u54A2\u54BE"+ - "\u5472\u54DE\u54B0\u57B5\u579E\u579F\u57A4\u578C"+ - "\u5797\u579D\u579B\u5794\u5798\u578F\u5799\u57A5"+ - "\u579A\u5795\u58F4\u590D\u5953\u59E1\u59DE\u59EE"+ - "\u5A00\u59F1\u59DD\u59FA\u59FD\u59FC\u59F6\u59E4"+ - "\u59F2\u59F7\u59DB\u59E9\u59F3\u59F5\u59E0\u59FE"+ - "\u59F4\u59ED\u5BA8\u5C4C\u5CD0\u5CD8\u5CCC\u5CD7"+ - "\u5CCB\u5CDB\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\u5CDE\u5CDA\u5CC9\u5CC7"+ - "\u5CCA\u5CD6\u5CD3\u5CD4\u5CCF\u5CC8\u5CC6\u5CCE"+ - "\u5CDF\u5CF8\u5DF9\u5E21\u5E22\u5E23\u5E20\u5E24"+ - "\u5EB0\u5EA4\u5EA2\u5E9B\u5EA3\u5EA5\u5F07\u5F2E"+ - "\u5F56\u5F86\u6037\u6039\u6054\u6072\u605E\u6045"+ - "\u6053\u6047\u6049\u605B\u604C\u6040\u6042\u605F"+ - "\u6024\u6044\u6058\u6066\u606E\u6242\u6243\u62CF"+ - "\u630D\u630B\u62F5\u630E\u6303\u62EB\u62F9\u630F"+ - "\u630C\u62F8\u62F6\u6300\u6313\u6314\u62FA\u6315"+ - "\u62FB\u62F0\u6541\u6543\u65AA\u65BF\u6636\u6621"+ - "\u6632\u6635\u661C\u6626\u6622\u6633\u662B\u663A"+ - "\u661D\u6634\u6639\u662E\u670F\u6710\u67C1\u67F2"+ - "\u67C8\u67BA\u67DC\u67BB\u67F8\u67D8\u67C0\u67B7"+ - "\u67C5\u67EB\u67E4\u67DF\u67B5\u67CD\u67B3\u67F7"+ - "\u67F6\u67EE\u67E3\u67C2\u67B9\u67CE\u67E7\u67F0"+ - "\u67B2\u67FC\u67C6\u67ED\u67CC\u67AE\u67E6\u67DB"+ - "\u67FA\u67C9\u67CA\u67C3\u67EA\u67CB\u6B28\u6B82"+ - "\u6B84\u6BB6\u6BD6\u6BD8\u6BE0\u6C20\u6C21\u6D28"+ - "\u6D34\u6D2D\u6D1F\u6D3C\u6D3F\u6D12\u6D0A\u6CDA"+ - "\u6D33\u6D04\u6D19\u6D3A\u6D1A\u6D11\u6D00\u6D1D"+ - "\u6D42\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\u6D01\u6D18\u6D37\u6D03\u6D0F"+ - "\u6D40\u6D07\u6D20\u6D2C\u6D08\u6D22\u6D09\u6D10"+ - "\u70B7\u709F\u70BE\u70B1\u70B0\u70A1\u70B4\u70B5"+ - "\u70A9\u7241\u7249\u724A\u726C\u7270\u7273\u726E"+ - "\u72CA\u72E4\u72E8\u72EB\u72DF\u72EA\u72E6\u72E3"+ - "\u7385\u73CC\u73C2\u73C8\u73C5\u73B9\u73B6\u73B5"+ - "\u73B4\u73EB\u73BF\u73C7\u73BE\u73C3\u73C6\u73B8"+ - "\u73CB\u74EC\u74EE\u752E\u7547\u7548\u75A7\u75AA"+ - "\u7679\u76C4\u7708\u7703\u7704\u7705\u770A\u76F7"+ - "\u76FB\u76FA\u77E7\u77E8\u7806\u7811\u7812\u7805"+ - "\u7810\u780F\u780E\u7809\u7803\u7813\u794A\u794C"+ - "\u794B\u7945\u7944\u79D5\u79CD\u79CF\u79D6\u79CE"+ - "\u7A80\u7A7E\u7AD1\u7B00\u7B01\u7C7A\u7C78\u7C79"+ - "\u7C7F\u7C80\u7C81\u7D03\u7D08\u7D01\u7F58\u7F91"+ - "\u7F8D\u7FBE\u8007\u800E\u800F\u8014\u8037\u80D8"+ - "\u80C7\u80E0\u80D1\u80C8\u80C2\u80D0\u80C5\u80E3"+ - "\u80D9\u80DC\u80CA\u80D5\u80C9\u80CF\u80D7\u80E6"+ - "\u80CD\u81FF\u8221\u8294\u82D9\u82FE\u82F9\u8307"+ - "\u82E8\u8300\u82D5\u833A\u82EB\u82D6\u82F4\u82EC"+ - "\u82E1\u82F2\u82F5\u830C\u82FB\u82F6\u82F0\u82EA"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\u82E4\u82E0\u82FA\u82F3\u82ED\u8677"+ - "\u8674\u867C\u8673\u8841\u884E\u8867\u886A\u8869"+ - "\u89D3\u8A04\u8A07\u8D72\u8FE3\u8FE1\u8FEE\u8FE0"+ - "\u90F1\u90BD\u90BF\u90D5\u90C5\u90BE\u90C7\u90CB"+ - "\u90C8\u91D4\u91D3\u9654\u964F\u9651\u9653\u964A"+ - "\u964E\u501E\u5005\u5007\u5013\u5022\u5030\u501B"+ - "\u4FF5\u4FF4\u5033\u5037\u502C\u4FF6\u4FF7\u5017"+ - "\u501C\u5020\u5027\u5035\u502F\u5031\u500E\u515A"+ - "\u5194\u5193\u51CA\u51C4\u51C5\u51C8\u51CE\u5261"+ - "\u525A\u5252\u525E\u525F\u5255\u5262\u52CD\u530E"+ - "\u539E\u5526\u54E2\u5517\u5512\u54E7\u54F3\u54E4"+ - "\u551A\u54FF\u5504\u5508\u54EB\u5511\u5505\u54F1"; - - private final static String innerIndex3= - "\u550A\u54FB\u54F7\u54F8\u54E0\u550E\u5503\u550B"+ - "\u5701\u5702\u57CC\u5832\u57D5\u57D2\u57BA\u57C6"+ - "\u57BD\u57BC\u57B8\u57B6\u57BF\u57C7\u57D0\u57B9"+ - "\u57C1\u590E\u594A\u5A19\u5A16\u5A2D\u5A2E\u5A15"+ - "\u5A0F\u5A17\u5A0A\u5A1E\u5A33\u5B6C\u5BA7\u5BAD"+ - "\u5BAC\u5C03\u5C56\u5C54\u5CEC\u5CFF\u5CEE\u5CF1"+ - "\u5CF7\u5D00\u5CF9\u5E29\u5E28\u5EA8\u5EAE\u5EAA"+ - "\u5EAC\u5F33\u5F30\u5F67\u605D\u605A\u6067\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\u6041\u60A2\u6088\u6080\u6092\u6081\u609D"+ - "\u6083\u6095\u609B\u6097\u6087\u609C\u608E\u6219"+ - "\u6246\u62F2\u6310\u6356\u632C\u6344\u6345\u6336"+ - "\u6343\u63E4\u6339\u634B\u634A\u633C\u6329\u6341"+ - "\u6334\u6358\u6354\u6359\u632D\u6347\u6333\u635A"+ - "\u6351\u6338\u6357\u6340\u6348\u654A\u6546\u65C6"+ - "\u65C3\u65C4\u65C2\u664A\u665F\u6647\u6651\u6712"+ - "\u6713\u681F\u681A\u6849\u6832\u6833\u683B\u684B"+ - "\u684F\u6816\u6831\u681C\u6835\u682B\u682D\u682F"+ - "\u684E\u6844\u6834\u681D\u6812\u6814\u6826\u6828"+ - "\u682E\u684D\u683A\u6825\u6820\u6B2C\u6B2F\u6B2D"+ - "\u6B31\u6B34\u6B6D\u8082\u6B88\u6BE6\u6BE4\u6BE8"+ - "\u6BE3\u6BE2\u6BE7\u6C25\u6D7A\u6D63\u6D64\u6D76"+ - "\u6D0D\u6D61\u6D92\u6D58\u6D62\u6D6D\u6D6F\u6D91"+ - "\u6D8D\u6DEF\u6D7F\u6D86\u6D5E\u6D67\u6D60\u6D97"+ - "\u6D70\u6D7C\u6D5F\u6D82\u6D98\u6D2F\u6D68\u6D8B"+ - "\u6D7E\u6D80\u6D84\u6D16\u6D83\u6D7B\u6D7D\u6D75"+ - "\u6D90\u70DC\u70D3\u70D1\u70DD\u70CB\u7F39\u70E2"+ - "\u70D7\u70D2\u70DE\u70E0\u70D4\u70CD\u70C5\u70C6"+ - "\u70C7\u70DA\u70CE\u70E1\u7242\u7278\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\u7277\u7276\u7300\u72FA\u72F4\u72FE\u72F6\u72F3"+ - "\u72FB\u7301\u73D3\u73D9\u73E5\u73D6\u73BC\u73E7"+ - "\u73E3\u73E9\u73DC\u73D2\u73DB\u73D4\u73DD\u73DA"+ - "\u73D7\u73D8\u73E8\u74DE\u74DF\u74F4\u74F5\u7521"+ - "\u755B\u755F\u75B0\u75C1\u75BB\u75C4\u75C0\u75BF"+ - "\u75B6\u75BA\u768A\u76C9\u771D\u771B\u7710\u7713"+ - "\u7712\u7723\u7711\u7715\u7719\u771A\u7722\u7727"+ - "\u7823\u782C\u7822\u7835\u782F\u7828\u782E\u782B"+ - "\u7821\u7829\u7833\u782A\u7831\u7954\u795B\u794F"+ - "\u795C\u7953\u7952\u7951\u79EB\u79EC\u79E0\u79EE"+ - "\u79ED\u79EA\u79DC\u79DE\u79DD\u7A86\u7A89\u7A85"+ - "\u7A8B\u7A8C\u7A8A\u7A87\u7AD8\u7B10\u7B04\u7B13"+ - "\u7B05\u7B0F\u7B08\u7B0A\u7B0E\u7B09\u7B12\u7C84"+ - "\u7C91\u7C8A\u7C8C\u7C88\u7C8D\u7C85\u7D1E\u7D1D"+ - "\u7D11\u7D0E\u7D18\u7D16\u7D13\u7D1F\u7D12\u7D0F"+ - "\u7D0C\u7F5C\u7F61\u7F5E\u7F60\u7F5D\u7F5B\u7F96"+ - "\u7F92\u7FC3\u7FC2\u7FC0\u8016\u803E\u8039\u80FA"+ - "\u80F2\u80F9\u80F5\u8101\u80FB\u8100\u8201\u822F"+ - "\u8225\u8333\u832D\u8344\u8319\u8351\u8325\u8356"+ - "\u833F\u8341\u8326\u831C\u8322\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u8342"+ - "\u834E\u831B\u832A\u8308\u833C\u834D\u8316\u8324"+ - "\u8320\u8337\u832F\u8329\u8347\u8345\u834C\u8353"+ - "\u831E\u832C\u834B\u8327\u8348\u8653\u8652\u86A2"+ - "\u86A8\u8696\u868D\u8691\u869E\u8687\u8697\u8686"+ - "\u868B\u869A\u8685\u86A5\u8699\u86A1\u86A7\u8695"+ - "\u8698\u868E\u869D\u8690\u8694\u8843\u8844\u886D"+ - "\u8875\u8876\u8872\u8880\u8871\u887F\u886F\u8883"+ - "\u887E\u8874\u887C\u8A12\u8C47\u8C57\u8C7B\u8CA4"+ - "\u8CA3\u8D76\u8D78\u8DB5\u8DB7\u8DB6\u8ED1\u8ED3"+ - "\u8FFE\u8FF5\u9002\u8FFF\u8FFB\u9004\u8FFC\u8FF6"+ - "\u90D6\u90E0\u90D9\u90DA\u90E3\u90DF\u90E5\u90D8"+ - "\u90DB\u90D7\u90DC\u90E4\u9150\u914E\u914F\u91D5"+ - "\u91E2\u91DA\u965C\u965F\u96BC\u98E3\u9ADF\u9B2F"+ - "\u4E7F\u5070\u506A\u5061\u505E\u5060\u5053\u504B"+ - "\u505D\u5072\u5048\u504D\u5041\u505B\u504A\u5062"+ - "\u5015\u5045\u505F\u5069\u506B\u5063\u5064\u5046"+ - "\u5040\u506E\u5073\u5057\u5051\u51D0\u526B\u526D"+ - "\u526C\u526E\u52D6\u52D3\u532D\u539C\u5575\u5576"+ - "\u553C\u554D\u5550\u5534\u552A\u5551\u5562\u5536"+ - "\u5535\u5530\u5552\u5545\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u550C\u5532"+ - "\u5565\u554E\u5539\u5548\u552D\u553B\u5540\u554B"+ - "\u570A\u5707\u57FB\u5814\u57E2\u57F6\u57DC\u57F4"+ - "\u5800\u57ED\u57FD\u5808\u57F8\u580B\u57F3\u57CF"+ - "\u5807\u57EE\u57E3\u57F2\u57E5\u57EC\u57E1\u580E"+ - "\u57FC\u5810\u57E7\u5801\u580C\u57F1\u57E9\u57F0"+ - "\u580D\u5804\u595C\u5A60\u5A58\u5A55\u5A67\u5A5E"+ - "\u5A38\u5A35\u5A6D\u5A50\u5A5F\u5A65\u5A6C\u5A53"+ - "\u5A64\u5A57\u5A43\u5A5D\u5A52\u5A44\u5A5B\u5A48"+ - "\u5A8E\u5A3E\u5A4D\u5A39\u5A4C\u5A70\u5A69\u5A47"+ - "\u5A51\u5A56\u5A42\u5A5C\u5B72\u5B6E\u5BC1\u5BC0"+ - "\u5C59\u5D1E\u5D0B\u5D1D\u5D1A\u5D20\u5D0C\u5D28"+ - "\u5D0D\u5D26\u5D25\u5D0F\u5D30\u5D12\u5D23\u5D1F"+ - "\u5D2E\u5E3E\u5E34\u5EB1\u5EB4\u5EB9\u5EB2\u5EB3"+ - "\u5F36\u5F38\u5F9B\u5F96\u5F9F\u608A\u6090\u6086"+ - "\u60BE\u60B0\u60BA\u60D3\u60D4\u60CF\u60E4\u60D9"+ - "\u60DD\u60C8\u60B1\u60DB\u60B7\u60CA\u60BF\u60C3"+ - "\u60CD\u60C0\u6332\u6365\u638A\u6382\u637D\u63BD"+ - "\u639E\u63AD\u639D\u6397\u63AB\u638E\u636F\u6387"+ - "\u6390\u636E\u63AF\u6375\u639C\u636D\u63AE\u637C"+ - "\u63A4\u633B\u639F\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u6378\u6385\u6381"+ - "\u6391\u638D\u6370\u6553\u65CD\u6665\u6661\u665B"+ - "\u6659\u665C\u6662\u6718\u6879\u6887\u6890\u689C"+ - "\u686D\u686E\u68AE\u68AB\u6956\u686F\u68A3\u68AC"+ - "\u68A9\u6875\u6874\u68B2\u688F\u6877\u6892\u687C"+ - "\u686B\u6872\u68AA\u6880\u6871\u687E\u689B\u6896"+ - "\u688B\u68A0\u6889\u68A4\u6878\u687B\u6891\u688C"+ - "\u688A\u687D\u6B36\u6B33\u6B37\u6B38\u6B91\u6B8F"+ - "\u6B8D\u6B8E\u6B8C\u6C2A\u6DC0\u6DAB\u6DB4\u6DB3"+ - "\u6E74\u6DAC\u6DE9\u6DE2\u6DB7\u6DF6\u6DD4\u6E00"+ - "\u6DC8\u6DE0\u6DDF\u6DD6\u6DBE\u6DE5\u6DDC\u6DDD"+ - "\u6DDB\u6DF4\u6DCA\u6DBD\u6DED\u6DF0\u6DBA\u6DD5"+ - "\u6DC2\u6DCF\u6DC9\u6DD0\u6DF2\u6DD3\u6DFD\u6DD7"+ - "\u6DCD\u6DE3\u6DBB\u70FA\u710D\u70F7\u7117\u70F4"+ - "\u710C\u70F0\u7104\u70F3\u7110\u70FC\u70FF\u7106"+ - "\u7113\u7100\u70F8\u70F6\u710B\u7102\u710E\u727E"+ - "\u727B\u727C\u727F\u731D\u7317\u7307\u7311\u7318"+ - "\u730A\u7308\u72FF\u730F\u731E\u7388\u73F6\u73F8"+ - "\u73F5\u7404\u7401\u73FD\u7407\u7400\u73FA\u73FC"+ - "\u73FF\u740C\u740B\u73F4\u7408\u7564\u7563\u75CE"+ - "\u75D2\u75CF\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\u75CB\u75CC\u75D1\u75D0"+ - "\u768F\u7689\u76D3\u7739\u772F\u772D\u7731\u7732"+ - "\u7734\u7733\u773D\u7725\u773B\u7735\u7848\u7852"+ - "\u7849\u784D\u784A\u784C\u7826\u7845\u7850\u7964"+ - "\u7967\u7969\u796A\u7963\u796B\u7961\u79BB\u79FA"+ - "\u79F8\u79F6\u79F7\u7A8F\u7A94\u7A90\u7B35\u7B47"+ - "\u7B34\u7B25\u7B30\u7B22\u7B24\u7B33\u7B18\u7B2A"+ - "\u7B1D\u7B31\u7B2B\u7B2D\u7B2F\u7B32\u7B38\u7B1A"+ - "\u7B23\u7C94\u7C98\u7C96\u7CA3\u7D35\u7D3D\u7D38"+ - "\u7D36\u7D3A\u7D45\u7D2C\u7D29\u7D41\u7D47\u7D3E"+ - "\u7D3F\u7D4A\u7D3B\u7D28\u7F63\u7F95\u7F9C\u7F9D"+ - "\u7F9B\u7FCA\u7FCB\u7FCD\u7FD0\u7FD1\u7FC7\u7FCF"+ - "\u7FC9\u801F\u801E\u801B\u8047\u8043\u8048\u8118"+ - "\u8125\u8119\u811B\u812D\u811F\u812C\u811E\u8121"+ - "\u8115\u8127\u811D\u8122\u8211\u8238\u8233\u823A"+ - "\u8234\u8232\u8274\u8390\u83A3\u83A8\u838D\u837A"+ - "\u8373\u83A4\u8374\u838F\u8381\u8395\u8399\u8375"+ - "\u8394\u83A9\u837D\u8383\u838C\u839D\u839B\u83AA"+ - "\u838B\u837E\u83A5\u83AF\u8388\u8397\u83B0\u837F"+ - "\u83A6\u8387\u83AE\u8376\u839A\u8659\u8656\u86BF"+ - "\u86B7\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\u86C2\u86C1\u86C5\u86BA\u86B0"+ - "\u86C8\u86B9\u86B3\u86B8\u86CC\u86B4\u86BB\u86BC"+ - "\u86C3\u86BD\u86BE\u8852\u8889\u8895\u88A8\u88A2"+ - "\u88AA\u889A\u8891\u88A1\u889F\u8898\u88A7\u8899"+ - "\u889B\u8897\u88A4\u88AC\u888C\u8893\u888E\u8982"+ - "\u89D6\u89D9\u89D5\u8A30\u8A27\u8A2C\u8A1E\u8C39"+ - "\u8C3B\u8C5C\u8C5D\u8C7D\u8CA5\u8D7D\u8D7B\u8D79"+ - "\u8DBC\u8DC2\u8DB9\u8DBF\u8DC1\u8ED8\u8EDE\u8EDD"+ - "\u8EDC\u8ED7\u8EE0\u8EE1\u9024\u900B\u9011\u901C"+ - "\u900C\u9021\u90EF\u90EA\u90F0\u90F4\u90F2\u90F3"+ - "\u90D4\u90EB\u90EC\u90E9\u9156\u9158\u915A\u9153"+ - "\u9155\u91EC\u91F4\u91F1\u91F3\u91F8\u91E4\u91F9"+ - "\u91EA\u91EB\u91F7\u91E8\u91EE\u957A\u9586\u9588"+ - "\u967C\u966D\u966B\u9671\u966F\u96BF\u976A\u9804"+ - "\u98E5\u9997\u509B\u5095\u5094\u509E\u508B\u50A3"+ - "\u5083\u508C\u508E\u509D\u5068\u509C\u5092\u5082"+ - "\u5087\u515F\u51D4\u5312\u5311\u53A4\u53A7\u5591"+ - "\u55A8\u55A5\u55AD\u5577\u5645\u55A2\u5593\u5588"+ - "\u558F\u55B5\u5581\u55A3\u5592\u55A4\u557D\u558C"+ - "\u55A6\u557F\u5595\u55A1\u558E\u570C\u5829\u5837"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\u5819\u581E\u5827\u5823\u5828\u57F5"+ - "\u5848\u5825\u581C\u581B\u5833\u583F\u5836\u582E"+ - "\u5839\u5838\u582D\u582C\u583B\u5961\u5AAF\u5A94"+ - "\u5A9F\u5A7A\u5AA2\u5A9E\u5A78\u5AA6\u5A7C\u5AA5"+ - "\u5AAC\u5A95\u5AAE\u5A37\u5A84\u5A8A\u5A97\u5A83"+ - "\u5A8B\u5AA9\u5A7B\u5A7D\u5A8C\u5A9C\u5A8F\u5A93"+ - "\u5A9D\u5BEA\u5BCD\u5BCB\u5BD4\u5BD1\u5BCA\u5BCE"+ - "\u5C0C\u5C30\u5D37\u5D43\u5D6B\u5D41\u5D4B\u5D3F"+ - "\u5D35\u5D51\u5D4E\u5D55\u5D33\u5D3A\u5D52\u5D3D"+ - "\u5D31\u5D59\u5D42\u5D39\u5D49\u5D38\u5D3C\u5D32"+ - "\u5D36\u5D40\u5D45\u5E44\u5E41\u5F58\u5FA6\u5FA5"+ - "\u5FAB\u60C9\u60B9\u60CC\u60E2\u60CE\u60C4\u6114"+ - "\u60F2\u610A\u6116\u6105\u60F5\u6113\u60F8\u60FC"+ - "\u60FE\u60C1\u6103\u6118\u611D\u6110\u60FF\u6104"+ - "\u610B\u624A\u6394\u63B1\u63B0\u63CE\u63E5\u63E8"+ - "\u63EF\u63C3\u649D\u63F3\u63CA\u63E0\u63F6\u63D5"+ - "\u63F2\u63F5\u6461\u63DF\u63BE\u63DD\u63DC\u63C4"+ - "\u63D8\u63D3\u63C2\u63C7\u63CC\u63CB\u63C8\u63F0"+ - "\u63D7\u63D9\u6532\u6567\u656A\u6564\u655C\u6568"+ - "\u6565\u658C\u659D\u659E\u65AE\u65D0\u65D2\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\u667C\u666C\u667B\u6680\u6671\u6679\u666A"+ - "\u6672\u6701\u690C\u68D3\u6904\u68DC\u692A\u68EC"+ - "\u68EA\u68F1\u690F\u68D6\u68F7\u68EB\u68E4\u68F6"+ - "\u6913\u6910\u68F3\u68E1\u6907\u68CC\u6908\u6970"+ - "\u68B4\u6911\u68EF\u68C6\u6914\u68F8\u68D0\u68FD"+ - "\u68FC\u68E8\u690B\u690A\u6917\u68CE\u68C8\u68DD"+ - "\u68DE\u68E6\u68F4\u68D1\u6906\u68D4\u68E9\u6915"+ - "\u6925\u68C7\u6B39\u6B3B\u6B3F\u6B3C\u6B94\u6B97"+ - "\u6B99\u6B95\u6BBD\u6BF0\u6BF2\u6BF3\u6C30\u6DFC"+ - "\u6E46\u6E47\u6E1F\u6E49\u6E88\u6E3C\u6E3D\u6E45"+ - "\u6E62\u6E2B\u6E3F\u6E41\u6E5D\u6E73\u6E1C\u6E33"+ - "\u6E4B\u6E40\u6E51\u6E3B\u6E03\u6E2E\u6E5E\u6E68"+ - "\u6E5C\u6E61\u6E31\u6E28\u6E60\u6E71\u6E6B\u6E39"+ - "\u6E22\u6E30\u6E53\u6E65\u6E27\u6E78\u6E64\u6E77"+ - "\u6E55\u6E79\u6E52\u6E66\u6E35\u6E36\u6E5A\u7120"+ - "\u711E\u712F\u70FB\u712E\u7131\u7123\u7125\u7122"+ - "\u7132\u711F\u7128\u713A\u711B\u724B\u725A\u7288"+ - "\u7289\u7286\u7285\u728B\u7312\u730B\u7330\u7322"+ - "\u7331\u7333\u7327\u7332\u732D\u7326\u7323\u7335"+ - "\u730C\u742E\u742C\u7430\u742B\u7416\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\u741A\u7421\u742D\u7431\u7424\u7423\u741D\u7429"+ - "\u7420\u7432\u74FB\u752F\u756F\u756C\u75E7\u75DA"+ - "\u75E1\u75E6\u75DD\u75DF\u75E4\u75D7\u7695\u7692"+ - "\u76DA\u7746\u7747\u7744\u774D\u7745\u774A\u774E"+ - "\u774B\u774C\u77DE\u77EC\u7860\u7864\u7865\u785C"+ - "\u786D\u7871\u786A\u786E\u7870\u7869\u7868\u785E"+ - "\u7862\u7974\u7973\u7972\u7970\u7A02\u7A0A\u7A03"+ - "\u7A0C\u7A04\u7A99\u7AE6\u7AE4\u7B4A\u7B3B\u7B44"+ - "\u7B48\u7B4C\u7B4E\u7B40\u7B58\u7B45\u7CA2\u7C9E"+ - "\u7CA8\u7CA1\u7D58\u7D6F\u7D63\u7D53\u7D56\u7D67"+ - "\u7D6A\u7D4F\u7D6D\u7D5C\u7D6B\u7D52\u7D54\u7D69"+ - "\u7D51\u7D5F\u7D4E\u7F3E\u7F3F\u7F65\u7F66\u7FA2"+ - "\u7FA0\u7FA1\u7FD7\u8051\u804F\u8050\u80FE\u80D4"+ - "\u8143\u814A\u8152\u814F\u8147\u813D\u814D\u813A"+ - "\u81E6\u81EE\u81F7\u81F8\u81F9\u8204\u823C\u823D"+ - "\u823F\u8275\u833B\u83CF\u83F9\u8423\u83C0\u83E8"+ - "\u8412\u83E7\u83E4\u83FC\u83F6\u8410\u83C6\u83C8"+ - "\u83EB\u83E3\u83BF\u8401\u83DD\u83E5\u83D8\u83FF"+ - "\u83E1\u83CB\u83CE\u83D6\u83F5\u83C9\u8409\u840F"+ - "\u83DE\u8411\u8406\u83C2\u83F3\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u83D5"+ - "\u83FA\u83C7\u83D1\u83EA\u8413\u83C3\u83EC\u83EE"+ - "\u83C4\u83FB\u83D7\u83E2\u841B\u83DB\u83FE\u86D8"+ - "\u86E2\u86E6\u86D3\u86E3\u86DA\u86EA\u86DD\u86EB"+ - "\u86DC\u86EC\u86E9\u86D7\u86E8\u86D1\u8848\u8856"+ - "\u8855\u88BA\u88D7\u88B9\u88B8\u88C0\u88BE\u88B6"+ - "\u88BC\u88B7\u88BD\u88B2\u8901\u88C9\u8995\u8998"+ - "\u8997\u89DD\u89DA\u89DB\u8A4E\u8A4D\u8A39\u8A59"+ - "\u8A40\u8A57\u8A58\u8A44\u8A45\u8A52\u8A48\u8A51"+ - "\u8A4A\u8A4C\u8A4F\u8C5F\u8C81\u8C80\u8CBA\u8CBE"+ - "\u8CB0\u8CB9\u8CB5\u8D84\u8D80\u8D89\u8DD8\u8DD3"+ - "\u8DCD\u8DC7\u8DD6\u8DDC\u8DCF\u8DD5\u8DD9\u8DC8"+ - "\u8DD7\u8DC5\u8EEF\u8EF7\u8EFA\u8EF9\u8EE6\u8EEE"+ - "\u8EE5\u8EF5\u8EE7\u8EE8\u8EF6\u8EEB\u8EF1\u8EEC"+ - "\u8EF4\u8EE9\u902D\u9034\u902F\u9106\u912C\u9104"+ - "\u90FF\u90FC\u9108\u90F9\u90FB\u9101\u9100\u9107"+ - "\u9105\u9103\u9161\u9164\u915F\u9162\u9160\u9201"+ - "\u920A\u9225\u9203\u921A\u9226\u920F\u920C\u9200"+ - "\u9212\u91FF\u91FD\u9206\u9204\u9227\u9202\u921C"+ - "\u9224\u9219\u9217\u9205\u9216\u957B\u958D\u958C"+ - "\u9590\u9687\u967E\u9688\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u9689\u9683"+ - "\u9680\u96C2\u96C8\u96C3\u96F1\u96F0\u976C\u9770"+ - "\u976E\u9807\u98A9\u98EB\u9CE6\u9EF9\u4E83\u4E84"+ - "\u4EB6\u50BD\u50BF\u50C6\u50AE\u50C4\u50CA\u50B4"+ - "\u50C8\u50C2\u50B0\u50C1\u50BA\u50B1\u50CB\u50C9"+ - "\u50B6\u50B8\u51D7\u527A\u5278\u527B\u527C\u55C3"+ - "\u55DB\u55CC\u55D0\u55CB\u55CA\u55DD\u55C0\u55D4"+ - "\u55C4\u55E9\u55BF\u55D2\u558D\u55CF\u55D5\u55E2"+ - "\u55D6\u55C8\u55F2\u55CD\u55D9\u55C2\u5714\u5853"+ - "\u5868\u5864\u584F\u584D\u5849\u586F\u5855\u584E"+ - "\u585D\u5859\u5865\u585B\u583D\u5863\u5871\u58FC"+ - "\u5AC7\u5AC4\u5ACB\u5ABA\u5AB8\u5AB1\u5AB5\u5AB0"+ - "\u5ABF\u5AC8\u5ABB\u5AC6\u5AB7\u5AC0\u5ACA\u5AB4"+ - "\u5AB6\u5ACD\u5AB9\u5A90\u5BD6\u5BD8\u5BD9\u5C1F"+ - "\u5C33\u5D71\u5D63\u5D4A\u5D65\u5D72\u5D6C\u5D5E"+ - "\u5D68\u5D67\u5D62\u5DF0\u5E4F\u5E4E\u5E4A\u5E4D"+ - "\u5E4B\u5EC5\u5ECC\u5EC6\u5ECB\u5EC7\u5F40\u5FAF"+ - "\u5FAD\u60F7\u6149\u614A\u612B\u6145\u6136\u6132"+ - "\u612E\u6146\u612F\u614F\u6129\u6140\u6220\u9168"+ - "\u6223\u6225\u6224\u63C5\u63F1\u63EB\u6410\u6412"+ - "\u6409\u6420\u6424\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u6433\u6443\u641F"+ - "\u6415\u6418\u6439\u6437\u6422\u6423\u640C\u6426"+ - "\u6430\u6428\u6441\u6435\u642F\u640A\u641A\u6440"+ - "\u6425\u6427\u640B\u63E7\u641B\u642E\u6421\u640E"+ - "\u656F\u6592\u65D3\u6686\u668C\u6695\u6690\u668B"+ - "\u668A\u6699\u6694\u6678\u6720\u6966\u695F\u6938"+ - "\u694E\u6962\u6971\u693F\u6945\u696A\u6939\u6942"+ - "\u6957\u6959\u697A\u6948\u6949\u6935\u696C\u6933"+ - "\u693D\u6965\u68F0\u6978\u6934\u6969\u6940\u696F"+ - "\u6944\u6976\u6958\u6941\u6974\u694C\u693B\u694B"+ - "\u6937\u695C\u694F\u6951\u6932\u6952\u692F\u697B"+ - "\u693C\u6B46\u6B45\u6B43\u6B42\u6B48\u6B41\u6B9B"+ - "\uFA0D\u6BFB\u6BFC\u6BF9\u6BF7\u6BF8\u6E9B\u6ED6"+ - "\u6EC8\u6E8F\u6EC0\u6E9F\u6E93\u6E94\u6EA0\u6EB1"+ - "\u6EB9\u6EC6\u6ED2\u6EBD\u6EC1\u6E9E\u6EC9\u6EB7"+ - "\u6EB0\u6ECD\u6EA6\u6ECF\u6EB2\u6EBE\u6EC3\u6EDC"+ - "\u6ED8\u6E99\u6E92\u6E8E\u6E8D\u6EA4\u6EA1\u6EBF"+ - "\u6EB3\u6ED0\u6ECA\u6E97\u6EAE\u6EA3\u7147\u7154"+ - "\u7152\u7163\u7160\u7141\u715D\u7162\u7172\u7178"+ - "\u716A\u7161\u7142\u7158\u7143\u714B\u7170\u715F"+ - "\u7150\u7153\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\u7144\u714D\u715A\u724F"+ - "\u728D\u728C\u7291\u7290\u728E\u733C\u7342\u733B"+ - "\u733A\u7340\u734A\u7349\u7444\u744A\u744B\u7452"+ - "\u7451\u7457\u7440\u744F\u7450\u744E\u7442\u7446"+ - "\u744D\u7454\u74E1\u74FF\u74FE\u74FD\u751D\u7579"+ - "\u7577\u6983\u75EF\u760F\u7603\u75F7\u75FE\u75FC"+ - "\u75F9\u75F8\u7610\u75FB\u75F6\u75ED\u75F5\u75FD"+ - "\u7699\u76B5\u76DD\u7755\u775F\u7760\u7752\u7756"+ - "\u775A\u7769\u7767\u7754\u7759\u776D\u77E0\u7887"+ - "\u789A\u7894\u788F\u7884\u7895\u7885\u7886\u78A1"+ - "\u7883\u7879\u7899\u7880\u7896\u787B\u797C\u7982"+ - "\u797D\u7979\u7A11\u7A18\u7A19\u7A12\u7A17\u7A15"+ - "\u7A22\u7A13\u7A1B\u7A10\u7AA3\u7AA2\u7A9E\u7AEB"+ - "\u7B66\u7B64\u7B6D\u7B74\u7B69\u7B72\u7B65\u7B73"+ - "\u7B71\u7B70\u7B61\u7B78\u7B76\u7B63\u7CB2\u7CB4"+ - "\u7CAF\u7D88\u7D86\u7D80\u7D8D\u7D7F\u7D85\u7D7A"+ - "\u7D8E\u7D7B\u7D83\u7D7C\u7D8C\u7D94\u7D84\u7D7D"+ - "\u7D92\u7F6D\u7F6B\u7F67\u7F68\u7F6C\u7FA6\u7FA5"+ - "\u7FA7\u7FDB\u7FDC\u8021\u8164\u8160\u8177\u815C"+ - "\u8169\u815B\u8162\u8172\u6721\u815E\u8176\u8167"+ - "\u816F\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\u8144\u8161\u821D\u8249\u8244"+ - "\u8240\u8242\u8245\u84F1\u843F\u8456\u8476\u8479"+ - "\u848F\u848D\u8465\u8451\u8440\u8486\u8467\u8430"+ - "\u844D\u847D\u845A\u8459\u8474\u8473\u845D\u8507"+ - "\u845E\u8437\u843A\u8434\u847A\u8443\u8478\u8432"+ - "\u8445\u8429\u83D9\u844B\u842F\u8442\u842D\u845F"+ - "\u8470\u8439\u844E\u844C\u8452\u846F\u84C5\u848E"+ - "\u843B\u8447\u8436\u8433\u8468\u847E\u8444\u842B"+ - "\u8460\u8454\u846E\u8450\u870B\u8704\u86F7\u870C"+ - "\u86FA\u86D6\u86F5\u874D\u86F8\u870E\u8709\u8701"+ - "\u86F6\u870D\u8705\u88D6\u88CB\u88CD\u88CE\u88DE"+ - "\u88DB\u88DA\u88CC\u88D0\u8985\u899B\u89DF\u89E5"+ - "\u89E4\u89E1\u89E0\u89E2\u89DC\u89E6\u8A76\u8A86"+ - "\u8A7F\u8A61\u8A3F\u8A77\u8A82\u8A84\u8A75\u8A83"+ - "\u8A81\u8A74\u8A7A\u8C3C\u8C4B\u8C4A\u8C65\u8C64"+ - "\u8C66\u8C86\u8C84\u8C85\u8CCC\u8D68\u8D69\u8D91"+ - "\u8D8C\u8D8E\u8D8F\u8D8D\u8D93\u8D94\u8D90\u8D92"+ - "\u8DF0\u8DE0\u8DEC\u8DF1\u8DEE\u8DD0\u8DE9\u8DE3"+ - "\u8DE2\u8DE7\u8DF2\u8DEB\u8DF4\u8F06\u8EFF\u8F01"+ - "\u8F00\u8F05\u8F07\u8F08\u8F02\u8F0B\u9052\u903F"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\u9044\u9049\u903D\u9110\u910D\u910F"+ - "\u9111\u9116\u9114\u910B\u910E\u916E\u916F\u9248"+ - "\u9252\u9230\u923A\u9266\u9233\u9265\u925E\u9283"+ - "\u922E\u924A\u9246\u926D\u926C\u924F\u9260\u9267"+ - "\u926F\u9236\u9261\u9270\u9231\u9254\u9263\u9250"+ - "\u9272\u924E\u9253\u924C\u9256\u9232\u959F\u959C"+ - "\u959E\u959B\u9692\u9693\u9691\u9697\u96CE\u96FA"+ - "\u96FD\u96F8\u96F5\u9773\u9777\u9778\u9772\u980F"+ - "\u980D\u980E\u98AC\u98F6\u98F9\u99AF\u99B2\u99B0"+ - "\u99B5\u9AAD\u9AAB\u9B5B\u9CEA\u9CED\u9CE7\u9E80"+ - "\u9EFD\u50E6\u50D4\u50D7\u50E8\u50F3\u50DB\u50EA"+ - "\u50DD\u50E4\u50D3\u50EC\u50F0\u50EF\u50E3\u50E0"; - - private final static String innerIndex4= - "\u51D8\u5280\u5281\u52E9\u52EB\u5330\u53AC\u5627"+ - "\u5615\u560C\u5612\u55FC\u560F\u561C\u5601\u5613"+ - "\u5602\u55FA\u561D\u5604\u55FF\u55F9\u5889\u587C"+ - "\u5890\u5898\u5886\u5881\u587F\u5874\u588B\u587A"+ - "\u5887\u5891\u588E\u5876\u5882\u5888\u587B\u5894"+ - "\u588F\u58FE\u596B\u5ADC\u5AEE\u5AE5\u5AD5\u5AEA"+ - "\u5ADA\u5AED\u5AEB\u5AF3\u5AE2\u5AE0\u5ADB\u5AEC"+ - "\u5ADE\u5ADD\u5AD9\u5AE8\u5ADF\u5B77\u5BE0\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\u5BE3\u5C63\u5D82\u5D80\u5D7D\u5D86\u5D7A"+ - "\u5D81\u5D77\u5D8A\u5D89\u5D88\u5D7E\u5D7C\u5D8D"+ - "\u5D79\u5D7F\u5E58\u5E59\u5E53\u5ED8\u5ED1\u5ED7"+ - "\u5ECE\u5EDC\u5ED5\u5ED9\u5ED2\u5ED4\u5F44\u5F43"+ - "\u5F6F\u5FB6\u612C\u6128\u6141\u615E\u6171\u6173"+ - "\u6152\u6153\u6172\u616C\u6180\u6174\u6154\u617A"+ - "\u615B\u6165\u613B\u616A\u6161\u6156\u6229\u6227"+ - "\u622B\u642B\u644D\u645B\u645D\u6474\u6476\u6472"+ - "\u6473\u647D\u6475\u6466\u64A6\u644E\u6482\u645E"+ - "\u645C\u644B\u6453\u6460\u6450\u647F\u643F\u646C"+ - "\u646B\u6459\u6465\u6477\u6573\u65A0\u66A1\u66A0"+ - "\u669F\u6705\u6704\u6722\u69B1\u69B6\u69C9\u69A0"+ - "\u69CE\u6996\u69B0\u69AC\u69BC\u6991\u6999\u698E"+ - "\u69A7\u698D\u69A9\u69BE\u69AF\u69BF\u69C4\u69BD"+ - "\u69A4\u69D4\u69B9\u69CA\u699A\u69CF\u69B3\u6993"+ - "\u69AA\u69A1\u699E\u69D9\u6997\u6990\u69C2\u69B5"+ - "\u69A5\u69C6\u6B4A\u6B4D\u6B4B\u6B9E\u6B9F\u6BA0"+ - "\u6BC3\u6BC4\u6BFE\u6ECE\u6EF5\u6EF1\u6F03\u6F25"+ - "\u6EF8\u6F37\u6EFB\u6F2E\u6F09\u6F4E\u6F19\u6F1A"+ - "\u6F27\u6F18\u6F3B\u6F12\u6EED\u6F0A\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\u6F36\u6F73\u6EF9\u6EEE\u6F2D\u6F40\u6F30\u6F3C"+ - "\u6F35\u6EEB\u6F07\u6F0E\u6F43\u6F05\u6EFD\u6EF6"+ - "\u6F39\u6F1C\u6EFC\u6F3A\u6F1F\u6F0D\u6F1E\u6F08"+ - "\u6F21\u7187\u7190\u7189\u7180\u7185\u7182\u718F"+ - "\u717B\u7186\u7181\u7197\u7244\u7253\u7297\u7295"+ - "\u7293\u7343\u734D\u7351\u734C\u7462\u7473\u7471"+ - "\u7475\u7472\u7467\u746E\u7500\u7502\u7503\u757D"+ - "\u7590\u7616\u7608\u760C\u7615\u7611\u760A\u7614"+ - "\u76B8\u7781\u777C\u7785\u7782\u776E\u7780\u776F"+ - "\u777E\u7783\u78B2\u78AA\u78B4\u78AD\u78A8\u787E"+ - "\u78AB\u789E\u78A5\u78A0\u78AC\u78A2\u78A4\u7998"+ - "\u798A\u798B\u7996\u7995\u7994\u7993\u7997\u7988"+ - "\u7992\u7990\u7A2B\u7A4A\u7A30\u7A2F\u7A28\u7A26"+ - "\u7AA8\u7AAB\u7AAC\u7AEE\u7B88\u7B9C\u7B8A\u7B91"+ - "\u7B90\u7B96\u7B8D\u7B8C\u7B9B\u7B8E\u7B85\u7B98"+ - "\u5284\u7B99\u7BA4\u7B82\u7CBB\u7CBF\u7CBC\u7CBA"+ - "\u7DA7\u7DB7\u7DC2\u7DA3\u7DAA\u7DC1\u7DC0\u7DC5"+ - "\u7D9D\u7DCE\u7DC4\u7DC6\u7DCB\u7DCC\u7DAF\u7DB9"+ - "\u7D96\u7DBC\u7D9F\u7DA6\u7DAE\u7DA9\u7DA1\u7DC9"+ - "\u7F73\u7FE2\u7FE3\u7FE5\u7FDE\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u8024"+ - "\u805D\u805C\u8189\u8186\u8183\u8187\u818D\u818C"+ - "\u818B\u8215\u8497\u84A4\u84A1\u849F\u84BA\u84CE"+ - "\u84C2\u84AC\u84AE\u84AB\u84B9\u84B4\u84C1\u84CD"+ - "\u84AA\u849A\u84B1\u84D0\u849D\u84A7\u84BB\u84A2"+ - "\u8494\u84C7\u84CC\u849B\u84A9\u84AF\u84A8\u84D6"+ - "\u8498\u84B6\u84CF\u84A0\u84D7\u84D4\u84D2\u84DB"+ - "\u84B0\u8491\u8661\u8733\u8723\u8728\u876B\u8740"+ - "\u872E\u871E\u8721\u8719\u871B\u8743\u872C\u8741"+ - "\u873E\u8746\u8720\u8732\u872A\u872D\u873C\u8712"+ - "\u873A\u8731\u8735\u8742\u8726\u8727\u8738\u8724"+ - "\u871A\u8730\u8711\u88F7\u88E7\u88F1\u88F2\u88FA"+ - "\u88FE\u88EE\u88FC\u88F6\u88FB\u88F0\u88EC\u88EB"+ - "\u899D\u89A1\u899F\u899E\u89E9\u89EB\u89E8\u8AAB"+ - "\u8A99\u8A8B\u8A92\u8A8F\u8A96\u8C3D\u8C68\u8C69"+ - "\u8CD5\u8CCF\u8CD7\u8D96\u8E09\u8E02\u8DFF\u8E0D"+ - "\u8DFD\u8E0A\u8E03\u8E07\u8E06\u8E05\u8DFE\u8E00"+ - "\u8E04\u8F10\u8F11\u8F0E\u8F0D\u9123\u911C\u9120"+ - "\u9122\u911F\u911D\u911A\u9124\u9121\u911B\u917A"+ - "\u9172\u9179\u9173\u92A5\u92A4\u9276\u929B\u927A"+ - "\u92A0\u9294\u92AA\u928D\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u92A6\u929A"+ - "\u92AB\u9279\u9297\u927F\u92A3\u92EE\u928E\u9282"+ - "\u9295\u92A2\u927D\u9288\u92A1\u928A\u9286\u928C"+ - "\u9299\u92A7\u927E\u9287\u92A9\u929D\u928B\u922D"+ - "\u969E\u96A1\u96FF\u9758\u977D\u977A\u977E\u9783"+ - "\u9780\u9782\u977B\u9784\u9781\u977F\u97CE\u97CD"+ - "\u9816\u98AD\u98AE\u9902\u9900\u9907\u999D\u999C"+ - "\u99C3\u99B9\u99BB\u99BA\u99C2\u99BD\u99C7\u9AB1"+ - "\u9AE3\u9AE7\u9B3E\u9B3F\u9B60\u9B61\u9B5F\u9CF1"+ - "\u9CF2\u9CF5\u9EA7\u50FF\u5103\u5130\u50F8\u5106"+ - "\u5107\u50F6\u50FE\u510B\u510C\u50FD\u510A\u528B"+ - "\u528C\u52F1\u52EF\u5648\u5642\u564C\u5635\u5641"+ - "\u564A\u5649\u5646\u5658\u565A\u5640\u5633\u563D"+ - "\u562C\u563E\u5638\u562A\u563A\u571A\u58AB\u589D"+ - "\u58B1\u58A0\u58A3\u58AF\u58AC\u58A5\u58A1\u58FF"+ - "\u5AFF\u5AF4\u5AFD\u5AF7\u5AF6\u5B03\u5AF8\u5B02"+ - "\u5AF9\u5B01\u5B07\u5B05\u5B0F\u5C67\u5D99\u5D97"+ - "\u5D9F\u5D92\u5DA2\u5D93\u5D95\u5DA0\u5D9C\u5DA1"+ - "\u5D9A\u5D9E\u5E69\u5E5D\u5E60\u5E5C\u7DF3\u5EDB"+ - "\u5EDE\u5EE1\u5F49\u5FB2\u618B\u6183\u6179\u61B1"+ - "\u61B0\u61A2\u6189\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u619B\u6193\u61AF"+ - "\u61AD\u619F\u6192\u61AA\u61A1\u618D\u6166\u61B3"+ - "\u622D\u646E\u6470\u6496\u64A0\u6485\u6497\u649C"+ - "\u648F\u648B\u648A\u648C\u64A3\u649F\u6468\u64B1"+ - "\u6498\u6576\u657A\u6579\u657B\u65B2\u65B3\u66B5"+ - "\u66B0\u66A9\u66B2\u66B7\u66AA\u66AF\u6A00\u6A06"+ - "\u6A17\u69E5\u69F8\u6A15\u69F1\u69E4\u6A20\u69FF"+ - "\u69EC\u69E2\u6A1B\u6A1D\u69FE\u6A27\u69F2\u69EE"+ - "\u6A14\u69F7\u69E7\u6A40\u6A08\u69E6\u69FB\u6A0D"+ - "\u69FC\u69EB\u6A09\u6A04\u6A18\u6A25\u6A0F\u69F6"+ - "\u6A26\u6A07\u69F4\u6A16\u6B51\u6BA5\u6BA3\u6BA2"+ - "\u6BA6\u6C01\u6C00\u6BFF\u6C02\u6F41\u6F26\u6F7E"+ - "\u6F87\u6FC6\u6F92\u6F8D\u6F89\u6F8C\u6F62\u6F4F"+ - "\u6F85\u6F5A\u6F96\u6F76\u6F6C\u6F82\u6F55\u6F72"+ - "\u6F52\u6F50\u6F57\u6F94\u6F93\u6F5D\u6F00\u6F61"+ - "\u6F6B\u6F7D\u6F67\u6F90\u6F53\u6F8B\u6F69\u6F7F"+ - "\u6F95\u6F63\u6F77\u6F6A\u6F7B\u71B2\u71AF\u719B"+ - "\u71B0\u71A0\u719A\u71A9\u71B5\u719D\u71A5\u719E"+ - "\u71A4\u71A1\u71AA\u719C\u71A7\u71B3\u7298\u729A"+ - "\u7358\u7352\u735E\u735F\u7360\u735D\u735B\u7361"+ - "\u735A\u7359\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\u7362\u7487\u7489\u748A"+ - "\u7486\u7481\u747D\u7485\u7488\u747C\u7479\u7508"+ - "\u7507\u757E\u7625\u761E\u7619\u761D\u761C\u7623"+ - "\u761A\u7628\u761B\u769C\u769D\u769E\u769B\u778D"+ - "\u778F\u7789\u7788\u78CD\u78BB\u78CF\u78CC\u78D1"+ - "\u78CE\u78D4\u78C8\u78C3\u78C4\u78C9\u799A\u79A1"+ - "\u79A0\u799C\u79A2\u799B\u6B76\u7A39\u7AB2\u7AB4"+ - "\u7AB3\u7BB7\u7BCB\u7BBE\u7BAC\u7BCE\u7BAF\u7BB9"+ - "\u7BCA\u7BB5\u7CC5\u7CC8\u7CCC\u7CCB\u7DF7\u7DDB"+ - "\u7DEA\u7DE7\u7DD7\u7DE1\u7E03\u7DFA\u7DE6\u7DF6"+ - "\u7DF1\u7DF0\u7DEE\u7DDF\u7F76\u7FAC\u7FB0\u7FAD"+ - "\u7FED\u7FEB\u7FEA\u7FEC\u7FE6\u7FE8\u8064\u8067"+ - "\u81A3\u819F\u819E\u8195\u81A2\u8199\u8197\u8216"+ - "\u824F\u8253\u8252\u8250\u824E\u8251\u8524\u853B"+ - "\u850F\u8500\u8529\u850E\u8509\u850D\u851F\u850A"+ - "\u8527\u851C\u84FB\u852B\u84FA\u8508\u850C\u84F4"+ - "\u852A\u84F2\u8515\u84F7\u84EB\u84F3\u84FC\u8512"+ - "\u84EA\u84E9\u8516\u84FE\u8528\u851D\u852E\u8502"+ - "\u84FD\u851E\u84F6\u8531\u8526\u84E7\u84E8\u84F0"+ - "\u84EF\u84F9\u8518\u8520\u8530\u850B\u8519\u852F"+ - "\u8662\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\u8756\u8763\u8764\u8777\u87E1"+ - "\u8773\u8758\u8754\u875B\u8752\u8761\u875A\u8751"+ - "\u875E\u876D\u876A\u8750\u874E\u875F\u875D\u876F"+ - "\u876C\u877A\u876E\u875C\u8765\u874F\u877B\u8775"+ - "\u8762\u8767\u8769\u885A\u8905\u890C\u8914\u890B"+ - "\u8917\u8918\u8919\u8906\u8916\u8911\u890E\u8909"+ - "\u89A2\u89A4\u89A3\u89ED\u89F0\u89EC\u8ACF\u8AC6"+ - "\u8AB8\u8AD3\u8AD1\u8AD4\u8AD5\u8ABB\u8AD7\u8ABE"+ - "\u8AC0\u8AC5\u8AD8\u8AC3\u8ABA\u8ABD\u8AD9\u8C3E"+ - "\u8C4D\u8C8F\u8CE5\u8CDF\u8CD9\u8CE8\u8CDA\u8CDD"+ - "\u8CE7\u8DA0\u8D9C\u8DA1\u8D9B\u8E20\u8E23\u8E25"+ - "\u8E24\u8E2E\u8E15\u8E1B\u8E16\u8E11\u8E19\u8E26"+ - "\u8E27\u8E14\u8E12\u8E18\u8E13\u8E1C\u8E17\u8E1A"+ - "\u8F2C\u8F24\u8F18\u8F1A\u8F20\u8F23\u8F16\u8F17"+ - "\u9073\u9070\u906F\u9067\u906B\u912F\u912B\u9129"+ - "\u912A\u9132\u9126\u912E\u9185\u9186\u918A\u9181"+ - "\u9182\u9184\u9180\u92D0\u92C3\u92C4\u92C0\u92D9"+ - "\u92B6\u92CF\u92F1\u92DF\u92D8\u92E9\u92D7\u92DD"+ - "\u92CC\u92EF\u92C2\u92E8\u92CA\u92C8\u92CE\u92E6"+ - "\u92CD\u92D5\u92C9\u92E0\u92DE\u92E7\u92D1\u92D3"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\u92B5\u92E1\u92C6\u92B4\u957C\u95AC"+ - "\u95AB\u95AE\u95B0\u96A4\u96A2\u96D3\u9705\u9708"+ - "\u9702\u975A\u978A\u978E\u9788\u97D0\u97CF\u981E"+ - "\u981D\u9826\u9829\u9828\u9820\u981B\u9827\u98B2"+ - "\u9908\u98FA\u9911\u9914\u9916\u9917\u9915\u99DC"+ - "\u99CD\u99CF\u99D3\u99D4\u99CE\u99C9\u99D6\u99D8"+ - "\u99CB\u99D7\u99CC\u9AB3\u9AEC\u9AEB\u9AF3\u9AF2"+ - "\u9AF1\u9B46\u9B43\u9B67\u9B74\u9B71\u9B66\u9B76"+ - "\u9B75\u9B70\u9B68\u9B64\u9B6C\u9CFC\u9CFA\u9CFD"+ - "\u9CFF\u9CF7\u9D07\u9D00\u9CF9\u9CFB\u9D08\u9D05"+ - "\u9D04\u9E83\u9ED3\u9F0F\u9F10\u511C\u5113\u5117"+ - "\u511A\u5111\u51DE\u5334\u53E1\u5670\u5660\u566E"+ - "\u5673\u5666\u5663\u566D\u5672\u565E\u5677\u571C"+ - "\u571B\u58C8\u58BD\u58C9\u58BF\u58BA\u58C2\u58BC"+ - "\u58C6\u5B17\u5B19\u5B1B\u5B21\u5B14\u5B13\u5B10"+ - "\u5B16\u5B28\u5B1A\u5B20\u5B1E\u5BEF\u5DAC\u5DB1"+ - "\u5DA9\u5DA7\u5DB5\u5DB0\u5DAE\u5DAA\u5DA8\u5DB2"+ - "\u5DAD\u5DAF\u5DB4\u5E67\u5E68\u5E66\u5E6F\u5EE9"+ - "\u5EE7\u5EE6\u5EE8\u5EE5\u5F4B\u5FBC\u619D\u61A8"+ - "\u6196\u61C5\u61B4\u61C6\u61C1\u61CC\u61BA\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\u61BF\u61B8\u618C\u64D7\u64D6\u64D0\u64CF"+ - "\u64C9\u64BD\u6489\u64C3\u64DB\u64F3\u64D9\u6533"+ - "\u657F\u657C\u65A2\u66C8\u66BE\u66C0\u66CA\u66CB"+ - "\u66CF\u66BD\u66BB\u66BA\u66CC\u6723\u6A34\u6A66"+ - "\u6A49\u6A67\u6A32\u6A68\u6A3E\u6A5D\u6A6D\u6A76"+ - "\u6A5B\u6A51\u6A28\u6A5A\u6A3B\u6A3F\u6A41\u6A6A"+ - "\u6A64\u6A50\u6A4F\u6A54\u6A6F\u6A69\u6A60\u6A3C"+ - "\u6A5E\u6A56\u6A55\u6A4D\u6A4E\u6A46\u6B55\u6B54"+ - "\u6B56\u6BA7\u6BAA\u6BAB\u6BC8\u6BC7\u6C04\u6C03"+ - "\u6C06\u6FAD\u6FCB\u6FA3\u6FC7\u6FBC\u6FCE\u6FC8"+ - "\u6F5E\u6FC4\u6FBD\u6F9E\u6FCA\u6FA8\u7004\u6FA5"+ - "\u6FAE\u6FBA\u6FAC\u6FAA\u6FCF\u6FBF\u6FB8\u6FA2"+ - "\u6FC9\u6FAB\u6FCD\u6FAF\u6FB2\u6FB0\u71C5\u71C2"+ - "\u71BF\u71B8\u71D6\u71C0\u71C1\u71CB\u71D4\u71CA"+ - "\u71C7\u71CF\u71BD\u71D8\u71BC\u71C6\u71DA\u71DB"+ - "\u729D\u729E\u7369\u7366\u7367\u736C\u7365\u736B"+ - "\u736A\u747F\u749A\u74A0\u7494\u7492\u7495\u74A1"+ - "\u750B\u7580\u762F\u762D\u7631\u763D\u7633\u763C"+ - "\u7635\u7632\u7630\u76BB\u76E6\u779A\u779D\u77A1"+ - "\u779C\u779B\u77A2\u77A3\u7795\u7799\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\u7797\u78DD\u78E9\u78E5\u78EA\u78DE\u78E3\u78DB"+ - "\u78E1\u78E2\u78ED\u78DF\u78E0\u79A4\u7A44\u7A48"+ - "\u7A47\u7AB6\u7AB8\u7AB5\u7AB1\u7AB7\u7BDE\u7BE3"+ - "\u7BE7\u7BDD\u7BD5\u7BE5\u7BDA\u7BE8\u7BF9\u7BD4"+ - "\u7BEA\u7BE2\u7BDC\u7BEB\u7BD8\u7BDF\u7CD2\u7CD4"+ - "\u7CD7\u7CD0\u7CD1\u7E12\u7E21\u7E17\u7E0C\u7E1F"+ - "\u7E20\u7E13\u7E0E\u7E1C\u7E15\u7E1A\u7E22\u7E0B"+ - "\u7E0F\u7E16\u7E0D\u7E14\u7E25\u7E24\u7F43\u7F7B"+ - "\u7F7C\u7F7A\u7FB1\u7FEF\u802A\u8029\u806C\u81B1"+ - "\u81A6\u81AE\u81B9\u81B5\u81AB\u81B0\u81AC\u81B4"+ - "\u81B2\u81B7\u81A7\u81F2\u8255\u8256\u8257\u8556"+ - "\u8545\u856B\u854D\u8553\u8561\u8558\u8540\u8546"+ - "\u8564\u8541\u8562\u8544\u8551\u8547\u8563\u853E"+ - "\u855B\u8571\u854E\u856E\u8575\u8555\u8567\u8560"+ - "\u858C\u8566\u855D\u8554\u8565\u856C\u8663\u8665"+ - "\u8664\u879B\u878F\u8797\u8793\u8792\u8788\u8781"+ - "\u8796\u8798\u8779\u8787\u87A3\u8785\u8790\u8791"+ - "\u879D\u8784\u8794\u879C\u879A\u8789\u891E\u8926"+ - "\u8930\u892D\u892E\u8927\u8931\u8922\u8929\u8923"+ - "\u892F\u892C\u891F\u89F1\u8AE0\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u8AE2"+ - "\u8AF2\u8AF4\u8AF5\u8ADD\u8B14\u8AE4\u8ADF\u8AF0"+ - "\u8AC8\u8ADE\u8AE1\u8AE8\u8AFF\u8AEF\u8AFB\u8C91"+ - "\u8C92\u8C90\u8CF5\u8CEE\u8CF1\u8CF0\u8CF3\u8D6C"+ - "\u8D6E\u8DA5\u8DA7\u8E33\u8E3E\u8E38\u8E40\u8E45"+ - "\u8E36\u8E3C\u8E3D\u8E41\u8E30\u8E3F\u8EBD\u8F36"+ - "\u8F2E\u8F35\u8F32\u8F39\u8F37\u8F34\u9076\u9079"+ - "\u907B\u9086\u90FA\u9133\u9135\u9136\u9193\u9190"+ - "\u9191\u918D\u918F\u9327\u931E\u9308\u931F\u9306"+ - "\u930F\u937A\u9338\u933C\u931B\u9323\u9312\u9301"+ - "\u9346\u932D\u930E\u930D\u92CB\u931D\u92FA\u9325"+ - "\u9313\u92F9\u92F7\u9334\u9302\u9324\u92FF\u9329"+ - "\u9339\u9335\u932A\u9314\u930C\u930B\u92FE\u9309"+ - "\u9300\u92FB\u9316\u95BC\u95CD\u95BE\u95B9\u95BA"+ - "\u95B6\u95BF\u95B5\u95BD\u96A9\u96D4\u970B\u9712"+ - "\u9710\u9799\u9797\u9794\u97F0\u97F8\u9835\u982F"+ - "\u9832\u9924\u991F\u9927\u9929\u999E\u99EE\u99EC"+ - "\u99E5\u99E4\u99F0\u99E3\u99EA\u99E9\u99E7\u9AB9"+ - "\u9ABF\u9AB4\u9ABB\u9AF6\u9AFA\u9AF9\u9AF7\u9B33"+ - "\u9B80\u9B85\u9B87\u9B7C\u9B7E\u9B7B\u9B82\u9B93"+ - "\u9B92\u9B90\u9B7A\u9B95\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u9B7D\u9B88"+ - "\u9D25\u9D17\u9D20\u9D1E\u9D14\u9D29\u9D1D\u9D18"+ - "\u9D22\u9D10\u9D19\u9D1F\u9E88\u9E86\u9E87\u9EAE"+ - "\u9EAD\u9ED5\u9ED6\u9EFA\u9F12\u9F3D\u5126\u5125"+ - "\u5122\u5124\u5120\u5129\u52F4\u5693\u568C\u568D"+ - "\u5686\u5684\u5683\u567E\u5682\u567F\u5681\u58D6"+ - "\u58D4\u58CF\u58D2\u5B2D\u5B25\u5B32\u5B23\u5B2C"+ - "\u5B27\u5B26\u5B2F\u5B2E\u5B7B\u5BF1\u5BF2\u5DB7"+ - "\u5E6C\u5E6A\u5FBE\u5FBB\u61C3\u61B5\u61BC\u61E7"+ - "\u61E0\u61E5\u61E4\u61E8\u61DE\u64EF\u64E9\u64E3"+ - "\u64EB\u64E4\u64E8\u6581\u6580\u65B6\u65DA\u66D2"+ - "\u6A8D\u6A96\u6A81\u6AA5\u6A89\u6A9F\u6A9B\u6AA1"+ - "\u6A9E\u6A87\u6A93\u6A8E\u6A95\u6A83\u6AA8\u6AA4"+ - "\u6A91\u6A7F\u6AA6\u6A9A\u6A85\u6A8C\u6A92\u6B5B"+ - "\u6BAD\u6C09\u6FCC\u6FA9\u6FF4\u6FD4\u6FE3\u6FDC"+ - "\u6FED\u6FE7\u6FE6\u6FDE\u6FF2\u6FDD\u6FE2\u6FE8"+ - "\u71E1\u71F1\u71E8\u71F2\u71E4\u71F0\u71E2\u7373"+ - "\u736E\u736F\u7497\u74B2\u74AB\u7490\u74AA\u74AD"+ - "\u74B1\u74A5\u74AF\u7510\u7511\u7512\u750F\u7584"+ - "\u7643\u7648\u7649\u7647\u76A4\u76E9\u77B5\u77AB"+ - "\u77B2\u77B7\u77B6\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u77B4\u77B1\u77A8"+ - "\u77F0\u78F3\u78FD\u7902\u78FB\u78FC\u78F2\u7905"+ - "\u78F9\u78FE\u7904\u79AB\u79A8\u7A5C\u7A5B\u7A56"+ - "\u7A58\u7A54\u7A5A\u7ABE\u7AC0\u7AC1\u7C05\u7C0F"+ - "\u7BF2\u7C00\u7BFF\u7BFB\u7C0E\u7BF4\u7C0B\u7BF3"+ - "\u7C02\u7C09\u7C03\u7C01\u7BF8\u7BFD\u7C06\u7BF0"+ - "\u7BF1\u7C10\u7C0A\u7CE8\u7E2D\u7E3C\u7E42\u7E33"+ - "\u9848\u7E38\u7E2A\u7E49\u7E40\u7E47\u7E29\u7E4C"+ - "\u7E30\u7E3B\u7E36\u7E44\u7E3A\u7F45\u7F7F\u7F7E"+ - "\u7F7D\u7FF4\u7FF2\u802C\u81BB\u81C4\u81CC\u81CA"+ - "\u81C5\u81C7\u81BC\u81E9\u825B\u825A\u825C\u8583"+ - "\u8580\u858F\u85A7\u8595\u85A0\u858B\u85A3\u857B"+ - "\u85A4\u859A\u859E\u8577\u857C\u8589\u85A1\u857A"+ - "\u8578\u8557\u858E\u8596\u8586\u858D\u8599\u859D"+ - "\u8581\u85A2\u8582\u8588\u8585\u8579\u8576\u8598"+ - "\u8590\u859F\u8668\u87BE\u87AA\u87AD\u87C5\u87B0"+ - "\u87AC\u87B9\u87B5\u87BC\u87AE\u87C9\u87C3\u87C2"+ - "\u87CC\u87B7\u87AF\u87C4\u87CA\u87B4\u87B6\u87BF"+ - "\u87B8\u87BD\u87DE\u87B2\u8935\u8933\u893C\u893E"+ - "\u8941\u8952\u8937\u8942\u89AD\u89AF\u89AE\u89F2"+ - "\u89F3\u8B1E\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\u8B18\u8B16\u8B11\u8B05"+ - "\u8B0B\u8B22\u8B0F\u8B12\u8B15\u8B07\u8B0D\u8B08"+ - "\u8B06\u8B1C\u8B13\u8B1A\u8C4F\u8C70\u8C72\u8C71"+ - "\u8C6F\u8C95\u8C94\u8CF9\u8D6F\u8E4E\u8E4D\u8E53"+ - "\u8E50\u8E4C\u8E47\u8F43\u8F40\u9085\u907E\u9138"+ - "\u919A\u91A2\u919B\u9199\u919F\u91A1\u919D\u91A0"+ - "\u93A1\u9383\u93AF\u9364\u9356\u9347\u937C\u9358"+ - "\u935C\u9376\u9349\u9350\u9351\u9360\u936D\u938F"+ - "\u934C\u936A\u9379\u9357\u9355\u9352\u934F\u9371"+ - "\u9377\u937B\u9361\u935E\u9363\u9367\u9380\u934E"+ - "\u9359\u95C7\u95C0\u95C9\u95C3\u95C5\u95B7\u96AE"+ - "\u96B0\u96AC\u9720\u971F\u9718\u971D\u9719\u979A"+ - "\u97A1\u979C\u979E\u979D\u97D5\u97D4\u97F1\u9841"+ - "\u9844\u984A\u9849\u9845\u9843\u9925\u992B\u992C"+ - "\u992A\u9933\u9932\u992F\u992D\u9931\u9930\u9998"+ - "\u99A3\u99A1\u9A02\u99FA\u99F4\u99F7\u99F9\u99F8"+ - "\u99F6\u99FB\u99FD\u99FE\u99FC\u9A03\u9ABE\u9AFE"+ - "\u9AFD\u9B01\u9AFC\u9B48\u9B9A\u9BA8\u9B9E\u9B9B"+ - "\u9BA6\u9BA1\u9BA5\u9BA4\u9B86\u9BA2\u9BA0\u9BAF"+ - "\u9D33\u9D41\u9D67\u9D36\u9D2E\u9D2F\u9D31\u9D38"+ - "\u9D30\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\u9D45\u9D42\u9D43\u9D3E\u9D37"+ - "\u9D40\u9D3D\u7FF5\u9D2D\u9E8A\u9E89\u9E8D\u9EB0"+ - "\u9EC8\u9EDA\u9EFB\u9EFF\u9F24\u9F23\u9F22\u9F54"+ - "\u9FA0\u5131\u512D\u512E\u5698\u569C\u5697\u569A"+ - "\u569D\u5699\u5970\u5B3C\u5C69\u5C6A\u5DC0\u5E6D"+ - "\u5E6E\u61D8\u61DF\u61ED\u61EE\u61F1\u61EA\u61F0"+ - "\u61EB\u61D6\u61E9\u64FF\u6504\u64FD\u64F8\u6501"+ - "\u6503\u64FC\u6594\u65DB\u66DA\u66DB\u66D8\u6AC5"+ - "\u6AB9\u6ABD\u6AE1\u6AC6\u6ABA\u6AB6\u6AB7\u6AC7"+ - "\u6AB4\u6AAD\u6B5E\u6BC9\u6C0B\u7007\u700C\u700D"+ - "\u7001\u7005\u7014\u700E\u6FFF\u7000\u6FFB\u7026"+ - "\u6FFC\u6FF7\u700A\u7201\u71FF\u71F9\u7203\u71FD"+ - "\u7376\u74B8\u74C0\u74B5\u74C1\u74BE\u74B6\u74BB"+ - "\u74C2\u7514\u7513\u765C\u7664\u7659\u7650\u7653"+ - "\u7657\u765A\u76A6\u76BD\u76EC\u77C2\u77BA\u78FF"+ - "\u790C\u7913\u7914\u7909\u7910\u7912\u7911\u79AD"+ - "\u79AC\u7A5F\u7C1C\u7C29\u7C19\u7C20\u7C1F\u7C2D"+ - "\u7C1D\u7C26\u7C28\u7C22\u7C25\u7C30\u7E5C\u7E50"+ - "\u7E56\u7E63\u7E58\u7E62\u7E5F\u7E51\u7E60\u7E57"+ - "\u7E53\u7FB5\u7FB3\u7FF7\u7FF8\u8075\u81D1\u81D2"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\u81D0\u825F\u825E\u85B4\u85C6\u85C0"+ - "\u85C3\u85C2\u85B3\u85B5\u85BD\u85C7\u85C4\u85BF"+ - "\u85CB\u85CE\u85C8\u85C5\u85B1\u85B6\u85D2\u8624"+ - "\u85B8\u85B7\u85BE\u8669\u87E7\u87E6\u87E2\u87DB"+ - "\u87EB\u87EA\u87E5\u87DF\u87F3\u87E4\u87D4\u87DC"+ - "\u87D3\u87ED\u87D8\u87E3\u87A4\u87D7\u87D9\u8801"+ - "\u87F4\u87E8\u87DD\u8953\u894B\u894F\u894C\u8946"+ - "\u8950\u8951\u8949\u8B2A\u8B27\u8B23\u8B33\u8B30"+ - "\u8B35\u8B47\u8B2F\u8B3C\u8B3E\u8B31\u8B25\u8B37"+ - "\u8B26\u8B36\u8B2E\u8B24\u8B3B\u8B3D\u8B3A\u8C42"+ - "\u8C75\u8C99\u8C98\u8C97\u8CFE\u8D04\u8D02\u8D00"+ - "\u8E5C\u8E62\u8E60\u8E57\u8E56\u8E5E\u8E65\u8E67"; - - private final static String innerIndex5= - "\u8E5B\u8E5A\u8E61\u8E5D\u8E69\u8E54\u8F46\u8F47"+ - "\u8F48\u8F4B\u9128\u913A\u913B\u913E\u91A8\u91A5"+ - "\u91A7\u91AF\u91AA\u93B5\u938C\u9392\u93B7\u939B"+ - "\u939D\u9389\u93A7\u938E\u93AA\u939E\u93A6\u9395"+ - "\u9388\u9399\u939F\u938D\u93B1\u9391\u93B2\u93A4"+ - "\u93A8\u93B4\u93A3\u93A5\u95D2\u95D3\u95D1\u96B3"+ - "\u96D7\u96DA\u5DC2\u96DF\u96D8\u96DD\u9723\u9722"+ - "\u9725\u97AC\u97AE\u97A8\u97AB\u97A4\u97AA\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\u97A2\u97A5\u97D7\u97D9\u97D6\u97D8\u97FA"+ - "\u9850\u9851\u9852\u98B8\u9941\u993C\u993A\u9A0F"+ - "\u9A0B\u9A09\u9A0D\u9A04\u9A11\u9A0A\u9A05\u9A07"+ - "\u9A06\u9AC0\u9ADC\u9B08\u9B04\u9B05\u9B29\u9B35"+ - "\u9B4A\u9B4C\u9B4B\u9BC7\u9BC6\u9BC3\u9BBF\u9BC1"+ - "\u9BB5\u9BB8\u9BD3\u9BB6\u9BC4\u9BB9\u9BBD\u9D5C"+ - "\u9D53\u9D4F\u9D4A\u9D5B\u9D4B\u9D59\u9D56\u9D4C"+ - "\u9D57\u9D52\u9D54\u9D5F\u9D58\u9D5A\u9E8E\u9E8C"+ - "\u9EDF\u9F01\u9F00\u9F16\u9F25\u9F2B\u9F2A\u9F29"+ - "\u9F28\u9F4C\u9F55\u5134\u5135\u5296\u52F7\u53B4"+ - "\u56AB\u56AD\u56A6\u56A7\u56AA\u56AC\u58DA\u58DD"+ - "\u58DB\u5912\u5B3D\u5B3E\u5B3F\u5DC3\u5E70\u5FBF"+ - "\u61FB\u6507\u6510\u650D\u6509\u650C\u650E\u6584"+ - "\u65DE\u65DD\u66DE\u6AE7\u6AE0\u6ACC\u6AD1\u6AD9"+ - "\u6ACB\u6ADF\u6ADC\u6AD0\u6AEB\u6ACF\u6ACD\u6ADE"+ - "\u6B60\u6BB0\u6C0C\u7019\u7027\u7020\u7016\u702B"+ - "\u7021\u7022\u7023\u7029\u7017\u7024\u701C\u702A"+ - "\u720C\u720A\u7207\u7202\u7205\u72A5\u72A6\u72A4"+ - "\u72A3\u72A1\u74CB\u74C5\u74B7\u74C3\u7516\u7660"+ - "\u77C9\u77CA\u77C4\u77F1\u791D\u791B\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\u7921\u791C\u7917\u791E\u79B0\u7A67\u7A68\u7C33"+ - "\u7C3C\u7C39\u7C2C\u7C3B\u7CEC\u7CEA\u7E76\u7E75"+ - "\u7E78\u7E70\u7E77\u7E6F\u7E7A\u7E72\u7E74\u7E68"+ - "\u7F4B\u7F4A\u7F83\u7F86\u7FB7\u7FFD\u7FFE\u8078"+ - "\u81D7\u81D5\u8264\u8261\u8263\u85EB\u85F1\u85ED"+ - "\u85D9\u85E1\u85E8\u85DA\u85D7\u85EC\u85F2\u85F8"+ - "\u85D8\u85DF\u85E3\u85DC\u85D1\u85F0\u85E6\u85EF"+ - "\u85DE\u85E2\u8800\u87FA\u8803\u87F6\u87F7\u8809"+ - "\u880C\u880B\u8806\u87FC\u8808\u87FF\u880A\u8802"+ - "\u8962\u895A\u895B\u8957\u8961\u895C\u8958\u895D"+ - "\u8959\u8988\u89B7\u89B6\u89F6\u8B50\u8B48\u8B4A"+ - "\u8B40\u8B53\u8B56\u8B54\u8B4B\u8B55\u8B51\u8B42"+ - "\u8B52\u8B57\u8C43\u8C77\u8C76\u8C9A\u8D06\u8D07"+ - "\u8D09\u8DAC\u8DAA\u8DAD\u8DAB\u8E6D\u8E78\u8E73"+ - "\u8E6A\u8E6F\u8E7B\u8EC2\u8F52\u8F51\u8F4F\u8F50"+ - "\u8F53\u8FB4\u9140\u913F\u91B0\u91AD\u93DE\u93C7"+ - "\u93CF\u93C2\u93DA\u93D0\u93F9\u93EC\u93CC\u93D9"+ - "\u93A9\u93E6\u93CA\u93D4\u93EE\u93E3\u93D5\u93C4"+ - "\u93CE\u93C0\u93D2\u93E7\u957D\u95DA\u95DB\u96E1"+ - "\u9729\u972B\u972C\u9728\u9726\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u97B3"+ - "\u97B7\u97B6\u97DD\u97DE\u97DF\u985C\u9859\u985D"+ - "\u9857\u98BF\u98BD\u98BB\u98BE\u9948\u9947\u9943"+ - "\u99A6\u99A7\u9A1A\u9A15\u9A25\u9A1D\u9A24\u9A1B"+ - "\u9A22\u9A20\u9A27\u9A23\u9A1E\u9A1C\u9A14\u9AC2"+ - "\u9B0B\u9B0A\u9B0E\u9B0C\u9B37\u9BEA\u9BEB\u9BE0"+ - "\u9BDE\u9BE4\u9BE6\u9BE2\u9BF0\u9BD4\u9BD7\u9BEC"+ - "\u9BDC\u9BD9\u9BE5\u9BD5\u9BE1\u9BDA\u9D77\u9D81"+ - "\u9D8A\u9D84\u9D88\u9D71\u9D80\u9D78\u9D86\u9D8B"+ - "\u9D8C\u9D7D\u9D6B\u9D74\u9D75\u9D70\u9D69\u9D85"+ - "\u9D73\u9D7B\u9D82\u9D6F\u9D79\u9D7F\u9D87\u9D68"+ - "\u9E94\u9E91\u9EC0\u9EFC\u9F2D\u9F40\u9F41\u9F4D"+ - "\u9F56\u9F57\u9F58\u5337\u56B2\u56B5\u56B3\u58E3"+ - "\u5B45\u5DC6\u5DC7\u5EEE\u5EEF\u5FC0\u5FC1\u61F9"+ - "\u6517\u6516\u6515\u6513\u65DF\u66E8\u66E3\u66E4"+ - "\u6AF3\u6AF0\u6AEA\u6AE8\u6AF9\u6AF1\u6AEE\u6AEF"+ - "\u703C\u7035\u702F\u7037\u7034\u7031\u7042\u7038"+ - "\u703F\u703A\u7039\u7040\u703B\u7033\u7041\u7213"+ - "\u7214\u72A8\u737D\u737C\u74BA\u76AB\u76AA\u76BE"+ - "\u76ED\u77CC\u77CE\u77CF\u77CD\u77F2\u7925\u7923"+ - "\u7927\u7928\u7924\u7929\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u79B2\u7A6E"+ - "\u7A6C\u7A6D\u7AF7\u7C49\u7C48\u7C4A\u7C47\u7C45"+ - "\u7CEE\u7E7B\u7E7E\u7E81\u7E80\u7FBA\u7FFF\u8079"+ - "\u81DB\u81D9\u820B\u8268\u8269\u8622\u85FF\u8601"+ - "\u85FE\u861B\u8600\u85F6\u8604\u8609\u8605\u860C"+ - "\u85FD\u8819\u8810\u8811\u8817\u8813\u8816\u8963"+ - "\u8966\u89B9\u89F7\u8B60\u8B6A\u8B5D\u8B68\u8B63"+ - "\u8B65\u8B67\u8B6D\u8DAE\u8E86\u8E88\u8E84\u8F59"+ - "\u8F56\u8F57\u8F55\u8F58\u8F5A\u908D\u9143\u9141"+ - "\u91B7\u91B5\u91B2\u91B3\u940B\u9413\u93FB\u9420"+ - "\u940F\u9414\u93FE\u9415\u9410\u9428\u9419\u940D"+ - "\u93F5\u9400\u93F7\u9407\u940E\u9416\u9412\u93FA"+ - "\u9409\u93F8\u940A\u93FF\u93FC\u940C\u93F6\u9411"+ - "\u9406\u95DE\u95E0\u95DF\u972E\u972F\u97B9\u97BB"+ - "\u97FD\u97FE\u9860\u9862\u9863\u985F\u98C1\u98C2"+ - "\u9950\u994E\u9959\u994C\u994B\u9953\u9A32\u9A34"+ - "\u9A31\u9A2C\u9A2A\u9A36\u9A29\u9A2E\u9A38\u9A2D"+ - "\u9AC7\u9ACA\u9AC6\u9B10\u9B12\u9B11\u9C0B\u9C08"+ - "\u9BF7\u9C05\u9C12\u9BF8\u9C40\u9C07\u9C0E\u9C06"+ - "\u9C17\u9C14\u9C09\u9D9F\u9D99\u9DA4\u9D9D\u9D92"+ - "\u9D98\u9D90\u9D9B\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u9DA0\u9D94\u9D9C"+ - "\u9DAA\u9D97\u9DA1\u9D9A\u9DA2\u9DA8\u9D9E\u9DA3"+ - "\u9DBF\u9DA9\u9D96\u9DA6\u9DA7\u9E99\u9E9B\u9E9A"+ - "\u9EE5\u9EE4\u9EE7\u9EE6\u9F30\u9F2E\u9F5B\u9F60"+ - "\u9F5E\u9F5D\u9F59\u9F91\u513A\u5139\u5298\u5297"+ - "\u56C3\u56BD\u56BE\u5B48\u5B47\u5DCB\u5DCF\u5EF1"+ - "\u61FD\u651B\u6B02\u6AFC\u6B03\u6AF8\u6B00\u7043"+ - "\u7044\u704A\u7048\u7049\u7045\u7046\u721D\u721A"+ - "\u7219\u737E\u7517\u766A\u77D0\u792D\u7931\u792F"+ - "\u7C54\u7C53\u7CF2\u7E8A\u7E87\u7E88\u7E8B\u7E86"+ - "\u7E8D\u7F4D\u7FBB\u8030\u81DD\u8618\u862A\u8626"+ - "\u861F\u8623\u861C\u8619\u8627\u862E\u8621\u8620"+ - "\u8629\u861E\u8625\u8829\u881D\u881B\u8820\u8824"+ - "\u881C\u882B\u884A\u896D\u8969\u896E\u896B\u89FA"+ - "\u8B79\u8B78\u8B45\u8B7A\u8B7B\u8D10\u8D14\u8DAF"+ - "\u8E8E\u8E8C\u8F5E\u8F5B\u8F5D\u9146\u9144\u9145"+ - "\u91B9\u943F\u943B\u9436\u9429\u943D\u943C\u9430"+ - "\u9439\u942A\u9437\u942C\u9440\u9431\u95E5\u95E4"+ - "\u95E3\u9735\u973A\u97BF\u97E1\u9864\u98C9\u98C6"+ - "\u98C0\u9958\u9956\u9A39\u9A3D\u9A46\u9A44\u9A42"+ - "\u9A41\u9A3A\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\u9A3F\u9ACD\u9B15\u9B17"+ - "\u9B18\u9B16\u9B3A\u9B52\u9C2B\u9C1D\u9C1C\u9C2C"+ - "\u9C23\u9C28\u9C29\u9C24\u9C21\u9DB7\u9DB6\u9DBC"+ - "\u9DC1\u9DC7\u9DCA\u9DCF\u9DBE\u9DC5\u9DC3\u9DBB"+ - "\u9DB5\u9DCE\u9DB9\u9DBA\u9DAC\u9DC8\u9DB1\u9DAD"+ - "\u9DCC\u9DB3\u9DCD\u9DB2\u9E7A\u9E9C\u9EEB\u9EEE"+ - "\u9EED\u9F1B\u9F18\u9F1A\u9F31\u9F4E\u9F65\u9F64"+ - "\u9F92\u4EB9\u56C6\u56C5\u56CB\u5971\u5B4B\u5B4C"+ - "\u5DD5\u5DD1\u5EF2\u6521\u6520\u6526\u6522\u6B0B"+ - "\u6B08\u6B09\u6C0D\u7055\u7056\u7057\u7052\u721E"+ - "\u721F\u72A9\u737F\u74D8\u74D5\u74D9\u74D7\u766D"+ - "\u76AD\u7935\u79B4\u7A70\u7A71\u7C57\u7C5C\u7C59"+ - "\u7C5B\u7C5A\u7CF4\u7CF1\u7E91\u7F4F\u7F87\u81DE"+ - "\u826B\u8634\u8635\u8633\u862C\u8632\u8636\u882C"+ - "\u8828\u8826\u882A\u8825\u8971\u89BF\u89BE\u89FB"+ - "\u8B7E\u8B84\u8B82\u8B86\u8B85\u8B7F\u8D15\u8E95"+ - "\u8E94\u8E9A\u8E92\u8E90\u8E96\u8E97\u8F60\u8F62"+ - "\u9147\u944C\u9450\u944A\u944B\u944F\u9447\u9445"+ - "\u9448\u9449\u9446\u973F\u97E3\u986A\u9869\u98CB"+ - "\u9954\u995B\u9A4E\u9A53\u9A54\u9A4C\u9A4F\u9A48"+ - "\u9A4A\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\u9A49\u9A52\u9A50\u9AD0\u9B19"+ - "\u9B2B\u9B3B\u9B56\u9B55\u9C46\u9C48\u9C3F\u9C44"+ - "\u9C39\u9C33\u9C41\u9C3C\u9C37\u9C34\u9C32\u9C3D"+ - "\u9C36\u9DDB\u9DD2\u9DDE\u9DDA\u9DCB\u9DD0\u9DDC"+ - "\u9DD1\u9DDF\u9DE9\u9DD9\u9DD8\u9DD6\u9DF5\u9DD5"+ - "\u9DDD\u9EB6\u9EF0\u9F35\u9F33\u9F32\u9F42\u9F6B"+ - "\u9F95\u9FA2\u513D\u5299\u58E8\u58E7\u5972\u5B4D"+ - "\u5DD8\u882F\u5F4F\u6201\u6203\u6204\u6529\u6525"+ - "\u6596\u66EB\u6B11\u6B12\u6B0F\u6BCA\u705B\u705A"+ - "\u7222\u7382\u7381\u7383\u7670\u77D4\u7C67\u7C66"+ - "\u7E95\u826C\u863A\u8640\u8639\u863C\u8631\u863B"+ - "\u863E\u8830\u8832\u882E\u8833\u8976\u8974\u8973"+ - "\u89FE\u8B8C\u8B8E\u8B8B\u8B88\u8C45\u8D19\u8E98"+ - "\u8F64\u8F63\u91BC\u9462\u9455\u945D\u9457\u945E"+ - "\u97C4\u97C5\u9800\u9A56\u9A59\u9B1E\u9B1F\u9B20"+ - "\u9C52\u9C58\u9C50\u9C4A\u9C4D\u9C4B\u9C55\u9C59"+ - "\u9C4C\u9C4E\u9DFB\u9DF7\u9DEF\u9DE3\u9DEB\u9DF8"+ - "\u9DE4\u9DF6\u9DE1\u9DEE\u9DE6\u9DF2\u9DF0\u9DE2"+ - "\u9DEC\u9DF4\u9DF3\u9DE8\u9DED\u9EC2\u9ED0\u9EF2"+ - "\u9EF3\u9F06\u9F1C\u9F38\u9F37\u9F36\u9F43\u9F4F"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\u9F71\u9F70\u9F6E\u9F6F\u56D3\u56CD"+ - "\u5B4E\u5C6D\u652D\u66ED\u66EE\u6B13\u705F\u7061"+ - "\u705D\u7060\u7223\u74DB\u74E5\u77D5\u7938\u79B7"+ - "\u79B6\u7C6A\u7E97\u7F89\u826D\u8643\u8838\u8837"+ - "\u8835\u884B\u8B94\u8B95\u8E9E\u8E9F\u8EA0\u8E9D"+ - "\u91BE\u91BD\u91C2\u946B\u9468\u9469\u96E5\u9746"+ - "\u9743\u9747\u97C7\u97E5\u9A5E\u9AD5\u9B59\u9C63"+ - "\u9C67\u9C66\u9C62\u9C5E\u9C60\u9E02\u9DFE\u9E07"+ - "\u9E03\u9E06\u9E05\u9E00\u9E01\u9E09\u9DFF\u9DFD"+ - "\u9E04\u9EA0\u9F1E\u9F46\u9F74\u9F75\u9F76\u56D4"+ - "\u652E\u65B8\u6B18\u6B19\u6B17\u6B1A\u7062\u7226"+ - "\u72AA\u77D8\u77D9\u7939\u7C69\u7C6B\u7CF6\u7E9A"+ - "\u7E98\u7E9B\u7E99\u81E0\u81E1\u8646\u8647\u8648"+ - "\u8979\u897A\u897C\u897B\u89FF\u8B98\u8B99\u8EA5"+ - "\u8EA4\u8EA3\u946E\u946D\u946F\u9471\u9473\u9749"+ - "\u9872\u995F\u9C68\u9C6E\u9C6D\u9E0B\u9E0D\u9E10"+ - "\u9E0F\u9E12\u9E11\u9EA1\u9EF5\u9F09\u9F47\u9F78"+ - "\u9F7B\u9F7A\u9F79\u571E\u7066\u7C6F\u883C\u8DB2"+ - "\u8EA6\u91C3\u9474\u9478\u9476\u9475\u9A60\u9C74"+ - "\u9C73\u9C71\u9C75\u9E14\u9E13\u9EF6\u9F0A\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\u9FA4\u7068\u7065\u7CF7\u866A\u883E\u883D"+ - "\u883F\u8B9E\u8C9C\u8EA9\u8EC9\u974B\u9873\u9874"+ - "\u98CC\u9961\u99AB\u9A64\u9A66\u9A67\u9B24\u9E15"+ - "\u9E17\u9F48\u6207\u6B1E\u7227\u864C\u8EA8\u9482"+ - "\u9480\u9481\u9A69\u9A68\u9B2E\u9E19\u7229\u864B"+ - "\u8B9F\u9483\u9C79\u9EB7\u7675\u9A6B\u9C7A\u9E1D"+ - "\u7069\u706A\u9EA4\u9F7E\u9F49\u9F98\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"+ - "\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD"; - - private final static short index1[] = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, - 32, 33, 34, 35, 36, 37, 38, 39, 0, 40, 41, 42, 43, 44, 45, 46, - 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, - 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, - 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 0, 0, 0, 0, 0, 0 - }; - - String index2[] = { - innerIndex0, - innerIndex1, - innerIndex2, - innerIndex3, - innerIndex4, - innerIndex5 - }; } From 2827ff39e5f4779d078017b003d08093dbef5de3 Mon Sep 17 00:00:00 2001 From: Weijun Wang Date: Thu, 9 Apr 2009 15:32:55 +0800 Subject: [PATCH 28/91] 6714845: Quotes in Kerberos configuration file are included in the values Reviewed-by: xuelei --- .../classes/sun/security/krb5/Config.java | 40 +++++++++++++++- .../security/krb5/ConfigWithQuotations.java | 47 +++++++++++++++++++ jdk/test/sun/security/krb5/edu.mit.Kerberos | 15 ++++++ 3 files changed, 100 insertions(+), 2 deletions(-) create mode 100644 jdk/test/sun/security/krb5/ConfigWithQuotations.java create mode 100644 jdk/test/sun/security/krb5/edu.mit.Kerberos diff --git a/jdk/src/share/classes/sun/security/krb5/Config.java b/jdk/src/share/classes/sun/security/krb5/Config.java index 07c78e2959a..e036776f53e 100644 --- a/jdk/src/share/classes/sun/security/krb5/Config.java +++ b/jdk/src/share/classes/sun/security/krb5/Config.java @@ -736,6 +736,14 @@ public class Config { return name; } + private static String trimmed(String s) { + s = s.trim(); + if (s.charAt(0) == '"' && s.charAt(s.length()-1) == '"' || + s.charAt(0) == '\'' && s.charAt(s.length()-1) == '\'') { + s = s.substring(1, s.length()-1).trim(); + } + return s; + } /** * Parses key-value pairs under a stanza name. */ @@ -747,7 +755,7 @@ public class Config { for (int j = 0; j < line.length(); j++) { if (line.charAt(j) == '=') { String key = (line.substring(0, j)).trim(); - String value = (line.substring(j + 1)).trim(); + String value = trimmed(line.substring(j + 1)); table.put(key, value); break; } @@ -820,7 +828,7 @@ public class Config { } else { nameVector = table.get(key); } - nameVector.addElement((line.substring(j + 1)).trim()); + nameVector.addElement(trimmed(line.substring(j + 1))); table.put(key, nameVector); break; } @@ -1263,4 +1271,32 @@ public class Config { } } + @Override + public String toString() { + StringBuffer sb = new StringBuffer(); + toStringIndented("", stanzaTable, sb); + return sb.toString(); + } + private static void toStringIndented(String prefix, Object obj, + StringBuffer sb) { + if (obj instanceof String) { + sb.append(prefix); + sb.append(obj); + sb.append('\n'); + } else if (obj instanceof Hashtable) { + Hashtable tab = (Hashtable)obj; + for (Object o: tab.keySet()) { + sb.append(prefix); + sb.append(o); + sb.append(" = {\n"); + toStringIndented(prefix + " ", tab.get(o), sb); + sb.append(prefix + "}\n"); + } + } else if (obj instanceof Vector) { + Vector v = (Vector)obj; + for (Object o: v.toArray()) { + toStringIndented(prefix + " ", o, sb); + } + } + } } diff --git a/jdk/test/sun/security/krb5/ConfigWithQuotations.java b/jdk/test/sun/security/krb5/ConfigWithQuotations.java new file mode 100644 index 00000000000..c55e3cbb8dd --- /dev/null +++ b/jdk/test/sun/security/krb5/ConfigWithQuotations.java @@ -0,0 +1,47 @@ +/* + * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. + * 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. + * + * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ +/* + * @test + * @bug 6714845 + * @summary Quotes in Kerberos configuration file are included in the values + */ + +import sun.security.krb5.Config; + +public class ConfigWithQuotations { + public static void main(String[] args) throws Exception { + // This config file is generated using Kerberos.app on a Mac + System.setProperty("java.security.krb5.conf", + System.getProperty("test.src", ".") +"/edu.mit.Kerberos"); + Config config = Config.getInstance(); + + System.out.println(config); + + if (!config.getDefaultRealm().equals("MAC.LOCAL")) { + throw new Exception("Realm error"); + } + if (!config.getKDCList("MAC.LOCAL").equals("kdc.mac.local:88")) { + throw new Exception("KDC error"); + } + } +} diff --git a/jdk/test/sun/security/krb5/edu.mit.Kerberos b/jdk/test/sun/security/krb5/edu.mit.Kerberos new file mode 100644 index 00000000000..94d76a6e58c --- /dev/null +++ b/jdk/test/sun/security/krb5/edu.mit.Kerberos @@ -0,0 +1,15 @@ +[domain_realm] + +[libdefaults] + default_realm = "MAC.LOCAL" + dns_fallback = "no" + +[logging] + admin_server = "FILE:/var/log/krb5kdc/kadmin.log" + kdc = "FILE:/var/log/krb5kdc/kdc.log" + +[realms] + MAC.LOCAL = { + kdc = "kdc.mac.local:88" + } + From 23d8c5ddc1154207f5fbb1a00d23c76ace2443bd Mon Sep 17 00:00:00 2001 From: Weijun Wang Date: Fri, 10 Apr 2009 11:21:31 +0800 Subject: [PATCH 29/91] 6587676: Krb5LoginModule failure if useTicketCache=true on Vista Reviewed-by: valeriep --- .../native/sun/security/krb5/NativeCreds.c | 258 ++++++++++-------- 1 file changed, 149 insertions(+), 109 deletions(-) diff --git a/jdk/src/windows/native/sun/security/krb5/NativeCreds.c b/jdk/src/windows/native/sun/security/krb5/NativeCreds.c index e112b86e9c3..968ff119153 100644 --- a/jdk/src/windows/native/sun/security/krb5/NativeCreds.c +++ b/jdk/src/windows/native/sun/security/krb5/NativeCreds.c @@ -73,6 +73,7 @@ jmethodID setRealmMethod = 0; * Function prototypes for internal routines * */ +BOOL DEBUG = 0; BOOL PackageConnectLookup(PHANDLE,PULONG); @@ -113,208 +114,221 @@ JNIEXPORT jint JNICALL JNI_OnLoad( jclass cls; JNIEnv *env; + jfieldID fldDEBUG; if ((*jvm)->GetEnv(jvm, (void **)&env, JNI_VERSION_1_2)) { return JNI_EVERSION; /* JNI version not supported */ } + cls = (*env)->FindClass(env,"sun/security/krb5/internal/Krb5"); + if (cls == NULL) { + printf("LSA: Couldn't find Krb5\n"); + return JNI_ERR; + } + fldDEBUG = (*env)->GetStaticFieldID(env, cls, "DEBUG", "Z"); + if (fldDEBUG == NULL) { + printf("LSA: Krb5 has no DEBUG field\n"); + return JNI_ERR; + } + DEBUG = (*env)->GetStaticBooleanField(env, cls, fldDEBUG); + cls = (*env)->FindClass(env,"sun/security/krb5/internal/Ticket"); if (cls == NULL) { - printf("Couldn't find Ticket\n"); + printf("LSA: Couldn't find Ticket\n"); return JNI_ERR; } - #ifdef DEBUG - printf("Found Ticket\n"); - #endif /* DEBUG */ + if (DEBUG) { + printf("LSA: Found Ticket\n"); + } /* DEBUG */ ticketClass = (*env)->NewWeakGlobalRef(env,cls); if (ticketClass == NULL) { return JNI_ERR; } - #ifdef DEBUG - printf("Made NewWeakGlobalRef\n"); - #endif /* DEBUG */ + if (DEBUG) { + printf("LSA: Made NewWeakGlobalRef\n"); + } /* DEBUG */ cls = (*env)->FindClass(env, "sun/security/krb5/PrincipalName"); if (cls == NULL) { - printf("Couldn't find PrincipalName\n"); + printf("LSA: Couldn't find PrincipalName\n"); return JNI_ERR; } - #ifdef DEBUG - printf("Found PrincipalName\n"); - #endif /* DEBUG */ + if (DEBUG) { + printf("LSA: Found PrincipalName\n"); + } /* DEBUG */ principalNameClass = (*env)->NewWeakGlobalRef(env,cls); if (principalNameClass == NULL) { return JNI_ERR; } - #ifdef DEBUG - printf("Made NewWeakGlobalRef\n"); - #endif /* DEBUG */ + if (DEBUG) { + printf("LSA: Made NewWeakGlobalRef\n"); + } /* DEBUG */ cls = (*env)->FindClass(env,"sun/security/util/DerValue"); if (cls == NULL) { - printf("Couldn't find DerValue\n"); + printf("LSA: Couldn't find DerValue\n"); return JNI_ERR; } - #ifdef DEBUG - printf("Found DerValue\n"); - #endif /* DEBUG */ + if (DEBUG) { + printf("LSA: Found DerValue\n"); + } /* DEBUG */ derValueClass = (*env)->NewWeakGlobalRef(env,cls); if (derValueClass == NULL) { return JNI_ERR; } - #ifdef DEBUG - printf("Made NewWeakGlobalRef\n"); - #endif /* DEBUG */ + if (DEBUG) { + printf("LSA: Made NewWeakGlobalRef\n"); + } /* DEBUG */ cls = (*env)->FindClass(env,"sun/security/krb5/EncryptionKey"); if (cls == NULL) { - printf("Couldn't find EncryptionKey\n"); + printf("LSA: Couldn't find EncryptionKey\n"); return JNI_ERR; } - #ifdef DEBUG - printf("Found EncryptionKey\n"); - #endif /* DEBUG */ + if (DEBUG) { + printf("LSA: Found EncryptionKey\n"); + } /* DEBUG */ encryptionKeyClass = (*env)->NewWeakGlobalRef(env,cls); if (encryptionKeyClass == NULL) { return JNI_ERR; } - #ifdef DEBUG - printf("Made NewWeakGlobalRef\n"); - #endif /* DEBUG */ + if (DEBUG) { + printf("LSA: Made NewWeakGlobalRef\n"); + } /* DEBUG */ cls = (*env)->FindClass(env,"sun/security/krb5/internal/TicketFlags"); if (cls == NULL) { - printf("Couldn't find TicketFlags\n"); + printf("LSA: Couldn't find TicketFlags\n"); return JNI_ERR; } - #ifdef DEBUG - printf("Found TicketFlags\n"); - #endif /* DEBUG */ + if (DEBUG) { + printf("LSA: Found TicketFlags\n"); + } /* DEBUG */ ticketFlagsClass = (*env)->NewWeakGlobalRef(env,cls); if (ticketFlagsClass == NULL) { return JNI_ERR; } - #ifdef DEBUG - printf("Made NewWeakGlobalRef\n"); - #endif /* DEBUG */ + if (DEBUG) { + printf("LSA: Made NewWeakGlobalRef\n"); + } /* DEBUG */ cls = (*env)->FindClass(env,"sun/security/krb5/internal/KerberosTime"); if (cls == NULL) { - printf("Couldn't find KerberosTime\n"); + printf("LSA: Couldn't find KerberosTime\n"); return JNI_ERR; } - #ifdef DEBUG - printf("Found KerberosTime\n"); - #endif /* DEBUG */ + if (DEBUG) { + printf("LSA: Found KerberosTime\n"); + } /* DEBUG */ kerberosTimeClass = (*env)->NewWeakGlobalRef(env,cls); if (kerberosTimeClass == NULL) { return JNI_ERR; } - #ifdef DEBUG - printf("Made NewWeakGlobalRef\n"); - #endif /* DEBUG */ + if (DEBUG) { + printf("LSA: Made NewWeakGlobalRef\n"); + } /* DEBUG */ cls = (*env)->FindClass(env,"java/lang/String"); if (cls == NULL) { - printf("Couldn't find String\n"); + printf("LSA: Couldn't find String\n"); return JNI_ERR; } - #ifdef DEBUG - printf("Found String\n"); - #endif /* DEBUG */ + if (DEBUG) { + printf("LSA: Found String\n"); + } /* DEBUG */ javaLangStringClass = (*env)->NewWeakGlobalRef(env,cls); if (javaLangStringClass == NULL) { return JNI_ERR; } - #ifdef DEBUG - printf("Made NewWeakGlobalRef\n"); - #endif /* DEBUG */ + if (DEBUG) { + printf("LSA: Made NewWeakGlobalRef\n"); + } /* DEBUG */ derValueConstructor = (*env)->GetMethodID(env, derValueClass, "", "([B)V"); if (derValueConstructor == 0) { - printf("Couldn't find DerValue constructor\n"); + printf("LSA: Couldn't find DerValue constructor\n"); return JNI_ERR; } - #ifdef DEBUG - printf("Found DerValue constructor\n"); - #endif /* DEBUG */ + if (DEBUG) { + printf("LSA: Found DerValue constructor\n"); + } /* DEBUG */ ticketConstructor = (*env)->GetMethodID(env, ticketClass, "", "(Lsun/security/util/DerValue;)V"); if (ticketConstructor == 0) { - printf("Couldn't find Ticket constructor\n"); + printf("LSA: Couldn't find Ticket constructor\n"); return JNI_ERR; } - #ifdef DEBUG - printf("Found Ticket constructor\n"); - #endif /* DEBUG */ + if (DEBUG) { + printf("LSA: Found Ticket constructor\n"); + } /* DEBUG */ principalNameConstructor = (*env)->GetMethodID(env, principalNameClass, "", "([Ljava/lang/String;)V"); if (principalNameConstructor == 0) { - printf("Couldn't find PrincipalName constructor\n"); + printf("LSA: Couldn't find PrincipalName constructor\n"); return JNI_ERR; } - #ifdef DEBUG - printf("Found PrincipalName constructor\n"); - #endif /* DEBUG */ + if (DEBUG) { + printf("LSA: Found PrincipalName constructor\n"); + } /* DEBUG */ encryptionKeyConstructor = (*env)->GetMethodID(env, encryptionKeyClass, "", "(I[B)V"); if (encryptionKeyConstructor == 0) { - printf("Couldn't find EncryptionKey constructor\n"); + printf("LSA: Couldn't find EncryptionKey constructor\n"); return JNI_ERR; } - #ifdef DEBUG - printf("Found EncryptionKey constructor\n"); - #endif /* DEBUG */ + if (DEBUG) { + printf("LSA: Found EncryptionKey constructor\n"); + } /* DEBUG */ ticketFlagsConstructor = (*env)->GetMethodID(env, ticketFlagsClass, "", "(I[B)V"); if (ticketFlagsConstructor == 0) { - printf("Couldn't find TicketFlags constructor\n"); + printf("LSA: Couldn't find TicketFlags constructor\n"); return JNI_ERR; } - #ifdef DEBUG - printf("Found TicketFlags constructor\n"); - #endif /* DEBUG */ + if (DEBUG) { + printf("LSA: Found TicketFlags constructor\n"); + } /* DEBUG */ kerberosTimeConstructor = (*env)->GetMethodID(env, kerberosTimeClass, "", "(Ljava/lang/String;)V"); if (kerberosTimeConstructor == 0) { - printf("Couldn't find KerberosTime constructor\n"); + printf("LSA: Couldn't find KerberosTime constructor\n"); return JNI_ERR; } - #ifdef DEBUG - printf("Found KerberosTime constructor\n"); - #endif /* DEBUG */ + if (DEBUG) { + printf("LSA: Found KerberosTime constructor\n"); + } /* DEBUG */ // load the setRealm method in PrincipalName setRealmMethod = (*env)->GetMethodID(env, principalNameClass, "setRealm", "(Ljava/lang/String;)V"); if (setRealmMethod == 0) { - printf("Couldn't find setRealm in PrincipalName\n"); + printf("LSA: Couldn't find setRealm in PrincipalName\n"); return JNI_ERR; } - #ifdef DEBUG - printf("Finished OnLoad processing\n"); - #endif /* DEBUG */ + if (DEBUG) { + printf("LSA: Finished OnLoad processing\n"); + } /* DEBUG */ return JNI_VERSION_1_2; } @@ -389,16 +403,25 @@ JNIEXPORT jobject JNICALL Java_sun_security_krb5_Credentials_acquireDefaultNativ if (krbcredsConstructor == 0) { krbcredsConstructor = (*env)->GetMethodID(env, krbcredsClass, "", - "(Lsun/security/krb5/internal/Ticket;Lsun/security/krb5/PrincipalName;Lsun/security/krb5/PrincipalName;Lsun/security/krb5/EncryptionKey;Lsun/security/krb5/internal/TicketFlags;Lsun/security/krb5/internal/KerberosTime;Lsun/security/krb5/internal/KerberosTime;Lsun/security/krb5/internal/KerberosTime;Lsun/security/krb5/internal/KerberosTime;Lsun/security/krb5/internal/HostAddresses;)V"); + "(Lsun/security/krb5/internal/Ticket;" + "Lsun/security/krb5/PrincipalName;" + "Lsun/security/krb5/PrincipalName;" + "Lsun/security/krb5/EncryptionKey;" + "Lsun/security/krb5/internal/TicketFlags;" + "Lsun/security/krb5/internal/KerberosTime;" + "Lsun/security/krb5/internal/KerberosTime;" + "Lsun/security/krb5/internal/KerberosTime;" + "Lsun/security/krb5/internal/KerberosTime;" + "Lsun/security/krb5/internal/HostAddresses;)V"); if (krbcredsConstructor == 0) { - printf("Couldn't find sun.security.krb5.Credentials constructor\n"); + printf("LSA: Couldn't find sun.security.krb5.Credentials constructor\n"); break; } } - #ifdef DEBUG - printf("Found KrbCreds constructor\n"); - #endif + if (DEBUG) { + printf("LSA: Found KrbCreds constructor\n"); + } // // Get the logon handle and package ID from the @@ -407,9 +430,9 @@ JNIEXPORT jobject JNICALL Java_sun_security_krb5_Credentials_acquireDefaultNativ if (!PackageConnectLookup(&LogonHandle, &PackageId)) break; - #ifdef DEBUG - printf("Got handle to Kerberos package\n"); - #endif /* DEBUG */ + if (DEBUG) { + printf("LSA: Got handle to Kerberos package\n"); + } /* DEBUG */ // Get the MS TGT from cache CacheRequest.MessageType = KerbRetrieveTicketMessage; @@ -426,9 +449,9 @@ JNIEXPORT jobject JNICALL Java_sun_security_krb5_Credentials_acquireDefaultNativ &SubStatus ); - #ifdef DEBUG - printf("Response size is %d\n", rspSize); - #endif + if (DEBUG) { + printf("LSA: Response size is %d\n", rspSize); + } if (!LSA_SUCCESS(Status) || !LSA_SUCCESS(SubStatus)) { if (!LSA_SUCCESS(Status)) { @@ -467,9 +490,9 @@ JNIEXPORT jobject JNICALL Java_sun_security_krb5_Credentials_acquireDefaultNativ } if (ignore_cache) { - #ifdef DEBUG - printf("MS TGT in cache is invalid/not supported; request new ticket\n"); - #endif /* DEBUG */ + if (DEBUG) { + printf("LSA: MS TGT in cache is invalid/not supported; request new ticket\n"); + } /* DEBUG */ // use domain to request Ticket Status = ConstructTicketRequest(msticket->TargetDomainName, @@ -493,9 +516,9 @@ JNIEXPORT jobject JNICALL Java_sun_security_krb5_Credentials_acquireDefaultNativ &SubStatus ); - #ifdef DEBUG - printf("Response size is %d\n", responseSize); - #endif /* DEBUG */ + if (DEBUG) { + printf("LSA: Response size is %d\n", responseSize); + } /* DEBUG */ if (!LSA_SUCCESS(Status) || !LSA_SUCCESS(SubStatus)) { if (!LSA_SUCCESS(Status)) { @@ -788,7 +811,9 @@ ShowLastError( static WCHAR szMsgBuf[MAX_MSG_SIZE]; DWORD dwRes; - printf("Error calling function %s: %lu\n", szAPI, dwError); + if (DEBUG) { + printf("LSA: Error calling function %s: %lu\n", szAPI, dwError); + } dwRes = FormatMessage ( FORMAT_MESSAGE_FROM_SYSTEM, @@ -798,11 +823,13 @@ ShowLastError( szMsgBuf, MAX_MSG_SIZE, NULL); - if (0 == dwRes) { - printf("FormatMessage failed with %d\n", GetLastError()); - // ExitProcess(EXIT_FAILURE); - } else { - printf("%S",szMsgBuf); + if (DEBUG) { + if (0 == dwRes) { + printf("LSA: FormatMessage failed with %d\n", GetLastError()); + // ExitProcess(EXIT_FAILURE); + } else { + printf("LSA: %S",szMsgBuf); + } } } @@ -896,17 +923,19 @@ jobject BuildPrincipal(JNIEnv *env, PKERB_EXTERNAL_NAME principalName, ((domainName.Length)*sizeof(WCHAR) + sizeof(UNICODE_NULL))); wcsncpy(realm, domainName.Buffer, domainName.Length/sizeof(WCHAR)); - #ifdef DEBUG - printf("Principal domain is %S\n", realm); - printf("Name type is %x\n", principalName->NameType); - printf("Name count is %x\n", principalName->NameCount); - #endif + if (DEBUG) { + printf("LSA: Principal domain is %S\n", realm); + printf("LSA: Name type is %x\n", principalName->NameType); + printf("LSA: Name count is %x\n", principalName->NameCount); + } nameCount = principalName->NameCount; stringArray = (*env)->NewObjectArray(env, nameCount, javaLangStringClass, NULL); if (stringArray == NULL) { - printf("Can't allocate String array for Principal\n"); + if (DEBUG) { + printf("LSA: Can't allocate String array for Principal\n"); + } LocalFree(realm); return principal; } @@ -941,6 +970,17 @@ jobject BuildEncryptionKey(JNIEnv *env, PKERB_CRYPTO_KEY cryptoKey) { // First, need to build a byte array jbyteArray ary; jobject encryptionKey = NULL; + unsigned int i; + + for (i=0; iLength; i++) { + if (cryptoKey->Value[i]) break; + } + if (i == cryptoKey->Length) { + if (DEBUG) { + printf("LSA: Session key all zero. Stop.\n"); + } + return NULL; + } ary = (*env)->NewByteArray(env,cryptoKey->Length); (*env)->SetByteArrayRegion(env, ary, (jsize) 0, cryptoKey->Length, @@ -1005,9 +1045,9 @@ jobject BuildKerberosTime(JNIEnv *env, PLARGE_INTEGER kerbtime) { hour, minute, second ); - #ifdef DEBUG - printf("%S\n", (wchar_t *)timeString); - #endif /* DEBUG */ + if (DEBUG) { + printf("LSA: %S\n", (wchar_t *)timeString); + } /* DEBUG */ stringTime = (*env)->NewString(env, timeString, (sizeof(timeString)/sizeof(WCHAR))-1); if (stringTime != NULL) { // everything's OK so far From e8f11acb077a7cdf7e6ac06f7978d9224099acd1 Mon Sep 17 00:00:00 2001 From: Martin Buchholz Date: Sun, 12 Apr 2009 20:21:43 -0700 Subject: [PATCH 30/91] 6827153: Miscellaneous typos in javadoc Reviewed-by: alanb --- .../share/classes/java/lang/NoSuchFieldError.java | 4 ++-- .../nio/channels/AsynchronousDatagramChannel.java | 2 +- jdk/src/share/classes/java/nio/file/Path.java | 12 ++++++------ .../classes/java/nio/file/SecureDirectoryStream.java | 2 +- .../classes/java/security/AccessController.java | 2 +- .../java/security/AlgorithmParametersSpi.java | 2 +- .../java/security/PrivilegedActionException.java | 2 +- jdk/src/share/classes/java/security/Security.java | 2 +- .../classes/java/security/SecurityPermission.java | 2 +- .../share/classes/java/security/SignatureSpi.java | 2 +- .../java/security/cert/CertificateFactory.java | 2 +- .../java/security/cert/CertificateFactorySpi.java | 4 ++-- 12 files changed, 19 insertions(+), 19 deletions(-) diff --git a/jdk/src/share/classes/java/lang/NoSuchFieldError.java b/jdk/src/share/classes/java/lang/NoSuchFieldError.java index 8b77c71b18c..8adebca0dfd 100644 --- a/jdk/src/share/classes/java/lang/NoSuchFieldError.java +++ b/jdk/src/share/classes/java/lang/NoSuchFieldError.java @@ -41,14 +41,14 @@ class NoSuchFieldError extends IncompatibleClassChangeError { private static final long serialVersionUID = -3456430195886129035L; /** - * Constructs a NoSuchFieldException with no detail message. + * Constructs a NoSuchFieldError with no detail message. */ public NoSuchFieldError() { super(); } /** - * Constructs a NoSuchFieldException with the specified + * Constructs a NoSuchFieldError with the specified * detail message. * * @param s the detail message. diff --git a/jdk/src/share/classes/java/nio/channels/AsynchronousDatagramChannel.java b/jdk/src/share/classes/java/nio/channels/AsynchronousDatagramChannel.java index 6a9d9f09715..65b90d0f29d 100644 --- a/jdk/src/share/classes/java/nio/channels/AsynchronousDatagramChannel.java +++ b/jdk/src/share/classes/java/nio/channels/AsynchronousDatagramChannel.java @@ -443,7 +443,7 @@ public abstract class AsynchronousDatagramChannel * at least care must be taken to ensure that the buffer is not accessed * while the channel remains open. * - *

If there is a security manager installed and the the channel is not + *

If there is a security manager installed and the channel is not * connected then this method verifies that the target address and port number * are permitted by the security manager's {@link SecurityManager#checkConnect * checkConnect} method. The overhead of this security check can be avoided diff --git a/jdk/src/share/classes/java/nio/file/Path.java b/jdk/src/share/classes/java/nio/file/Path.java index 55bf8fd2675..8f796b6c32e 100644 --- a/jdk/src/share/classes/java/nio/file/Path.java +++ b/jdk/src/share/classes/java/nio/file/Path.java @@ -494,7 +494,7 @@ public abstract class Path * @throws IOException * if an I/O error occurs * @throws SecurityException - * In the case of the the default provider, and a security manager + * In the case of the default provider, and a security manager * is installed, it denies {@link LinkPermission}("symbolic") * or its {@link SecurityManager#checkWrite(String) checkWrite} * method denies write access to the path of the symbolic link. @@ -531,7 +531,7 @@ public abstract class Path * @throws IOException * if an I/O error occurs * @throws SecurityException - * In the case of the the default provider, and a security manager + * In the case of the default provider, and a security manager * is installed, it denies {@link LinkPermission}("hard") * or its {@link SecurityManager#checkWrite(String) checkWrite} * method denies write access to both this path and the path of the @@ -560,7 +560,7 @@ public abstract class Path * @throws IOException * if an I/O error occurs * @throws SecurityException - * In the case of the the default provider, and a security manager + * In the case of the default provider, and a security manager * is installed, it checks that {@code FilePermission} has been * granted with the "{@code readlink}" action to read the link. */ @@ -615,7 +615,7 @@ public abstract class Path * obtained * * @throws SecurityException - * In the case of the the default provider, and a security manager + * In the case of the default provider, and a security manager * is installed, the {@link #toAbsolutePath toAbsolutePath} method * throws a security exception. */ @@ -636,7 +636,7 @@ public abstract class Path * @throws IOError * if an I/O error occurs * @throws SecurityException - * In the case of the the default provider, and a security manager + * In the case of the default provider, and a security manager * is installed, its {@link SecurityManager#checkPropertyAccess(String) * checkPropertyAccess} method is invoked to check access to the * system property {@code user.dir} @@ -677,7 +677,7 @@ public abstract class Path * @throws IOException * if the file does not exist or an I/O error occurs * @throws SecurityException - * In the case of the the default provider, and a security manager + * In the case of the default provider, and a security manager * is installed, its {@link SecurityManager#checkRead(String) checkRead} * method is invoked to check read access to the file, and where * this path is not absolute, its {@link SecurityManager#checkPropertyAccess(String) diff --git a/jdk/src/share/classes/java/nio/file/SecureDirectoryStream.java b/jdk/src/share/classes/java/nio/file/SecureDirectoryStream.java index b2555c14185..7268c41c54d 100644 --- a/jdk/src/share/classes/java/nio/file/SecureDirectoryStream.java +++ b/jdk/src/share/classes/java/nio/file/SecureDirectoryStream.java @@ -208,7 +208,7 @@ public abstract class SecureDirectoryStream * @throws ClosedDirectoryStreamException * if the directory stream is closed * @throws NoSuchFileException - * if the the directory does not exist (optional specific exception) + * if the directory does not exist (optional specific exception) * @throws DirectoryNotEmptyException * if the directory could not otherwise be deleted because it is * not empty (optional specific exception) diff --git a/jdk/src/share/classes/java/security/AccessController.java b/jdk/src/share/classes/java/security/AccessController.java index dd49271ef87..47b8a93dc0e 100644 --- a/jdk/src/share/classes/java/security/AccessController.java +++ b/jdk/src/share/classes/java/security/AccessController.java @@ -425,7 +425,7 @@ public final class AccessController { * Performs the specified PrivilegedExceptionAction with * privileges enabled and restricted by the specified * AccessControlContext. The action is performed with the - * intersection of the the permissions possessed by the caller's + * intersection of the permissions possessed by the caller's * protection domain, and those possessed by the domains represented by the * specified AccessControlContext. *

diff --git a/jdk/src/share/classes/java/security/AlgorithmParametersSpi.java b/jdk/src/share/classes/java/security/AlgorithmParametersSpi.java index 4bff86ded5c..a70faf376c3 100644 --- a/jdk/src/share/classes/java/security/AlgorithmParametersSpi.java +++ b/jdk/src/share/classes/java/security/AlgorithmParametersSpi.java @@ -102,7 +102,7 @@ public abstract class AlgorithmParametersSpi { * parameters should be returned in an instance of the * DSAParameterSpec class. * - * @param paramSpec the the specification class in which + * @param paramSpec the specification class in which * the parameters should be returned. * * @return the parameter specification. diff --git a/jdk/src/share/classes/java/security/PrivilegedActionException.java b/jdk/src/share/classes/java/security/PrivilegedActionException.java index 4f42c02b2f8..d17d21a528a 100644 --- a/jdk/src/share/classes/java/security/PrivilegedActionException.java +++ b/jdk/src/share/classes/java/security/PrivilegedActionException.java @@ -87,7 +87,7 @@ public class PrivilegedActionException extends Exception { } /** - * Returns the the cause of this exception (the exception thrown by + * Returns the cause of this exception (the exception thrown by * the privileged computation that resulted in this * PrivilegedActionException). * diff --git a/jdk/src/share/classes/java/security/Security.java b/jdk/src/share/classes/java/security/Security.java index 7ed79566a1c..c7d69501711 100644 --- a/jdk/src/share/classes/java/security/Security.java +++ b/jdk/src/share/classes/java/security/Security.java @@ -501,7 +501,7 @@ public final class Security { *

  • <crypto_service>.<algorithm_or_type> * <attribute_name>:< attribute_value> *

    The cryptographic service name must not contain any dots. There - * must be one or more space charaters between the the + * must be one or more space charaters between the * <algorithm_or_type> and the <attribute_name>. *

    A provider satisfies this selection criterion iff the * provider implements the specified algorithm or type for the specified diff --git a/jdk/src/share/classes/java/security/SecurityPermission.java b/jdk/src/share/classes/java/security/SecurityPermission.java index 41744ae73e8..1d9049d5bec 100644 --- a/jdk/src/share/classes/java/security/SecurityPermission.java +++ b/jdk/src/share/classes/java/security/SecurityPermission.java @@ -118,7 +118,7 @@ import java.util.StringTokenizer; * setProperty.{key} * Setting of the security property with the specified key * This could include setting a security provider or defining - * the location of the the system-wide security policy. Malicious + * the location of the system-wide security policy. Malicious * code that has permission to set a new security provider may * set a rogue provider that steals confidential information such * as cryptographic private keys. In addition, malicious code with diff --git a/jdk/src/share/classes/java/security/SignatureSpi.java b/jdk/src/share/classes/java/security/SignatureSpi.java index 4b6049c192f..b6bf347d655 100644 --- a/jdk/src/share/classes/java/security/SignatureSpi.java +++ b/jdk/src/share/classes/java/security/SignatureSpi.java @@ -316,7 +316,7 @@ public abstract class SignatureSpi { * overridden by a provider * * @exception InvalidAlgorithmParameterException if this method is - * overridden by a provider and the the given parameters + * overridden by a provider and the given parameters * are inappropriate for this signature engine */ protected void engineSetParameter(AlgorithmParameterSpec params) diff --git a/jdk/src/share/classes/java/security/cert/CertificateFactory.java b/jdk/src/share/classes/java/security/cert/CertificateFactory.java index 961e15de30e..f1059d1c5ff 100644 --- a/jdk/src/share/classes/java/security/cert/CertificateFactory.java +++ b/jdk/src/share/classes/java/security/cert/CertificateFactory.java @@ -460,7 +460,7 @@ public class CertificateFactory { * {@link java.io.InputStream#reset() reset}, this method will * consume the entire input stream. Otherwise, each call to this * method consumes one CRL and the read position of the input stream - * is positioned to the next available byte after the the inherent + * is positioned to the next available byte after the inherent * end-of-CRL marker. If the data in the * input stream does not contain an inherent end-of-CRL marker (other * than EOF) and there is trailing data after the CRL is parsed, a diff --git a/jdk/src/share/classes/java/security/cert/CertificateFactorySpi.java b/jdk/src/share/classes/java/security/cert/CertificateFactorySpi.java index 5c24027a440..29eb74bfae8 100644 --- a/jdk/src/share/classes/java/security/cert/CertificateFactorySpi.java +++ b/jdk/src/share/classes/java/security/cert/CertificateFactorySpi.java @@ -88,7 +88,7 @@ public abstract class CertificateFactorySpi { * {@link java.io.InputStream#reset() reset}, this method will * consume the entire input stream. Otherwise, each call to this * method consumes one certificate and the read position of the input stream - * is positioned to the next available byte after the the inherent + * is positioned to the next available byte after the inherent * end-of-certificate marker. If the data in the * input stream does not contain an inherent end-of-certificate marker (other * than EOF) and there is trailing data after the certificate is parsed, a @@ -261,7 +261,7 @@ public abstract class CertificateFactorySpi { * {@link java.io.InputStream#reset() reset}, this method will * consume the entire input stream. Otherwise, each call to this * method consumes one CRL and the read position of the input stream - * is positioned to the next available byte after the the inherent + * is positioned to the next available byte after the inherent * end-of-CRL marker. If the data in the * input stream does not contain an inherent end-of-CRL marker (other * than EOF) and there is trailing data after the CRL is parsed, a From 8ac601577f9c72b9f9b47c897b5da8f39fba6dc4 Mon Sep 17 00:00:00 2001 From: Denis Fokin Date: Mon, 13 Apr 2009 21:42:44 +0400 Subject: [PATCH 31/91] 6590857: Drag & Drop arbitrary file copy Reviewed-by: uta --- .../sun/awt/datatransfer/DataTransferer.java | 155 ++++++++++++++++-- 1 file changed, 143 insertions(+), 12 deletions(-) diff --git a/jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java b/jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java index d96008309fb..cfe0190b318 100644 --- a/jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java +++ b/jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java @@ -65,10 +65,13 @@ import java.lang.reflect.Modifier; import java.rmi.MarshalledObject; +import java.security.AccessControlContext; +import java.security.AccessControlException; import java.security.AccessController; import java.security.PrivilegedAction; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; +import java.security.ProtectionDomain; import java.util.ArrayList; import java.util.Arrays; @@ -111,6 +114,8 @@ import javax.imageio.stream.ImageOutputStream; import sun.awt.image.ImageRepresentation; import sun.awt.image.ToolkitImage; +import java.io.FilePermission; + /** * Provides a set of functions to be shared among the DataFlavor class and @@ -1177,8 +1182,10 @@ search: (String.class.equals(flavor.getRepresentationClass()) && isFlavorCharsetTextType(flavor) && isTextFormat(format))) { + String str = removeSuspectedData(flavor, contents, (String)obj); + return translateTransferableString( - (String)obj, + str, format); // Source data is a Reader. Convert to a String and recur. In the @@ -1286,6 +1293,11 @@ search: throw new IOException("data translation failed"); } final List list = (List)obj; + + final ArrayList fileList = new ArrayList(); + + final ProtectionDomain userProtectionDomain = getUserProtectionDomain(contents); + int nFiles = 0; for (int i = 0; i < list.size(); i++) { Object o = list.get(i); @@ -1293,17 +1305,18 @@ search: nFiles++; } } - final String[] files = new String[nFiles]; try { AccessController.doPrivileged(new PrivilegedExceptionAction() { public Object run() throws IOException { - for (int i = 0, j = 0; i < list.size(); i++) { - Object o = list.get(i); - if (o instanceof File) { - files[j++] = ((File)o).getCanonicalPath(); - } else if (o instanceof String) { - files[j++] = (String)o; + for (Object fileObject : list) + { + File file = castToFile(fileObject); + if (null == System.getSecurityManager() || + !(isFileInWebstartedCache(file) || + isForbiddenToRead(file, userProtectionDomain))) + { + fileList.add(file.getCanonicalPath()); } } return null; @@ -1313,10 +1326,11 @@ search: throw new IOException(pae.getMessage()); } - for (int i = 0; i < files.length; i++) { - byte[] bytes = files[i].getBytes(); - if (i != 0) bos.write(0); - bos.write(bytes, 0, bytes.length); + for (int i = 0; i < fileList.size(); i++) + { + byte[] bytes = ((String)fileList.get(i)).getBytes(); + if (i != 0) bos.write(0); + bos.write(bytes, 0, bytes.length); } // Source data is an InputStream. For arbitrary flavors, just grab the @@ -1366,6 +1380,123 @@ search: return ret; } + private String removeSuspectedData(DataFlavor flavor, final Transferable contents, final String str) + throws IOException + { + if (null == System.getSecurityManager() + || !flavor.isMimeTypeEqual("text/uri-list")) + { + return str; + } + + + String ret_val = ""; + final ProtectionDomain userProtectionDomain = getUserProtectionDomain(contents); + + try { + ret_val = (String) AccessController.doPrivileged(new PrivilegedExceptionAction() { + public Object run() { + + StringBuffer allowedFiles = new StringBuffer(str.length()); + String [] uriArray = str.split("(\\s)+"); + + for (String fileName : uriArray) + { + File file = new File(fileName); + if (file.exists() && + !(isFileInWebstartedCache(file) || + isForbiddenToRead(file, userProtectionDomain))) + { + + if (0 != allowedFiles.length()) + { + allowedFiles.append("\\r\\n"); + } + + allowedFiles.append(fileName); + } + } + + return allowedFiles.toString(); + } + }); + } catch (PrivilegedActionException pae) { + throw new IOException(pae.getMessage(), pae); + } + + return ret_val; + } + + private static ProtectionDomain getUserProtectionDomain(Transferable contents) { + return contents.getClass().getProtectionDomain(); + } + + private boolean isForbiddenToRead (File file, ProtectionDomain protectionDomain) + { + if (null == protectionDomain) { + return false; + } + try { + FilePermission filePermission = + new FilePermission(file.getCanonicalPath(), "read, delete"); + if (protectionDomain.implies(filePermission)) { + return false; + } + } catch (IOException e) {} + + return true; + } + + // It is important do not use user's successors + // of File class. + private File castToFile(Object fileObject) throws IOException { + String filePath = null; + if (fileObject instanceof File) { + filePath = ((File)fileObject).getCanonicalPath(); + } else if (fileObject instanceof String) { + filePath = (String) fileObject; + } + return new File(filePath); + } + + private final static String[] DEPLOYMENT_CACHE_PROPERTIES = { + "deployment.system.cachedir", + "deployment.user.cachedir", + "deployment.javaws.cachedir", + "deployment.javapi.cachedir" + }; + + private final static ArrayList deploymentCacheDirectoryList = + new ArrayList(); + + private static boolean isFileInWebstartedCache(File f) { + + if (deploymentCacheDirectoryList.isEmpty()) { + for (String cacheDirectoryProperty : DEPLOYMENT_CACHE_PROPERTIES) { + String cacheDirectoryPath = System.getProperty(cacheDirectoryProperty); + if (cacheDirectoryPath != null) { + try { + File cacheDirectory = (new File(cacheDirectoryPath)).getCanonicalFile(); + if (cacheDirectory != null) { + deploymentCacheDirectoryList.add(cacheDirectory); + } + } catch (IOException ioe) {} + } + } + } + + for (File deploymentCacheDirectory : deploymentCacheDirectoryList) { + for (File dir = f; dir != null; dir = dir.getParentFile()) { + if (dir.equals(deploymentCacheDirectory)) { + return true; + } + } + } + + return false; + } + + public Object translateBytes(byte[] bytes, DataFlavor flavor, long format, Transferable localeTransferable) throws IOException From bca01e082666c5c45b0828ea0f1a52c89c6e2e0a Mon Sep 17 00:00:00 2001 From: Valerie Peng Date: Mon, 13 Apr 2009 18:20:51 -0700 Subject: [PATCH 32/91] 6829098: Regression test java/security/Security/ClassLoaderDeadlock/Deadlock2.java error - missing ";" Added back the missing ";" Reviewed-by: weijun --- .../java/security/Security/ClassLoaderDeadlock/Deadlock2.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.java b/jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.java index b5938d1de88..3ab228045b4 100644 --- a/jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.java +++ b/jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.java @@ -56,7 +56,7 @@ public class Deadlock2 { e.printStackTrace(); } } - } + }; Thread thread1 = new Thread(readObjectRunnable, "Read Object"); Thread thread2 = new Thread(xmlRunnable, "XML"); From 9c7b1e8b5b91f0c1c5238bd82f18e67e4dad1d08 Mon Sep 17 00:00:00 2001 From: Anthony Petrov Date: Tue, 14 Apr 2009 14:17:31 +0400 Subject: [PATCH 33/91] 6825342: Security warning may change Z-order of top-level Added the SWP_NOOWNERZORDER flag when calling ::SetWindowPos() Reviewed-by: art, dcherepanov --- jdk/src/windows/native/sun/windows/awt_Window.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/jdk/src/windows/native/sun/windows/awt_Window.cpp b/jdk/src/windows/native/sun/windows/awt_Window.cpp index 88bcd8ecc45..ad0400bc08b 100644 --- a/jdk/src/windows/native/sun/windows/awt_Window.cpp +++ b/jdk/src/windows/native/sun/windows/awt_Window.cpp @@ -369,7 +369,8 @@ void AwtWindow::RepositionSecurityWarning(JNIEnv *env) ::SetWindowPos(warningWindow, HWND_NOTOPMOST, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, - SWP_ASYNCWINDOWPOS | SWP_NOACTIVATE | SWP_NOZORDER + SWP_ASYNCWINDOWPOS | SWP_NOACTIVATE | SWP_NOZORDER | + SWP_NOOWNERZORDER ); } @@ -854,7 +855,7 @@ void AwtWindow::StartSecurityAnimation(AnimationKind kind) if (securityAnimationKind == akShow) { ::SetWindowPos(warningWindow, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOMOVE | - SWP_SHOWWINDOW); + SWP_SHOWWINDOW | SWP_NOOWNERZORDER); ::SetLayeredWindowAttributes(warningWindow, RGB(0, 0, 0), 0xFF, LWA_ALPHA); @@ -880,7 +881,7 @@ void AwtWindow::StopSecurityAnimation() case akPreHide: ::SetWindowPos(warningWindow, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOMOVE | - SWP_HIDEWINDOW); + SWP_HIDEWINDOW | SWP_NOOWNERZORDER); break; case akShow: RepaintWarningWindow(); From 9e2590b7bf321030927385d637a333d45e1e633e Mon Sep 17 00:00:00 2001 From: Alan Bateman Date: Wed, 15 Apr 2009 14:53:34 +0100 Subject: [PATCH 34/91] 6795561: (bf) CharBuffer.subSequence() uses wrong capacity value for new buffer Reviewed-by: sherman, iris --- .../share/classes/java/nio/ByteBufferAs-X-Buffer.java | 10 ++++++---- jdk/src/share/classes/java/nio/Direct-X-Buffer.java | 10 ++++++---- jdk/src/share/classes/java/nio/Heap-X-Buffer.java | 9 ++++++--- jdk/src/share/classes/java/nio/StringCharBuffer.java | 6 ++++-- jdk/test/java/nio/Buffer/Basic-X.java | 9 +++++++-- jdk/test/java/nio/Buffer/Basic.java | 2 +- jdk/test/java/nio/Buffer/BasicByte.java | 5 +++++ jdk/test/java/nio/Buffer/BasicChar.java | 9 +++++++-- jdk/test/java/nio/Buffer/BasicDouble.java | 5 +++++ jdk/test/java/nio/Buffer/BasicFloat.java | 5 +++++ jdk/test/java/nio/Buffer/BasicInt.java | 5 +++++ jdk/test/java/nio/Buffer/BasicLong.java | 5 +++++ jdk/test/java/nio/Buffer/BasicShort.java | 5 +++++ 13 files changed, 67 insertions(+), 18 deletions(-) diff --git a/jdk/src/share/classes/java/nio/ByteBufferAs-X-Buffer.java b/jdk/src/share/classes/java/nio/ByteBufferAs-X-Buffer.java index 15626425a0e..60be7479c49 100644 --- a/jdk/src/share/classes/java/nio/ByteBufferAs-X-Buffer.java +++ b/jdk/src/share/classes/java/nio/ByteBufferAs-X-Buffer.java @@ -196,10 +196,12 @@ class ByteBufferAs$Type$Buffer$RW$$BO$ // package-private if ((start < 0) || (end > len) || (start > end)) throw new IndexOutOfBoundsException(); - int sublen = end - start; - int off = offset + ((pos + start) << $LG_BYTES_PER_VALUE$); - assert (off >= 0); - return new ByteBufferAsCharBuffer$RW$$BO$(bb, -1, 0, sublen, sublen, off); + return new ByteBufferAsCharBuffer$RW$$BO$(bb, + -1, + pos + start, + pos + end, + capacity(), + offset); } #end[char] diff --git a/jdk/src/share/classes/java/nio/Direct-X-Buffer.java b/jdk/src/share/classes/java/nio/Direct-X-Buffer.java index 5f738b7811e..a977626351e 100644 --- a/jdk/src/share/classes/java/nio/Direct-X-Buffer.java +++ b/jdk/src/share/classes/java/nio/Direct-X-Buffer.java @@ -412,10 +412,12 @@ class Direct$Type$Buffer$RW$$BO$ if ((start < 0) || (end > len) || (start > end)) throw new IndexOutOfBoundsException(); - int sublen = end - start; - int off = (pos + start) << $LG_BYTES_PER_VALUE$; - assert (off >= 0); - return new DirectCharBuffer$RW$$BO$(this, -1, 0, sublen, sublen, off); + return new DirectCharBuffer$RW$$BO$(this, + -1, + pos + start, + pos + end, + capacity(), + offset); } #end[char] diff --git a/jdk/src/share/classes/java/nio/Heap-X-Buffer.java b/jdk/src/share/classes/java/nio/Heap-X-Buffer.java index b615ba3c633..864161fa02e 100644 --- a/jdk/src/share/classes/java/nio/Heap-X-Buffer.java +++ b/jdk/src/share/classes/java/nio/Heap-X-Buffer.java @@ -572,10 +572,13 @@ class Heap$Type$Buffer$RW$ || (end > length()) || (start > end)) throw new IndexOutOfBoundsException(); - int len = end - start; + int pos = position(); return new HeapCharBuffer$RW$(hb, - -1, 0, len, len, - offset + position() + start); + -1, + pos + start, + pos + end, + capacity(), + offset); } #end[char] diff --git a/jdk/src/share/classes/java/nio/StringCharBuffer.java b/jdk/src/share/classes/java/nio/StringCharBuffer.java index 648b1986fca..8871b943f41 100644 --- a/jdk/src/share/classes/java/nio/StringCharBuffer.java +++ b/jdk/src/share/classes/java/nio/StringCharBuffer.java @@ -102,10 +102,12 @@ class StringCharBuffer // package-private public final CharBuffer subSequence(int start, int end) { try { int pos = position(); - return new StringCharBuffer(str, -1, + return new StringCharBuffer(str, + -1, pos + checkIndex(start, pos), pos + checkIndex(end, pos), - remaining(), offset); + capacity(), + offset); } catch (IllegalArgumentException x) { throw new IndexOutOfBoundsException(); } diff --git a/jdk/test/java/nio/Buffer/Basic-X.java b/jdk/test/java/nio/Buffer/Basic-X.java index d4e1a2762f1..6612771def4 100644 --- a/jdk/test/java/nio/Buffer/Basic-X.java +++ b/jdk/test/java/nio/Buffer/Basic-X.java @@ -365,8 +365,11 @@ public class Basic$Type$ b.position(2); ck(b, b.charAt(1), 'd'); - CharBuffer c = (CharBuffer)b.subSequence(1, 4); - ck(b, b.subSequence(1, 4).toString().equals("def")); + CharBuffer c = b.subSequence(1, 4); + ck(c, c.capacity(), b.capacity()); + ck(c, c.position(), b.position()+1); + ck(c, c.limit(), b.position()+4); + ck(c, b.subSequence(1, 4).toString().equals("def")); // 4938424 b.position(4); @@ -722,6 +725,8 @@ public class Basic$Type$ ck(b, start, b.position()); ck(b, end, b.limit()); ck(b, s.length(), b.capacity()); + b.position(6); + ck(b, b.subSequence(0,3).toString().equals("ghi")); // The index, relative to the position, must be non-negative and // smaller than remaining(). diff --git a/jdk/test/java/nio/Buffer/Basic.java b/jdk/test/java/nio/Buffer/Basic.java index c0c420f8495..b8ed89bb30d 100644 --- a/jdk/test/java/nio/Buffer/Basic.java +++ b/jdk/test/java/nio/Buffer/Basic.java @@ -25,7 +25,7 @@ * @summary Unit test for buffers * @bug 4413135 4414911 4416536 4416562 4418782 4471053 4472779 4490253 4523725 * 4526177 4463011 4660660 4661219 4663521 4782970 4804304 4938424 6231529 - * 6221101 6234263 6535542 6591971 6593946 + * 6221101 6234263 6535542 6591971 6593946 6795561 * @author Mark Reinhold */ diff --git a/jdk/test/java/nio/Buffer/BasicByte.java b/jdk/test/java/nio/Buffer/BasicByte.java index 0f5ac6f6e0a..7e259a1416d 100644 --- a/jdk/test/java/nio/Buffer/BasicByte.java +++ b/jdk/test/java/nio/Buffer/BasicByte.java @@ -371,6 +371,9 @@ public class BasicByte + + + @@ -783,6 +786,8 @@ public class BasicByte + + diff --git a/jdk/test/java/nio/Buffer/BasicChar.java b/jdk/test/java/nio/Buffer/BasicChar.java index 28eb49fb560..a0df9fcf3a9 100644 --- a/jdk/test/java/nio/Buffer/BasicChar.java +++ b/jdk/test/java/nio/Buffer/BasicChar.java @@ -365,8 +365,11 @@ public class BasicChar b.position(2); ck(b, b.charAt(1), 'd'); - CharBuffer c = (CharBuffer)b.subSequence(1, 4); - ck(b, b.subSequence(1, 4).toString().equals("def")); + CharBuffer c = b.subSequence(1, 4); + ck(c, c.capacity(), b.capacity()); + ck(c, c.position(), b.position()+1); + ck(c, c.limit(), b.position()+4); + ck(c, b.subSequence(1, 4).toString().equals("def")); // 4938424 b.position(4); @@ -722,6 +725,8 @@ public class BasicChar ck(b, start, b.position()); ck(b, end, b.limit()); ck(b, s.length(), b.capacity()); + b.position(6); + ck(b, b.subSequence(0,3).toString().equals("ghi")); // The index, relative to the position, must be non-negative and // smaller than remaining(). diff --git a/jdk/test/java/nio/Buffer/BasicDouble.java b/jdk/test/java/nio/Buffer/BasicDouble.java index b2a1be65ad7..a627d0e9194 100644 --- a/jdk/test/java/nio/Buffer/BasicDouble.java +++ b/jdk/test/java/nio/Buffer/BasicDouble.java @@ -371,6 +371,9 @@ public class BasicDouble + + + @@ -783,6 +786,8 @@ public class BasicDouble + + diff --git a/jdk/test/java/nio/Buffer/BasicFloat.java b/jdk/test/java/nio/Buffer/BasicFloat.java index b6b5ea0dbdf..730dcbeac95 100644 --- a/jdk/test/java/nio/Buffer/BasicFloat.java +++ b/jdk/test/java/nio/Buffer/BasicFloat.java @@ -371,6 +371,9 @@ public class BasicFloat + + + @@ -783,6 +786,8 @@ public class BasicFloat + + diff --git a/jdk/test/java/nio/Buffer/BasicInt.java b/jdk/test/java/nio/Buffer/BasicInt.java index 938ada29571..b20e4bb1056 100644 --- a/jdk/test/java/nio/Buffer/BasicInt.java +++ b/jdk/test/java/nio/Buffer/BasicInt.java @@ -371,6 +371,9 @@ public class BasicInt + + + @@ -783,6 +786,8 @@ public class BasicInt + + diff --git a/jdk/test/java/nio/Buffer/BasicLong.java b/jdk/test/java/nio/Buffer/BasicLong.java index 17537a71ffc..0d4c568e1e3 100644 --- a/jdk/test/java/nio/Buffer/BasicLong.java +++ b/jdk/test/java/nio/Buffer/BasicLong.java @@ -371,6 +371,9 @@ public class BasicLong + + + @@ -783,6 +786,8 @@ public class BasicLong + + diff --git a/jdk/test/java/nio/Buffer/BasicShort.java b/jdk/test/java/nio/Buffer/BasicShort.java index dc9c7db3803..58e5a3e6d68 100644 --- a/jdk/test/java/nio/Buffer/BasicShort.java +++ b/jdk/test/java/nio/Buffer/BasicShort.java @@ -371,6 +371,9 @@ public class BasicShort + + + @@ -783,6 +786,8 @@ public class BasicShort + + From 26dc2b8949b950c8624b4c963bd219942736a119 Mon Sep 17 00:00:00 2001 From: Alan Bateman Date: Wed, 15 Apr 2009 16:16:35 +0100 Subject: [PATCH 35/91] 6543863: (fc) FileLock.release can deadlock with FileChannel.close 6429910: (fc) FileChannel.lock() IOException: Bad file number, not AsynchronousCloseException 6814948: (fc) test/java/nio/channels/AsynchronousFileChannel/Lock.java failed intermittently 6822643: (fc) AsynchronousFileChannel.close does not invalidate FileLocks Reviewed-by: sherman --- .../nio/ch/AsynchronousFileChannelImpl.java | 34 +++++-- .../classes/sun/nio/ch/FileChannelImpl.java | 63 ++++++------ .../classes/sun/nio/ch/FileLockImpl.java | 10 +- .../classes/sun/nio/ch/FileLockTable.java | 29 ++---- .../ch/SimpleAsynchronousFileChannelImpl.java | 38 +++---- .../WindowsAsynchronousFileChannelImpl.java | 11 +-- .../native/sun/nio/ch/FileDispatcherImpl.c | 2 +- .../AsynchronousFileChannel/Basic.java | 81 ++++++++------- .../AsynchronousFileChannel/Lock.java | 2 +- .../FileChannel/ReleaseOnCloseDeadlock.java | 98 +++++++++++++++++++ 10 files changed, 229 insertions(+), 139 deletions(-) create mode 100644 jdk/test/java/nio/channels/FileChannel/ReleaseOnCloseDeadlock.java diff --git a/jdk/src/share/classes/sun/nio/ch/AsynchronousFileChannelImpl.java b/jdk/src/share/classes/sun/nio/ch/AsynchronousFileChannelImpl.java index 2735a5a29cd..180238d8413 100644 --- a/jdk/src/share/classes/sun/nio/ch/AsynchronousFileChannelImpl.java +++ b/jdk/src/share/classes/sun/nio/ch/AsynchronousFileChannelImpl.java @@ -113,16 +113,16 @@ abstract class AsynchronousFileChannelImpl } } - final void invalidateAllLocks() { + final void invalidateAllLocks() throws IOException { if (fileLockTable != null) { - try { - fileLockTable.removeAll( new FileLockTable.Releaser() { - public void release(FileLock fl) { - ((FileLockImpl)fl).invalidate(); + for (FileLock fl: fileLockTable.removeAll()) { + synchronized (fl) { + if (fl.isValid()) { + FileLockImpl fli = (FileLockImpl)fl; + implRelease(fli); + fli.invalidate(); } - }); - } catch (IOException e) { - throw new AssertionError(e); + } } } } @@ -158,7 +158,21 @@ abstract class AsynchronousFileChannelImpl } /** - * Invoked by FileLockImpl to release lock acquired by this channel. + * Releases the given file lock. */ - abstract void release(FileLockImpl fli) throws IOException; + protected abstract void implRelease(FileLockImpl fli) throws IOException; + + /** + * Invoked by FileLockImpl to release the given file lock and remove it + * from the lock table. + */ + final void release(FileLockImpl fli) throws IOException { + try { + begin(); + implRelease(fli); + removeFromFileLockTable(fli); + } finally { + end(); + } + } } diff --git a/jdk/src/share/classes/sun/nio/ch/FileChannelImpl.java b/jdk/src/share/classes/sun/nio/ch/FileChannelImpl.java index 1d60e9615ff..d0461b30b9a 100644 --- a/jdk/src/share/classes/sun/nio/ch/FileChannelImpl.java +++ b/jdk/src/share/classes/sun/nio/ch/FileChannelImpl.java @@ -33,8 +33,6 @@ import java.nio.BufferPoolMXBean; import java.nio.channels.*; import java.util.ArrayList; import java.util.List; -import java.util.Iterator; -import java.lang.reflect.Field; import java.security.AccessController; import javax.management.ObjectName; import javax.management.MalformedObjectNameException; @@ -95,14 +93,16 @@ public class FileChannelImpl // -- Standard channel operations -- protected void implCloseChannel() throws IOException { - // Invalidate and release any locks that we still hold + // Release and invalidate any locks that we still hold if (fileLockTable != null) { - fileLockTable.removeAll( new FileLockTable.Releaser() { - public void release(FileLock fl) throws IOException { - ((FileLockImpl)fl).invalidate(); - nd.release(fd, fl.position(), fl.size()); + for (FileLock fl: fileLockTable.removeAll()) { + synchronized (fl) { + if (fl.isValid()) { + nd.release(fd, fl.position(), fl.size()); + ((FileLockImpl)fl).invalidate(); + } } - }); + } } nd.preClose(fd); @@ -912,32 +912,33 @@ public class FileChannelImpl FileLockImpl fli = new FileLockImpl(this, position, size, shared); FileLockTable flt = fileLockTable(); flt.add(fli); - boolean i = true; + boolean completed = false; int ti = -1; try { begin(); ti = threads.add(); if (!isOpen()) return null; - int result = nd.lock(fd, true, position, size, shared); - if (result == FileDispatcher.RET_EX_LOCK) { - assert shared; - FileLockImpl fli2 = new FileLockImpl(this, position, size, - false); - flt.replace(fli, fli2); - return fli2; + int n; + do { + n = nd.lock(fd, true, position, size, shared); + } while ((n == FileDispatcher.INTERRUPTED) && isOpen()); + if (isOpen()) { + if (n == FileDispatcher.RET_EX_LOCK) { + assert shared; + FileLockImpl fli2 = new FileLockImpl(this, position, size, + false); + flt.replace(fli, fli2); + fli = fli2; + } + completed = true; } - if (result == FileDispatcher.INTERRUPTED || result == FileDispatcher.NO_LOCK) { - flt.remove(fli); - i = false; - } - } catch (IOException e) { - flt.remove(fli); - throw e; } finally { + if (!completed) + flt.remove(fli); threads.remove(ti); try { - end(i); + end(completed); } catch (ClosedByInterruptException e) { throw new FileLockInterruptionException(); } @@ -985,7 +986,6 @@ public class FileChannelImpl } void release(FileLockImpl fli) throws IOException { - ensureOpen(); int ti = threads.add(); try { ensureOpen(); @@ -1005,7 +1005,7 @@ public class FileChannelImpl */ private static class SimpleFileLockTable extends FileLockTable { // synchronize on list for access - private List lockList = new ArrayList(2); + private final List lockList = new ArrayList(2); public SimpleFileLockTable() { } @@ -1034,14 +1034,11 @@ public class FileChannelImpl } } - public void removeAll(Releaser releaser) throws IOException { + public List removeAll() { synchronized(lockList) { - Iterator i = lockList.iterator(); - while (i.hasNext()) { - FileLock fl = i.next(); - releaser.release(fl); - i.remove(); - } + List result = new ArrayList(lockList); + lockList.clear(); + return result; } } diff --git a/jdk/src/share/classes/sun/nio/ch/FileLockImpl.java b/jdk/src/share/classes/sun/nio/ch/FileLockImpl.java index 9efd1532b50..8f12bcf0fdb 100644 --- a/jdk/src/share/classes/sun/nio/ch/FileLockImpl.java +++ b/jdk/src/share/classes/sun/nio/ch/FileLockImpl.java @@ -31,25 +31,24 @@ import java.nio.channels.*; public class FileLockImpl extends FileLock { - boolean valid; + private volatile boolean valid = true; FileLockImpl(FileChannel channel, long position, long size, boolean shared) { super(channel, position, size, shared); - this.valid = true; } FileLockImpl(AsynchronousFileChannel channel, long position, long size, boolean shared) { super(channel, position, size, shared); - this.valid = true; } - public synchronized boolean isValid() { + public boolean isValid() { return valid; } - synchronized void invalidate() { + void invalidate() { + assert Thread.holdsLock(this); valid = false; } @@ -66,5 +65,4 @@ public class FileLockImpl valid = false; } } - } diff --git a/jdk/src/share/classes/sun/nio/ch/FileLockTable.java b/jdk/src/share/classes/sun/nio/ch/FileLockTable.java index 137ab88872b..39cee5abfe8 100644 --- a/jdk/src/share/classes/sun/nio/ch/FileLockTable.java +++ b/jdk/src/share/classes/sun/nio/ch/FileLockTable.java @@ -60,23 +60,12 @@ abstract class FileLockTable { */ public abstract void remove(FileLock fl); - /** - * An implementation of this interface releases a given file lock. - * Used with removeAll. - */ - public abstract interface Releaser { - void release(FileLock fl) throws IOException; - } - /** * Removes all file locks from the table. - *

    - * The Releaser#release method is invoked for each file lock before - * it is removed. * - * @throws IOException if the release method throws IOException + * @return The list of file locks removed */ - public abstract void removeAll(Releaser r) throws IOException; + public abstract List removeAll(); /** * Replaces an existing file lock in the table. @@ -195,7 +184,7 @@ class SharedFileLockTable extends FileLockTable { FileLockReference ref = list.get(index); FileLock lock = ref.get(); if (lock == fl) { - assert (lock != null) && (lock.channel() == channel); + assert (lock != null) && (lock.acquiredBy() == channel); ref.clear(); list.remove(index); break; @@ -206,7 +195,8 @@ class SharedFileLockTable extends FileLockTable { } @Override - public void removeAll(Releaser releaser) throws IOException { + public List removeAll() { + List result = new ArrayList(); List list = lockMap.get(fileKey); if (list != null) { synchronized (list) { @@ -216,13 +206,13 @@ class SharedFileLockTable extends FileLockTable { FileLock lock = ref.get(); // remove locks obtained by this channel - if (lock != null && lock.channel() == channel) { - // invoke the releaser to invalidate/release the lock - releaser.release(lock); - + if (lock != null && lock.acquiredBy() == channel) { // remove the lock from the list ref.clear(); list.remove(index); + + // add to result + result.add(lock); } else { index++; } @@ -232,6 +222,7 @@ class SharedFileLockTable extends FileLockTable { removeKeyIfEmpty(fileKey, list); } } + return result; } @Override diff --git a/jdk/src/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java b/jdk/src/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java index 52fe5a2802f..fb82f330be4 100644 --- a/jdk/src/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java +++ b/jdk/src/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java @@ -97,6 +97,9 @@ public class SimpleAsynchronousFileChannelImpl // then it will throw ClosedChannelException } + // Invalidate and release any locks that we still hold + invalidateAllLocks(); + // signal any threads blocked on this channel nd.preClose(fdObj); threads.signalAndWait(); @@ -109,9 +112,6 @@ public class SimpleAsynchronousFileChannelImpl closeLock.writeLock().unlock(); } - // Invalidate and release any locks that we still hold - invalidateAllLocks(); - // close file nd.close(fdObj); @@ -226,11 +226,9 @@ public class SimpleAsynchronousFileChannelImpl do { n = nd.lock(fdObj, true, position, size, shared); } while ((n == FileDispatcher.INTERRUPTED) && isOpen()); - if (n == FileDispatcher.LOCKED) { + if (n == FileDispatcher.LOCKED && isOpen()) { result.setResult(fli); } else { - if (n != FileDispatcher.INTERRUPTED) - throw new AssertionError(); throw new AsynchronousCloseException(); } } catch (IOException x) { @@ -279,16 +277,16 @@ public class SimpleAsynchronousFileChannelImpl do { n = nd.lock(fdObj, false, position, size, shared); } while ((n == FileDispatcher.INTERRUPTED) && isOpen()); - if (n != FileDispatcher.LOCKED) { - if (n == FileDispatcher.NO_LOCK) - return null; // locked by someone else - if (n == FileDispatcher.INTERRUPTED) - throw new AsynchronousCloseException(); - // should not get here - throw new AssertionError(); + if (n == FileDispatcher.LOCKED && isOpen()) { + gotLock = true; + return fli; // lock acquired } - gotLock = true; - return fli; + if (n == FileDispatcher.NO_LOCK) + return null; // locked by someone else + if (n == FileDispatcher.INTERRUPTED) + throw new AsynchronousCloseException(); + // should not get here + throw new AssertionError(); } finally { if (!gotLock) removeFromFileLockTable(fli); @@ -298,14 +296,8 @@ public class SimpleAsynchronousFileChannelImpl } @Override - void release(FileLockImpl fli) throws IOException { - try { - begin(); - nd.release(fdObj, fli.position(), fli.size()); - removeFromFileLockTable(fli); - } finally { - end(); - } + protected void implRelease(FileLockImpl fli) throws IOException { + nd.release(fdObj, fli.position(), fli.size()); } @Override diff --git a/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java b/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java index ef668648d67..e08f460d919 100644 --- a/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java +++ b/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java @@ -354,16 +354,9 @@ public class WindowsAsynchronousFileChannelImpl } } - // invoke by FileFileImpl to release lock @Override - void release(FileLockImpl fli) throws IOException { - try { - begin(); - nd.release(fdObj, fli.position(), fli.size()); - removeFromFileLockTable(fli); - } finally { - end(); - } + protected void implRelease(FileLockImpl fli) throws IOException { + nd.release(fdObj, fli.position(), fli.size()); } /** diff --git a/jdk/src/windows/native/sun/nio/ch/FileDispatcherImpl.c b/jdk/src/windows/native/sun/nio/ch/FileDispatcherImpl.c index a65ad90e24d..7b41d86fad1 100644 --- a/jdk/src/windows/native/sun/nio/ch/FileDispatcherImpl.c +++ b/jdk/src/windows/native/sun/nio/ch/FileDispatcherImpl.c @@ -414,7 +414,7 @@ Java_sun_nio_ch_FileDispatcherImpl_release0(JNIEnv *env, jobject this, o.Offset = lowPos; o.OffsetHigh = highPos; result = UnlockFileEx(h, 0, lowNumBytes, highNumBytes, &o); - if (result == 0) { + if (result == 0 && GetLastError() != ERROR_NOT_LOCKED) { JNU_ThrowIOExceptionWithLastError(env, "Release failed"); } } diff --git a/jdk/test/java/nio/channels/AsynchronousFileChannel/Basic.java b/jdk/test/java/nio/channels/AsynchronousFileChannel/Basic.java index 5ffb42c0b8b..ea9a5415923 100644 --- a/jdk/test/java/nio/channels/AsynchronousFileChannel/Basic.java +++ b/jdk/test/java/nio/channels/AsynchronousFileChannel/Basic.java @@ -22,7 +22,7 @@ */ /* @test - * @bug 4607272 + * @bug 4607272 6822643 * @summary Unit test for AsynchronousFileChannel */ @@ -51,7 +51,6 @@ public class Basic { // run tests testUsingCompletionHandlers(ch); testUsingWaitOnResult(ch); - testLocking(ch); testInterruptHandlerThread(ch); // close channel and invoke test that expects channel to be closed @@ -59,6 +58,7 @@ public class Basic { testClosedChannel(ch); // these tests open the file themselves + testLocking(blah.toPath()); testCustomThreadPool(blah.toPath()); testAsynchronousClose(blah.toPath()); testCancel(blah.toPath()); @@ -160,47 +160,54 @@ public class Basic { } // exercise lock methods - static void testLocking(AsynchronousFileChannel ch) - throws IOException - { + static void testLocking(Path file) throws IOException { System.out.println("testLocking"); - // test 1 - acquire lock and check that tryLock throws - // OverlappingFileLockException + AsynchronousFileChannel ch = AsynchronousFileChannel + .open(file, READ, WRITE); FileLock fl; try { - fl = ch.lock().get(); - } catch (ExecutionException x) { - throw new RuntimeException(x); - } catch (InterruptedException x) { - throw new RuntimeException("Should not be interrupted"); - } - if (!fl.acquiredBy().equals(ch)) - throw new RuntimeException("FileLock#acquiredBy returned incorrect channel"); - try { - ch.tryLock(); - throw new RuntimeException("OverlappingFileLockException expected"); - } catch (OverlappingFileLockException x) { - } - fl.release(); + // test 1 - acquire lock and check that tryLock throws + // OverlappingFileLockException + try { + fl = ch.lock().get(); + } catch (ExecutionException x) { + throw new RuntimeException(x); + } catch (InterruptedException x) { + throw new RuntimeException("Should not be interrupted"); + } + if (!fl.acquiredBy().equals(ch)) + throw new RuntimeException("FileLock#acquiredBy returned incorrect channel"); + try { + ch.tryLock(); + throw new RuntimeException("OverlappingFileLockException expected"); + } catch (OverlappingFileLockException x) { + } + fl.release(); - // test 2 - acquire try and check that lock throws OverlappingFileLockException - fl = ch.tryLock(); - if (fl == null) - throw new RuntimeException("Unable to acquire lock"); - try { - ch.lock(null, new CompletionHandler () { - public void completed(FileLock result, Void att) { - } - public void failed(Throwable exc, Void att) { - } - public void cancelled(Void att) { - } - }); - throw new RuntimeException("OverlappingFileLockException expected"); - } catch (OverlappingFileLockException x) { + // test 2 - acquire try and check that lock throws OverlappingFileLockException + fl = ch.tryLock(); + if (fl == null) + throw new RuntimeException("Unable to acquire lock"); + try { + ch.lock(null, new CompletionHandler () { + public void completed(FileLock result, Void att) { + } + public void failed(Throwable exc, Void att) { + } + public void cancelled(Void att) { + } + }); + throw new RuntimeException("OverlappingFileLockException expected"); + } catch (OverlappingFileLockException x) { + } + } finally { + ch.close(); } - fl.release(); + + // test 3 - channel is closed so FileLock should no longer be valid + if (fl.isValid()) + throw new RuntimeException("FileLock expected to be invalid"); } // interrupt should not close channel diff --git a/jdk/test/java/nio/channels/AsynchronousFileChannel/Lock.java b/jdk/test/java/nio/channels/AsynchronousFileChannel/Lock.java index 38c0f7d0c6e..f8b55cc44f8 100644 --- a/jdk/test/java/nio/channels/AsynchronousFileChannel/Lock.java +++ b/jdk/test/java/nio/channels/AsynchronousFileChannel/Lock.java @@ -23,7 +23,7 @@ /* @test - * @bug 4607272 + * @bug 4607272 6814948 * @summary Unit test for AsynchronousFileChannel#lock method */ diff --git a/jdk/test/java/nio/channels/FileChannel/ReleaseOnCloseDeadlock.java b/jdk/test/java/nio/channels/FileChannel/ReleaseOnCloseDeadlock.java new file mode 100644 index 00000000000..c7ed16a9204 --- /dev/null +++ b/jdk/test/java/nio/channels/FileChannel/ReleaseOnCloseDeadlock.java @@ -0,0 +1,98 @@ +/* + * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. + * 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. + * + * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +/* @test + * @bug 6543863 + * @summary Try to cause a deadlock between (Asynchronous)FileChannel.close + * and FileLock.release + */ + +import java.io.*; +import java.nio.file.Path; +import static java.nio.file.StandardOpenOption.*; +import java.nio.channels.*; +import java.util.concurrent.*; + +public class ReleaseOnCloseDeadlock { + private static final int LOCK_COUNT = 1024; + + public static void main(String[] args) throws IOException { + File blah = File.createTempFile("blah", null); + blah.deleteOnExit(); + for (int i=0; i<100; i++) { + test(blah.toPath()); + } + } + + static void test(Path file) throws IOException { + FileLock[] locks = new FileLock[LOCK_COUNT]; + + FileChannel fc = FileChannel.open(file, READ, WRITE); + for (int i=0; i Date: Wed, 15 Apr 2009 09:53:54 -0700 Subject: [PATCH 36/91] 6684007: PrintAssembly plugin not available for linux or windows Reviewed-by: rasbold, jrose, twisti --- hotspot/.hgignore | 2 +- hotspot/make/windows/makefiles/vm.make | 8 +- .../src/share/tools/MakeDeps/BuildConfig.java | 2 +- hotspot/src/share/tools/hsdis/Makefile | 120 +++++++++++------- hotspot/src/share/tools/hsdis/README | 84 ++++++------ hotspot/src/share/tools/hsdis/hsdis-demo.c | 24 +--- hotspot/src/share/tools/hsdis/hsdis.c | 11 +- 7 files changed, 134 insertions(+), 117 deletions(-) diff --git a/hotspot/.hgignore b/hotspot/.hgignore index 2c5fe5bc135..fec499bf63f 100644 --- a/hotspot/.hgignore +++ b/hotspot/.hgignore @@ -1,7 +1,7 @@ ^build/ ^dist/ ^nbproject/private/ -^src/share/tools/hsdis/bin/ +^src/share/tools/hsdis/build/ ^src/share/tools/IdealGraphVisualizer/[a-zA-Z0-9]*/build/ ^src/share/tools/IdealGraphVisualizer/build/ ^src/share/tools/IdealGraphVisualizer/dist/ diff --git a/hotspot/make/windows/makefiles/vm.make b/hotspot/make/windows/makefiles/vm.make index 151c280a4fc..eafb4417da5 100644 --- a/hotspot/make/windows/makefiles/vm.make +++ b/hotspot/make/windows/makefiles/vm.make @@ -55,10 +55,16 @@ CPP_FLAGS=$(CPP_FLAGS) /D "COMPILER2" CPP_FLAGS=$(CPP_FLAGS) /D "COMPILER1" /D "COMPILER2" !endif +!if "$(BUILDARCH)" == "i486" +HOTSPOT_LIB_ARCH=i386 +!else +HOTSPOT_LIB_ARCH=$(BUILDARCH) +!endif + # The following variables are defined in the generated local.make file. CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_RELEASE_VERSION=\"$(HS_BUILD_VER)\"" CPP_FLAGS=$(CPP_FLAGS) /D "JRE_RELEASE_VERSION=\"$(JRE_RELEASE_VER)\"" -CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_LIB_ARCH=\"$(BUILDARCH)\"" +CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_LIB_ARCH=\"$(HOTSPOT_LIB_ARCH)\"" CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_BUILD_TARGET=\"$(BUILD_FLAVOR)\"" CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_BUILD_USER=\"$(BuildUser)\"" CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_VM_DISTRO=\"$(HOTSPOT_VM_DISTRO)\"" diff --git a/hotspot/src/share/tools/MakeDeps/BuildConfig.java b/hotspot/src/share/tools/MakeDeps/BuildConfig.java index accdab67550..ec26bc698c7 100644 --- a/hotspot/src/share/tools/MakeDeps/BuildConfig.java +++ b/hotspot/src/share/tools/MakeDeps/BuildConfig.java @@ -247,7 +247,7 @@ class BuildConfig { sysDefines.add("HOTSPOT_BUILD_USER="+System.getProperty("user.name")); sysDefines.add("HOTSPOT_BUILD_TARGET=\\\""+get("Build")+"\\\""); sysDefines.add("_JNI_IMPLEMENTATION_"); - sysDefines.add("HOTSPOT_LIB_ARCH=\\\"i486\\\""); + sysDefines.add("HOTSPOT_LIB_ARCH=\\\"i386\\\""); sysDefines.addAll(defines); diff --git a/hotspot/src/share/tools/hsdis/Makefile b/hotspot/src/share/tools/hsdis/Makefile index 6bdf4b8151c..c1fd4ca4b9d 100644 --- a/hotspot/src/share/tools/hsdis/Makefile +++ b/hotspot/src/share/tools/hsdis/Makefile @@ -22,61 +22,75 @@ # # -# Single gnu makefile for solaris, linux and windows (windows requires mks or -# cygwin). - -ifeq ($(BINUTILS),) -# Pop all the way out of the workspace to look for binutils. -# ...You probably want to override this setting. -BINUTILS = $(shell cd ../../../../..;pwd)/binutils-2.17-$(LIBARCH) -endif +# Single gnu makefile for solaris, linux and windows (windows requires cygwin and mingw) # Default arch; it is changed below as needed. ARCH = i386 OS = $(shell uname) -CPPFLAGS += -I$(BINUTILS)/include -I$(BINUTILS)/bfd -CPPFLAGS += -DHOTSPOT_LIB_ARCH=\"$(LIBARCH)\" -DLIBARCH_$(LIBARCH) -CPPFLAGS += -DHOTSPOT_OS=\"$(OS)\" -DOS_$(OS) - ## OS = SunOS ## ifeq ($(OS),SunOS) -ARCH = $(shell uname -p) +CPU = $(shell uname -p) +ARCH1=$(CPU:i586=i386) +ARCH=$(ARCH1:i686=i386) OS = solaris CC = cc -CCFLAGS += -Kpic -g -CCFLAGS/amd64 += -xarch=amd64 -CCFLAGS/sparcv9 += -xarch=v9 -CCFLAGS += $(CCFLAGS/$(LIBARCH)) +CFLAGS += -KPIC +ifdef LP64 +ifeq ($(ARCH),sparc) +ARCH = sparcv9 +endif +ifeq ($(ARCH),i386) +ARCH = amd64 +endif +endif +CFLAGS/sparcv9 += -xarch=v9 +CFLAGS/amd64 += -m64 +CFLAGS += $(CFLAGS/$(ARCH)) DLDFLAGS += -G +LDFLAGS += -ldl OUTFLAGS += -o $@ LIB_EXT = .so else ## OS = Linux ## ifeq ($(OS),Linux) -CPU = $(shell uname -m) -ifeq ($(CPU),ia64) -ARCH = ia64 +ifneq ($(MINGW),) +LIB_EXT = .dll +CPPFLAGS += -I$(TARGET_DIR)/include +LDFLAGS += -L$(TARGET_DIR)/lib +OS=windows +ifneq ($(findstring x86_64-,$(MINGW)),) +ARCH=amd64 else -ifeq ($(CPU),x86_64) -CCFLAGS += -fPIC -endif # x86_64 -endif # ia64 +ARCH=i386 +endif +CC = $(MINGW)-gcc +CONFIGURE_ARGS= --host=$(MINGW) --target=$(MINGW) +else +CPU = $(shell uname -m) +ARCH1=$(CPU:x86_64=amd64) +ARCH=$(ARCH1:i686=i386) +CFLAGS/i386 += -m32 +CFLAGS/sparc += -m32 +CFLAGS/sparcv9 += -m64 +CFLAGS/amd64 += -m64 +CFLAGS += $(CFLAGS/$(ARCH)) +CFLAGS += -fPIC OS = linux -CC = gcc -CCFLAGS += -O -DLDFLAGS += -shared -OUTFLAGS += -o $@ LIB_EXT = .so -CPPFLAGS += -Iinclude -Iinclude/$(OS)_$(ARCH)/ +CC = gcc +endif +CFLAGS += -O +DLDFLAGS += -shared +LDFLAGS += -ldl +OUTFLAGS += -o $@ ## OS = Windows ## else # !SunOS, !Linux => Windows -OS = win -CC = cl +OS = windows +CC = gcc #CPPFLAGS += /D"WIN32" /D"_WINDOWS" /D"DEBUG" /D"NDEBUG" -CCFLAGS += /nologo /MD /W3 /WX /O2 /Fo$(@:.dll=.obj) /Gi- -CCFLAGS += -Iinclude -Iinclude/gnu -Iinclude/$(OS)_$(ARCH) -CCFLAGS += /D"HOTSPOT_LIB_ARCH=\"$(LIBARCH)\"" +CFLAGS += /nologo /MD /W3 /WX /O2 /Fo$(@:.dll=.obj) /Gi- +CFLAGS += LIBARCH=\"$(LIBARCH)\"" DLDFLAGS += /dll /subsystem:windows /incremental:no \ /export:decode_instruction OUTFLAGS += /link /out:$@ @@ -94,21 +108,34 @@ LIBARCH = $(LIBARCH64) endif # LIBARCH64/$(ARCH) endif # LP64 -TARGET_DIR = bin/$(OS) +JDKARCH=$(LIBARCH:i386=i586) + +ifeq ($(BINUTILS),) +# Pop all the way out of the workspace to look for binutils. +# ...You probably want to override this setting. +BINUTILSDIR = $(shell cd build/binutils;pwd) +else +BINUTILSDIR = $(shell cd $(BINUTILS);pwd) +endif + +CPPFLAGS += -I$(BINUTILSDIR)/include -I$(BINUTILS)/bfd -I$(TARGET_DIR)/bfd +CPPFLAGS += -DLIBARCH_$(LIBARCH) -DLIBARCH=\"$(LIBARCH)\" -DLIB_EXT=\"$(LIB_EXT)\" + +TARGET_DIR = build/$(OS)-$(JDKARCH) TARGET = $(TARGET_DIR)/hsdis-$(LIBARCH)$(LIB_EXT) SOURCE = hsdis.c -LIBRARIES = $(BINUTILS)/bfd/libbfd.a \ - $(BINUTILS)/opcodes/libopcodes.a \ - $(BINUTILS)/libiberty/libiberty.a +LIBRARIES = $(TARGET_DIR)/bfd/libbfd.a \ + $(TARGET_DIR)/opcodes/libopcodes.a \ + $(TARGET_DIR)/libiberty/libiberty.a -DEMO_TARGET = $(TARGET_DIR)/hsdis-demo-$(LIBARCH) +DEMO_TARGET = $(TARGET_DIR)/hsdis-demo DEMO_SOURCE = hsdis-demo.c .PHONY: all clean demo both -all: $(TARGET) demo +all: $(TARGET) both: all all64 @@ -117,16 +144,17 @@ both: all all64 demo: $(TARGET) $(DEMO_TARGET) -$(LIBRARIES): - @echo "*** Please build binutils first; see ./README: ***" - @sed < ./README '1,/__________/d' | head -20 - @echo "..."; exit 1 +$(LIBRARIES): $(TARGET_DIR) $(TARGET_DIR)/Makefile + if [ ! -f $@ ]; then cd $(TARGET_DIR); make all-opcodes; fi + +$(TARGET_DIR)/Makefile: + (cd $(TARGET_DIR); CC=$(CC) CFLAGS="$(CFLAGS)" $(BINUTILSDIR)/configure --disable-nls $(CONFIGURE_ARGS)) $(TARGET): $(SOURCE) $(LIBS) $(LIBRARIES) $(TARGET_DIR) - $(CC) $(OUTFLAGS) $(CPPFLAGS) $(CCFLAGS) $(SOURCE) $(DLDFLAGS) $(LIBRARIES) + $(CC) $(OUTFLAGS) $(CPPFLAGS) $(CFLAGS) $(SOURCE) $(DLDFLAGS) $(LIBRARIES) $(DEMO_TARGET): $(DEMO_SOURCE) $(TARGET) $(TARGET_DIR) - $(CC) $(OUTFLAGS) $(CPPFLAGS) $(CCFLAGS) $(DEMO_SOURCE) $(LDFLAGS) + $(CC) $(OUTFLAGS) -DTARGET_DIR=\"$(TARGET_DIR)\" $(CPPFLAGS) -g $(CFLAGS/$(ARCH)) $(DEMO_SOURCE) $(LDFLAGS) $(TARGET_DIR): [ -d $@ ] || mkdir -p $@ diff --git a/hotspot/src/share/tools/hsdis/README b/hotspot/src/share/tools/hsdis/README index 76c92a44ed8..91118e0ae5e 100644 --- a/hotspot/src/share/tools/hsdis/README +++ b/hotspot/src/share/tools/hsdis/README @@ -32,61 +32,55 @@ you do not have a version that is new enough. * Building -To build this project you need a build of Gnu binutils to link against. -It is known to work with binutils 2.17. +To build this project you a copy of GNU binutils to build against. It +is known to work with binutils 2.17 and binutils 2.19.1. Download a +copy of the software from http://directory.fsf.org/project/binutils or +one of it's mirrors. Builds targetting windows should use at least +2.19 and currently requires the use of a cross compiler. -The makefile looks for this build in $BINUTILS, or (if that is not set), -in .../binutils-2.17-$LIBARCH, where LIBARCH (as in HotSpot) is one of -the jre subdirectory keywords i386, amd64, sparc, sparcv9, etc. +The makefile looks for the sources in build/binutils or you can +specify it's location to the makefile using BINTUILS=path. It will +configure binutils and build it first and then build and link the +disasembly adapter. Make all will build the default target for your +platform. If you platform support both 32 and 64 simultaneously then +"make both" will build them both at once. "make all64" will +explicitly build the 64 bit version. By default this will build the +disassembler library only. If you build demo it will build a demo +program that attempts to exercise the library. -To build Gnu binutils, first download a copy of the software: - http://directory.fsf.org/project/binutils/ +Windows -Unpack the binutils tarball into an empty directory: - chdir ../../../../.. - tar -xzf - < ../binutils-2.17.tar.gz - mv binutils-2.17 binutils-2.17-i386 #or binutils-2.17-sparc - cd binutils-2.17-i386 +In theory this should be buildable on Windows but getting a working +GNU build environment on Windows has proven difficult. MINGW should +be able to do it but at the time of this writing I was unable to get +this working. Instead you can use the mingw cross compiler on linux +to produce the windows binaries. For 32-bit windows you can install +mingw32 using your package manager and it will be added to your path +automatically. For 64-bit you need to download the 64 bit mingw from +http://sourceforge.net/projects/mingw-w64. Grab a copy of the +complete toolchain and unpack it somewhere. Put the bin directory of +the toolchain in your path. The mingw installs contain cross compile +versions of gcc that are named with a prefix to indicate what they are +targetting and you must tell the Makefile which one to use. This +should either be i586-mingw32msvc or x86_64-pc-mingw32 depending on +which on you are targetting and there should be a version of gcc in +your path named i586-mingw32msvc-gcc or x86_64-pc-mingw32-gcc. Tell +the makefile what prefix to use to find the mingw tools by using +MINGW=. For example: -From inside that directory, run configure and make: - ( export CFLAGS='-fPIC' - ./configure i386-pc-elf ) - gnumake +make MINGW=i586-mingw32msvc BINTUILS=build/binutils-2.19.1 -(Leave out or change the argument to configure if not on an i386 system.) - -Next, untar again into another empty directory for the LP64 version: - chdir .. - tar -xzf - < ../binutils-2.17.tar.gz - mv binutils-2.17 binutils-2.17-amd64 #or binutils-2.17-sparcv9 - cd binutils-2.17-amd64 - -From inside that directory, run configure for LP64 and make: - ( export ac_cv_c_bigendian=no CFLAGS='-m64 -fPIC' LDFLAGS=-m64 - ./configure amd64-pc-elf ) - gnumake - -The -fPIC option is needed because the generated code will be -linked into the hsdid-$LIBARCH.so binary. If you miss the -option, the JVM will fail to load the disassembler. - -You probably want two builds, one for 32 and one for 64 bits. -To build the 64-bit variation of a platforn, add LP64=1 to -the make command line for hsdis. - -So, go back to the hsdis project and build: - chdir .../hsdis - gnumake - gnumake LP64=1 +will build the Win32 cross compiled version of hsdis based on 2.19.1. * Installing -Products are named like bin/$OS/hsdis-$LIBARCH.so. -You can install them on your LD_LIBRARY_PATH, -or inside of your JRE next to $LIBARCH/libjvm.so. +Products are named like build/$OS-$LIBARCH/hsdis-$LIBARCH.so. You can +install them on your LD_LIBRARY_PATH, or inside of your JRE next to +$LIBARCH/libjvm.so. Now test: - export LD_LIBRARY_PATH .../hsdis/bin/solaris:$LD_LIBRARY_PATH + + export LD_LIBRARY_PATH .../hsdis/build/$OS-$LIBARCH:$LD_LIBRARY_PATH dargs='-XX:+UnlockDiagnosticVMOptions -XX:+PrintAssembly' dargs=$dargs' -XX:PrintAssemblyOptions=hsdis-print-bytes' java $dargs -Xbatch CompileCommand=print,*String.hashCode HelloWorld diff --git a/hotspot/src/share/tools/hsdis/hsdis-demo.c b/hotspot/src/share/tools/hsdis/hsdis-demo.c index adea76e63d7..513245350f0 100644 --- a/hotspot/src/share/tools/hsdis/hsdis-demo.c +++ b/hotspot/src/share/tools/hsdis/hsdis-demo.c @@ -53,7 +53,7 @@ int main(int ac, char** av) { else if (!strncmp(arg, "-options=", 9)) options = arg+9; else - { printf("Usage: %s [-xml] [name...]\n"); exit(2); } + { printf("Usage: %s [-xml] [name...]\n", av[0]); exit(2); } continue; } greet(arg); @@ -76,26 +76,14 @@ void end_of_file() { } #include "dlfcn.h" -#ifdef HOTSPOT_LIB_ARCH -#define LIBARCH HOTSPOT_LIB_ARCH -#endif -#ifdef HOTSPOT_OS -#define OS HOTSPOT_OS -#endif - #define DECODE_INSTRUCTIONS_NAME "decode_instructions" #define HSDIS_NAME "hsdis" static void* decode_instructions_pv = 0; static const char* hsdis_path[] = { - HSDIS_NAME".so", -#ifdef OS - "bin/"OS"/"HSDIS_NAME".so", -#endif -#ifdef LIBARCH - HSDIS_NAME"-"LIBARCH".so", -#ifdef OS - "bin/"OS"/"HSDIS_NAME"-"LIBARCH".so", -#endif + HSDIS_NAME"-"LIBARCH LIB_EXT, + "./" HSDIS_NAME"-"LIBARCH LIB_EXT, +#ifdef TARGET_DIR + TARGET_DIR"/"HSDIS_NAME"-"LIBARCH LIB_EXT, #endif NULL }; @@ -112,7 +100,7 @@ static const char* load_decode_instructions() { for (dllib = NULL; dllib == NULL; ) { const char* next_lib = (*next_in_path++); if (next_lib == NULL) - return "cannot find plugin "HSDIS_NAME".so"; + return "cannot find plugin "HSDIS_NAME LIB_EXT; dllib = dlopen(next_lib, RTLD_LAZY); } } diff --git a/hotspot/src/share/tools/hsdis/hsdis.c b/hotspot/src/share/tools/hsdis/hsdis.c index 75b7efe2638..841a3af62ec 100644 --- a/hotspot/src/share/tools/hsdis/hsdis.c +++ b/hotspot/src/share/tools/hsdis/hsdis.c @@ -33,6 +33,7 @@ #include #include #include +#include #ifndef bool #define bool int @@ -404,21 +405,21 @@ static const bfd_arch_info_type* find_arch_info(const char* arch_name) { } static const char* native_arch_name() { - const char* res = HOTSPOT_LIB_ARCH; + const char* res = NULL; +#ifdef LIBARCH_i386 + res = "i386"; +#endif #ifdef LIBARCH_amd64 res = "i386:x86-64"; #endif #ifdef LIBARCH_sparc res = "sparc:v8plusb"; #endif -#ifdef LIBARCH_sparc - res = "sparc:v8plusb"; -#endif #ifdef LIBARCH_sparcv9 res = "sparc:v9b"; #endif if (res == NULL) - res = "HOTSPOT_LIB_ARCH is not set in Makefile!"; + res = "architecture not set in Makefile!"; return res; } From 3119cce77df6252950b1a7ac8ee6f81b86967eaf Mon Sep 17 00:00:00 2001 From: Weijun Wang Date: Thu, 16 Apr 2009 11:16:40 +0800 Subject: [PATCH 37/91] 6830658: Changeset ec64fd74aa69 breaks the fastdebug build in NativeCreds.c Reviewed-by: tbell --- .../native/sun/security/krb5/NativeCreds.c | 120 +++++++++--------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/jdk/src/windows/native/sun/security/krb5/NativeCreds.c b/jdk/src/windows/native/sun/security/krb5/NativeCreds.c index 968ff119153..c910c62be4a 100644 --- a/jdk/src/windows/native/sun/security/krb5/NativeCreds.c +++ b/jdk/src/windows/native/sun/security/krb5/NativeCreds.c @@ -1,5 +1,5 @@ /* - * Portions Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved. + * Portions Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved. * 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,7 +73,7 @@ jmethodID setRealmMethod = 0; * Function prototypes for internal routines * */ -BOOL DEBUG = 0; +BOOL native_debug = 0; BOOL PackageConnectLookup(PHANDLE,PULONG); @@ -130,7 +130,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad( printf("LSA: Krb5 has no DEBUG field\n"); return JNI_ERR; } - DEBUG = (*env)->GetStaticBooleanField(env, cls, fldDEBUG); + native_debug = (*env)->GetStaticBooleanField(env, cls, fldDEBUG); cls = (*env)->FindClass(env,"sun/security/krb5/internal/Ticket"); @@ -138,17 +138,17 @@ JNIEXPORT jint JNICALL JNI_OnLoad( printf("LSA: Couldn't find Ticket\n"); return JNI_ERR; } - if (DEBUG) { + if (native_debug) { printf("LSA: Found Ticket\n"); - } /* DEBUG */ + } ticketClass = (*env)->NewWeakGlobalRef(env,cls); if (ticketClass == NULL) { return JNI_ERR; } - if (DEBUG) { + if (native_debug) { printf("LSA: Made NewWeakGlobalRef\n"); - } /* DEBUG */ + } cls = (*env)->FindClass(env, "sun/security/krb5/PrincipalName"); @@ -156,17 +156,17 @@ JNIEXPORT jint JNICALL JNI_OnLoad( printf("LSA: Couldn't find PrincipalName\n"); return JNI_ERR; } - if (DEBUG) { + if (native_debug) { printf("LSA: Found PrincipalName\n"); - } /* DEBUG */ + } principalNameClass = (*env)->NewWeakGlobalRef(env,cls); if (principalNameClass == NULL) { return JNI_ERR; } - if (DEBUG) { + if (native_debug) { printf("LSA: Made NewWeakGlobalRef\n"); - } /* DEBUG */ + } cls = (*env)->FindClass(env,"sun/security/util/DerValue"); @@ -174,17 +174,17 @@ JNIEXPORT jint JNICALL JNI_OnLoad( printf("LSA: Couldn't find DerValue\n"); return JNI_ERR; } - if (DEBUG) { + if (native_debug) { printf("LSA: Found DerValue\n"); - } /* DEBUG */ + } derValueClass = (*env)->NewWeakGlobalRef(env,cls); if (derValueClass == NULL) { return JNI_ERR; } - if (DEBUG) { + if (native_debug) { printf("LSA: Made NewWeakGlobalRef\n"); - } /* DEBUG */ + } cls = (*env)->FindClass(env,"sun/security/krb5/EncryptionKey"); @@ -192,17 +192,17 @@ JNIEXPORT jint JNICALL JNI_OnLoad( printf("LSA: Couldn't find EncryptionKey\n"); return JNI_ERR; } - if (DEBUG) { + if (native_debug) { printf("LSA: Found EncryptionKey\n"); - } /* DEBUG */ + } encryptionKeyClass = (*env)->NewWeakGlobalRef(env,cls); if (encryptionKeyClass == NULL) { return JNI_ERR; } - if (DEBUG) { + if (native_debug) { printf("LSA: Made NewWeakGlobalRef\n"); - } /* DEBUG */ + } cls = (*env)->FindClass(env,"sun/security/krb5/internal/TicketFlags"); @@ -210,17 +210,17 @@ JNIEXPORT jint JNICALL JNI_OnLoad( printf("LSA: Couldn't find TicketFlags\n"); return JNI_ERR; } - if (DEBUG) { + if (native_debug) { printf("LSA: Found TicketFlags\n"); - } /* DEBUG */ + } ticketFlagsClass = (*env)->NewWeakGlobalRef(env,cls); if (ticketFlagsClass == NULL) { return JNI_ERR; } - if (DEBUG) { + if (native_debug) { printf("LSA: Made NewWeakGlobalRef\n"); - } /* DEBUG */ + } cls = (*env)->FindClass(env,"sun/security/krb5/internal/KerberosTime"); @@ -228,17 +228,17 @@ JNIEXPORT jint JNICALL JNI_OnLoad( printf("LSA: Couldn't find KerberosTime\n"); return JNI_ERR; } - if (DEBUG) { + if (native_debug) { printf("LSA: Found KerberosTime\n"); - } /* DEBUG */ + } kerberosTimeClass = (*env)->NewWeakGlobalRef(env,cls); if (kerberosTimeClass == NULL) { return JNI_ERR; } - if (DEBUG) { + if (native_debug) { printf("LSA: Made NewWeakGlobalRef\n"); - } /* DEBUG */ + } cls = (*env)->FindClass(env,"java/lang/String"); @@ -246,17 +246,17 @@ JNIEXPORT jint JNICALL JNI_OnLoad( printf("LSA: Couldn't find String\n"); return JNI_ERR; } - if (DEBUG) { + if (native_debug) { printf("LSA: Found String\n"); - } /* DEBUG */ + } javaLangStringClass = (*env)->NewWeakGlobalRef(env,cls); if (javaLangStringClass == NULL) { return JNI_ERR; } - if (DEBUG) { + if (native_debug) { printf("LSA: Made NewWeakGlobalRef\n"); - } /* DEBUG */ + } derValueConstructor = (*env)->GetMethodID(env, derValueClass, "", "([B)V"); @@ -264,9 +264,9 @@ JNIEXPORT jint JNICALL JNI_OnLoad( printf("LSA: Couldn't find DerValue constructor\n"); return JNI_ERR; } - if (DEBUG) { + if (native_debug) { printf("LSA: Found DerValue constructor\n"); - } /* DEBUG */ + } ticketConstructor = (*env)->GetMethodID(env, ticketClass, "", "(Lsun/security/util/DerValue;)V"); @@ -274,9 +274,9 @@ JNIEXPORT jint JNICALL JNI_OnLoad( printf("LSA: Couldn't find Ticket constructor\n"); return JNI_ERR; } - if (DEBUG) { + if (native_debug) { printf("LSA: Found Ticket constructor\n"); - } /* DEBUG */ + } principalNameConstructor = (*env)->GetMethodID(env, principalNameClass, "", "([Ljava/lang/String;)V"); @@ -284,9 +284,9 @@ JNIEXPORT jint JNICALL JNI_OnLoad( printf("LSA: Couldn't find PrincipalName constructor\n"); return JNI_ERR; } - if (DEBUG) { + if (native_debug) { printf("LSA: Found PrincipalName constructor\n"); - } /* DEBUG */ + } encryptionKeyConstructor = (*env)->GetMethodID(env, encryptionKeyClass, "", "(I[B)V"); @@ -294,9 +294,9 @@ JNIEXPORT jint JNICALL JNI_OnLoad( printf("LSA: Couldn't find EncryptionKey constructor\n"); return JNI_ERR; } - if (DEBUG) { + if (native_debug) { printf("LSA: Found EncryptionKey constructor\n"); - } /* DEBUG */ + } ticketFlagsConstructor = (*env)->GetMethodID(env, ticketFlagsClass, "", "(I[B)V"); @@ -304,9 +304,9 @@ JNIEXPORT jint JNICALL JNI_OnLoad( printf("LSA: Couldn't find TicketFlags constructor\n"); return JNI_ERR; } - if (DEBUG) { + if (native_debug) { printf("LSA: Found TicketFlags constructor\n"); - } /* DEBUG */ + } kerberosTimeConstructor = (*env)->GetMethodID(env, kerberosTimeClass, "", "(Ljava/lang/String;)V"); @@ -314,9 +314,9 @@ JNIEXPORT jint JNICALL JNI_OnLoad( printf("LSA: Couldn't find KerberosTime constructor\n"); return JNI_ERR; } - if (DEBUG) { + if (native_debug) { printf("LSA: Found KerberosTime constructor\n"); - } /* DEBUG */ + } // load the setRealm method in PrincipalName setRealmMethod = (*env)->GetMethodID(env, principalNameClass, @@ -326,9 +326,9 @@ JNIEXPORT jint JNICALL JNI_OnLoad( return JNI_ERR; } - if (DEBUG) { + if (native_debug) { printf("LSA: Finished OnLoad processing\n"); - } /* DEBUG */ + } return JNI_VERSION_1_2; } @@ -419,7 +419,7 @@ JNIEXPORT jobject JNICALL Java_sun_security_krb5_Credentials_acquireDefaultNativ } } - if (DEBUG) { + if (native_debug) { printf("LSA: Found KrbCreds constructor\n"); } @@ -430,9 +430,9 @@ JNIEXPORT jobject JNICALL Java_sun_security_krb5_Credentials_acquireDefaultNativ if (!PackageConnectLookup(&LogonHandle, &PackageId)) break; - if (DEBUG) { + if (native_debug) { printf("LSA: Got handle to Kerberos package\n"); - } /* DEBUG */ + } // Get the MS TGT from cache CacheRequest.MessageType = KerbRetrieveTicketMessage; @@ -449,7 +449,7 @@ JNIEXPORT jobject JNICALL Java_sun_security_krb5_Credentials_acquireDefaultNativ &SubStatus ); - if (DEBUG) { + if (native_debug) { printf("LSA: Response size is %d\n", rspSize); } @@ -490,9 +490,9 @@ JNIEXPORT jobject JNICALL Java_sun_security_krb5_Credentials_acquireDefaultNativ } if (ignore_cache) { - if (DEBUG) { + if (native_debug) { printf("LSA: MS TGT in cache is invalid/not supported; request new ticket\n"); - } /* DEBUG */ + } // use domain to request Ticket Status = ConstructTicketRequest(msticket->TargetDomainName, @@ -516,9 +516,9 @@ JNIEXPORT jobject JNICALL Java_sun_security_krb5_Credentials_acquireDefaultNativ &SubStatus ); - if (DEBUG) { + if (native_debug) { printf("LSA: Response size is %d\n", responseSize); - } /* DEBUG */ + } if (!LSA_SUCCESS(Status) || !LSA_SUCCESS(SubStatus)) { if (!LSA_SUCCESS(Status)) { @@ -811,7 +811,7 @@ ShowLastError( static WCHAR szMsgBuf[MAX_MSG_SIZE]; DWORD dwRes; - if (DEBUG) { + if (native_debug) { printf("LSA: Error calling function %s: %lu\n", szAPI, dwError); } @@ -823,7 +823,7 @@ ShowLastError( szMsgBuf, MAX_MSG_SIZE, NULL); - if (DEBUG) { + if (native_debug) { if (0 == dwRes) { printf("LSA: FormatMessage failed with %d\n", GetLastError()); // ExitProcess(EXIT_FAILURE); @@ -923,7 +923,7 @@ jobject BuildPrincipal(JNIEnv *env, PKERB_EXTERNAL_NAME principalName, ((domainName.Length)*sizeof(WCHAR) + sizeof(UNICODE_NULL))); wcsncpy(realm, domainName.Buffer, domainName.Length/sizeof(WCHAR)); - if (DEBUG) { + if (native_debug) { printf("LSA: Principal domain is %S\n", realm); printf("LSA: Name type is %x\n", principalName->NameType); printf("LSA: Name count is %x\n", principalName->NameCount); @@ -933,7 +933,7 @@ jobject BuildPrincipal(JNIEnv *env, PKERB_EXTERNAL_NAME principalName, stringArray = (*env)->NewObjectArray(env, nameCount, javaLangStringClass, NULL); if (stringArray == NULL) { - if (DEBUG) { + if (native_debug) { printf("LSA: Can't allocate String array for Principal\n"); } LocalFree(realm); @@ -976,7 +976,7 @@ jobject BuildEncryptionKey(JNIEnv *env, PKERB_CRYPTO_KEY cryptoKey) { if (cryptoKey->Value[i]) break; } if (i == cryptoKey->Length) { - if (DEBUG) { + if (native_debug) { printf("LSA: Session key all zero. Stop.\n"); } return NULL; @@ -1045,9 +1045,9 @@ jobject BuildKerberosTime(JNIEnv *env, PLARGE_INTEGER kerbtime) { hour, minute, second ); - if (DEBUG) { + if (native_debug) { printf("LSA: %S\n", (wchar_t *)timeString); - } /* DEBUG */ + } stringTime = (*env)->NewString(env, timeString, (sizeof(timeString)/sizeof(WCHAR))-1); if (stringTime != NULL) { // everything's OK so far From 970eb79fc4592b268364b2c67acf763f8379f5d6 Mon Sep 17 00:00:00 2001 From: Tom Rodriguez Date: Thu, 16 Apr 2009 10:40:42 -0700 Subject: [PATCH 38/91] 6449385: JCK test dup2_x200106m1 fails with Segmentation Fault on x86 Reviewed-by: kvn --- hotspot/src/os_cpu/solaris_x86/vm/globals_solaris_x86.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hotspot/src/os_cpu/solaris_x86/vm/globals_solaris_x86.hpp b/hotspot/src/os_cpu/solaris_x86/vm/globals_solaris_x86.hpp index 754195f10ff..1a291cd91ff 100644 --- a/hotspot/src/os_cpu/solaris_x86/vm/globals_solaris_x86.hpp +++ b/hotspot/src/os_cpu/solaris_x86/vm/globals_solaris_x86.hpp @@ -39,7 +39,7 @@ define_pd_global(uintx, JVMInvokeMethodSlack, 8*K); // ThreadStackSize 320 allows TaggedStackInterpreter and a couple of test cases // to run while keeping the number of threads that can be created high. define_pd_global(intx, ThreadStackSize, 320); -define_pd_global(intx, VMThreadStackSize, 256); +define_pd_global(intx, VMThreadStackSize, 512); define_pd_global(intx, SurvivorRatio, 8); define_pd_global(uintx, JVMInvokeMethodSlack, 10*K); #endif // AMD64 From 88ac170f53cacc72c68bda389290f2e1c5ea5963 Mon Sep 17 00:00:00 2001 From: Tom Rodriguez Date: Thu, 16 Apr 2009 15:50:32 -0700 Subject: [PATCH 39/91] 6828024: verification of fixed interval usage is too weak Reviewed-by: kvn --- hotspot/src/share/vm/c1/c1_LinearScan.cpp | 62 ++++++++++++++++++++++- hotspot/src/share/vm/includeDB_compiler1 | 1 + 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/hotspot/src/share/vm/c1/c1_LinearScan.cpp b/hotspot/src/share/vm/c1/c1_LinearScan.cpp index 328c2e1a016..40332b1e91d 100644 --- a/hotspot/src/share/vm/c1/c1_LinearScan.cpp +++ b/hotspot/src/share/vm/c1/c1_LinearScan.cpp @@ -2956,9 +2956,11 @@ void LinearScan::do_linear_scan() { NOT_PRODUCT(print_intervals("After Register Allocation")); NOT_PRODUCT(print_lir(2, "LIR after register allocation:")); - DEBUG_ONLY(verify()); sort_intervals_after_allocation(); + + DEBUG_ONLY(verify()); + eliminate_spill_moves(); assign_reg_num(); CHECK_BAILOUT(); @@ -3147,6 +3149,16 @@ void LinearScan::verify_intervals() { void LinearScan::verify_no_oops_in_fixed_intervals() { + Interval* fixed_intervals; + Interval* other_intervals; + create_unhandled_lists(&fixed_intervals, &other_intervals, is_precolored_cpu_interval, NULL); + + // to ensure a walking until the last instruction id, add a dummy interval + // with a high operation id + other_intervals = new Interval(any_reg); + other_intervals->add_range(max_jint - 2, max_jint - 1); + IntervalWalker* iw = new IntervalWalker(this, fixed_intervals, other_intervals); + LIR_OpVisitState visitor; for (int i = 0; i < block_count(); i++) { BlockBegin* block = block_at(i); @@ -3159,6 +3171,54 @@ void LinearScan::verify_no_oops_in_fixed_intervals() { visitor.visit(op); + if (visitor.info_count() > 0) { + iw->walk_before(op->id()); + bool check_live = true; + if (op->code() == lir_move) { + LIR_Op1* move = (LIR_Op1*)op; + check_live = (move->patch_code() == lir_patch_none); + } + LIR_OpBranch* branch = op->as_OpBranch(); + if (branch != NULL && branch->stub() != NULL && branch->stub()->is_exception_throw_stub()) { + // Don't bother checking the stub in this case since the + // exception stub will never return to normal control flow. + check_live = false; + } + + // Make sure none of the fixed registers is live across an + // oopmap since we can't handle that correctly. + if (check_live) { + for (Interval* interval = iw->active_first(fixedKind); + interval != Interval::end(); + interval = interval->next()) { + if (interval->current_to() > op->id() + 1) { + // This interval is live out of this op so make sure + // that this interval represents some value that's + // referenced by this op either as an input or output. + bool ok = false; + for_each_visitor_mode(mode) { + int n = visitor.opr_count(mode); + for (int k = 0; k < n; k++) { + LIR_Opr opr = visitor.opr_at(mode, k); + if (opr->is_fixed_cpu()) { + if (interval_at(reg_num(opr)) == interval) { + ok = true; + break; + } + int hi = reg_numHi(opr); + if (hi != -1 && interval_at(hi) == interval) { + ok = true; + break; + } + } + } + } + assert(ok, "fixed intervals should never be live across an oopmap point"); + } + } + } + } + // oop-maps at calls do not contain registers, so check is not needed if (!visitor.has_call()) { diff --git a/hotspot/src/share/vm/includeDB_compiler1 b/hotspot/src/share/vm/includeDB_compiler1 index 3ea09fd8ad1..af25216cf55 100644 --- a/hotspot/src/share/vm/includeDB_compiler1 +++ b/hotspot/src/share/vm/includeDB_compiler1 @@ -270,6 +270,7 @@ c1_LIRGenerator_.cpp vmreg_.inline.hpp c1_LinearScan.cpp bitMap.inline.hpp c1_LinearScan.cpp c1_CFGPrinter.hpp +c1_LinearScan.cpp c1_CodeStubs.hpp c1_LinearScan.cpp c1_Compilation.hpp c1_LinearScan.cpp c1_FrameMap.hpp c1_LinearScan.cpp c1_IR.hpp From c435a0905dfae827687ed46015269f9c1b36c239 Mon Sep 17 00:00:00 2001 From: Xueming Shen Date: Thu, 16 Apr 2009 21:00:42 -0700 Subject: [PATCH 40/91] 4244499: ZipEntry() does not convert filenames from Unicode to platform 4532049: IllegalArgumentException in ZipInputStream while reading unicode file 5030283: Incorrect implementation of UTF-8 in zip package 4700978: ZipFile can't treat Japanese name in a zipfile properly 4980042: Cannot use Surrogates in zip file metadata like filenames 4820807: java.util.zip.ZipInputStream cannot extract files with Chinese chars in name Add new constructors for zip classes to support non-UTF-8 encoded names/comments in ZIP file Reviewed-by: alanb, martin --- jdk/make/java/zip/FILES_c.gmk | 1 - jdk/make/java/zip/mapfile-vers | 12 +- jdk/make/java/zip/reorder-i586 | 12 +- jdk/make/java/zip/reorder-sparc | 12 +- jdk/make/java/zip/reorder-sparcv9 | 12 +- .../share/classes/java/util/zip/ZipCoder.java | 139 ++++ .../classes/java/util/zip/ZipConstants64.java | 7 + .../share/classes/java/util/zip/ZipEntry.java | 39 +- .../share/classes/java/util/zip/ZipFile.java | 208 ++++- .../classes/java/util/zip/ZipInputStream.java | 105 +-- .../java/util/zip/ZipOutputStream.java | 132 ++-- .../share/classes/java/util/zip/package.html | 5 + jdk/src/share/native/java/util/zip/ZipEntry.c | 105 --- jdk/src/share/native/java/util/zip/ZipFile.c | 74 +- jdk/src/share/native/java/util/zip/zip_util.c | 3 +- jdk/src/share/native/java/util/zip/zip_util.h | 1 + jdk/test/java/util/zip/ZipCoding.java | 133 ++++ jdk/test/java/util/zip/zip.java | 743 ++++++++++++++++++ 18 files changed, 1386 insertions(+), 357 deletions(-) create mode 100644 jdk/src/share/classes/java/util/zip/ZipCoder.java delete mode 100644 jdk/src/share/native/java/util/zip/ZipEntry.c create mode 100644 jdk/test/java/util/zip/ZipCoding.java create mode 100644 jdk/test/java/util/zip/zip.java diff --git a/jdk/make/java/zip/FILES_c.gmk b/jdk/make/java/zip/FILES_c.gmk index 6426cea2ced..f88386c8ee9 100644 --- a/jdk/make/java/zip/FILES_c.gmk +++ b/jdk/make/java/zip/FILES_c.gmk @@ -29,7 +29,6 @@ FILES_c = \ Deflater.c \ Inflater.c \ ZipFile.c \ - ZipEntry.c \ zadler32.c \ zcrc32.c \ deflate.c \ diff --git a/jdk/make/java/zip/mapfile-vers b/jdk/make/java/zip/mapfile-vers index 443ea67c83e..096fa35e434 100644 --- a/jdk/make/java/zip/mapfile-vers +++ b/jdk/make/java/zip/mapfile-vers @@ -50,15 +50,17 @@ SUNWprivate_1.1 { Java_java_util_zip_Inflater_initIDs; Java_java_util_zip_Inflater_reset; Java_java_util_zip_Inflater_setDictionary; - Java_java_util_zip_ZipEntry_initFields; - Java_java_util_zip_ZipEntry_initIDs; Java_java_util_zip_ZipFile_close; Java_java_util_zip_ZipFile_freeEntry; - Java_java_util_zip_ZipFile_getCSize; Java_java_util_zip_ZipFile_getEntry; - Java_java_util_zip_ZipFile_getMethod; + Java_java_util_zip_ZipFile_getEntryBytes; + Java_java_util_zip_ZipFile_getEntryCrc; + Java_java_util_zip_ZipFile_getEntryCSize; + Java_java_util_zip_ZipFile_getEntryFlag; + Java_java_util_zip_ZipFile_getEntryMethod; + Java_java_util_zip_ZipFile_getEntrySize; + Java_java_util_zip_ZipFile_getEntryTime; Java_java_util_zip_ZipFile_getNextEntry; - Java_java_util_zip_ZipFile_getSize; Java_java_util_zip_ZipFile_getZipMessage; Java_java_util_zip_ZipFile_getTotal; Java_java_util_zip_ZipFile_initIDs; diff --git a/jdk/make/java/zip/reorder-i586 b/jdk/make/java/zip/reorder-i586 index d1af81c9d7a..d9e90ead435 100644 --- a/jdk/make/java/zip/reorder-i586 +++ b/jdk/make/java/zip/reorder-i586 @@ -20,12 +20,14 @@ text: .text%Java_java_util_zip_ZipFile_initIDs; text: .text%Java_java_util_zip_ZipFile_open; text: .text%Java_java_util_zip_ZipFile_getTotal; text: .text%Java_java_util_zip_ZipFile_getEntry; -text: .text%Java_java_util_zip_ZipEntry_initIDs; -text: .text%Java_java_util_zip_ZipEntry_initFields; text: .text%Java_java_util_zip_ZipFile_freeEntry; -text: .text%Java_java_util_zip_ZipFile_getCSize; -text: .text%Java_java_util_zip_ZipFile_getSize; -text: .text%Java_java_util_zip_ZipFile_getMethod; +text: .text%Java_java_util_zip_ZipFile_getEntryTime; +text: .text%Java_java_util_zip_ZipFile_getEntryCrc; +text: .text%Java_java_util_zip_ZipFile_getEntryCSize; +text: .text%Java_java_util_zip_ZipFile_getEntrySize; +text: .text%Java_java_util_zip_ZipFile_getEntryFlag; +text: .text%Java_java_util_zip_ZipFile_getEntryMethod; +text: .text%Java_java_util_zip_ZipFile_getEntryBytes; text: .text%Java_java_util_zip_Inflater_initIDs; text: .text%Java_java_util_zip_Inflater_init; text: .text%inflateInit2_; diff --git a/jdk/make/java/zip/reorder-sparc b/jdk/make/java/zip/reorder-sparc index b004b3c7d0c..82cc81b6322 100644 --- a/jdk/make/java/zip/reorder-sparc +++ b/jdk/make/java/zip/reorder-sparc @@ -19,12 +19,14 @@ text: .text%Java_java_util_zip_ZipFile_initIDs; text: .text%Java_java_util_zip_ZipFile_open; text: .text%Java_java_util_zip_ZipFile_getTotal; text: .text%Java_java_util_zip_ZipFile_getEntry; -text: .text%Java_java_util_zip_ZipEntry_initIDs; -text: .text%Java_java_util_zip_ZipEntry_initFields; text: .text%Java_java_util_zip_ZipFile_freeEntry; -text: .text%Java_java_util_zip_ZipFile_getCSize; -text: .text%Java_java_util_zip_ZipFile_getSize; -text: .text%Java_java_util_zip_ZipFile_getMethod; +text: .text%Java_java_util_zip_ZipFile_getEntryTime; +text: .text%Java_java_util_zip_ZipFile_getEntryCrc; +text: .text%Java_java_util_zip_ZipFile_getEntryCSize; +text: .text%Java_java_util_zip_ZipFile_getEntrySize; +text: .text%Java_java_util_zip_ZipFile_getEntryFlag; +text: .text%Java_java_util_zip_ZipFile_getEntryMethod; +text: .text%Java_java_util_zip_ZipFile_getEntryBytes; text: .text%Java_java_util_zip_Inflater_initIDs; text: .text%Java_java_util_zip_Inflater_init; text: .text%inflateInit2_; diff --git a/jdk/make/java/zip/reorder-sparcv9 b/jdk/make/java/zip/reorder-sparcv9 index e1061f8ebae..a2b0f467df0 100644 --- a/jdk/make/java/zip/reorder-sparcv9 +++ b/jdk/make/java/zip/reorder-sparcv9 @@ -20,12 +20,14 @@ text: .text%Java_java_util_zip_ZipFile_initIDs; text: .text%Java_java_util_zip_ZipFile_open; text: .text%Java_java_util_zip_ZipFile_getTotal; text: .text%Java_java_util_zip_ZipFile_getEntry; -text: .text%Java_java_util_zip_ZipEntry_initIDs; -text: .text%Java_java_util_zip_ZipEntry_initFields; text: .text%Java_java_util_zip_ZipFile_freeEntry; -text: .text%Java_java_util_zip_ZipFile_getCSize; -text: .text%Java_java_util_zip_ZipFile_getSize; -text: .text%Java_java_util_zip_ZipFile_getMethod; +text: .text%Java_java_util_zip_ZipFile_getEntryTime; +text: .text%Java_java_util_zip_ZipFile_getEntryCrc; +text: .text%Java_java_util_zip_ZipFile_getEntryCSize; +text: .text%Java_java_util_zip_ZipFile_getEntrySize; +text: .text%Java_java_util_zip_ZipFile_getEntryFlag; +text: .text%Java_java_util_zip_ZipFile_getEntryMethod; +text: .text%Java_java_util_zip_ZipFile_getEntryBytes; text: .text%Java_java_util_zip_Inflater_initIDs; text: .text%Java_java_util_zip_Inflater_init; text: .text%inflateInit2_; diff --git a/jdk/src/share/classes/java/util/zip/ZipCoder.java b/jdk/src/share/classes/java/util/zip/ZipCoder.java new file mode 100644 index 00000000000..6442bea819d --- /dev/null +++ b/jdk/src/share/classes/java/util/zip/ZipCoder.java @@ -0,0 +1,139 @@ +/* + * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. + * 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. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +package java.util.zip; + +import java.nio.ByteBuffer; +import java.nio.CharBuffer; +import java.nio.charset.Charset; +import java.nio.charset.CharsetDecoder; +import java.nio.charset.CharsetEncoder; +import java.nio.charset.CoderResult; +import java.nio.charset.CodingErrorAction; +import java.util.Arrays; + +/** + * Utility class for zipfile name and comment decoding and encoding + */ + +final class ZipCoder { + + String toString(byte[] ba, int length) { + CharsetDecoder cd = decoder().reset(); + int len = (int)(length * cd.maxCharsPerByte()); + char[] ca = new char[len]; + if (len == 0) + return new String(ca); + ByteBuffer bb = ByteBuffer.wrap(ba, 0, length); + CharBuffer cb = CharBuffer.wrap(ca); + CoderResult cr = cd.decode(bb, cb, true); + if (!cr.isUnderflow()) + throw new IllegalArgumentException(cr.toString()); + cr = cd.flush(cb); + if (!cr.isUnderflow()) + throw new IllegalArgumentException(cr.toString()); + return new String(ca, 0, cb.position()); + } + + String toString(byte[] ba) { + return toString(ba, ba.length); + } + + byte[] getBytes(String s) { + CharsetEncoder ce = encoder().reset(); + char[] ca = s.toCharArray(); + int len = (int)(ca.length * ce.maxBytesPerChar()); + byte[] ba = new byte[len]; + if (len == 0) + return ba; + ByteBuffer bb = ByteBuffer.wrap(ba); + CharBuffer cb = CharBuffer.wrap(ca); + CoderResult cr = ce.encode(cb, bb, true); + if (!cr.isUnderflow()) + throw new IllegalArgumentException(cr.toString()); + cr = ce.flush(bb); + if (!cr.isUnderflow()) + throw new IllegalArgumentException(cr.toString()); + if (bb.position() == ba.length) // defensive copy? + return ba; + else + return Arrays.copyOf(ba, bb.position()); + } + + // assume invoked only if "this" is not utf8 + byte[] getBytesUTF8(String s) { + if (isutf8) + return getBytes(s); + if (utf8 == null) + utf8 = new ZipCoder(Charset.forName("UTF-8")); + return utf8.getBytes(s); + } + + + String toStringUTF8(byte[] ba, int len) { + if (isutf8) + return toString(ba, len); + if (utf8 == null) + utf8 = new ZipCoder(Charset.forName("UTF-8")); + return utf8.toString(ba, len); + } + + boolean isUTF8() { + return isutf8; + } + + private Charset cs; + private CharsetDecoder dec; + private CharsetEncoder enc; + private boolean isutf8; + private ZipCoder utf8; + + private ZipCoder(Charset cs) { + this.cs = cs; + this.isutf8 = cs.name().equals("UTF-8"); + } + + static ZipCoder get(Charset charset) { + return new ZipCoder(charset); + } + + private CharsetDecoder decoder() { + if (dec == null) { + dec = cs.newDecoder() + .onMalformedInput(CodingErrorAction.REPORT) + .onUnmappableCharacter(CodingErrorAction.REPORT); + } + return dec; + } + + private CharsetEncoder encoder() { + if (enc == null) { + enc = cs.newEncoder() + .onMalformedInput(CodingErrorAction.REPORT) + .onUnmappableCharacter(CodingErrorAction.REPORT); + } + return enc; + } +} diff --git a/jdk/src/share/classes/java/util/zip/ZipConstants64.java b/jdk/src/share/classes/java/util/zip/ZipConstants64.java index 1bf3b1841b4..b844b2cccee 100644 --- a/jdk/src/share/classes/java/util/zip/ZipConstants64.java +++ b/jdk/src/share/classes/java/util/zip/ZipConstants64.java @@ -73,5 +73,12 @@ class ZipConstants64 { static final int ZIP64_EXTSIZ = 8; // compressed size, 8-byte static final int ZIP64_EXTLEN = 16; // uncompressed size, 8-byte + /* + * Language encoding flag EFS + */ + static final int EFS = 0x800; // If this bit is set the filename and + // comment fields for this file must be + // encoded using UTF-8. + private ZipConstants64() {} } diff --git a/jdk/src/share/classes/java/util/zip/ZipEntry.java b/jdk/src/share/classes/java/util/zip/ZipEntry.java index 6c16a9adb15..96e3b4d828e 100644 --- a/jdk/src/share/classes/java/util/zip/ZipEntry.java +++ b/jdk/src/share/classes/java/util/zip/ZipEntry.java @@ -40,6 +40,7 @@ class ZipEntry implements ZipConstants, Cloneable { long size = -1; // uncompressed size of entry data long csize = -1; // compressed size of entry data int method = -1; // compression method + int flag = 0; // general purpose flag byte[] extra; // optional extra field data for entry String comment; // optional comment string for entry @@ -53,13 +54,6 @@ class ZipEntry implements ZipConstants, Cloneable { */ public static final int DEFLATED = 8; - static { - /* Zip library is loaded from System.initializeSystemClass */ - initIDs(); - } - - private static native void initIDs(); - /** * Creates a new zip entry with the specified name. * @@ -90,28 +84,15 @@ class ZipEntry implements ZipConstants, Cloneable { size = e.size; csize = e.csize; method = e.method; + flag = e.flag; extra = e.extra; comment = e.comment; } /* - * Creates a new zip entry for the given name with fields initialized - * from the specified jzentry data. + * Creates a new un-initialized zip entry */ - ZipEntry(String name, long jzentry) { - this.name = name; - initFields(jzentry); - } - - private native void initFields(long jzentry); - - /* - * Creates a new zip entry with fields initialized from the specified - * jzentry data. - */ - ZipEntry(long jzentry) { - initFields(jzentry); - } + ZipEntry() {} /** * Returns the name of the entry. @@ -258,16 +239,16 @@ class ZipEntry implements ZipConstants, Cloneable { /** * Sets the optional comment string for the entry. + * + *

    ZIP entry comments have maximum length of 0xffff. If the length of the + * specified comment string is greater than 0xFFFF bytes after encoding, only + * the first 0xFFFF bytes are output to the ZIP file entry. + * * @param comment the comment string - * @exception IllegalArgumentException if the length of the specified - * comment string is greater than 0xFFFF bytes + * * @see #getComment() */ public void setComment(String comment) { - if (comment != null && comment.length() > 0xffff/3 - && ZipOutputStream.getUTF8Length(comment) > 0xffff) { - throw new IllegalArgumentException("invalid entry comment length"); - } this.comment = comment; } diff --git a/jdk/src/share/classes/java/util/zip/ZipFile.java b/jdk/src/share/classes/java/util/zip/ZipFile.java index 37e92ddecb7..8ee0bc2eb57 100644 --- a/jdk/src/share/classes/java/util/zip/ZipFile.java +++ b/jdk/src/share/classes/java/util/zip/ZipFile.java @@ -29,9 +29,11 @@ import java.io.InputStream; import java.io.IOException; import java.io.EOFException; import java.io.File; +import java.nio.charset.Charset; import java.util.Vector; import java.util.Enumeration; import java.util.NoSuchElementException; +import static java.util.zip.ZipConstants64.*; /** * This class is used to read entries from a zip file. @@ -76,16 +78,19 @@ class ZipFile implements ZipConstants { /** * Opens a zip file for reading. * - *

    First, if there is a security - * manager, its checkRead method - * is called with the name argument - * as its argument to ensure the read is allowed. + *

    First, if there is a security manager, its checkRead + * method is called with the name argument as its argument + * to ensure the read is allowed. + * + *

    The UTF-8 {@link java.nio.charset.Charset charset} is used to + * decode the entry names and comments. * * @param name the name of the zip file * @throws ZipException if a ZIP format error has occurred * @throws IOException if an I/O error has occurred * @throws SecurityException if a security manager exists and its * checkRead method doesn't allow read access to the file. + * * @see SecurityManager#checkRead(java.lang.String) */ public ZipFile(String name) throws IOException { @@ -101,6 +106,9 @@ class ZipFile implements ZipConstants { * method is called with the name argument as its argument to * ensure the read is allowed. * + *

    The UTF-8 {@link java.nio.charset.Charset charset} is used to + * decode the entry names and comments + * * @param file the ZIP file to be opened for reading * @param mode the mode in which the file is to be opened * @throws ZipException if a ZIP format error has occurred @@ -115,6 +123,59 @@ class ZipFile implements ZipConstants { * @since 1.3 */ public ZipFile(File file, int mode) throws IOException { + this(file, mode, Charset.forName("UTF-8")); + } + + /** + * Opens a ZIP file for reading given the specified File object. + * + *

    The UTF-8 {@link java.nio.charset.Charset charset} is used to + * decode the entry names and comments. + * + * @param file the ZIP file to be opened for reading + * @throws ZipException if a ZIP format error has occurred + * @throws IOException if an I/O error has occurred + */ + public ZipFile(File file) throws ZipException, IOException { + this(file, OPEN_READ); + } + + private ZipCoder zc; + + /** + * Opens a new ZipFile to read from the specified + * File object in the specified mode. The mode argument + * must be either OPEN_READ or OPEN_READ | OPEN_DELETE. + * + *

    First, if there is a security manager, its checkRead + * method is called with the name argument as its argument to + * ensure the read is allowed. + * + * @param file the ZIP file to be opened for reading + * @param mode the mode in which the file is to be opened + * @param charset + * the {@link java.nio.charset.Charset {@code charset}} to + * be used to decode the ZIP entry name and comment that are not + * encoded by using UTF-8 encoding (indicated by entry's general + * purpose flag). + * + * @throws ZipException if a ZIP format error has occurred + * @throws IOException if an I/O error has occurred + * + * @throws SecurityException + * if a security manager exists and its checkRead + * method doesn't allow read access to the file,or its + * checkDelete method doesn't allow deleting the + * file when the OPEN_DELETE flag is set + * + * @throws IllegalArgumentException if the mode argument is invalid + * + * @see SecurityManager#checkRead(java.lang.String) + * + * @since 1.7 + */ + public ZipFile(File file, int mode, Charset charset) throws IOException + { if (((mode & OPEN_READ) == 0) || ((mode & ~(OPEN_READ | OPEN_DELETE)) != 0)) { throw new IllegalArgumentException("Illegal mode: 0x"+ @@ -128,24 +189,61 @@ class ZipFile implements ZipConstants { sm.checkDelete(name); } } + if (charset == null) + throw new NullPointerException("charset is null"); + this.zc = ZipCoder.get(charset); jzfile = open(name, mode, file.lastModified()); - this.name = name; this.total = getTotal(jzfile); } - private static native long open(String name, int mode, long lastModified); - private static native int getTotal(long jzfile); - + /** + * Opens a zip file for reading. + * + *

    First, if there is a security manager, its checkRead + * method is called with the name argument as its argument + * to ensure the read is allowed. + * + * @param name the name of the zip file + * @param charset + * the {@link java.nio.charset.Charset {@code charset}} to + * be used to decode the ZIP entry name and comment that are not + * encoded by using UTF-8 encoding (indicated by entry's general + * purpose flag). + * + * @throws ZipException if a ZIP format error has occurred + * @throws IOException if an I/O error has occurred + * @throws SecurityException + * if a security manager exists and its checkRead + * method doesn't allow read access to the file + * + * @see SecurityManager#checkRead(java.lang.String) + * + * @since 1.7 + */ + public ZipFile(String name, Charset charset) throws IOException + { + this(new File(name), OPEN_READ, charset); + } /** * Opens a ZIP file for reading given the specified File object. * @param file the ZIP file to be opened for reading - * @throws ZipException if a ZIP error has occurred + * @param charset + * The {@link java.nio.charset.Charset {@code charset}} to be + * used to decode the ZIP entry name and comment (ignored if + * the language + * encoding bit of the ZIP entry's general purpose bit + * flag is set). + * + * @throws ZipException if a ZIP format error has occurred * @throws IOException if an I/O error has occurred + * + * @since 1.7 */ - public ZipFile(File file) throws ZipException, IOException { - this(file, OPEN_READ); + public ZipFile(File file, Charset charset) throws IOException + { + this(file, OPEN_READ, charset); } /** @@ -163,9 +261,9 @@ class ZipFile implements ZipConstants { long jzentry = 0; synchronized (this) { ensureOpen(); - jzentry = getEntry(jzfile, name, true); + jzentry = getEntry(jzfile, zc.getBytes(name), true); if (jzentry != 0) { - ZipEntry ze = new ZipEntry(name, jzentry); + ZipEntry ze = getZipEntry(name, jzentry); freeEntry(jzfile, jzentry); return ze; } @@ -173,7 +271,7 @@ class ZipFile implements ZipConstants { return null; } - private static native long getEntry(long jzfile, String name, + private static native long getEntry(long jzfile, byte[] name, boolean addSlash); // freeEntry releases the C jzentry struct. @@ -194,36 +292,30 @@ class ZipFile implements ZipConstants { * @throws IllegalStateException if the zip file has been closed */ public InputStream getInputStream(ZipEntry entry) throws IOException { - return getInputStream(entry.name); - } - - /** - * Returns an input stream for reading the contents of the specified - * entry, or null if the entry was not found. - */ - private InputStream getInputStream(String name) throws IOException { - if (name == null) { - throw new NullPointerException("name"); + if (entry == null) { + throw new NullPointerException("entry"); } long jzentry = 0; ZipFileInputStream in = null; synchronized (this) { ensureOpen(); - jzentry = getEntry(jzfile, name, false); + if (!zc.isUTF8() && (entry.flag & EFS) != 0) { + jzentry = getEntry(jzfile, zc.getBytesUTF8(entry.name), false); + } else { + jzentry = getEntry(jzfile, zc.getBytes(entry.name), false); + } if (jzentry == 0) { return null; } - in = new ZipFileInputStream(jzentry); - } final ZipFileInputStream zfin = in; - switch (getMethod(jzentry)) { + switch (getEntryMethod(jzentry)) { case STORED: return zfin; case DEFLATED: // MORE: Compute good size for inflater stream: - long size = getSize(jzentry) + 2; // Inflater likes a bit of slack + long size = getEntrySize(jzentry) + 2; // Inflater likes a bit of slack if (size > 65536) size = 8192; if (size <= 0) size = 4096; return new InflaterInputStream(zfin, getInflater(), (int)size) { @@ -267,8 +359,6 @@ class ZipFile implements ZipConstants { } } - private static native int getMethod(long jzentry); - /* * Gets an inflater from the list of available inflaters or allocates * a new one. @@ -343,7 +433,7 @@ class ZipFile implements ZipConstants { ",\n message = " + message ); } - ZipEntry ze = new ZipEntry(jzentry); + ZipEntry ze = getZipEntry(null, jzentry); freeEntry(jzfile, jzentry); return ze; } @@ -351,6 +441,38 @@ class ZipFile implements ZipConstants { }; } + private ZipEntry getZipEntry(String name, long jzentry) { + ZipEntry e = new ZipEntry(); + e.flag = getEntryFlag(jzentry); // get the flag first + if (name != null) { + e.name = name; + } else { + byte[] bname = getEntryBytes(jzentry, JZENTRY_NAME); + if (!zc.isUTF8() && (e.flag & EFS) != 0) { + e.name = zc.toStringUTF8(bname, bname.length); + } else { + e.name = zc.toString(bname, bname.length); + } + } + e.time = getEntryTime(jzentry); + e.crc = getEntryCrc(jzentry); + e.size = getEntrySize(jzentry); + e. csize = getEntryCSize(jzentry); + e.method = getEntryMethod(jzentry); + e.extra = getEntryBytes(jzentry, JZENTRY_EXTRA); + byte[] bcomm = getEntryBytes(jzentry, JZENTRY_COMMENT); + if (bcomm == null) { + e.comment = null; + } else { + if (!zc.isUTF8() && (e.flag & EFS) != 0) { + e.comment = zc.toStringUTF8(bcomm, bcomm.length); + } else { + e.comment = zc.toString(bcomm, bcomm.length); + } + } + return e; + } + private static native long getNextEntry(long jzfile, int i); /** @@ -443,8 +565,8 @@ class ZipFile implements ZipConstants { ZipFileInputStream(long jzentry) { pos = 0; - rem = getCSize(jzentry); - size = getSize(jzentry); + rem = getEntryCSize(jzentry); + size = getEntrySize(jzentry); this.jzentry = jzentry; } @@ -514,13 +636,25 @@ class ZipFile implements ZipConstants { } + + private static native long open(String name, int mode, long lastModified) + throws IOException; + private static native int getTotal(long jzfile); private static native int read(long jzfile, long jzentry, long pos, byte[] b, int off, int len); - private static native long getCSize(long jzentry); + // access to the native zentry object + private static native long getEntryTime(long jzentry); + private static native long getEntryCrc(long jzentry); + private static native long getEntryCSize(long jzentry); + private static native long getEntrySize(long jzentry); + private static native int getEntryMethod(long jzentry); + private static native int getEntryFlag(long jzentry); - private static native long getSize(long jzentry); + private static final int JZENTRY_NAME = 0; + private static final int JZENTRY_EXTRA = 1; + private static final int JZENTRY_COMMENT = 2; + private static native byte[] getEntryBytes(long jzentry, int type); - // Temporary add on for bug troubleshooting private static native String getZipMessage(long jzfile); } diff --git a/jdk/src/share/classes/java/util/zip/ZipInputStream.java b/jdk/src/share/classes/java/util/zip/ZipInputStream.java index 1b9b93415cb..83f9ad4b753 100644 --- a/jdk/src/share/classes/java/util/zip/ZipInputStream.java +++ b/jdk/src/share/classes/java/util/zip/ZipInputStream.java @@ -29,6 +29,7 @@ import java.io.InputStream; import java.io.IOException; import java.io.EOFException; import java.io.PushbackInputStream; +import java.nio.charset.Charset; import static java.util.zip.ZipConstants64.*; /** @@ -54,6 +55,8 @@ class ZipInputStream extends InflaterInputStream implements ZipConstants { // one entry private boolean entryEOF = false; + private ZipCoder zc; + /** * Check to make sure that this stream has not been closed */ @@ -65,14 +68,39 @@ class ZipInputStream extends InflaterInputStream implements ZipConstants { /** * Creates a new ZIP input stream. + * + *

    The UTF-8 {@link java.nio.charset.Charset charset} is used to + * decode the entry names. + * * @param in the actual input stream */ public ZipInputStream(InputStream in) { + this(in, Charset.forName("UTF-8")); + } + + /** + * Creates a new ZIP input stream. + * + * @param in the actual input stream + * + * @param charset + * The {@link java.nio.charset.Charset {@code charset}} to be + * used to decode the ZIP entry name (ignored if the + * language + * encoding bit of the ZIP entry's general purpose bit + * flag is set). + * + * @since 1.7 + */ + public ZipInputStream(InputStream in, Charset charset) { super(new PushbackInputStream(in, 512), new Inflater(true), 512); usesDefaultInflater = true; if(in == null) { throw new NullPointerException("in is null"); } + if (charset == null) + throw new NullPointerException("charset is null"); + this.zc = ZipCoder.get(charset); } /** @@ -141,8 +169,8 @@ class ZipInputStream extends InflaterInputStream implements ZipConstants { * @param len the maximum number of bytes read * @return the actual number of bytes read, or -1 if the end of the * entry is reached - * @exception NullPointerException If b is null. - * @exception IndexOutOfBoundsException If off is negative, + * @exception NullPointerException if b is null. + * @exception IndexOutOfBoundsException if off is negative, * len is negative, or len is greater than * b.length - off * @exception ZipException if a ZIP file error has occurred @@ -252,6 +280,8 @@ class ZipInputStream extends InflaterInputStream implements ZipConstants { if (get32(tmpbuf, 0) != LOCSIG) { return null; } + // get flag first, we need check EFS. + flag = get16(tmpbuf, LOCFLG); // get the entry name and create the ZipEntry first int len = get16(tmpbuf, LOCNAM); int blen = b.length; @@ -262,9 +292,11 @@ class ZipInputStream extends InflaterInputStream implements ZipConstants { b = new byte[blen]; } readFully(b, 0, len); - ZipEntry e = createZipEntry(getUTF8String(b, 0, len)); + // Force to use UTF-8 if the EFS bit is ON, even the cs is NOT UTF-8 + ZipEntry e = createZipEntry(((flag & EFS) != 0) + ? zc.toStringUTF8(b, len) + : zc.toString(b, len)); // now get the remaining fields for the entry - flag = get16(tmpbuf, LOCFLG); if ((flag & 1) == 1) { throw new ZipException("encrypted ZIP entry not supported"); } @@ -313,71 +345,6 @@ class ZipInputStream extends InflaterInputStream implements ZipConstants { return e; } - /* - * Fetches a UTF8-encoded String from the specified byte array. - */ - private static String getUTF8String(byte[] b, int off, int len) { - // First, count the number of characters in the sequence - int count = 0; - int max = off + len; - int i = off; - while (i < max) { - int c = b[i++] & 0xff; - switch (c >> 4) { - case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7: - // 0xxxxxxx - count++; - break; - case 12: case 13: - // 110xxxxx 10xxxxxx - if ((b[i++] & 0xc0) != 0x80) { - throw new IllegalArgumentException(); - } - count++; - break; - case 14: - // 1110xxxx 10xxxxxx 10xxxxxx - if (((b[i++] & 0xc0) != 0x80) || - ((b[i++] & 0xc0) != 0x80)) { - throw new IllegalArgumentException(); - } - count++; - break; - default: - // 10xxxxxx, 1111xxxx - throw new IllegalArgumentException(); - } - } - if (i != max) { - throw new IllegalArgumentException(); - } - // Now decode the characters... - char[] cs = new char[count]; - i = 0; - while (off < max) { - int c = b[off++] & 0xff; - switch (c >> 4) { - case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7: - // 0xxxxxxx - cs[i++] = (char)c; - break; - case 12: case 13: - // 110xxxxx 10xxxxxx - cs[i++] = (char)(((c & 0x1f) << 6) | (b[off++] & 0x3f)); - break; - case 14: - // 1110xxxx 10xxxxxx 10xxxxxx - int t = (b[off++] & 0x3f) << 6; - cs[i++] = (char)(((c & 0x0f) << 12) | t | (b[off++] & 0x3f)); - break; - default: - // 10xxxxxx, 1111xxxx - throw new IllegalArgumentException(); - } - } - return new String(cs, 0, count); - } - /** * Creates a new ZipEntry object for the specified * entry name. diff --git a/jdk/src/share/classes/java/util/zip/ZipOutputStream.java b/jdk/src/share/classes/java/util/zip/ZipOutputStream.java index bd44d3213cf..da35ed97f14 100644 --- a/jdk/src/share/classes/java/util/zip/ZipOutputStream.java +++ b/jdk/src/share/classes/java/util/zip/ZipOutputStream.java @@ -27,6 +27,7 @@ package java.util.zip; import java.io.OutputStream; import java.io.IOException; +import java.nio.charset.Charset; import java.util.Vector; import java.util.HashSet; import static java.util.zip.ZipConstants64.*; @@ -44,19 +45,9 @@ class ZipOutputStream extends DeflaterOutputStream implements ZipConstants { private static class XEntry { public final ZipEntry entry; public final long offset; - public final int flag; public XEntry(ZipEntry entry, long offset) { this.entry = entry; this.offset = offset; - this.flag = (entry.method == DEFLATED && - (entry.size == -1 || - entry.csize == -1 || - entry.crc == -1)) - // store size, compressed size, and crc-32 in data descriptor - // immediately following the compressed entry data - ? 8 - // store size, compressed size, and crc-32 in LOC header - : 0; } } @@ -66,12 +57,14 @@ class ZipOutputStream extends DeflaterOutputStream implements ZipConstants { private CRC32 crc = new CRC32(); private long written = 0; private long locoff = 0; - private String comment; + private byte[] comment; private int method = DEFLATED; private boolean finished; private boolean closed = false; + private final ZipCoder zc; + private static int version(ZipEntry e) throws ZipException { switch (e.method) { case DEFLATED: return 20; @@ -100,10 +93,31 @@ class ZipOutputStream extends DeflaterOutputStream implements ZipConstants { /** * Creates a new ZIP output stream. + * + *

    The UTF-8 {@link java.nio.charset.Charset charset} is used + * to encode the entry names and comments. + * * @param out the actual output stream */ public ZipOutputStream(OutputStream out) { + this(out, Charset.forName("UTF-8")); + } + + /** + * Creates a new ZIP output stream. + * + * @param out the actual output stream + * + * @param charset the {@link java.nio.charset.Charset charset} + * to be used to encode the entry names and comments + * + * @since 1.7 + */ + public ZipOutputStream(OutputStream out, Charset charset) { super(out, new Deflater(Deflater.DEFAULT_COMPRESSION, true)); + if (charset == null) + throw new NullPointerException("charset is null"); + this.zc = ZipCoder.get(charset); usesDefaultDeflater = true; } @@ -114,11 +128,11 @@ class ZipOutputStream extends DeflaterOutputStream implements ZipConstants { * ZIP file comment is greater than 0xFFFF bytes */ public void setComment(String comment) { - if (comment != null && comment.length() > 0xffff/3 - && getUTF8Length(comment) > 0xffff) { - throw new IllegalArgumentException("ZIP file comment too long."); + if (comment != null) { + this.comment = zc.getBytes(comment); + if (this.comment.length > 0xffff) + throw new IllegalArgumentException("ZIP file comment too long."); } - this.comment = comment; } /** @@ -167,8 +181,15 @@ class ZipOutputStream extends DeflaterOutputStream implements ZipConstants { if (e.method == -1) { e.method = method; // use default method } + // store size, compressed size, and crc-32 in LOC header + e.flag = 0; switch (e.method) { case DEFLATED: + // store size, compressed size, and crc-32 in data descriptor + // immediately following the compressed entry data + if (e.size == -1 || e.csize == -1 || e.crc == -1) + e.flag = 8; + break; case STORED: // compressed size, uncompressed size, and crc-32 must all be @@ -192,6 +213,8 @@ class ZipOutputStream extends DeflaterOutputStream implements ZipConstants { if (! names.add(e.name)) { throw new ZipException("duplicate entry: " + e.name); } + if (zc.isUTF8()) + e.flag |= EFS; current = new XEntry(e, written); xentries.add(current); writeLOC(current); @@ -213,7 +236,7 @@ class ZipOutputStream extends DeflaterOutputStream implements ZipConstants { while (!def.finished()) { deflate(); } - if ((current.flag & 8) == 0) { + if ((e.flag & 8) == 0) { // verify size, compressed size, and crc-32 settings if (e.size != def.getBytesRead()) { throw new ZipException( @@ -343,11 +366,11 @@ class ZipOutputStream extends DeflaterOutputStream implements ZipConstants { */ private void writeLOC(XEntry xentry) throws IOException { ZipEntry e = xentry.entry; - int flag = xentry.flag; + int flag = e.flag; int elen = (e.extra != null) ? e.extra.length : 0; boolean hasZip64 = false; - writeInt(LOCSIG); // LOC header signature + writeInt(LOCSIG); // LOC header signature if ((flag & 8) == 8) { writeShort(version(e)); // version needed to extract @@ -380,7 +403,7 @@ class ZipOutputStream extends DeflaterOutputStream implements ZipConstants { writeInt(e.size); // uncompressed size } } - byte[] nameBytes = getUTF8Bytes(e.name); + byte[] nameBytes = zc.getBytes(e.name); writeShort(nameBytes.length); writeShort(elen); writeBytes(nameBytes, 0, nameBytes.length); @@ -417,7 +440,7 @@ class ZipOutputStream extends DeflaterOutputStream implements ZipConstants { */ private void writeCEN(XEntry xentry) throws IOException { ZipEntry e = xentry.entry; - int flag = xentry.flag; + int flag = e.flag; int version = version(e); long csize = e.csize; @@ -454,7 +477,7 @@ class ZipOutputStream extends DeflaterOutputStream implements ZipConstants { writeInt(e.crc); // crc-32 writeInt(csize); // compressed size writeInt(size); // uncompressed size - byte[] nameBytes = getUTF8Bytes(e.name); + byte[] nameBytes = zc.getBytes(e.name); writeShort(nameBytes.length); if (hasZip64) { // + headid(2) + datasize(2) @@ -464,8 +487,8 @@ class ZipOutputStream extends DeflaterOutputStream implements ZipConstants { } byte[] commentBytes; if (e.comment != null) { - commentBytes = getUTF8Bytes(e.comment); - writeShort(commentBytes.length); + commentBytes = zc.getBytes(e.comment); + writeShort(Math.min(commentBytes.length, 0xffff)); } else { commentBytes = null; writeShort(0); @@ -489,7 +512,7 @@ class ZipOutputStream extends DeflaterOutputStream implements ZipConstants { writeBytes(e.extra, 0, e.extra.length); } if (commentBytes != null) { - writeBytes(commentBytes, 0, commentBytes.length); + writeBytes(commentBytes, 0, Math.min(commentBytes.length, 0xffff)); } } @@ -541,9 +564,8 @@ class ZipOutputStream extends DeflaterOutputStream implements ZipConstants { writeInt(xlen); // length of central directory writeInt(xoff); // offset of central directory if (comment != null) { // zip file comment - byte[] b = getUTF8Bytes(comment); - writeShort(b.length); - writeBytes(b, 0, b.length); + writeShort(comment.length); + writeBytes(comment, 0, comment.length); } else { writeShort(0); } @@ -594,60 +616,4 @@ class ZipOutputStream extends DeflaterOutputStream implements ZipConstants { super.out.write(b, off, len); written += len; } - - /* - * Returns the length of String's UTF8 encoding. - */ - static int getUTF8Length(String s) { - int count = 0; - for (int i = 0; i < s.length(); i++) { - char ch = s.charAt(i); - if (ch <= 0x7f) { - count++; - } else if (ch <= 0x7ff) { - count += 2; - } else { - count += 3; - } - } - return count; - } - - /* - * Returns an array of bytes representing the UTF8 encoding - * of the specified String. - */ - private static byte[] getUTF8Bytes(String s) { - char[] c = s.toCharArray(); - int len = c.length; - // Count the number of encoded bytes... - int count = 0; - for (int i = 0; i < len; i++) { - int ch = c[i]; - if (ch <= 0x7f) { - count++; - } else if (ch <= 0x7ff) { - count += 2; - } else { - count += 3; - } - } - // Now return the encoded bytes... - byte[] b = new byte[count]; - int off = 0; - for (int i = 0; i < len; i++) { - int ch = c[i]; - if (ch <= 0x7f) { - b[off++] = (byte)ch; - } else if (ch <= 0x7ff) { - b[off++] = (byte)((ch >> 6) | 0xc0); - b[off++] = (byte)((ch & 0x3f) | 0x80); - } else { - b[off++] = (byte)((ch >> 12) | 0xe0); - b[off++] = (byte)(((ch >> 6) & 0x3f) | 0x80); - b[off++] = (byte)((ch & 0x3f) | 0x80); - } - } - return b; - } } diff --git a/jdk/src/share/classes/java/util/zip/package.html b/jdk/src/share/classes/java/util/zip/package.html index d4b59263678..83d117de55e 100644 --- a/jdk/src/share/classes/java/util/zip/package.html +++ b/jdk/src/share/classes/java/util/zip/package.html @@ -52,6 +52,11 @@ input streams. PKWARE ZIP File Format Specification. The ZIP64(tm) format extensions are used to overcome the size limitations of the original ZIP format. +

    + +

  • APPENDIX D of + PKWARE ZIP File Format Specification - Language Encoding Flag (EFS) to + encode ZIP entry filename and comment fields using UTF-8.

  • ZLIB Compressed Data Format Specification version 3.3 diff --git a/jdk/src/share/native/java/util/zip/ZipEntry.c b/jdk/src/share/native/java/util/zip/ZipEntry.c deleted file mode 100644 index 94cd68e1b12..00000000000 --- a/jdk/src/share/native/java/util/zip/ZipEntry.c +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright 1998 Sun Microsystems, Inc. All Rights Reserved. - * 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. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - */ - -/* - * Native method support for java.util.zip.ZipEntry - */ - -#include -#include -#include "jlong.h" -#include "jvm.h" -#include "jni.h" -#include "jni_util.h" -#include "zip_util.h" - -#include "java_util_zip_ZipEntry.h" - -#define DEFLATED 8 -#define STORED 0 - -static jfieldID nameID; -static jfieldID timeID; -static jfieldID crcID; -static jfieldID sizeID; -static jfieldID csizeID; -static jfieldID methodID; -static jfieldID extraID; -static jfieldID commentID; - -JNIEXPORT void JNICALL -Java_java_util_zip_ZipEntry_initIDs(JNIEnv *env, jclass cls) -{ - nameID = (*env)->GetFieldID(env, cls, "name", "Ljava/lang/String;"); - timeID = (*env)->GetFieldID(env, cls, "time", "J"); - crcID = (*env)->GetFieldID(env, cls, "crc", "J"); - sizeID = (*env)->GetFieldID(env, cls, "size", "J"); - csizeID = (*env)->GetFieldID(env, cls, "csize", "J"); - methodID = (*env)->GetFieldID(env, cls, "method", "I"); - extraID = (*env)->GetFieldID(env, cls, "extra", "[B"); - commentID = (*env)->GetFieldID(env, cls, "comment", "Ljava/lang/String;"); -} - -JNIEXPORT void JNICALL -Java_java_util_zip_ZipEntry_initFields(JNIEnv *env, jobject obj, jlong zentry) -{ - jzentry *ze = jlong_to_ptr(zentry); - jstring name = (*env)->GetObjectField(env, obj, nameID); - - if (name == 0) { - name = (*env)->NewStringUTF(env, ze->name); - if (name == 0) { - return; - } - (*env)->SetObjectField(env, obj, nameID, name); - } - (*env)->SetLongField(env, obj, timeID, (jlong)ze->time & 0xffffffffUL); - (*env)->SetLongField(env, obj, crcID, (jlong)ze->crc & 0xffffffffUL); - (*env)->SetLongField(env, obj, sizeID, (jlong)ze->size); - if (ze->csize == 0) { - (*env)->SetLongField(env, obj, csizeID, (jlong)ze->size); - (*env)->SetIntField(env, obj, methodID, STORED); - } else { - (*env)->SetLongField(env, obj, csizeID, (jlong)ze->csize); - (*env)->SetIntField(env, obj, methodID, DEFLATED); - } - if (ze->extra != 0) { - unsigned char *bp = (unsigned char *)&ze->extra[0]; - jsize len = (bp[0] | (bp[1] << 8)); - jbyteArray extra = (*env)->NewByteArray(env, len); - if (extra == 0) { - return; - } - (*env)->SetByteArrayRegion(env, extra, 0, len, &ze->extra[2]); - (*env)->SetObjectField(env, obj, extraID, extra); - } - if (ze->comment != 0) { - jstring comment = (*env)->NewStringUTF(env, ze->comment); - if (comment == 0) { - return; - } - (*env)->SetObjectField(env, obj, commentID, comment); - } -} diff --git a/jdk/src/share/native/java/util/zip/ZipFile.c b/jdk/src/share/native/java/util/zip/ZipFile.c index 0c20536b49a..d5cb1ecac8b 100644 --- a/jdk/src/share/native/java/util/zip/ZipFile.c +++ b/jdk/src/share/native/java/util/zip/ZipFile.c @@ -141,12 +141,11 @@ Java_java_util_zip_ZipFile_close(JNIEnv *env, jclass cls, jlong zfile) JNIEXPORT jlong JNICALL Java_java_util_zip_ZipFile_getEntry(JNIEnv *env, jclass cls, jlong zfile, - jstring name, jboolean addSlash) + jbyteArray name, jboolean addSlash) { #define MAXNAME 1024 jzfile *zip = jlong_to_ptr(zfile); - jsize slen = (*env)->GetStringLength(env, name); - jsize ulen = (*env)->GetStringUTFLength(env, name); + jsize ulen = (*env)->GetArrayLength(env, name); char buf[MAXNAME+2], *path; jzentry *ze; @@ -159,7 +158,7 @@ Java_java_util_zip_ZipFile_getEntry(JNIEnv *env, jclass cls, jlong zfile, } else { path = buf; } - (*env)->GetStringUTFRegion(env, name, 0, slen, path); + (*env)->GetByteArrayRegion(env, name, 0, ulen, (jbyte *)path); path[ulen] = '\0'; if (addSlash == JNI_FALSE) { ze = ZIP_GetEntry(zip, path, 0); @@ -186,34 +185,87 @@ Java_java_util_zip_ZipFile_getNextEntry(JNIEnv *env, jclass cls, jlong zfile, jint n) { jzentry *ze = ZIP_GetNextEntry(jlong_to_ptr(zfile), n); - return ptr_to_jlong(ze); } JNIEXPORT jint JNICALL -Java_java_util_zip_ZipFile_getMethod(JNIEnv *env, jclass cls, jlong zentry) +Java_java_util_zip_ZipFile_getEntryMethod(JNIEnv *env, jclass cls, jlong zentry) { jzentry *ze = jlong_to_ptr(zentry); - return ze->csize != 0 ? DEFLATED : STORED; } -JNIEXPORT jlong JNICALL -Java_java_util_zip_ZipFile_getCSize(JNIEnv *env, jclass cls, jlong zentry) +JNIEXPORT jint JNICALL +Java_java_util_zip_ZipFile_getEntryFlag(JNIEnv *env, jclass cls, jlong zentry) { jzentry *ze = jlong_to_ptr(zentry); + return ze->flag; +} +JNIEXPORT jlong JNICALL +Java_java_util_zip_ZipFile_getEntryCSize(JNIEnv *env, jclass cls, jlong zentry) +{ + jzentry *ze = jlong_to_ptr(zentry); return ze->csize != 0 ? ze->csize : ze->size; } JNIEXPORT jlong JNICALL -Java_java_util_zip_ZipFile_getSize(JNIEnv *env, jclass cls, jlong zentry) +Java_java_util_zip_ZipFile_getEntrySize(JNIEnv *env, jclass cls, jlong zentry) { jzentry *ze = jlong_to_ptr(zentry); - return ze->size; } +JNIEXPORT jlong JNICALL +Java_java_util_zip_ZipFile_getEntryTime(JNIEnv *env, jclass cls, jlong zentry) +{ + jzentry *ze = jlong_to_ptr(zentry); + return (jlong)ze->time & 0xffffffffUL; +} + +JNIEXPORT jlong JNICALL +Java_java_util_zip_ZipFile_getEntryCrc(JNIEnv *env, jclass cls, jlong zentry) +{ + jzentry *ze = jlong_to_ptr(zentry); + return (jlong)ze->crc & 0xffffffffUL; +} + +JNIEXPORT jbyteArray JNICALL +Java_java_util_zip_ZipFile_getEntryBytes(JNIEnv *env, jclass cls, jlong zentry, jint type) +{ + jzentry *ze = jlong_to_ptr(zentry); + int len = 0; + jbyteArray jba = NULL; + switch (type) { + case java_util_zip_ZipFile_JZENTRY_NAME: + if (ze->name != 0) { + len = (int)strlen(ze->name); + if (len == 0 || (jba = (*env)->NewByteArray(env, len)) == NULL) + break; + (*env)->SetByteArrayRegion(env, jba, 0, len, (jbyte *)ze->name); + } + break; + case java_util_zip_ZipFile_JZENTRY_EXTRA: + if (ze->extra != 0) { + unsigned char *bp = (unsigned char *)&ze->extra[0]; + len = (bp[0] | (bp[1] << 8)); + if (len <= 0 || (jba = (*env)->NewByteArray(env, len)) == NULL) + break; + (*env)->SetByteArrayRegion(env, jba, 0, len, &ze->extra[2]); + } + break; + case java_util_zip_ZipFile_JZENTRY_COMMENT: + if (ze->comment != 0) { + len = (int)strlen(ze->comment); + if (len == 0 || (jba = (*env)->NewByteArray(env, len)) == NULL) + break; + (*env)->SetByteArrayRegion(env, jba, 0, len, (jbyte*)ze->comment); + } + break; + } + return jba; +} + JNIEXPORT jint JNICALL Java_java_util_zip_ZipFile_read(JNIEnv *env, jclass cls, jlong zfile, jlong zentry, jlong pos, jbyteArray bytes, diff --git a/jdk/src/share/native/java/util/zip/zip_util.c b/jdk/src/share/native/java/util/zip/zip_util.c index 89f52ae3bcc..626d4118f75 100644 --- a/jdk/src/share/native/java/util/zip/zip_util.c +++ b/jdk/src/share/native/java/util/zip/zip_util.c @@ -512,7 +512,6 @@ readCEN(jzfile *zip, jint knownTotal) /* Clear previous zip error */ zip->msg = NULL; - /* Get position of END header */ if ((endpos = findEND(zip, endbuf)) == -1) return -1; /* no END header or system error */ @@ -520,7 +519,6 @@ readCEN(jzfile *zip, jint knownTotal) if (endpos == 0) return 0; /* only END header present */ freeCEN(zip); - /* Get position and length of central directory */ cenlen = ENDSIZ(endbuf); cenoff = ENDOFF(endbuf); @@ -935,6 +933,7 @@ newEntry(jzfile *zip, jzcell *zc, AccessHint accessHint) ze->crc = CENCRC(cen); locoff = CENOFF(cen); ze->pos = -(zip->locpos + locoff); + ze->flag = CENFLG(cen); if ((ze->name = malloc(nlen + 1)) == NULL) goto Catch; memcpy(ze->name, cen + CENHDR, nlen); diff --git a/jdk/src/share/native/java/util/zip/zip_util.h b/jdk/src/share/native/java/util/zip/zip_util.h index 7ad11715e5a..311a9fcd9de 100644 --- a/jdk/src/share/native/java/util/zip/zip_util.h +++ b/jdk/src/share/native/java/util/zip/zip_util.h @@ -168,6 +168,7 @@ typedef struct jzentry { /* Zip file entry */ char *comment; /* optional zip file comment */ jbyte *extra; /* optional extra data */ jlong pos; /* position of LOC header or entry data */ + jint flag; /* general purpose flag */ } jzentry; /* diff --git a/jdk/test/java/util/zip/ZipCoding.java b/jdk/test/java/util/zip/ZipCoding.java new file mode 100644 index 00000000000..baedc449bfb --- /dev/null +++ b/jdk/test/java/util/zip/ZipCoding.java @@ -0,0 +1,133 @@ +/* + * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. + * 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. + * + * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +/** + * @test + * @bug 4244499 4532049 4700978 4820807 4980042 + * @summary Test ZipInputStream, ZipOutputStream and ZipFile with non-UTF8 encoding + */ + +import java.io.*; +import java.nio.charset.*; +import java.util.*; +import java.util.zip.*; + +public class ZipCoding { + + public static void main(String[] args) throws Exception { + + test("MS932", + "\u4e00\u4e01", "\uff67\uff68\uff69\uff6a\uff6b\uff6c"); + + test("ibm437", + "\u00e4\u00fc", "German Umlaut \u00fc in comment"); + + test("utf-8", + "\u4e00\u4e01", "\uff67\uff68\uff69\uff6a\uff6b\uff6c"); + + test("utf-8", + "\u00e4\u00fc", "German Umlaut \u00fc in comment"); + + test("utf-8", + "Surrogate\ud801\udc01", "Surrogates \ud800\udc00 in comment"); + + } + + static void testZipInputStream(InputStream is, Charset cs, + String name, String comment, byte[] bb) + throws Exception + { + ZipInputStream zis = new ZipInputStream(is, cs); + ZipEntry e = zis.getNextEntry(); + if (e == null || ! name.equals(e.getName())) + throw new RuntimeException("ZipIS name doesn't match!"); + byte[] bBuf = new byte[bb.length << 1]; + int n = zis.read(bBuf, 0, bBuf.length); + if (n != bb.length || + !Arrays.equals(bb, Arrays.copyOf(bBuf, n))) { + throw new RuntimeException("ZipIS content doesn't match!"); + } + zis.close(); + } + + static void testZipFile(File f, Charset cs, + String name, String comment, byte[] bb) + throws Exception + { + ZipFile zf = new ZipFile(f, cs); + Enumeration zes = zf.entries(); + ZipEntry e = (ZipEntry)zes.nextElement(); + if (! name.equals(e.getName()) || + ! comment.equals(e.getComment())) + throw new RuntimeException("ZipFile: name/comment doesn't match!"); + InputStream is = zf.getInputStream(e); + if (is == null) + throw new RuntimeException("ZipFile: getIS failed!"); + byte[] bBuf = new byte[bb.length << 1]; + int n = 0; + int nn =0; + while ((nn = is.read(bBuf, n, bBuf.length-n)) != -1) { + n += nn; + } + if (n != bb.length || + !Arrays.equals(bb, Arrays.copyOf(bBuf, n))) { + throw new RuntimeException("ZipFile content doesn't match!"); + } + zf.close(); + } + + static void test(String csn, String name, String comment) + throws Exception + { + byte[] bb = "This is the conent of the zipfile".getBytes("ISO-8859-1"); + Charset cs = Charset.forName(csn); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + ZipOutputStream zos = new ZipOutputStream(baos, cs); + + ZipEntry e = new ZipEntry(name); + e.setComment(comment); + zos.putNextEntry(e); + zos.write(bb, 0, bb.length); + zos.closeEntry(); + zos.close(); + ByteArrayInputStream bis = new ByteArrayInputStream(baos.toByteArray()); + testZipInputStream(bis, cs, name, comment, bb); + + if ("utf-8".equals(csn)) { + // EFS should be set + bis.reset(); + testZipInputStream(bis, Charset.forName("MS932"), name, comment, bb); + } + + File f = new File(new File(System.getProperty("test.dir", ".")), + "zfcoding.zip"); + FileOutputStream fos = new FileOutputStream(f); + baos.writeTo(fos); + fos.close(); + testZipFile(f, cs, name, comment, bb); + if ("utf-8".equals(csn)) { + testZipFile(f, Charset.forName("MS932"), name, comment, bb); + } + f.delete(); + } +} diff --git a/jdk/test/java/util/zip/zip.java b/jdk/test/java/util/zip/zip.java new file mode 100644 index 00000000000..33eccf9496d --- /dev/null +++ b/jdk/test/java/util/zip/zip.java @@ -0,0 +1,743 @@ +/* + * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. + * 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. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +import java.io.*; +import java.nio.charset.Charset; +import java.util.*; +import java.util.zip.*; +import java.text.MessageFormat; + +/** + * A stripped-down version of Jar tool with a "-encoding" option to + * support non-UTF8 encoidng for entry name and comment. + */ +public class zip { + String program; + PrintStream out, err; + String fname; + String zname = ""; + String[] files; + Charset cs = Charset.forName("UTF-8"); + + Map entryMap = new HashMap(); + Set entries = new LinkedHashSet(); + List paths = new ArrayList(); + + CRC32 crc32 = new CRC32(); + /* + * cflag: create + * uflag: update + * xflag: xtract + * tflag: table + * vflag: verbose + * flag0: no zip compression (store only) + */ + boolean cflag, uflag, xflag, tflag, vflag, flag0; + + private static ResourceBundle rsrc; + static { + try { + // just use the jar message + rsrc = ResourceBundle.getBundle("sun.tools.jar.resources.jar"); + } catch (MissingResourceException e) { + throw new Error("Fatal: Resource for jar is missing"); + } + } + + public zip(PrintStream out, PrintStream err, String program) { + this.out = out; + this.err = err; + this.program = program; + } + + private boolean ok; + + public synchronized boolean run(String args[]) { + ok = true; + if (!parseArgs(args)) { + return false; + } + try { + if (cflag || uflag) { + if (fname != null) { + zname = fname.replace(File.separatorChar, '/'); + if (zname.startsWith("./")) { + zname = zname.substring(2); + } + } + } + if (cflag) { + OutputStream out; + if (fname != null) { + out = new FileOutputStream(fname); + } else { + out = new FileOutputStream(FileDescriptor.out); + if (vflag) { + vflag = false; + } + } + expand(null, files, false); + create(new BufferedOutputStream(out, 4096)); + out.close(); + } else if (uflag) { + File inputFile = null, tmpFile = null; + FileInputStream in; + FileOutputStream out; + if (fname != null) { + inputFile = new File(fname); + String path = inputFile.getParent(); + tmpFile = File.createTempFile("tmp", null, + new File((path == null) ? "." : path)); + in = new FileInputStream(inputFile); + out = new FileOutputStream(tmpFile); + } else { + in = new FileInputStream(FileDescriptor.in); + out = new FileOutputStream(FileDescriptor.out); + vflag = false; + } + expand(null, files, true); + boolean updateOk = update(in, new BufferedOutputStream(out)); + if (ok) { + ok = updateOk; + } + in.close(); + out.close(); + if (fname != null) { + inputFile.delete(); + if (!tmpFile.renameTo(inputFile)) { + tmpFile.delete(); + throw new IOException(getMsg("error.write.file")); + } + tmpFile.delete(); + } + } else if (tflag) { + replaceFSC(files); + if (fname != null) { + list(fname, files); + } else { + InputStream in = new FileInputStream(FileDescriptor.in); + try{ + list(new BufferedInputStream(in), files); + } finally { + in.close(); + } + } + } else if (xflag) { + replaceFSC(files); + if (fname != null && files != null) { + extract(fname, files); + } else { + InputStream in = (fname == null) + ? new FileInputStream(FileDescriptor.in) + : new FileInputStream(fname); + try { + extract(new BufferedInputStream(in), files); + } finally { + in.close(); + } + } + } + } catch (IOException e) { + fatalError(e); + ok = false; + } catch (Error ee) { + ee.printStackTrace(); + ok = false; + } catch (Throwable t) { + t.printStackTrace(); + ok = false; + } + out.flush(); + err.flush(); + return ok; + } + + + boolean parseArgs(String args[]) { + try { + args = parse(args); + } catch (FileNotFoundException e) { + fatalError(formatMsg("error.cant.open", e.getMessage())); + return false; + } catch (IOException e) { + fatalError(e); + return false; + } + int count = 1; + try { + String flags = args[0]; + if (flags.startsWith("-")) { + flags = flags.substring(1); + } + for (int i = 0; i < flags.length(); i++) { + switch (flags.charAt(i)) { + case 'c': + if (xflag || tflag || uflag) { + usageError(); + return false; + } + cflag = true; + break; + case 'u': + if (cflag || xflag || tflag) { + usageError(); + return false; + } + uflag = true; + break; + case 'x': + if (cflag || uflag || tflag) { + usageError(); + return false; + } + xflag = true; + break; + case 't': + if (cflag || uflag || xflag) { + usageError(); + return false; + } + tflag = true; + break; + case 'v': + vflag = true; + break; + case 'f': + fname = args[count++]; + break; + case '0': + flag0 = true; + break; + default: + error(formatMsg("error.illegal.option", + String.valueOf(flags.charAt(i)))); + usageError(); + return false; + } + } + } catch (ArrayIndexOutOfBoundsException e) { + usageError(); + return false; + } + if (!cflag && !tflag && !xflag && !uflag) { + error(getMsg("error.bad.option")); + usageError(); + return false; + } + /* parse file arguments */ + int n = args.length - count; + if (n > 0) { + int k = 0; + String[] nameBuf = new String[n]; + try { + for (int i = count; i < args.length; i++) { + if (args[i].equals("-encoding")) { + cs = Charset.forName(args[++i]); + } else if (args[i].equals("-C")) { + /* change the directory */ + String dir = args[++i]; + dir = (dir.endsWith(File.separator) ? + dir : (dir + File.separator)); + dir = dir.replace(File.separatorChar, '/'); + while (dir.indexOf("//") > -1) { + dir = dir.replace("//", "/"); + } + paths.add(dir.replace(File.separatorChar, '/')); + nameBuf[k++] = dir + args[++i]; + } else { + nameBuf[k++] = args[i]; + } + } + } catch (ArrayIndexOutOfBoundsException e) { + e.printStackTrace(); + usageError(); + return false; + } + if (k != 0) { + files = new String[k]; + System.arraycopy(nameBuf, 0, files, 0, k); + } + } else if (cflag || uflag) { + error(getMsg("error.bad.uflag")); + usageError(); + return false; + } + return true; + } + + void expand(File dir, String[] files, boolean isUpdate) { + if (files == null) { + return; + } + for (int i = 0; i < files.length; i++) { + File f; + if (dir == null) { + f = new File(files[i]); + } else { + f = new File(dir, files[i]); + } + if (f.isFile()) { + if (entries.add(f)) { + if (isUpdate) + entryMap.put(entryName(f.getPath()), f); + } + } else if (f.isDirectory()) { + if (entries.add(f)) { + if (isUpdate) { + String dirPath = f.getPath(); + dirPath = (dirPath.endsWith(File.separator)) ? dirPath : + (dirPath + File.separator); + entryMap.put(entryName(dirPath), f); + } + expand(f, f.list(), isUpdate); + } + } else { + error(formatMsg("error.nosuch.fileordir", String.valueOf(f))); + ok = false; + } + } + } + + void create(OutputStream out) throws IOException + { + ZipOutputStream zos = new ZipOutputStream(out, cs); + if (flag0) { + zos.setMethod(ZipOutputStream.STORED); + } + for (File file: entries) { + addFile(zos, file); + } + zos.close(); + } + + boolean update(InputStream in, OutputStream out) throws IOException + { + ZipInputStream zis = new ZipInputStream(in, cs); + ZipOutputStream zos = new ZipOutputStream(out, cs); + ZipEntry e = null; + byte[] buf = new byte[1024]; + int n = 0; + boolean updateOk = true; + + // put the old entries first, replace if necessary + while ((e = zis.getNextEntry()) != null) { + String name = e.getName(); + if (!entryMap.containsKey(name)) { // copy the old stuff + // do our own compression + ZipEntry e2 = new ZipEntry(name); + e2.setMethod(e.getMethod()); + e2.setTime(e.getTime()); + e2.setComment(e.getComment()); + e2.setExtra(e.getExtra()); + if (e.getMethod() == ZipEntry.STORED) { + e2.setSize(e.getSize()); + e2.setCrc(e.getCrc()); + } + zos.putNextEntry(e2); + while ((n = zis.read(buf, 0, buf.length)) != -1) { + zos.write(buf, 0, n); + } + } else { // replace with the new files + File f = entryMap.get(name); + addFile(zos, f); + entryMap.remove(name); + entries.remove(f); + } + } + + // add the remaining new files + for (File f: entries) { + addFile(zos, f); + } + zis.close(); + zos.close(); + return updateOk; + } + + private String entryName(String name) { + name = name.replace(File.separatorChar, '/'); + String matchPath = ""; + for (String path : paths) { + if (name.startsWith(path) && (path.length() > matchPath.length())) { + matchPath = path; + } + } + name = name.substring(matchPath.length()); + + if (name.startsWith("/")) { + name = name.substring(1); + } else if (name.startsWith("./")) { + name = name.substring(2); + } + return name; + } + + void addFile(ZipOutputStream zos, File file) throws IOException { + String name = file.getPath(); + boolean isDir = file.isDirectory(); + if (isDir) { + name = name.endsWith(File.separator) ? name : + (name + File.separator); + } + name = entryName(name); + + if (name.equals("") || name.equals(".") || name.equals(zname)) { + return; + } + + long size = isDir ? 0 : file.length(); + + if (vflag) { + out.print(formatMsg("out.adding", name)); + } + ZipEntry e = new ZipEntry(name); + e.setTime(file.lastModified()); + if (size == 0) { + e.setMethod(ZipEntry.STORED); + e.setSize(0); + e.setCrc(0); + } else if (flag0) { + e.setSize(size); + e.setMethod(ZipEntry.STORED); + crc32File(e, file); + } + zos.putNextEntry(e); + if (!isDir) { + byte[] buf = new byte[8192]; + int len; + InputStream is = new BufferedInputStream(new FileInputStream(file)); + while ((len = is.read(buf, 0, buf.length)) != -1) { + zos.write(buf, 0, len); + } + is.close(); + } + zos.closeEntry(); + /* report how much compression occurred. */ + if (vflag) { + size = e.getSize(); + long csize = e.getCompressedSize(); + out.print(formatMsg2("out.size", String.valueOf(size), + String.valueOf(csize))); + if (e.getMethod() == ZipEntry.DEFLATED) { + long ratio = 0; + if (size != 0) { + ratio = ((size - csize) * 100) / size; + } + output(formatMsg("out.deflated", String.valueOf(ratio))); + } else { + output(getMsg("out.stored")); + } + } + } + + private void crc32File(ZipEntry e, File f) throws IOException { + InputStream is = new BufferedInputStream(new FileInputStream(f)); + byte[] buf = new byte[8192]; + crc32.reset(); + int r = 0; + int nread = 0; + long len = f.length(); + while ((r = is.read(buf)) != -1) { + nread += r; + crc32.update(buf, 0, r); + } + is.close(); + if (nread != (int) len) { + throw new ZipException(formatMsg( + "error.incorrect.length", f.getPath())); + } + e.setCrc(crc32.getValue()); + } + + void replaceFSC(String files[]) { + if (files != null) { + for (String file : files) { + file = file.replace(File.separatorChar, '/'); + } + } + } + + Set newDirSet() { + return new HashSet() { + public boolean add(ZipEntry e) { + return (e == null || super.add(e)); + }}; + } + + void updateLastModifiedTime(Set zes) throws IOException { + for (ZipEntry ze : zes) { + long lastModified = ze.getTime(); + if (lastModified != -1) { + File f = new File(ze.getName().replace('/', File.separatorChar)); + f.setLastModified(lastModified); + } + } + } + + void extract(InputStream in, String files[]) throws IOException { + ZipInputStream zis = new ZipInputStream(in, cs); + ZipEntry e; + Set dirs = newDirSet(); + while ((e = zis.getNextEntry()) != null) { + if (files == null) { + dirs.add(extractFile(zis, e)); + } else { + String name = e.getName(); + for (String file : files) { + if (name.startsWith(file)) { + dirs.add(extractFile(zis, e)); + break; + } + } + } + } + updateLastModifiedTime(dirs); + } + + void extract(String fname, String files[]) throws IOException { + ZipFile zf = new ZipFile(fname, cs); + Set dirs = newDirSet(); + Enumeration zes = zf.entries(); + while (zes.hasMoreElements()) { + ZipEntry e = zes.nextElement(); + InputStream is; + if (files == null) { + dirs.add(extractFile(zf.getInputStream(e), e)); + } else { + String name = e.getName(); + for (String file : files) { + if (name.startsWith(file)) { + dirs.add(extractFile(zf.getInputStream(e), e)); + break; + } + } + } + } + zf.close(); + updateLastModifiedTime(dirs); + } + + ZipEntry extractFile(InputStream is, ZipEntry e) throws IOException { + ZipEntry rc = null; + String name = e.getName(); + File f = new File(e.getName().replace('/', File.separatorChar)); + if (e.isDirectory()) { + if (f.exists()) { + if (!f.isDirectory()) { + throw new IOException(formatMsg("error.create.dir", + f.getPath())); + } + } else { + if (!f.mkdirs()) { + throw new IOException(formatMsg("error.create.dir", + f.getPath())); + } else { + rc = e; + } + } + if (vflag) { + output(formatMsg("out.create", name)); + } + } else { + if (f.getParent() != null) { + File d = new File(f.getParent()); + if (!d.exists() && !d.mkdirs() || !d.isDirectory()) { + throw new IOException(formatMsg( + "error.create.dir", d.getPath())); + } + } + OutputStream os = new FileOutputStream(f); + byte[] b = new byte[8192]; + int len; + try { + while ((len = is.read(b, 0, b.length)) != -1) { + os.write(b, 0, len); + } + } finally { + if (is instanceof ZipInputStream) + ((ZipInputStream)is).closeEntry(); + else + is.close(); + os.close(); + } + if (vflag) { + if (e.getMethod() == ZipEntry.DEFLATED) { + output(formatMsg("out.inflated", name)); + } else { + output(formatMsg("out.extracted", name)); + } + } + } + long lastModified = e.getTime(); + if (lastModified != -1) { + f.setLastModified(lastModified); + } + return rc; + } + + void list(InputStream in, String files[]) throws IOException { + ZipInputStream zis = new ZipInputStream(in, cs); + ZipEntry e; + while ((e = zis.getNextEntry()) != null) { + zis.closeEntry(); + printEntry(e, files); + } + } + + void list(String fname, String files[]) throws IOException { + ZipFile zf = new ZipFile(fname, cs); + Enumeration zes = zf.entries(); + while (zes.hasMoreElements()) { + printEntry(zes.nextElement(), files); + } + zf.close(); + } + + void printEntry(ZipEntry e, String[] files) throws IOException { + if (files == null) { + printEntry(e); + } else { + String name = e.getName(); + for (String file : files) { + if (name.startsWith(file)) { + printEntry(e); + return; + } + } + } + } + + void printEntry(ZipEntry e) throws IOException { + if (vflag) { + StringBuilder sb = new StringBuilder(); + String s = Long.toString(e.getSize()); + for (int i = 6 - s.length(); i > 0; --i) { + sb.append(' '); + } + sb.append(s).append(' ').append(new Date(e.getTime()).toString()); + sb.append(' ').append(e.getName()); + output(sb.toString()); + } else { + output(e.getName()); + } + } + + void usageError() { + error( + "Usage: zip {ctxu}[vf0] [zip-file] [-encoding encname][-C dir] files ...\n" + + "Options:\n" + + " -c create new archive\n" + + " -t list table of contents for archive\n" + + " -x extract named (or all) files from archive\n" + + " -u update existing archive\n" + + " -v generate verbose output on standard output\n" + + " -f specify archive file name\n" + + " -0 store only; use no ZIP compression\n" + + " -C change to the specified directory and include the following file\n" + + "If any file is a directory then it is processed recursively.\n"); + } + + void fatalError(Exception e) { + e.printStackTrace(); + } + + + void fatalError(String s) { + error(program + ": " + s); + } + + + protected void output(String s) { + out.println(s); + } + + protected void error(String s) { + err.println(s); + } + + private String getMsg(String key) { + try { + return (rsrc.getString(key)); + } catch (MissingResourceException e) { + throw new Error("Error in message file"); + } + } + + private String formatMsg(String key, String arg) { + String msg = getMsg(key); + String[] args = new String[1]; + args[0] = arg; + return MessageFormat.format(msg, (Object[]) args); + } + + private String formatMsg2(String key, String arg, String arg1) { + String msg = getMsg(key); + String[] args = new String[2]; + args[0] = arg; + args[1] = arg1; + return MessageFormat.format(msg, (Object[]) args); + } + + public static String[] parse(String[] args) throws IOException + { + ArrayList newArgs = new ArrayList(args.length); + for (int i = 0; i < args.length; i++) { + String arg = args[i]; + if (arg.length() > 1 && arg.charAt(0) == '@') { + arg = arg.substring(1); + if (arg.charAt(0) == '@') { + newArgs.add(arg); + } else { + loadCmdFile(arg, newArgs); + } + } else { + newArgs.add(arg); + } + } + return newArgs.toArray(new String[newArgs.size()]); + } + + private static void loadCmdFile(String name, List args) throws IOException + { + Reader r = new BufferedReader(new FileReader(name)); + StreamTokenizer st = new StreamTokenizer(r); + st.resetSyntax(); + st.wordChars(' ', 255); + st.whitespaceChars(0, ' '); + st.commentChar('#'); + st.quoteChar('"'); + st.quoteChar('\''); + while (st.nextToken() != st.TT_EOF) { + args.add(st.sval); + } + r.close(); + } + + public static void main(String args[]) { + zip z = new zip(System.out, System.err, "zip"); + System.exit(z.run(args) ? 0 : 1); + } +} + From 617835c850237062850adb4d7d6b1bb0dc0399df Mon Sep 17 00:00:00 2001 From: Tom Rodriguez Date: Thu, 16 Apr 2009 21:25:29 -0700 Subject: [PATCH 41/91] 6741757: minor ctw improvements Reviewed-by: kvn --- .../src/share/vm/classfile/classLoader.cpp | 67 ++++++++++++------- 1 file changed, 41 insertions(+), 26 deletions(-) diff --git a/hotspot/src/share/vm/classfile/classLoader.cpp b/hotspot/src/share/vm/classfile/classLoader.cpp index 2e93cd045c2..9e48c90a7e4 100644 --- a/hotspot/src/share/vm/classfile/classLoader.cpp +++ b/hotspot/src/share/vm/classfile/classLoader.cpp @@ -1217,31 +1217,34 @@ void ClassLoader::compile_the_world_in(char* name, Handle loader, TRAPS) { // valid class file. The class loader will check everything else. if (strchr(buffer, '.') == NULL) { _compile_the_world_counter++; - if (_compile_the_world_counter >= CompileTheWorldStartAt && _compile_the_world_counter <= CompileTheWorldStopAt) { - // Construct name without extension - symbolHandle sym = oopFactory::new_symbol_handle(buffer, CHECK); - // Use loader to load and initialize class - klassOop ik = SystemDictionary::resolve_or_null(sym, loader, Handle(), THREAD); - instanceKlassHandle k (THREAD, ik); - if (k.not_null() && !HAS_PENDING_EXCEPTION) { - k->initialize(THREAD); + if (_compile_the_world_counter > CompileTheWorldStopAt) return; + + // Construct name without extension + symbolHandle sym = oopFactory::new_symbol_handle(buffer, CHECK); + // Use loader to load and initialize class + klassOop ik = SystemDictionary::resolve_or_null(sym, loader, Handle(), THREAD); + instanceKlassHandle k (THREAD, ik); + if (k.not_null() && !HAS_PENDING_EXCEPTION) { + k->initialize(THREAD); + } + bool exception_occurred = HAS_PENDING_EXCEPTION; + CLEAR_PENDING_EXCEPTION; + if (CompileTheWorldPreloadClasses && k.not_null()) { + constantPoolKlass::preload_and_initialize_all_classes(k->constants(), THREAD); + if (HAS_PENDING_EXCEPTION) { + // If something went wrong in preloading we just ignore it + CLEAR_PENDING_EXCEPTION; + tty->print_cr("Preloading failed for (%d) %s", _compile_the_world_counter, buffer); } - bool exception_occurred = HAS_PENDING_EXCEPTION; - CLEAR_PENDING_EXCEPTION; + } + + if (_compile_the_world_counter >= CompileTheWorldStartAt) { if (k.is_null() || (exception_occurred && !CompileTheWorldIgnoreInitErrors)) { // If something went wrong (e.g. ExceptionInInitializerError) we skip this class tty->print_cr("CompileTheWorld (%d) : Skipping %s", _compile_the_world_counter, buffer); } else { tty->print_cr("CompileTheWorld (%d) : %s", _compile_the_world_counter, buffer); // Preload all classes to get around uncommon traps - if (CompileTheWorldPreloadClasses) { - constantPoolKlass::preload_and_initialize_all_classes(k->constants(), THREAD); - if (HAS_PENDING_EXCEPTION) { - // If something went wrong in preloading we just ignore it - CLEAR_PENDING_EXCEPTION; - tty->print_cr("Preloading failed for (%d) %s", _compile_the_world_counter, buffer); - } - } // Iterate over all methods in class for (int n = 0; n < k->methods()->length(); n++) { methodHandle m (THREAD, methodOop(k->methods()->obj_at(n))); @@ -1253,16 +1256,28 @@ void ClassLoader::compile_the_world_in(char* name, Handle loader, TRAPS) { CLEAR_PENDING_EXCEPTION; tty->print_cr("CompileTheWorld (%d) : Skipping method: %s", _compile_the_world_counter, m->name()->as_C_string()); } - if (TieredCompilation) { - // Clobber the first compile and force second tier compilation - m->clear_code(); - CompileBroker::compile_method(m, InvocationEntryBci, - methodHandle(), 0, "CTW", THREAD); - if (HAS_PENDING_EXCEPTION) { - CLEAR_PENDING_EXCEPTION; - tty->print_cr("CompileTheWorld (%d) : Skipping method: %s", _compile_the_world_counter, m->name()->as_C_string()); + if (TieredCompilation) { + // Clobber the first compile and force second tier compilation + nmethod* nm = m->code(); + if (nm != NULL) { + // Throw out the code so that the code cache doesn't fill up + nm->make_not_entrant(); + m->clear_code(); + } + CompileBroker::compile_method(m, InvocationEntryBci, + methodHandle(), 0, "CTW", THREAD); + if (HAS_PENDING_EXCEPTION) { + CLEAR_PENDING_EXCEPTION; + tty->print_cr("CompileTheWorld (%d) : Skipping method: %s", _compile_the_world_counter, m->name()->as_C_string()); + } } } + + nmethod* nm = m->code(); + if (nm != NULL) { + // Throw out the code so that the code cache doesn't fill up + nm->make_not_entrant(); + m->clear_code(); } } } From fd76ca6d808e06e8305a766ea8a91abf39d192f8 Mon Sep 17 00:00:00 2001 From: Artem Ananiev Date: Fri, 17 Apr 2009 12:46:24 +0400 Subject: [PATCH 42/91] 6829923: Test javax/swing/system/6799345/TestShutdown.java fails on X11 platforms XAWT toolkit thread is correctly interrupted when AppContext is disposed Reviewed-by: anthony, peterz --- jdk/src/solaris/classes/sun/awt/X11/XToolkit.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java b/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java index c3011dfa6a2..d969f0c4c1d 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java @@ -565,6 +565,17 @@ public final class XToolkit extends UNIXToolkit implements Runnable { { XEvent ev = new XEvent(); while(true) { + // Fix for 6829923: we should gracefully handle toolkit thread interruption + if (Thread.currentThread().isInterrupted()) { + // We expect interruption from the AppContext.dispose() method only. + // If the thread is interrupted from another place, let's skip it + // for compatibility reasons. Probably some time later we'll remove + // the check for AppContext.isDisposed() and will unconditionally + // break the loop here. + if (AppContext.getAppContext().isDisposed()) { + break; + } + } awtLock(); try { if (loop == SECONDARY_LOOP) { From a758339886ec17986d53874972d3a6765785cc0c Mon Sep 17 00:00:00 2001 From: Alex Menkov Date: Fri, 17 Apr 2009 15:02:46 +0400 Subject: [PATCH 43/91] 5050147: RFE: Add More Useful Constructors to MidiMessage Subclasses Reviewed-by: alexp --- .../classes/javax/sound/midi/MetaMessage.java | 23 ++++++ .../javax/sound/midi/ShortMessage.java | 77 +++++++++++++++++++ .../javax/sound/midi/SysexMessage.java | 48 ++++++++++++ 3 files changed, 148 insertions(+) diff --git a/jdk/src/share/classes/javax/sound/midi/MetaMessage.java b/jdk/src/share/classes/javax/sound/midi/MetaMessage.java index 7718f8caf38..8b27fa1f490 100644 --- a/jdk/src/share/classes/javax/sound/midi/MetaMessage.java +++ b/jdk/src/share/classes/javax/sound/midi/MetaMessage.java @@ -102,6 +102,29 @@ public class MetaMessage extends MidiMessage { this(defaultMessage); } + /** + * Constructs a new {@code MetaMessage} and sets the message parameters. + * The contents of the message can be changed by using + * the {@code setMessage} method. + * + * @param type meta-message type (must be less than 128) + * @param data the data bytes in the MIDI message + * @param length an amount of bytes in the {@code data} byte array; + * it should be non-negative and less than or equal to + * {@code data.length} + * @throws InvalidMidiDataException if the parameter values do not specify + * a valid MIDI meta message + * @see #setMessage(int, byte[], int) + * @see #getType() + * @see #getData() + * @since 1.7 + */ + public MetaMessage(int type, byte[] data, int length) + throws InvalidMidiDataException { + super(null); + setMessage(type, data, length); // can throw InvalidMidiDataException + } + /** * Constructs a new MetaMessage. diff --git a/jdk/src/share/classes/javax/sound/midi/ShortMessage.java b/jdk/src/share/classes/javax/sound/midi/ShortMessage.java index 716d7b0ef4f..2dddc3c7a85 100644 --- a/jdk/src/share/classes/javax/sound/midi/ShortMessage.java +++ b/jdk/src/share/classes/javax/sound/midi/ShortMessage.java @@ -187,6 +187,83 @@ public class ShortMessage extends MidiMessage { length = 3; } + /** + * Constructs a new {@code ShortMessage} which represents a MIDI + * message that takes no data bytes. + * The contents of the message can be changed by using one of + * the {@code setMessage} methods. + * + * @param status the MIDI status byte + * @throws InvalidMidiDataException if {@code status} does not specify + * a valid MIDI status byte for a message that requires no data bytes + * @see #setMessage(int) + * @see #setMessage(int, int, int) + * @see #setMessage(int, int, int, int) + * @see #getStatus() + * @since 1.7 + */ + public ShortMessage(int status) throws InvalidMidiDataException { + super(null); + setMessage(status); // can throw InvalidMidiDataException + } + + /** + * Constructs a new {@code ShortMessage} which represents a MIDI message + * that takes up to two data bytes. If the message only takes one data byte, + * the second data byte is ignored. If the message does not take + * any data bytes, both data bytes are ignored. + * The contents of the message can be changed by using one of + * the {@code setMessage} methods. + * + * @param status the MIDI status byte + * @param data1 the first data byte + * @param data2 the second data byte + * @throws InvalidMidiDataException if the status byte or all data bytes + * belonging to the message do not specify a valid MIDI message + * @see #setMessage(int) + * @see #setMessage(int, int, int) + * @see #setMessage(int, int, int, int) + * @see #getStatus() + * @see #getData1() + * @see #getData2() + * @since 1.7 + */ + public ShortMessage(int status, int data1, int data2) + throws InvalidMidiDataException { + super(null); + setMessage(status, data1, data2); // can throw InvalidMidiDataException + } + + /** + * Constructs a new {@code ShortMessage} which represents a channel + * MIDI message that takes up to two data bytes. If the message only takes + * one data byte, the second data byte is ignored. If the message does not + * take any data bytes, both data bytes are ignored. + * The contents of the message can be changed by using one of + * the {@code setMessage} methods. + * + * @param command the MIDI command represented by this message + * @param channel the channel associated with the message + * @param data1 the first data byte + * @param data2 the second data byte + * @throws InvalidMidiDataException if the command value, channel value + * or all data bytes belonging to the message do not specify + * a valid MIDI message + * @see #setMessage(int) + * @see #setMessage(int, int, int) + * @see #setMessage(int, int, int, int) + * @see #getCommand() + * @see #getChannel() + * @see #getData1() + * @see #getData2() + * @since 1.7 + */ + public ShortMessage(int command, int channel, int data1, int data2) + throws InvalidMidiDataException { + super(null); + setMessage(command, channel, data1, data2); + } + /** * Constructs a new ShortMessage. diff --git a/jdk/src/share/classes/javax/sound/midi/SysexMessage.java b/jdk/src/share/classes/javax/sound/midi/SysexMessage.java index a3833fffdbe..387d0660339 100644 --- a/jdk/src/share/classes/javax/sound/midi/SysexMessage.java +++ b/jdk/src/share/classes/javax/sound/midi/SysexMessage.java @@ -120,6 +120,54 @@ public class SysexMessage extends MidiMessage { data[1] = (byte) (ShortMessage.END_OF_EXCLUSIVE & 0xFF); } + /** + * Constructs a new {@code SysexMessage} and sets the data for + * the message. The first byte of the data array must be a valid system + * exclusive status byte (0xF0 or 0xF7). + * The contents of the message can be changed by using one of + * the {@code setMessage} methods. + * + * @param data the system exclusive message data including the status byte + * @param length the length of the valid message data in the array, + * including the status byte; it should be non-negative and less than + * or equal to {@code data.length} + * @throws InvalidMidiDataException if the parameter values + * do not specify a valid MIDI meta message. + * @see #setMessage(byte[], int) + * @see #setMessage(int, byte[], int) + * @see #getData() + * @since 1.7 + */ + public SysexMessage(byte[] data, int length) + throws InvalidMidiDataException { + super(null); + setMessage(data, length); + } + + /** + * Constructs a new {@code SysexMessage} and sets the data for the message. + * The contents of the message can be changed by using one of + * the {@code setMessage} methods. + * + * @param status the status byte for the message; it must be a valid system + * exclusive status byte (0xF0 or 0xF7) + * @param data the system exclusive message data (without the status byte) + * @param length the length of the valid message data in the array; + * it should be non-negative and less than or equal to + * {@code data.length} + * @throws InvalidMidiDataException if the parameter values + * do not specify a valid MIDI meta message. + * @see #setMessage(byte[], int) + * @see #setMessage(int, byte[], int) + * @see #getData() + * @since 1.7 + */ + public SysexMessage(int status, byte[] data, int length) + throws InvalidMidiDataException { + super(null); + setMessage(status, data, length); + } + /** * Constructs a new SysexMessage. From 8d4e786794cd7a9ecf8a12419e7910eef4693ce1 Mon Sep 17 00:00:00 2001 From: Alex Menkov Date: Fri, 17 Apr 2009 15:10:05 +0400 Subject: [PATCH 44/91] 4672194: FloatControl should provide consistent policy for the floats Reviewed-by: alexp --- .../javax/sound/sampled/FloatControl.java | 43 +++++++++++++++++-- 1 file changed, 39 insertions(+), 4 deletions(-) diff --git a/jdk/src/share/classes/javax/sound/sampled/FloatControl.java b/jdk/src/share/classes/javax/sound/sampled/FloatControl.java index 650ec4901c3..12a31402bc2 100644 --- a/jdk/src/share/classes/javax/sound/sampled/FloatControl.java +++ b/jdk/src/share/classes/javax/sound/sampled/FloatControl.java @@ -131,13 +131,31 @@ public abstract class FloatControl extends Control { * @param minLabel the label for the minimum value, such as "Left" or "Off" * @param midLabel the label for the midpoint value, such as "Center" or "Default" * @param maxLabel the label for the maximum value, such as "Right" or "Full" + * + * @throws IllegalArgumentException if {@code minimum} is greater + * than {@code maximum} or {@code initialValue} does not fall + * within the allowable range */ protected FloatControl(Type type, float minimum, float maximum, - float precision, int updatePeriod, float initialValue, - String units, String minLabel, String midLabel, String maxLabel) { + float precision, int updatePeriod, float initialValue, + String units, String minLabel, String midLabel, String maxLabel) { super(type); + if (minimum > maximum) { + throw new IllegalArgumentException("Minimum value " + minimum + + " exceeds maximum value " + maximum + "."); + } + if (initialValue < minimum) { + throw new IllegalArgumentException("Initial value " + initialValue + + " smaller than allowable minimum value " + minimum + "."); + } + if (initialValue > maximum) { + throw new IllegalArgumentException("Initial value " + initialValue + + " exceeds allowable maximum value " + maximum + "."); + } + + this.minimum = minimum; this.maximum = maximum; @@ -167,10 +185,15 @@ public abstract class FloatControl extends Control { * @param initialValue the value that the control starts with when constructed * @param units the label for the units in which the control's values are expressed, * such as "dB" or "frames per second" + * + * @throws IllegalArgumentException if {@code minimum} is greater + * than {@code maximum} or {@code initialValue} does not fall + * within the allowable range */ protected FloatControl(Type type, float minimum, float maximum, - float precision, int updatePeriod, float initialValue, String units) { - this(type, minimum, maximum, precision, updatePeriod, initialValue, units, "", "", ""); + float precision, int updatePeriod, float initialValue, String units) { + this(type, minimum, maximum, precision, updatePeriod, + initialValue, units, "", "", ""); } @@ -306,9 +329,21 @@ public abstract class FloatControl extends Control { * @param to final value after the shift * @param microseconds maximum duration of the shift in microseconds * + * @throws IllegalArgumentException if either {@code from} or {@code to} + * value does not fall within the allowable range + * * @see #getUpdatePeriod */ public void shift(float from, float to, int microseconds) { + // test "from" value, "to" value will be tested by setValue() + if (from < minimum) { + throw new IllegalArgumentException("Requested value " + from + + " smaller than allowable minimum value " + minimum + "."); + } + if (from > maximum) { + throw new IllegalArgumentException("Requested value " + from + + " exceeds allowable maximum value " + maximum + "."); + } setValue(to); } From d15fceaa77688bb8c8a7708d4aa483c6fa7a6232 Mon Sep 17 00:00:00 2001 From: Alex Menkov Date: Fri, 17 Apr 2009 15:11:43 +0400 Subject: [PATCH 45/91] 4895403: SPEC: documentation of javax.sound.sampled.spi.MixerProvider should be detailed Reviewed-by: malenkov --- .../sound/sampled/spi/MixerProvider.java | 31 ++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/jdk/src/share/classes/javax/sound/sampled/spi/MixerProvider.java b/jdk/src/share/classes/javax/sound/sampled/spi/MixerProvider.java index d5c161ea34d..c79bb1114a6 100644 --- a/jdk/src/share/classes/javax/sound/sampled/spi/MixerProvider.java +++ b/jdk/src/share/classes/javax/sound/sampled/spi/MixerProvider.java @@ -42,9 +42,15 @@ public abstract class MixerProvider { /** * Indicates whether the mixer provider supports the mixer represented by * the specified mixer info object. + *

    + * The full set of mixer info objects that represent the mixers supported + * by this {@code MixerProvider} may be obtained + * through the {@code getMixerInfo} method. + * * @param info an info object that describes the mixer for which support is queried - * @return true if the specified mixer is supported, - * otherwise false + * @return {@code true} if the specified mixer is supported, + * otherwise {@code false} + * @see #getMixerInfo() */ public boolean isMixerSupported(Mixer.Info info) { @@ -62,17 +68,34 @@ public abstract class MixerProvider { /** * Obtains the set of info objects representing the mixer * or mixers provided by this MixerProvider. - * @return set of mixer info objects + *

    + * The {@code isMixerSupported} method returns {@code true} + * for all the info objects returned by this method. + * The corresponding mixer instances for the info objects + * are returned by the {@code getMixer} method. + * + * @return a set of mixer info objects + * @see #getMixer(javax.sound.sampled.Mixer.Info) getMixer(Mixer.Info) + * @see #isMixerSupported(javax.sound.sampled.Mixer.Info) isMixerSupported(Mixer.Info) */ public abstract Mixer.Info[] getMixerInfo(); /** * Obtains an instance of the mixer represented by the info object. + *

    + * The full set of the mixer info objects that represent the mixers + * supported by this {@code MixerProvider} may be obtained + * through the {@code getMixerInfo} method. + * Use the {@code isMixerSupported} method to test whether + * this {@code MixerProvider} supports a particular mixer. + * * @param info an info object that describes the desired mixer * @return mixer instance * @throws IllegalArgumentException if the info object specified does not - * match the info object for a mixer supported by this MixerProvider. + * match the info object for a mixer supported by this MixerProvider. + * @see #getMixerInfo() + * @see #isMixerSupported(javax.sound.sampled.Mixer.Info) isMixerSupported(Mixer.Info) */ public abstract Mixer getMixer(Mixer.Info info); } From 9a0763bf6bf4ab2bdb6ef95a74241b086b64d0f7 Mon Sep 17 00:00:00 2001 From: Alex Menkov Date: Fri, 17 Apr 2009 15:15:20 +0400 Subject: [PATCH 46/91] 6806019: 38 JCK api/javax_sound/midi/ tests fails starting from jdk7 b46 Reviewed-by: kalli --- .../com/sun/media/sound/SoftSynthesizer.java | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java b/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java index 3f6c12fc765..ab46b2dc9a9 100644 --- a/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java +++ b/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java @@ -889,9 +889,12 @@ public class SoftSynthesizer implements AudioSynthesizer, return; } synchronized (control_mutex) { + Throwable causeException = null; try { - if (line != null) + if (line != null) { + // can throw IllegalArgumentException setFormat(line.getFormat()); + } AudioInputStream ais = openStream(getFormat(), info); @@ -900,10 +903,13 @@ public class SoftSynthesizer implements AudioSynthesizer, if (line == null) { - if(testline != null) + if (testline != null) { line = testline; - else + } else { + // can throw LineUnavailableException, + // IllegalArgumentException, SecurityException line = AudioSystem.getSourceDataLine(getFormat()); + } } double latency = this.latency; @@ -911,6 +917,8 @@ public class SoftSynthesizer implements AudioSynthesizer, if (!line.isOpen()) { int bufferSize = getFormat().getFrameSize() * (int)(getFormat().getFrameRate() * (latency/1000000f)); + // can throw LineUnavailableException, + // IllegalArgumentException, SecurityException line.open(getFormat(), bufferSize); // Remember that we opened that line @@ -954,13 +962,22 @@ public class SoftSynthesizer implements AudioSynthesizer, weakstream.sourceDataLine = sourceDataLine; } - - } catch (LineUnavailableException e) { + causeException = e; + } catch (IllegalArgumentException e) { + causeException = e; + } catch (SecurityException e) { + causeException = e; + } + + if (causeException != null) { if (isOpen()) close(); // am: need MidiUnavailableException(Throwable) ctor! - throw new MidiUnavailableException(e.toString()); + MidiUnavailableException ex = new MidiUnavailableException( + "Can not open line"); + ex.initCause(causeException); + throw ex; } } From b136abc34404c4df35c28e610ea7ed02c2eb8de3 Mon Sep 17 00:00:00 2001 From: Karl Helgason Date: Fri, 17 Apr 2009 16:13:43 +0400 Subject: [PATCH 47/91] 6821030: Merge OpenJDK Gervill with upstream sources, Q1CY2009 Reviewed-by: darcy, amenkov --- .../com/sun/media/sound/SoftAudioPusher.java | 1 + .../com/sun/media/sound/SoftChannel.java | 17 ++++ .../com/sun/media/sound/SoftChorus.java | 32 +++--- .../com/sun/media/sound/SoftFilter.java | 18 ++-- .../sun/media/sound/SoftJitterCorrector.java | 1 + .../com/sun/media/sound/SoftMainMixer.java | 59 +++++++++-- .../com/sun/media/sound/SoftVoice.java | 20 +++- .../Gervill/SoftChannel/NoteOverFlowTest.java | 73 ++++++++++++++ .../Gervill/SoftFilter/TestProcessAudio.java | 99 +++++++++++++++++++ 9 files changed, 283 insertions(+), 37 deletions(-) create mode 100644 jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest.java create mode 100644 jdk/test/javax/sound/midi/Gervill/SoftFilter/TestProcessAudio.java diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftAudioPusher.java b/jdk/src/share/classes/com/sun/media/sound/SoftAudioPusher.java index d19ff412bd8..43773347a41 100644 --- a/jdk/src/share/classes/com/sun/media/sound/SoftAudioPusher.java +++ b/jdk/src/share/classes/com/sun/media/sound/SoftAudioPusher.java @@ -54,6 +54,7 @@ public class SoftAudioPusher implements Runnable { return; active = true; audiothread = new Thread(this); + audiothread.setDaemon(true); audiothread.setPriority(Thread.MAX_PRIORITY); audiothread.start(); } diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java b/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java index 8bb5f2ef66a..57bb3b85dc9 100644 --- a/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java +++ b/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java @@ -67,6 +67,7 @@ public class SoftChannel implements MidiChannel, ModelDirectedPlayer { dontResetControls[77] = true; // Sound Controller 8 (GM2 default: Vibrato Depth) dontResetControls[78] = true; // Sound Controller 9 (GM2 default: Vibrato Delay) dontResetControls[79] = true; // Sound Controller 10 (GM2 default: Undefined) + dontResetControls[84] = true; // Portamento Controller dontResetControls[120] = true; // All Sound Off dontResetControls[121] = true; // Reset All Controllers dontResetControls[122] = true; // Local Control On/Off @@ -556,6 +557,18 @@ public class SoftChannel implements MidiChannel, ModelDirectedPlayer { && voices[i].releaseTriggered == false) { voices[i].noteOff(velocity); } + // We must also check stolen voices + if (voices[i].stealer_channel == this && voices[i].stealer_noteNumber == noteNumber) { + SoftVoice v = voices[i]; + v.stealer_releaseTriggered = false; + v.stealer_channel = null; + v.stealer_performer = null; + v.stealer_voiceID = -1; + v.stealer_noteNumber = 0; + v.stealer_velocity = 0; + v.stealer_extendedConnectionBlocks = null; + v.stealer_channelmixer = null; + } } // Try play back note-off triggered voices, @@ -1385,6 +1398,10 @@ public class SoftChannel implements MidiChannel, ModelDirectedPlayer { controlChange(i, 0); } + // Portamento Controller (0x54) has to reset + // to -1 which mean that Portamento Controller is off + portamento_control_note = -1; + controlChange(71, 64); // Filter Resonance controlChange(72, 64); // Release Time controlChange(73, 64); // Attack Time diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftChorus.java b/jdk/src/share/classes/com/sun/media/sound/SoftChorus.java index 0a9f6443950..59778cdbb1e 100644 --- a/jdk/src/share/classes/com/sun/media/sound/SoftChorus.java +++ b/jdk/src/share/classes/com/sun/media/sound/SoftChorus.java @@ -38,11 +38,11 @@ public class SoftChorus implements SoftAudioProcessor { private float[] delaybuffer; private int rovepos = 0; - private volatile float gain = 1; - private volatile float rgain = 0; - private volatile float delay = 0; + private float gain = 1; + private float rgain = 0; + private float delay = 0; private float lastdelay = 0; - private volatile float feedback = 0; + private float feedback = 0; public VariableDelay(int maxbuffersize) { delaybuffer = new float[maxbuffersize]; @@ -115,10 +115,8 @@ public class SoftChorus implements SoftAudioProcessor { private static class LFODelay { - private volatile double c_cos_delta; - private volatile double c_sin_delta; - private double c_cos = 1; - private double c_sin = 0; + private double phase = 1; + private double phase_step = 0; private double depth = 0; private VariableDelay vdelay; private double samplerate; @@ -139,13 +137,11 @@ public class SoftChorus implements SoftAudioProcessor { public void setRate(double rate) { double g = (Math.PI * 2) * (rate / controlrate); - c_cos_delta = Math.cos(g); - c_sin_delta = Math.sin(g); + phase_step = g; } public void setPhase(double phase) { - c_cos = Math.cos(phase); - c_sin = Math.sin(phase); + this.phase = phase; } public void setFeedBack(float feedback) { @@ -161,16 +157,16 @@ public class SoftChorus implements SoftAudioProcessor { } public void processMix(float[] in, float[] out, float[] rout) { - c_cos = c_cos * c_cos_delta - c_sin * c_sin_delta; - c_sin = c_cos * c_sin_delta + c_sin * c_cos_delta; - vdelay.setDelay((float) (depth * 0.5 * (c_cos + 2))); + phase += phase_step; + while(phase > (Math.PI * 2)) phase -= (Math.PI * 2); + vdelay.setDelay((float) (depth * 0.5 * (Math.cos(phase) + 2))); vdelay.processMix(in, out, rout); } public void processReplace(float[] in, float[] out, float[] rout) { - c_cos = c_cos * c_cos_delta - c_sin * c_sin_delta; - c_sin = c_cos * c_sin_delta + c_sin * c_cos_delta; - vdelay.setDelay((float) (depth * 0.5 * (c_cos + 2))); + phase += phase_step; + while(phase > (Math.PI * 2)) phase -= (Math.PI * 2); + vdelay.setDelay((float) (depth * 0.5 * (Math.cos(phase) + 2))); vdelay.processReplace(in, out, rout); } diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java b/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java index 0468f15bec0..c7ed4872b8b 100644 --- a/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java +++ b/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java @@ -543,8 +543,6 @@ public class SoftFilter { public void filter1(SoftAudioBuffer sbuffer) { - float[] buffer = sbuffer.array(); - if (dirty) { filter1calc(); dirty = false; @@ -559,6 +557,7 @@ public class SoftFilter { if (wet > 0 || last_wet > 0) { + float[] buffer = sbuffer.array(); int len = buffer.length; float a0 = this.last_a0; float q = this.last_q; @@ -577,14 +576,16 @@ public class SoftFilter { q += q_delta; gain += gain_delta; wet += wet_delta; - y1 = (1 - q * a0) * y1 - (a0) * y2 + (a0) * buffer[i]; - y2 = (1 - q * a0) * y2 + (a0) * y1; + float ga0 = (1 - q * a0); + y1 = ga0 * y1 + (a0) * (buffer[i] - y2); + y2 = ga0 * y2 + (a0) * y1; buffer[i] = y2 * gain * wet + buffer[i] * (1 - wet); } } else if (a0_delta == 0 && q_delta == 0) { + float ga0 = (1 - q * a0); for (int i = 0; i < len; i++) { - y1 = (1 - q * a0) * y1 - (a0) * y2 + (a0) * buffer[i]; - y2 = (1 - q * a0) * y2 + (a0) * y1; + y1 = ga0 * y1 + (a0) * (buffer[i] - y2); + y2 = ga0 * y2 + (a0) * y1; buffer[i] = y2 * gain; } } else { @@ -592,8 +593,9 @@ public class SoftFilter { a0 += a0_delta; q += q_delta; gain += gain_delta; - y1 = (1 - q * a0) * y1 - (a0) * y2 + (a0) * buffer[i]; - y2 = (1 - q * a0) * y2 + (a0) * y1; + float ga0 = (1 - q * a0); + y1 = ga0 * y1 + (a0) * (buffer[i] - y2); + y2 = ga0 * y2 + (a0) * y1; buffer[i] = y2 * gain; } } diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java b/jdk/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java index 98d205b6deb..b647ba77908 100644 --- a/jdk/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java +++ b/jdk/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java @@ -216,6 +216,7 @@ public class SoftJitterCorrector extends AudioInputStream { }; thread = new Thread(runnable); + thread.setDaemon(true); thread.setPriority(Thread.MAX_PRIORITY); thread.start(); } diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java b/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java index 1f38058b052..b62d1d480af 100644 --- a/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java +++ b/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java @@ -48,16 +48,18 @@ public class SoftMainMixer { public final static int CHANNEL_LEFT = 0; public final static int CHANNEL_RIGHT = 1; - public final static int CHANNEL_EFFECT1 = 2; - public final static int CHANNEL_EFFECT2 = 3; - public final static int CHANNEL_EFFECT3 = 4; - public final static int CHANNEL_EFFECT4 = 5; + public final static int CHANNEL_MONO = 2; + public final static int CHANNEL_EFFECT1 = 3; + public final static int CHANNEL_EFFECT2 = 4; + public final static int CHANNEL_EFFECT3 = 5; + public final static int CHANNEL_EFFECT4 = 6; public final static int CHANNEL_LEFT_DRY = 10; public final static int CHANNEL_RIGHT_DRY = 11; public final static int CHANNEL_SCRATCH1 = 12; public final static int CHANNEL_SCRATCH2 = 13; public final static int CHANNEL_CHANNELMIXER_LEFT = 14; public final static int CHANNEL_CHANNELMIXER_RIGHT = 15; + public final static int CHANNEL_CHANNELMIXER_MONO = 16; protected boolean active_sensing_on = false; private long msec_last_activity = -1; private boolean pusher_silent = false; @@ -485,8 +487,10 @@ public class SoftMainMixer { // to channelmixer left,right input/output SoftAudioBuffer leftbak = buffers[CHANNEL_LEFT]; SoftAudioBuffer rightbak = buffers[CHANNEL_RIGHT]; + SoftAudioBuffer monobak = buffers[CHANNEL_MONO]; buffers[CHANNEL_LEFT] = buffers[CHANNEL_CHANNELMIXER_LEFT]; - buffers[CHANNEL_RIGHT] = buffers[CHANNEL_CHANNELMIXER_LEFT]; + buffers[CHANNEL_RIGHT] = buffers[CHANNEL_CHANNELMIXER_RIGHT]; + buffers[CHANNEL_MONO] = buffers[CHANNEL_CHANNELMIXER_MONO]; int bufferlen = buffers[CHANNEL_LEFT].getSize(); @@ -503,6 +507,7 @@ public class SoftMainMixer { for (ModelChannelMixer cmixer : act_registeredMixers) { for (int i = 0; i < cbuffer.length; i++) Arrays.fill(cbuffer[i], 0); + buffers[CHANNEL_MONO].clear(); boolean hasactivevoices = false; for (int i = 0; i < voicestatus.length; i++) if (voicestatus[i].active) @@ -517,6 +522,26 @@ public class SoftMainMixer { } } + if(!buffers[CHANNEL_MONO].isSilent()) + { + float[] mono = buffers[CHANNEL_MONO].array(); + float[] left = buffers[CHANNEL_LEFT].array(); + if (nrofchannels != 1) { + float[] right = buffers[CHANNEL_RIGHT].array(); + for (int i = 0; i < bufferlen; i++) { + float v = mono[i]; + left[i] += v; + right[i] += v; + } + } + else + { + for (int i = 0; i < bufferlen; i++) { + left[i] += mono[i]; + } + } + } + for (int i = 0; i < cbuffer.length; i++) { float[] cbuff = cbuffer[i]; float[] obuff = obuffer[i]; @@ -539,6 +564,7 @@ public class SoftMainMixer { buffers[CHANNEL_LEFT] = leftbak; buffers[CHANNEL_RIGHT] = rightbak; + buffers[CHANNEL_MONO] = monobak; } @@ -547,6 +573,27 @@ public class SoftMainMixer { if (voicestatus[i].channelmixer == null) voicestatus[i].processAudioLogic(buffers); + if(!buffers[CHANNEL_MONO].isSilent()) + { + float[] mono = buffers[CHANNEL_MONO].array(); + float[] left = buffers[CHANNEL_LEFT].array(); + int bufferlen = buffers[CHANNEL_LEFT].getSize(); + if (nrofchannels != 1) { + float[] right = buffers[CHANNEL_RIGHT].array(); + for (int i = 0; i < bufferlen; i++) { + float v = mono[i]; + left[i] += v; + right[i] += v; + } + } + else + { + for (int i = 0; i < bufferlen; i++) { + left[i] += mono[i]; + } + } + } + // Run effects if (synth.chorus_on) chorus.processAudio(); @@ -665,7 +712,7 @@ public class SoftMainMixer { / synth.getControlRate()); control_mutex = synth.control_mutex; - buffers = new SoftAudioBuffer[16]; + buffers = new SoftAudioBuffer[17]; for (int i = 0; i < buffers.length; i++) { buffers[i] = new SoftAudioBuffer(buffersize, synth.getFormat()); } diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java b/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java index 49662b78706..cec2e3047ac 100644 --- a/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java +++ b/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java @@ -782,6 +782,7 @@ public class SoftVoice extends VoiceStatus { SoftAudioBuffer left = buffer[SoftMainMixer.CHANNEL_LEFT]; SoftAudioBuffer right = buffer[SoftMainMixer.CHANNEL_RIGHT]; + SoftAudioBuffer mono = buffer[SoftMainMixer.CHANNEL_MONO]; SoftAudioBuffer eff1 = buffer[SoftMainMixer.CHANNEL_EFFECT1]; SoftAudioBuffer eff2 = buffer[SoftMainMixer.CHANNEL_EFFECT2]; SoftAudioBuffer leftdry = buffer[SoftMainMixer.CHANNEL_LEFT_DRY]; @@ -803,13 +804,22 @@ public class SoftVoice extends VoiceStatus { mixAudioStream(rightdry, left, last_out_mixer_left, out_mixer_left); } else { - mixAudioStream(leftdry, left, last_out_mixer_left, out_mixer_left); - if (rightdry != null) - mixAudioStream(rightdry, right, last_out_mixer_right, - out_mixer_right); + if(rightdry == null && + last_out_mixer_left == last_out_mixer_right && + out_mixer_left == out_mixer_right) + { + mixAudioStream(leftdry, mono, last_out_mixer_left, out_mixer_left); + } else - mixAudioStream(leftdry, right, last_out_mixer_right, + { + mixAudioStream(leftdry, left, last_out_mixer_left, out_mixer_left); + if (rightdry != null) + mixAudioStream(rightdry, right, last_out_mixer_right, out_mixer_right); + else + mixAudioStream(leftdry, right, last_out_mixer_right, + out_mixer_right); + } } if (rightdry == null) { diff --git a/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest.java b/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest.java new file mode 100644 index 00000000000..fdb33571b4d --- /dev/null +++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest.java @@ -0,0 +1,73 @@ +/* + * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved. + * 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. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +/* @test + @summary Test SoftChannel noteOn/noteOff overflow test */ + +import javax.sound.midi.MidiChannel; +import javax.sound.midi.VoiceStatus; +import javax.sound.sampled.AudioFormat; +import javax.sound.sampled.AudioInputStream; + +import com.sun.media.sound.AudioSynthesizer; +import com.sun.media.sound.SoftSynthesizer; + +public class NoteOverFlowTest { + + public static void main(String[] args) throws Exception + { + AudioSynthesizer synth = new SoftSynthesizer(); + AudioFormat format = new AudioFormat(44100, 16, 2, true, false); + AudioInputStream stream = synth.openStream(format, null); + + // Make all voices busy, e.g. + // send midi on and midi off on all available voices + MidiChannel ch1 = synth.getChannels()[0]; + ch1.programChange(48); // Use contionus instrument like string ensemble + for (int i = 0; i < synth.getMaxPolyphony(); i++) { + ch1.noteOn(64, 64); + ch1.noteOff(64); + } + + // Now send single midi on, and midi off message + ch1.noteOn(64, 64); + ch1.noteOff(64); + + // Read 10 sec from stream, by this time all voices should be inactvie + stream.skip(format.getFrameSize() * ((int)(format.getFrameRate() * 20))); + + // If no voice are active, then this test will pass + VoiceStatus[] v = synth.getVoiceStatus(); + for (int i = 0; i < v.length; i++) { + if(v[i].active) + { + throw new RuntimeException("Not all voices are inactive!"); + } + } + + // Close the synthesizer after use + synth.close(); + } +} diff --git a/jdk/test/javax/sound/midi/Gervill/SoftFilter/TestProcessAudio.java b/jdk/test/javax/sound/midi/Gervill/SoftFilter/TestProcessAudio.java new file mode 100644 index 00000000000..032f66762c0 --- /dev/null +++ b/jdk/test/javax/sound/midi/Gervill/SoftFilter/TestProcessAudio.java @@ -0,0 +1,99 @@ +/* + * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. + * 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. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +/* @test + @summary Test SoftFilter processAudio method */ + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.Random; + +import javax.sound.sampled.*; + +import com.sun.media.sound.*; + +public class TestProcessAudio { + + public static void main(String[] args) throws Exception { + AudioFormat format = new AudioFormat(44100, 16, 2, true, false); + SoftAudioBuffer sbuffer = new SoftAudioBuffer(3600, format); + SoftFilter filter = new SoftFilter(format.getSampleRate()); + Random random = new Random(42); + + + for (int t = 0; t <= 6; t++) + { + if(t == 0) filter.setFilterType(SoftFilter.FILTERTYPE_BP12); + if(t == 1) filter.setFilterType(SoftFilter.FILTERTYPE_HP12); + if(t == 2) filter.setFilterType(SoftFilter.FILTERTYPE_HP24); + if(t == 3) filter.setFilterType(SoftFilter.FILTERTYPE_LP12); + if(t == 4) filter.setFilterType(SoftFilter.FILTERTYPE_LP24); + if(t == 5) filter.setFilterType(SoftFilter.FILTERTYPE_LP6); + if(t == 6) filter.setFilterType(SoftFilter.FILTERTYPE_NP12); + + + // Try first by reseting always + for (int f = 1200; f < 3600; f+=100) + for (int r = 0; r <= 30; r+=5) { + filter.reset(); + filter.setResonance(r); + filter.setFrequency(f); + float[] data = sbuffer.array(); + int len = sbuffer.getSize(); + for (int i = 0; i < len; i++) + data[i] = random.nextFloat() - 0.5f; + filter.processAudio(sbuffer); + } + + // Now we skip reseting + // to test how changing frequency and resonance + // affect active filter + for (int f = 100; f < 12800; f+=1200) + for (int r = 0; r <= 30; r+=5) { + filter.setResonance(r); + filter.setFrequency(f); + float[] data = sbuffer.array(); + int len = sbuffer.getSize(); + for (int i = 0; i < len; i++) + data[i] = random.nextFloat() - 0.5f; + filter.processAudio(sbuffer); + } + for (int f = 12800; f >= 100; f-=1200) + for (int r = 30; r >= 0; r-=5) { + filter.setResonance(r); + filter.setFrequency(f); + float[] data = sbuffer.array(); + int len = sbuffer.getSize(); + for (int i = 0; i < len; i++) + data[i] = random.nextFloat() - 0.5f; + filter.processAudio(sbuffer); + } + filter.reset(); + } + + } + +} From e06ad08fd438f6070be2c0bf4e69a9178db67863 Mon Sep 17 00:00:00 2001 From: Anthony Petrov Date: Fri, 17 Apr 2009 16:16:14 +0400 Subject: [PATCH 48/91] 6826104: Getting a NullPointer exception when clicked on Application & Toolkit Modal dialog The addition of window peers to the windows collection has been restored in XWindowPeer. Reviewed-by: art, dcherepanov --- jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java b/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java index 41807dbf047..d3fb2107281 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java @@ -146,6 +146,13 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, params.put(OVERRIDE_REDIRECT, Boolean.valueOf(isOverrideRedirect())); + SunToolkit.awtLock(); + try { + windows.add(this); + } finally { + SunToolkit.awtUnlock(); + } + cachedFocusableWindow = isFocusableWindow(); Font f = target.getFont(); From 2f6783dce500f4962e19911eda018cb4f26e09bd Mon Sep 17 00:00:00 2001 From: Karl Helgason Date: Fri, 17 Apr 2009 16:20:50 +0400 Subject: [PATCH 49/91] 6823445: Gervill SoftChannel/ResetAllControllers jtreg test fails after portamento fix from last merge Reviewed-by: amenkov --- .../com/sun/media/sound/SoftChannel.java | 23 ++++++------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java b/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java index 57bb3b85dc9..96a575f2c8e 100644 --- a/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java +++ b/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java @@ -67,7 +67,6 @@ public class SoftChannel implements MidiChannel, ModelDirectedPlayer { dontResetControls[77] = true; // Sound Controller 8 (GM2 default: Vibrato Depth) dontResetControls[78] = true; // Sound Controller 9 (GM2 default: Vibrato Delay) dontResetControls[79] = true; // Sound Controller 10 (GM2 default: Undefined) - dontResetControls[84] = true; // Portamento Controller dontResetControls[120] = true; // All Sound Off dontResetControls[121] = true; // Reset All Controllers dontResetControls[122] = true; // Local Control On/Off @@ -94,7 +93,6 @@ public class SoftChannel implements MidiChannel, ModelDirectedPlayer { protected double portamento_time = 1; // keyschanges per control buffer time protected int[] portamento_lastnote = new int[128]; protected int portamento_lastnote_ix = 0; - private int portamento_control_note = -1; private boolean portamento = false; private boolean mono = false; private boolean mute = false; @@ -370,12 +368,12 @@ public class SoftChannel implements MidiChannel, ModelDirectedPlayer { voice.setSoloMute(solomute); if (releaseTriggered) return; - if (portamento_control_note != -1) { + if (controller[84] != 0) { voice.co_noteon_keynumber[0] - = (tuning.getTuning(portamento_control_note) / 100.0) + = (tuning.getTuning(controller[84]) / 100.0) * (1f / 128f); voice.portamento = true; - portamento_control_note = -1; + controlChange(84, 0); } else if (portamento) { if (mono) { if (portamento_lastnote[0] != -1) { @@ -383,7 +381,7 @@ public class SoftChannel implements MidiChannel, ModelDirectedPlayer { = (tuning.getTuning(portamento_lastnote[0]) / 100.0) * (1f / 128f); voice.portamento = true; - portamento_control_note = -1; + controlChange(84, 0); } portamento_lastnote[0] = noteNumber; } else { @@ -450,19 +448,19 @@ public class SoftChannel implements MidiChannel, ModelDirectedPlayer { } } - if (portamento_control_note != -1) { + if (controller[84] != 0) { boolean n_found = false; for (int i = 0; i < voices.length; i++) { if (voices[i].on && voices[i].channel == channel && voices[i].active - && voices[i].note == portamento_control_note + && voices[i].note == controller[84] && voices[i].releaseTriggered == false) { voices[i].portamento = true; voices[i].setNote(noteNumber); n_found = true; } } - portamento_control_note = -1; + controlChange(84, 0); if (n_found) return; } @@ -1154,9 +1152,6 @@ public class SoftChannel implements MidiChannel, ModelDirectedPlayer { } } break; - case 84: - portamento_control_note = value; - break; case 98: nrpn_control = (nrpn_control & (127 << 7)) + value; rpn_control = RPN_NULL_VALUE; @@ -1398,10 +1393,6 @@ public class SoftChannel implements MidiChannel, ModelDirectedPlayer { controlChange(i, 0); } - // Portamento Controller (0x54) has to reset - // to -1 which mean that Portamento Controller is off - portamento_control_note = -1; - controlChange(71, 64); // Filter Resonance controlChange(72, 64); // Release Time controlChange(73, 64); // Attack Time From b426a72177f8b09d6549ca8f3475b8dc0b17f778 Mon Sep 17 00:00:00 2001 From: Karl Helgason Date: Fri, 17 Apr 2009 16:28:02 +0400 Subject: [PATCH 50/91] 6823446: Gervill SoftLowFrequencyOscillator fails when freq is set to 0 cent or 8.1758 Hz Reviewed-by: amenkov --- .../sound/SoftLowFrequencyOscillator.java | 10 +- .../TestProcessControlLogic.java | 106 ++++++++++++++++++ 2 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 jdk/test/javax/sound/midi/Gervill/SoftLowFrequencyOscillator/TestProcessControlLogic.java diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java b/jdk/src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java index adfe9e08de3..5e2ea0b4999 100644 --- a/jdk/src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java +++ b/jdk/src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java @@ -45,6 +45,13 @@ public class SoftLowFrequencyOscillator implements SoftProcess { private double sin_factor = 0; private static double PI2 = 2.0 * Math.PI; + public SoftLowFrequencyOscillator() { + // If sin_step is 0 then sin_stepfreq must be -INF + for (int i = 0; i < sin_stepfreq.length; i++) { + sin_stepfreq[i] = Double.NEGATIVE_INFINITY; + } + } + public void reset() { for (int i = 0; i < used_count; i++) { out[i][0] = 0; @@ -53,7 +60,8 @@ public class SoftLowFrequencyOscillator implements SoftProcess { freq[i][0] = 0; delay_counter[i] = 0; sin_phase[i] = 0; - sin_stepfreq[i] = 0; + // If sin_step is 0 then sin_stepfreq must be -INF + sin_stepfreq[i] = Double.NEGATIVE_INFINITY; sin_step[i] = 0; } used_count = 0; diff --git a/jdk/test/javax/sound/midi/Gervill/SoftLowFrequencyOscillator/TestProcessControlLogic.java b/jdk/test/javax/sound/midi/Gervill/SoftLowFrequencyOscillator/TestProcessControlLogic.java new file mode 100644 index 00000000000..6289a88cd86 --- /dev/null +++ b/jdk/test/javax/sound/midi/Gervill/SoftLowFrequencyOscillator/TestProcessControlLogic.java @@ -0,0 +1,106 @@ +/* + * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. + * 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. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +/* @test + @summary Test SoftLowFrequencyOscillator processControlLogic method */ + +import com.sun.media.sound.AudioSynthesizerPropertyInfo; +import com.sun.media.sound.SoftLowFrequencyOscillator; +import com.sun.media.sound.SoftSynthesizer; + +public class TestProcessControlLogic { + + private static float control_rate = 147f; + private static SoftSynthesizer synth = new SoftSynthesizer(); + private static SoftLowFrequencyOscillator lfo = new SoftLowFrequencyOscillator(); + + private static void testLFO(boolean shared, int instance, float freq, float delay, + float delay2) throws Exception { + SoftLowFrequencyOscillator lfo = + shared?TestProcessControlLogic.lfo:new SoftLowFrequencyOscillator(); + lfo.reset(); + double[] lfo_freq = lfo.get(instance, "freq"); + double[] lfo_delay = lfo.get(instance, "delay"); + double[] lfo_delay2 = lfo.get(instance, "delay2"); + double[] lfo_output = lfo.get(instance, null); + lfo_freq[0] = freq; + lfo_delay[0] = delay; + lfo_delay2[0] = delay2; + lfo.init(synth); + + // For delayCount amount time, the output LFO should be 0.5 + int delayCount = (int) ((Math.pow(2, delay / 1200.0) * control_rate)); + delayCount += (int) ((delay2 * control_rate) / 1000.0); + for (int i = 0; i < delayCount; i++) { + if (Math.abs(0.5 - lfo_output[0]) > 0.000001) + throw new Exception("Incorrect LFO output (" + +"0.5 != "+lfo_output[0]+")!"); + lfo.processControlLogic(); + } + + // After the delay the LFO should start oscillate + // Let make sure output is accurate enough + double p_step = (440.0 / control_rate) + * Math.exp((freq - 6900.0) * (Math.log(2) / 1200.0)); + double p = 0; + for (int i = 0; i < 30; i++) { + p += p_step; + double predicted_output = 0.5 + Math.sin(p * 2 * Math.PI) * 0.5; + if (Math.abs(predicted_output - lfo_output[0]) > 0.001) + throw new Exception("Incorrect LFO output (" + +predicted_output+" != "+lfo_output[0]+")!"); + lfo.processControlLogic(); + } + + } + + public static void main(String[] args) throws Exception { + + // Get default control rate from synthesizer + AudioSynthesizerPropertyInfo[] p = synth.getPropertyInfo(null); + for (int i = 0; i < p.length; i++) { + if (p[i].name.equals("control rate")) { + control_rate = ((Float) p[i].value).floatValue(); + break; + } + } + + // Test LFO under various configurations + for (int instance = 0; instance < 3; instance++) + for (int d1 = -3000; d1 < 0; d1 += 1000) + for (int d2 = 0; d2 < 5000; d2 += 1000) + for (int fr = -1000; fr < 1000; fr += 100) { + testLFO(true, instance, + (fr == -1000) ? Float.NEGATIVE_INFINITY : fr, + (d1 == -3000) ? Float.NEGATIVE_INFINITY : d1, + d2); + testLFO(false, instance, + (fr == -1000) ? Float.NEGATIVE_INFINITY : fr, + (d1 == -3000) ? Float.NEGATIVE_INFINITY : d1, + d2); + } + + } +} From c0f20f9d47f52cd43eae94810292642244bf2916 Mon Sep 17 00:00:00 2001 From: Anthony Petrov Date: Fri, 17 Apr 2009 16:30:15 +0400 Subject: [PATCH 51/91] 6821948: Consider removing the constraints for bounds of untrusted top-level windows The constrainBounds() methods are removed. Reviewed-by: art, dcherepanov --- .../classes/sun/awt/X11/XDecoratedPeer.java | 43 +---------- .../sun/awt/X11/XEmbeddedFramePeer.java | 6 -- .../solaris/classes/sun/awt/X11/XWindow.java | 6 +- .../classes/sun/awt/X11/XWindowPeer.java | 57 +------------- .../classes/sun/awt/windows/WDialogPeer.java | 6 +- .../sun/awt/windows/WEmbeddedFramePeer.java | 6 -- .../classes/sun/awt/windows/WFramePeer.java | 6 +- .../classes/sun/awt/windows/WWindowPeer.java | 75 ++----------------- 8 files changed, 14 insertions(+), 191 deletions(-) diff --git a/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java b/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java index 739713dd713..3fc5c9b8b0c 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java @@ -490,8 +490,7 @@ abstract class XDecoratedPeer extends XWindowPeer { // if the window manager or any other part of the windowing // system sets inappropriate size for this window, we can // do nothing but accept it. - Rectangle reqBounds = newDimensions.getBounds(); - Rectangle newBounds = constrainBounds(reqBounds.x, reqBounds.y, reqBounds.width, reqBounds.height); + Rectangle newBounds = newDimensions.getBounds(); Insets insets = newDimensions.getInsets(); // Inherit isClientSizeSet from newDimensions if (newDimensions.isClientSizeSet()) { @@ -619,46 +618,6 @@ abstract class XDecoratedPeer extends XWindowPeer { // This method gets overriden in XFramePeer & XDialogPeer. abstract boolean isTargetUndecorated(); - @Override - Rectangle constrainBounds(int x, int y, int width, int height) { - // We don't restrict the setBounds() operation if the code is trusted. - if (!hasWarningWindow()) { - return new Rectangle(x, y, width, height); - } - - // If it's undecorated or is not currently visible, - // apply the same constraints as for the Window. - if (!isVisible() || isTargetUndecorated()) { - return super.constrainBounds(x, y, width, height); - } - - // If it's visible & decorated, constraint the size only - int newX = x; - int newY = y; - int newW = width; - int newH = height; - - GraphicsConfiguration gc = ((Window)target).getGraphicsConfiguration(); - Rectangle sB = gc.getBounds(); - Insets sIn = ((Window)target).getToolkit().getScreenInsets(gc); - - Rectangle curBounds = getBounds(); - - int maxW = Math.max(sB.width - sIn.left - sIn.right, curBounds.width); - int maxH = Math.max(sB.height - sIn.top - sIn.bottom, curBounds.height); - - // First make sure the size is withing the visible part of the screen - if (newW > maxW) { - newW = maxW; - } - - if (newH > maxH) { - newH = maxH; - } - - return new Rectangle(newX, newY, newW, newH); - } - /** * @see java.awt.peer.ComponentPeer#setBounds */ diff --git a/jdk/src/solaris/classes/sun/awt/X11/XEmbeddedFramePeer.java b/jdk/src/solaris/classes/sun/awt/X11/XEmbeddedFramePeer.java index 892d7c94e99..4b9bcc91def 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XEmbeddedFramePeer.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XEmbeddedFramePeer.java @@ -196,12 +196,6 @@ public class XEmbeddedFramePeer extends XFramePeer { } } - @Override - Rectangle constrainBounds(int x, int y, int width, int height) { - // We don't constrain the bounds of the EmbeddedFrames - return new Rectangle(x, y, width, height); - } - // don't use getBounds() inherited from XDecoratedPeer public Rectangle getBounds() { return new Rectangle(x, y, width, height); diff --git a/jdk/src/solaris/classes/sun/awt/X11/XWindow.java b/jdk/src/solaris/classes/sun/awt/X11/XWindow.java index 6c517b19697..5115f464922 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XWindow.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XWindow.java @@ -156,11 +156,11 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { } XWindow(Component target, long parentWindow) { - this(target, parentWindow, target.getBounds()); + this(target, parentWindow, new Rectangle(target.getBounds())); } XWindow(Component target) { - this(target, (target.getParent() == null) ? 0 : getParentWindowID(target), target.getBounds()); + this(target, (target.getParent() == null) ? 0 : getParentWindowID(target), new Rectangle(target.getBounds())); } XWindow(Object target) { @@ -198,7 +198,7 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { | XConstants.ButtonMotionMask | XConstants.ExposureMask | XConstants.StructureNotifyMask); if (target != null) { - params.putIfNull(BOUNDS, target.getBounds()); + params.putIfNull(BOUNDS, new Rectangle(target.getBounds())); } else { params.putIfNull(BOUNDS, new Rectangle(0, 0, MIN_SIZE, MIN_SIZE)); } diff --git a/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java b/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java index d3fb2107281..e78d007bdbf 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java @@ -180,9 +180,6 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, GraphicsConfiguration gc = getGraphicsConfiguration(); ((X11GraphicsDevice)gc.getDevice()).addDisplayChangedListener(this); - - Rectangle bounds = (Rectangle)(params.get(BOUNDS)); - params.put(BOUNDS, constrainBounds(bounds.x, bounds.y, bounds.width, bounds.height)); } protected String getWMName() { @@ -437,56 +434,6 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, return ownerPeer; } - // This method is overriden at the XDecoratedPeer to handle - // decorated windows a bit differently. - Rectangle constrainBounds(int x, int y, int width, int height) { - // We don't restrict the setBounds() operation if the code is trusted. - if (!hasWarningWindow()) { - return new Rectangle(x, y, width, height); - } - - // The window bounds should be within the visible part of the screen - int newX = x; - int newY = y; - int newW = width; - int newH = height; - - // Now check each point is within the visible part of the screen - GraphicsConfiguration gc = ((Window)target).getGraphicsConfiguration(); - Rectangle sB = gc.getBounds(); - Insets sIn = ((Window)target).getToolkit().getScreenInsets(gc); - - int screenX = sB.x + sIn.left; - int screenY = sB.y + sIn.top; - int screenW = sB.width - sIn.left - sIn.right; - int screenH = sB.height - sIn.top - sIn.bottom; - - - // First make sure the size is withing the visible part of the screen - if (newW > screenW) { - newW = screenW; - } - - if (newH > screenH) { - newH = screenH; - } - - // Tweak the location if needed - if (newX < screenX) { - newX = screenX; - } else if (newX + newW > screenX + screenW) { - newX = screenX + screenW - newW; - } - - if (newY < screenY) { - newY = screenY; - } else if (newY + newH > screenY + screenH) { - newY = screenY + screenH - newH; - } - - return new Rectangle(newX, newY, newW, newH); - } - //Fix for 6318144: PIT:Setting Min Size bigger than current size enlarges //the window but fails to revalidate, Sol-CDE //This bug is regression for @@ -495,13 +442,11 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, //Note that this function is overriden in XDecoratedPeer so event //posting is not changing for decorated peers public void setBounds(int x, int y, int width, int height, int op) { - Rectangle newBounds = constrainBounds(x, y, width, height); - XToolkit.awtLock(); try { Rectangle oldBounds = getBounds(); - super.setBounds(newBounds.x, newBounds.y, newBounds.width, newBounds.height, op); + super.setBounds(x, y, width, height, op); Rectangle bounds = getBounds(); diff --git a/jdk/src/windows/classes/sun/awt/windows/WDialogPeer.java b/jdk/src/windows/classes/sun/awt/windows/WDialogPeer.java index 96cdb26f6d3..4424f1cc813 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WDialogPeer.java +++ b/jdk/src/windows/classes/sun/awt/windows/WDialogPeer.java @@ -114,12 +114,10 @@ class WDialogPeer extends WWindowPeer implements DialogPeer { } public void reshape(int x, int y, int width, int height) { - Rectangle newBounds = constrainBounds(x, y, width, height); - if (((Dialog)target).isUndecorated()) { - super.reshape(newBounds.x, newBounds.y, newBounds.width, newBounds.height); + super.reshape(x, y, width, height); } else { - reshapeFrame(newBounds.x, newBounds.y, newBounds.width, newBounds.height); + reshapeFrame(x, y, width, height); } } diff --git a/jdk/src/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java b/jdk/src/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java index 2e1e6e618dc..2ed17f60fe3 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java +++ b/jdk/src/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java @@ -67,12 +67,6 @@ public class WEmbeddedFramePeer extends WFramePeer { public native void synthesizeWmActivate(boolean doActivate); - @Override - Rectangle constrainBounds(int x, int y, int width, int height) { - // We don't constrain the bounds of the EmbeddedFrames - return new Rectangle(x, y, width, height); - } - @Override public boolean isAccelCapable() { // REMIND: Temp workaround for issues with using HW acceleration diff --git a/jdk/src/windows/classes/sun/awt/windows/WFramePeer.java b/jdk/src/windows/classes/sun/awt/windows/WFramePeer.java index 79bf6b77e41..86bde26582b 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WFramePeer.java +++ b/jdk/src/windows/classes/sun/awt/windows/WFramePeer.java @@ -89,12 +89,10 @@ class WFramePeer extends WWindowPeer implements FramePeer { } public void reshape(int x, int y, int width, int height) { - Rectangle newBounds = constrainBounds(x, y, width, height); - if (((Frame)target).isUndecorated()) { - super.reshape(newBounds.x, newBounds.y, newBounds.width, newBounds.height); + super.reshape(x, y, width, height); } else { - reshapeFrame(newBounds.x, newBounds.y, newBounds.width, newBounds.height); + reshapeFrame(x, y, width, height); } } diff --git a/jdk/src/windows/classes/sun/awt/windows/WWindowPeer.java b/jdk/src/windows/classes/sun/awt/windows/WWindowPeer.java index 3c624020934..4a23b779d62 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WWindowPeer.java +++ b/jdk/src/windows/classes/sun/awt/windows/WWindowPeer.java @@ -546,81 +546,16 @@ public class WWindowPeer extends WPanelPeer implements WindowPeer, private volatile int sysW = 0; private volatile int sysH = 0; - Rectangle constrainBounds(int x, int y, int width, int height) { - GraphicsConfiguration gc = this.winGraphicsConfig; - - // We don't restrict the setBounds() operation if the code is trusted. - if (!hasWarningWindow() || gc == null) { - return new Rectangle(x, y, width, height); - } - - int newX = x; - int newY = y; - int newW = width; - int newH = height; - - Rectangle sB = gc.getBounds(); - Insets sIn = Toolkit.getDefaultToolkit().getScreenInsets(gc); - - int screenW = sB.width - sIn.left - sIn.right; - int screenH = sB.height - sIn.top - sIn.bottom; - - // If it's undecorated or is not currently visible - if (!AWTAccessor.getComponentAccessor().isVisible_NoClientCode( - (Component)target) || isTargetUndecorated()) - { - // Now check each point is within the visible part of the screen - int screenX = sB.x + sIn.left; - int screenY = sB.y + sIn.top; - - // First make sure the size is within the visible part of the screen - if (newW > screenW) { - newW = screenW; - } - if (newH > screenH) { - newH = screenH; - } - - // Tweak the location if needed - if (newX < screenX) { - newX = screenX; - } else if (newX + newW > screenX + screenW) { - newX = screenX + screenW - newW; - } - if (newY < screenY) { - newY = screenY; - } else if (newY + newH > screenY + screenH) { - newY = screenY + screenH - newH; - } - } else { - int maxW = Math.max(screenW, sysW); - int maxH = Math.max(screenH, sysH); - - // Make sure the size is withing the visible part of the screen - // OR less that the current size of the window. - if (newW > maxW) { - newW = maxW; - } - if (newH > maxH) { - newH = maxH; - } - } - - return new Rectangle(newX, newY, newW, newH); - } - public native void repositionSecurityWarning(); @Override public void setBounds(int x, int y, int width, int height, int op) { - Rectangle newBounds = constrainBounds(x, y, width, height); + sysX = x; + sysY = y; + sysW = width; + sysH = height; - sysX = newBounds.x; - sysY = newBounds.y; - sysW = newBounds.width; - sysH = newBounds.height; - - super.setBounds(newBounds.x, newBounds.y, newBounds.width, newBounds.height, op); + super.setBounds(x, y, width, height, op); } @Override From 4b321c2bfcb2a32fed1fb14d4d90e79a602ce400 Mon Sep 17 00:00:00 2001 From: Anthony Petrov Date: Fri, 17 Apr 2009 16:42:14 +0400 Subject: [PATCH 52/91] 6829858: JInternalFrame is not redrawing heavyweight children properly The Container.recursiveApplyCurrentShape() is now recursively called for all hw containers, even those having non-null layout Reviewed-by: art, dcherepanov --- jdk/src/share/classes/java/awt/Container.java | 6 +- jdk/test/java/awt/Mixing/MixingInHwPanel.java | 428 ++++++++++++++++++ 2 files changed, 430 insertions(+), 4 deletions(-) create mode 100644 jdk/test/java/awt/Mixing/MixingInHwPanel.java diff --git a/jdk/src/share/classes/java/awt/Container.java b/jdk/src/share/classes/java/awt/Container.java index 9a184a7a2ea..ec77fb9bc87 100644 --- a/jdk/src/share/classes/java/awt/Container.java +++ b/jdk/src/share/classes/java/awt/Container.java @@ -3977,10 +3977,8 @@ public class Container extends Component { Component comp = getComponent(index); if (!comp.isLightweight()) { comp.applyCurrentShape(); - if (comp instanceof Container && ((Container)comp).getLayout() == null) { - ((Container)comp).recursiveApplyCurrentShape(); - } - } else if (comp instanceof Container && + } + if (comp instanceof Container && ((Container)comp).hasHeavyweightDescendants()) { ((Container)comp).recursiveApplyCurrentShape(); } diff --git a/jdk/test/java/awt/Mixing/MixingInHwPanel.java b/jdk/test/java/awt/Mixing/MixingInHwPanel.java new file mode 100644 index 00000000000..bafe7be402c --- /dev/null +++ b/jdk/test/java/awt/Mixing/MixingInHwPanel.java @@ -0,0 +1,428 @@ +/* + * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. + * 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. + * + * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +/* + @test %W% %E% + @bug 6829858 + @summary Mixing should work inside heavyweight containers + @author anthony.petrov@sun.com: area=awt.mixing + @library ../regtesthelpers + @build Util + @run main MixingInHwPanel +*/ + + +/** + * MixingInHwPanel.java + * + * summary: Mixing should work inside heavyweight containers + */ + +import java.awt.*; +import java.awt.event.*; +import javax.swing.*; +import test.java.awt.regtesthelpers.Util; + + + +public class MixingInHwPanel +{ + static volatile boolean failed = true; + + private static void init() + { + //*** Create instructions for the user here *** + + String[] instructions = + { + "This is an AUTOMATIC test, simply wait until it is done.", + "The result (passed or failed) will be shown in the", + "message window below." + }; + Sysout.createDialog( ); + Sysout.printInstructions( instructions ); + + // Create the components: frame -> hwPanel -> JDesktopPane -> + // -> JInternalFrame -> hwButton + Frame frame = new Frame("Mixing in a heavyweight Panel"); + frame.setBounds(100, 100, 640, 480); + + Panel hwPanel = new Panel(new BorderLayout()); + frame.add(hwPanel); + + JDesktopPane desktop = new JDesktopPane(); + hwPanel.add(desktop); + + JInternalFrame iFrame = new JInternalFrame("one", + true, true, true, true); + iFrame.setPreferredSize(new Dimension(150, 55)); + iFrame.setBounds(600, 100, 150, 55); + iFrame.setVisible(true); + desktop.add(iFrame); + + Button button = new Button("HW Button"); + button.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + failed = false; + } + }); + iFrame.add(button); + + // Show the frame with the hwButton slightly hidden initially + frame.setVisible(true); + + Robot robot = Util.createRobot(); + robot.setAutoDelay(20); + + Util.waitForIdle(robot); + + // Now resize the frame so that the button is fully visible + frame.setBounds(100, 100, 800, 480); + frame.validate(); + + Util.waitForIdle(robot); + + // And click the part of the button that has been previously hidden + Point bLoc = button.getLocationOnScreen(); + robot.mouseMove(bLoc.x + button.getWidth() - 6, bLoc.y + button.getHeight() / 2); + + Util.waitForIdle(robot); + + robot.mousePress(InputEvent.BUTTON1_MASK); + robot.mouseRelease(InputEvent.BUTTON1_MASK); + + Util.waitForIdle(robot); + + // If the click happens (the shape is reapplied), the button's action + // listener will make failed == false. + if (failed) { + MixingInHwPanel.fail("The HW button did not receive the click."); + } else { + MixingInHwPanel.pass(); + } + }//End init() + + + + /***************************************************** + * Standard Test Machinery Section + * DO NOT modify anything in this section -- it's a + * standard chunk of code which has all of the + * synchronisation necessary for the test harness. + * By keeping it the same in all tests, it is easier + * to read and understand someone else's test, as + * well as insuring that all tests behave correctly + * with the test harness. + * There is a section following this for test- + * classes + ******************************************************/ + private static boolean theTestPassed = false; + private static boolean testGeneratedInterrupt = false; + private static String failureMessage = ""; + + private static Thread mainThread = null; + + private static int sleepTime = 300000; + + // Not sure about what happens if multiple of this test are + // instantiated in the same VM. Being static (and using + // static vars), it aint gonna work. Not worrying about + // it for now. + public static void main( String args[] ) throws InterruptedException + { + mainThread = Thread.currentThread(); + try + { + init(); + } + catch( TestPassedException e ) + { + //The test passed, so just return from main and harness will + // interepret this return as a pass + return; + } + //At this point, neither test pass nor test fail has been + // called -- either would have thrown an exception and ended the + // test, so we know we have multiple threads. + + //Test involves other threads, so sleep and wait for them to + // called pass() or fail() + try + { + Thread.sleep( sleepTime ); + //Timed out, so fail the test + throw new RuntimeException( "Timed out after " + sleepTime/1000 + " seconds" ); + } + catch (InterruptedException e) + { + //The test harness may have interrupted the test. If so, rethrow the exception + // so that the harness gets it and deals with it. + if( ! testGeneratedInterrupt ) throw e; + + //reset flag in case hit this code more than once for some reason (just safety) + testGeneratedInterrupt = false; + + if ( theTestPassed == false ) + { + throw new RuntimeException( failureMessage ); + } + } + + }//main + + public static synchronized void setTimeoutTo( int seconds ) + { + sleepTime = seconds * 1000; + } + + public static synchronized void pass() + { + Sysout.println( "The test passed." ); + Sysout.println( "The test is over, hit Ctl-C to stop Java VM" ); + //first check if this is executing in main thread + if ( mainThread == Thread.currentThread() ) + { + //Still in the main thread, so set the flag just for kicks, + // and throw a test passed exception which will be caught + // and end the test. + theTestPassed = true; + throw new TestPassedException(); + } + theTestPassed = true; + testGeneratedInterrupt = true; + mainThread.interrupt(); + }//pass() + + public static synchronized void fail() + { + //test writer didn't specify why test failed, so give generic + fail( "it just plain failed! :-)" ); + } + + public static synchronized void fail( String whyFailed ) + { + Sysout.println( "The test failed: " + whyFailed ); + Sysout.println( "The test is over, hit Ctl-C to stop Java VM" ); + //check if this called from main thread + if ( mainThread == Thread.currentThread() ) + { + //If main thread, fail now 'cause not sleeping + throw new RuntimeException( whyFailed ); + } + theTestPassed = false; + testGeneratedInterrupt = true; + failureMessage = whyFailed; + mainThread.interrupt(); + }//fail() + +}// class MixingInHwPanel + +//This exception is used to exit from any level of call nesting +// when it's determined that the test has passed, and immediately +// end the test. +class TestPassedException extends RuntimeException +{ +} + +//*********** End Standard Test Machinery Section ********** + + +//************ Begin classes defined for the test **************** + +// if want to make listeners, here is the recommended place for them, then instantiate +// them in init() + +/* Example of a class which may be written as part of a test +class NewClass implements anInterface + { + static int newVar = 0; + + public void eventDispatched(AWTEvent e) + { + //Counting events to see if we get enough + eventCount++; + + if( eventCount == 20 ) + { + //got enough events, so pass + + MixingInHwPanel.pass(); + } + else if( tries == 20 ) + { + //tried too many times without getting enough events so fail + + MixingInHwPanel.fail(); + } + + }// eventDispatched() + + }// NewClass class + +*/ + + +//************** End classes defined for the test ******************* + + + + +/**************************************************** + Standard Test Machinery + DO NOT modify anything below -- it's a standard + chunk of code whose purpose is to make user + interaction uniform, and thereby make it simpler + to read and understand someone else's test. + ****************************************************/ + +/** + This is part of the standard test machinery. + It creates a dialog (with the instructions), and is the interface + for sending text messages to the user. + To print the instructions, send an array of strings to Sysout.createDialog + WithInstructions method. Put one line of instructions per array entry. + To display a message for the tester to see, simply call Sysout.println + with the string to be displayed. + This mimics System.out.println but works within the test harness as well + as standalone. + */ + +class Sysout +{ + private static TestDialog dialog; + + public static void createDialogWithInstructions( String[] instructions ) + { + dialog = new TestDialog( new Frame(), "Instructions" ); + dialog.printInstructions( instructions ); + dialog.setVisible(true); + println( "Any messages for the tester will display here." ); + } + + public static void createDialog( ) + { + dialog = new TestDialog( new Frame(), "Instructions" ); + String[] defInstr = { "Instructions will appear here. ", "" } ; + dialog.printInstructions( defInstr ); + dialog.setVisible(true); + println( "Any messages for the tester will display here." ); + } + + + public static void printInstructions( String[] instructions ) + { + dialog.printInstructions( instructions ); + } + + + public static void println( String messageIn ) + { + dialog.displayMessage( messageIn ); + System.out.println(messageIn); + } + +}// Sysout class + +/** + This is part of the standard test machinery. It provides a place for the + test instructions to be displayed, and a place for interactive messages + to the user to be displayed. + To have the test instructions displayed, see Sysout. + To have a message to the user be displayed, see Sysout. + Do not call anything in this dialog directly. + */ +class TestDialog extends Dialog +{ + + TextArea instructionsText; + TextArea messageText; + int maxStringLength = 80; + + //DO NOT call this directly, go through Sysout + public TestDialog( Frame frame, String name ) + { + super( frame, name ); + int scrollBoth = TextArea.SCROLLBARS_BOTH; + instructionsText = new TextArea( "", 15, maxStringLength, scrollBoth ); + add( "North", instructionsText ); + + messageText = new TextArea( "", 5, maxStringLength, scrollBoth ); + add("Center", messageText); + + pack(); + + setVisible(true); + }// TestDialog() + + //DO NOT call this directly, go through Sysout + public void printInstructions( String[] instructions ) + { + //Clear out any current instructions + instructionsText.setText( "" ); + + //Go down array of instruction strings + + String printStr, remainingStr; + for( int i=0; i < instructions.length; i++ ) + { + //chop up each into pieces maxSringLength long + remainingStr = instructions[ i ]; + while( remainingStr.length() > 0 ) + { + //if longer than max then chop off first max chars to print + if( remainingStr.length() >= maxStringLength ) + { + //Try to chop on a word boundary + int posOfSpace = remainingStr. + lastIndexOf( ' ', maxStringLength - 1 ); + + if( posOfSpace <= 0 ) posOfSpace = maxStringLength - 1; + + printStr = remainingStr.substring( 0, posOfSpace + 1 ); + remainingStr = remainingStr.substring( posOfSpace + 1 ); + } + //else just print + else + { + printStr = remainingStr; + remainingStr = ""; + } + + instructionsText.append( printStr + "\n" ); + + }// while + + }// for + + }//printInstructions() + + //DO NOT call this directly, go through Sysout + public void displayMessage( String messageIn ) + { + messageText.append( messageIn + "\n" ); + System.out.println(messageIn); + } + +}// TestDialog class + + From 66152627379bf57f444cc706d5a0e57d77bb14c4 Mon Sep 17 00:00:00 2001 From: Vladimir Kozlov Date: Fri, 17 Apr 2009 09:38:32 -0700 Subject: [PATCH 53/91] 6831323: Use v8plus as minimum required hardware for current Hotspot sources Use -xarch=v8plus as default for 32-bits VM on sparc. Reviewed-by: never, twisti --- hotspot/make/solaris/makefiles/sparcWorks.make | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/hotspot/make/solaris/makefiles/sparcWorks.make b/hotspot/make/solaris/makefiles/sparcWorks.make index 501268e3d25..f88cfdfff3a 100644 --- a/hotspot/make/solaris/makefiles/sparcWorks.make +++ b/hotspot/make/solaris/makefiles/sparcWorks.make @@ -46,7 +46,7 @@ C_COMPILER_REV := \ $(shell $(CC) -V 2>&1 | sed -n 's/^.*[ ,\t]C[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/p') # Pick which compiler is validated -ifeq ($(JDK_MINOR_VERSION),6) +ifeq ($(JRE_RELEASE_VER),1.6.0) # Validated compiler for JDK6 is SS11 (5.8) VALIDATED_COMPILER_REV := 5.8 VALIDATED_C_COMPILER_REV := 5.8 @@ -101,18 +101,9 @@ CFLAGS += ${SOLARIS_7_OR_LATER} # New architecture options started in SS12 (5.9), we need both styles to build. # The older arch options for SS11 (5.8) or older and also for /usr/ccs/bin/as. -# Note: SS12 default for 32bit sparc is now the same as v8plus, so the -# settings below have changed all SS12 32bit sparc builds to be v8plus. -# The older SS11 (5.8) settings have remained as they always have been. -ifeq ($(TYPE),COMPILER2) - ARCHFLAG_OLD/sparc = -xarch=v8plus -else - ifeq ($(TYPE),TIERED) - ARCHFLAG_OLD/sparc = -xarch=v8plus - else - ARCHFLAG_OLD/sparc = -xarch=v8 - endif -endif +# Note: default for 32bit sparc is now the same as v8plus, so the +# settings below have changed all 32bit sparc builds to be v8plus. +ARCHFLAG_OLD/sparc = -xarch=v8plus ARCHFLAG_NEW/sparc = -m32 -xarch=sparc ARCHFLAG_OLD/sparcv9 = -xarch=v9 ARCHFLAG_NEW/sparcv9 = -m64 -xarch=sparc From e13875dd4ea9df0c6da13d42d5506612692fe3e4 Mon Sep 17 00:00:00 2001 From: Tim Bell Date: Mon, 20 Apr 2009 00:12:19 -0700 Subject: [PATCH 54/91] 6372405: Server thread hangs when fragments don't complete because of connection abort 5104239: Java: thread deadlock 6191561: JCK15: api/org_omg/PortableInterceptor/ClientRequestInfo/index.html#RIMethods sometime hang 6486322: org.omg.CORBA.ORB.init() thread safety issue 6420980: Security issue with the com.sun.corba.se.impl.orbutil.ORBUtility class 6465377: NullPointerException for RMI ORB in 1.5.0_08 6553303: Corba application fails w/ org.omg.CORBA.COMM_FAILURE: vmcid: SUN minor code: 203 completed: No 6438259: Wrong repository ID generated by IDLJ Reviewed-by: darcy --- .../encoding/BufferManagerReadStream.java | 14 ++- .../corba/se/impl/io/ObjectStreamClass.java | 32 +++--- .../sun/corba/se/impl/oa/poa/POAFactory.java | 10 +- .../com/sun/corba/se/impl/orb/ORBImpl.java | 97 +++++++++++-------- .../sun/corba/se/impl/orb/ORBSingleton.java | 4 +- .../sun/corba/se/impl/orbutil/ORBUtility.java | 21 +--- .../se/impl/resolver/INSURLOperationImpl.java | 10 +- .../SocketOrChannelConnectionImpl.java | 6 +- .../sun/corba/se/spi/logging/data/ORBUtil.mc | 4 +- .../com/sun/tools/corba/se/idl/Parser.java | 8 +- .../corba/se/logutil/InputException.java | 1 - .../src/share/classes/org/omg/CORBA/ORB.java | 4 +- 12 files changed, 114 insertions(+), 97 deletions(-) diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerReadStream.java b/corba/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerReadStream.java index 4925c735495..c57942f0da1 100644 --- a/corba/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerReadStream.java +++ b/corba/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerReadStream.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved. * 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,6 +44,7 @@ public class BufferManagerReadStream // We should convert endOfStream to a final static dummy end node private boolean endOfStream = true; private BufferQueue fragmentQueue = new BufferQueue(); + private long FRAGMENT_TIMEOUT = 60000; // REVISIT - This should go in BufferManagerRead. But, since // BufferManagerRead is an interface. BufferManagerRead @@ -111,9 +112,16 @@ public class BufferManagerReadStream throw wrapper.endOfStream() ; } + boolean interrupted = false; try { - fragmentQueue.wait(); - } catch (InterruptedException e) {} + fragmentQueue.wait(FRAGMENT_TIMEOUT); + } catch (InterruptedException e) { + interrupted = true; + } + + if (!interrupted && fragmentQueue.size() == 0) { + throw wrapper.bufferReadManagerTimeout(); + } if (receivedCancel) { throw new RequestCanceledException(cancelReqId); diff --git a/corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java b/corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java index c9b79dfe526..b23049c08bc 100644 --- a/corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java +++ b/corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java @@ -1,5 +1,5 @@ /* - * Copyright 1998-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 1998-2008 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -153,22 +153,22 @@ public class ObjectStreamClass implements java.io.Serializable { desc = new ObjectStreamClass(cl, superdesc, serializable, externalizable); } + // Must always call init. See bug 4488137. This code was + // incorrectly changed to return immediately on a non-null + // cache result. That allowed threads to gain access to + // unintialized instances. + // + // History: Note, the following init() call was originally within + // the synchronization block, as it currently is now. Later, the + // init() call was moved outside the synchronization block, and + // the init() method used a private member variable lock, to + // avoid performance problems. See bug 4165204. But that lead to + // a deadlock situation, see bug 5104239. Hence, the init() method + // has now been moved back into the synchronization block. The + // right approach to solving these problems would be to rewrite + // this class, based on the latest java.io.ObjectStreamClass. + desc.init(); } - - // Must always call init. See bug 4488137. This code was - // incorrectly changed to return immediately on a non-null - // cache result. That allowed threads to gain access to - // unintialized instances. - // - // All threads must sync on the member variable lock - // and check the initialization state. - // - // Another possibility is to continue to synchronize on the - // descriptorFor array, but that leads to poor performance - // (see bug 4165204 "ObjectStreamClass can hold global lock - // for a very long time"). - desc.init(); - return desc; } diff --git a/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAFactory.java b/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAFactory.java index 5cde4bf0ec3..c0cb1d8c100 100644 --- a/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAFactory.java +++ b/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved. * 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,6 +76,7 @@ public class POAFactory implements ObjectAdapterFactory private ORB orb ; private POASystemException wrapper ; private OMGSystemException omgWrapper ; + private boolean isShuttingDown = false; public POASystemException getWrapper() { @@ -166,6 +167,7 @@ public class POAFactory implements ObjectAdapterFactory // pm.deactivate removes itself from poaManagers! Iterator managers = null ; synchronized (this) { + isShuttingDown = true ; managers = (new HashSet(poaManagers)).iterator(); } @@ -208,9 +210,15 @@ public class POAFactory implements ObjectAdapterFactory ClosureFactory.makeFuture( rpClosure ) ) ; } + public synchronized POA getRootPOA() { if (rootPOA == null) { + // See if we are trying to getRootPOA while shutting down the ORB. + if (isShuttingDown) { + throw omgWrapper.noObjectAdaptor( ) ; + } + try { Object obj = orb.resolve_initial_references( ORBConstants.ROOT_POA_NAME ) ; diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java b/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java index 52b5cbf38f3..45fa6dde373 100644 --- a/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java +++ b/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -185,7 +185,6 @@ public class ORBImpl extends com.sun.corba.se.spi.orb.ORB private java.lang.Object runObj = new java.lang.Object(); private java.lang.Object shutdownObj = new java.lang.Object(); - private java.lang.Object waitForCompletionObj = new java.lang.Object(); private static final byte STATUS_OPERATING = 1; private static final byte STATUS_SHUTTING_DOWN = 2; private static final byte STATUS_SHUTDOWN = 3; @@ -194,7 +193,6 @@ public class ORBImpl extends com.sun.corba.se.spi.orb.ORB // XXX Should we move invocation tracking to the first level server dispatcher? private java.lang.Object invocationObj = new java.lang.Object(); - private int numInvocations = 0; // thread local variable to store a boolean to detect deadlock in // ORB.shutdown(true). @@ -1245,37 +1243,48 @@ public class ORBImpl extends com.sun.corba.se.spi.orb.ORB public void shutdown(boolean wait_for_completion) { - synchronized (this) { - checkShutdownState(); + // to wait for completion, we would deadlock, so throw a standard + // OMG exception. + if (wait_for_completion && ((Boolean)isProcessingInvocation.get()).booleanValue()) { + throw omgWrapper.shutdownWaitForCompletionDeadlock() ; } - // Avoid more than one thread performing shutdown at a time. - synchronized (shutdownObj) { - checkShutdownState(); - // This is to avoid deadlock - if (wait_for_completion && - isProcessingInvocation.get() == Boolean.TRUE) { - throw omgWrapper.shutdownWaitForCompletionDeadlock() ; - } + boolean doShutdown = false ; - status = STATUS_SHUTTING_DOWN; - // XXX access to requestDispatcherRegistry should be protected - // by the ORBImpl instance monitor, but is not here in the - // shutdownServants call. - shutdownServants(wait_for_completion); - if (wait_for_completion) { - synchronized ( waitForCompletionObj ) { - while (numInvocations > 0) { - try { - waitForCompletionObj.wait(); - } catch (InterruptedException ex) {} - } + synchronized (this) { + checkShutdownState() ; + + if (status == STATUS_SHUTTING_DOWN) { + if (!wait_for_completion) + // If we are already shutting down and don't want + // to wait, nothing to do: return. + return ; + } else { + // The ORB status was STATUS_OPERATING, so start the shutdown. + status = STATUS_SHUTTING_DOWN ; + doShutdown = true ; + } + } + + // At this point, status is SHUTTING_DOWN. + // All shutdown calls with wait_for_completion == true must synchronize + // here. Only the first call will be made with doShutdown == true. + synchronized (shutdownObj) { + if (doShutdown) { + // shutdownServants will set all POAManagers into the + // INACTIVE state, causing request to be rejected. + // If wait_for_completion is true, this will not return until + // all invocations have completed. + shutdownServants(wait_for_completion); + + synchronized (runObj) { + runObj.notifyAll(); + } + + synchronized (this) { + status = STATUS_SHUTDOWN; } } - synchronized ( runObj ) { - runObj.notifyAll(); - } - status = STATUS_SHUTDOWN; } } @@ -1314,23 +1323,13 @@ public class ORBImpl extends com.sun.corba.se.spi.orb.ORB { synchronized (invocationObj) { isProcessingInvocation.set(Boolean.TRUE); - numInvocations++; } } public void finishedDispatch() { synchronized (invocationObj) { - numInvocations--; isProcessingInvocation.set(Boolean.FALSE); - if (numInvocations == 0) { - synchronized (waitForCompletionObj) { - waitForCompletionObj.notifyAll(); - } - } else if (numInvocations < 0) { - throw wrapper.numInvocationsAlreadyZero( - CompletionStatus.COMPLETED_YES ) ; - } } } @@ -1341,12 +1340,24 @@ public class ORBImpl extends com.sun.corba.se.spi.orb.ORB */ public synchronized void destroy() { - if (status == STATUS_OPERATING) { + boolean shutdownFirst = false ; + + synchronized (this) { + shutdownFirst = (status == STATUS_OPERATING) ; + } + + if (shutdownFirst) { shutdown(true); } - getCorbaTransportManager().close(); - getPIHandler().destroyInterceptors() ; - status = STATUS_DESTROYED; + + synchronized (this) { + if (status < STATUS_DESTROYED) { + getCorbaTransportManager().close(); + getPIHandler().destroyInterceptors() ; + status = STATUS_DESTROYED; + } + } + } /** diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java b/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java index 4c43ee67e5b..ecd9539b8aa 100644 --- a/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java +++ b/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java @@ -1,5 +1,5 @@ /* - * Copyright 1997-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -135,7 +135,7 @@ import com.sun.corba.se.spi.legacy.connection.LegacyServerSocketEndPointInfo; public class ORBSingleton extends ORB { // This is used to support read_Object. - private static ORB fullORB; + private ORB fullORB; private static PresentationManager.StubFactoryFactory staticStubFactoryFactory = PresentationDefaults.getStaticStubFactoryFactory() ; diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java index ab5106d580b..dd5af6e8b3b 100644 --- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java +++ b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -806,25 +806,6 @@ public final class ORBUtility { return result ; } - public static void setDaemon(Thread thread) - { - // Catch exceptions since setDaemon can cause a - // security exception to be thrown under netscape - // in the Applet mode - final Thread finalThread = thread; - try { - AccessController.doPrivileged(new PrivilegedAction() { - public java.lang.Object run() { - finalThread.setDaemon(true); - return null; - } - }); - } catch (Exception e) { - // REVISIT: Object to get static method. Ignore it. - dprint(new Object(), "setDaemon: Exception: " + e); - } - } - public static String operationNameAndRequestId(CorbaMessageMediator m) { return "op/" + m.getOperationName() + " id/" + m.getRequestId(); diff --git a/corba/src/share/classes/com/sun/corba/se/impl/resolver/INSURLOperationImpl.java b/corba/src/share/classes/com/sun/corba/se/impl/resolver/INSURLOperationImpl.java index 9d07b453fc9..0bb9d94a1fd 100644 --- a/corba/src/share/classes/com/sun/corba/se/impl/resolver/INSURLOperationImpl.java +++ b/corba/src/share/classes/com/sun/corba/se/impl/resolver/INSURLOperationImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 1998-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. * 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,8 @@ import com.sun.corba.se.spi.orb.ORB; import com.sun.corba.se.spi.resolver.Resolver; import com.sun.corba.se.impl.encoding.EncapsInputStream; -import com.sun.corba.se.impl.logging.ORBUtilSystemException ; +import com.sun.corba.se.impl.logging.ORBUtilSystemException; +import com.sun.corba.se.impl.logging.OMGSystemException; import com.sun.corba.se.impl.naming.namingutil.INSURLHandler; import com.sun.corba.se.impl.naming.namingutil.IIOPEndpointInfo; import com.sun.corba.se.impl.naming.namingutil.INSURL; @@ -76,6 +77,7 @@ public class INSURLOperationImpl implements Operation { ORB orb; ORBUtilSystemException wrapper ; + OMGSystemException omgWrapper ; Resolver bootstrapResolver ; // Root Naming Context for default resolution of names. @@ -90,6 +92,8 @@ public class INSURLOperationImpl implements Operation this.orb = orb ; wrapper = ORBUtilSystemException.get( orb, CORBALogDomains.ORB_RESOLVER ) ; + omgWrapper = OMGSystemException.get( orb, + CORBALogDomains.ORB_RESOLVER ) ; this.bootstrapResolver = bootstrapResolver ; } @@ -126,6 +130,8 @@ public class INSURLOperationImpl implements Operation return getIORFromString( str ) ; else { INSURL insURL = insURLHandler.parseURL( str ) ; + if (insURL == null) + throw omgWrapper.soBadSchemeName() ; return resolveINSURL( insURL ) ; } } diff --git a/corba/src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelConnectionImpl.java b/corba/src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelConnectionImpl.java index e160eec73c4..5dbfedb9fea 100644 --- a/corba/src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelConnectionImpl.java +++ b/corba/src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelConnectionImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2001-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -1057,7 +1057,9 @@ public class SocketOrChannelConnectionImpl // IIOPOutputStream will cleanup the connection info when it // sees this exception. - throw wrapper.writeErrorSend(e1) ; + SystemException exc = wrapper.writeErrorSend(e1); + purgeCalls(exc, false, true); + throw exc; } } diff --git a/corba/src/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc b/corba/src/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc index 40cdb885a26..7c46f35a117 100644 --- a/corba/src/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc +++ b/corba/src/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc @@ -1,6 +1,6 @@ ; -; Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. +; Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved. ; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ; ; This code is free software; you can redistribute it and/or modify it @@ -144,6 +144,8 @@ 15 WARNING "Read of full message failed : bytes requested = {0} bytes read = {1} max wait time = {2} total time spent waiting = {3}") (CREATE_LISTENER_FAILED 16 SEVERE "Unable to create listener thread on the specified port: {0}") + (BUFFER_READ_MANAGER_TIMEOUT + 17 WARNING "Timeout while reading data in buffer manager") ) (DATA_CONVERSION (BAD_STRINGIFIED_IOR_LEN 1 WARNING "A character did not map to the transmission code set") diff --git a/corba/src/share/classes/com/sun/tools/corba/se/idl/Parser.java b/corba/src/share/classes/com/sun/tools/corba/se/idl/Parser.java index 20432edf142..17221825f62 100644 --- a/corba/src/share/classes/com/sun/tools/corba/se/idl/Parser.java +++ b/corba/src/share/classes/com/sun/tools/corba/se/idl/Parser.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -2086,8 +2086,8 @@ class Parser if (token.type == Token.LeftBrace) { repIDStack.push(((IDLID)repIDStack.peek ()).clone ()) ; - ((IDLID)repIDStack.peek ()).appendToName (name); structEntry = makeStructEntry( name, entry, false ) ; + ((IDLID)repIDStack.peek ()).appendToName (name); prep.openScope (structEntry); match (Token.LeftBrace) ; member (structEntry) ; @@ -2174,8 +2174,8 @@ class Parser if (token.type == Token.Switch) { repIDStack.push (((IDLID)repIDStack.peek ()).clone ()); - ((IDLID)repIDStack.peek ()).appendToName (name); unionEntry = makeUnionEntry( name, entry, false ) ; + ((IDLID)repIDStack.peek ()).appendToName (name); match (Token.Switch); match (Token.LeftParen); unionEntry.type (switchTypeSpec (unionEntry)); @@ -2641,8 +2641,8 @@ class Parser private void exceptDcl (SymtabEntry entry) throws IOException, ParseException { match (Token.Exception); - ExceptionEntry exceptEntry = stFactory.exceptionEntry (entry, (IDLID)repIDStack.peek ()); repIDStack.push (((IDLID)repIDStack.peek ()).clone ()); + ExceptionEntry exceptEntry = stFactory.exceptionEntry (entry, (IDLID)repIDStack.peek ()); ((IDLID)repIDStack.peek ()).appendToName (token.name); exceptEntry.sourceFile (scanner.fileEntry ()); // Comment must immediately precede "exception" keyword diff --git a/corba/src/share/classes/com/sun/tools/corba/se/logutil/InputException.java b/corba/src/share/classes/com/sun/tools/corba/se/logutil/InputException.java index 5c1f4984e57..597d3185a6b 100644 --- a/corba/src/share/classes/com/sun/tools/corba/se/logutil/InputException.java +++ b/corba/src/share/classes/com/sun/tools/corba/se/logutil/InputException.java @@ -91,4 +91,3 @@ public class InputException { } } - diff --git a/corba/src/share/classes/org/omg/CORBA/ORB.java b/corba/src/share/classes/org/omg/CORBA/ORB.java index cecdefeb3e5..dde09300f2f 100644 --- a/corba/src/share/classes/org/omg/CORBA/ORB.java +++ b/corba/src/share/classes/org/omg/CORBA/ORB.java @@ -1,5 +1,5 @@ /* - * Copyright 1995-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 1995-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -289,7 +289,7 @@ abstract public class ORB { * * @return the singleton ORB */ - public static ORB init() { + public static synchronized ORB init() { if (singleton == null) { String className = getSystemProperty(ORBSingletonClassKey); if (className == null) From cab29c9b7a89da716082c83f0ef6e1b33b32953b Mon Sep 17 00:00:00 2001 From: Alan Bateman Date: Mon, 20 Apr 2009 09:30:50 +0100 Subject: [PATCH 55/91] 6830721: (fc) test/java/nio/channels/AsynchronousFileChannel/Basic.java intermittent failure Reviewed-by: sherman --- .../nio/channels/AsynchronousFileChannel/Basic.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/jdk/test/java/nio/channels/AsynchronousFileChannel/Basic.java b/jdk/test/java/nio/channels/AsynchronousFileChannel/Basic.java index ea9a5415923..1f37d4be11c 100644 --- a/jdk/test/java/nio/channels/AsynchronousFileChannel/Basic.java +++ b/jdk/test/java/nio/channels/AsynchronousFileChannel/Basic.java @@ -22,7 +22,7 @@ */ /* @test - * @bug 4607272 6822643 + * @bug 4607272 6822643 6830721 * @summary Unit test for AsynchronousFileChannel */ @@ -431,10 +431,11 @@ public class Basic { throw new RuntimeException("isCancelled not consistent"); try { res.get(); - if (!cancelled) + if (cancelled) throw new RuntimeException("CancellationException expected"); } catch (CancellationException x) { - // expected + if (!cancelled) + throw new RuntimeException("CancellationException not expected"); } catch (ExecutionException x) { throw new RuntimeException(x); } catch (InterruptedException x) { @@ -442,9 +443,11 @@ public class Basic { } try { res.get(1, TimeUnit.SECONDS); - throw new RuntimeException("CancellationException expected"); + if (cancelled) + throw new RuntimeException("CancellationException expected"); } catch (CancellationException x) { - // expected + if (!cancelled) + throw new RuntimeException("CancellationException not expected"); } catch (ExecutionException x) { throw new RuntimeException(x); } catch (TimeoutException x) { From d4a0d0c66da77942c8bdbb25e1f1eebf36e026c3 Mon Sep 17 00:00:00 2001 From: Alan Bateman Date: Mon, 20 Apr 2009 13:27:23 +0100 Subject: [PATCH 56/91] 6831461: (sample) Copy -r fails with IllegalArgumentexception: 'maxDepth' is negative Reviewed-by: chegar --- jdk/src/share/sample/nio/file/Copy.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/jdk/src/share/sample/nio/file/Copy.java b/jdk/src/share/sample/nio/file/Copy.java index e1d5d044ef5..bcd3af0c682 100644 --- a/jdk/src/share/sample/nio/file/Copy.java +++ b/jdk/src/share/sample/nio/file/Copy.java @@ -52,7 +52,7 @@ public class Copy { /** * Copy source file to target location. If {@code prompt} is true then - * prompted user to overwrite target if it exists. The {@code preserve} + * prompt user to overwrite target if it exists. The {@code preserve} * parameter determines if file attributes should be copied/preserved. */ static void copyFile(Path source, Path target, boolean prompt, boolean preserve) { @@ -63,7 +63,7 @@ public class Copy { try { source.copyTo(target, options); } catch (IOException x) { - System.err.format("Unable to create: %s: %s%n", target, x); + System.err.format("Unable to copy: %s: %s%n", source, x); } } } @@ -124,13 +124,13 @@ public class Copy { public FileVisitResult postVisitDirectory(Path dir, IOException exc) { // fix up modification time of directory when done if (exc == null && preserve) { + Path newdir = target.resolve(source.relativize(dir)); try { BasicFileAttributes attrs = Attributes.readBasicFileAttributes(dir); - Path newdir = target.resolve(source.relativize(dir)); Attributes.setLastModifiedTime(newdir, attrs.lastModifiedTime(), attrs.resolution()); } catch (IOException x) { - // ignore + System.err.format("Unable to copy all attributes to: %s: %s%n", newdir, x); } } return CONTINUE; @@ -191,6 +191,7 @@ public class Copy { try { isDir = Attributes.readBasicFileAttributes(target).isDirectory(); } catch (IOException x) { + // ignore (probably target does not exist) } // copy each source file/directory to target @@ -201,7 +202,7 @@ public class Copy { // follow links when copying files EnumSet opts = EnumSet.of(FileVisitOption.FOLLOW_LINKS); TreeCopier tc = new TreeCopier(source[i], dest, prompt, preserve); - Files.walkFileTree(source[i], opts, -1, tc); + Files.walkFileTree(source[i], opts, Integer.MAX_VALUE, tc); } else { // not recursive so source must not be a directory try { @@ -209,7 +210,9 @@ public class Copy { System.err.format("%s: is a directory%n", source[i]); continue; } - } catch (IOException x) { } + } catch (IOException x) { + // assume not directory + } copyFile(source[i], dest, prompt, preserve); } } From 75d9b0f9860ecbcf472276cfe31fa3c1648ea191 Mon Sep 17 00:00:00 2001 From: Dmitry Cherepanov Date: Mon, 20 Apr 2009 14:41:24 -0400 Subject: [PATCH 57/91] 6633354: AppletPanel loads Swing classes Reviewed-by: art, anthony --- jdk/src/share/classes/sun/applet/AppletPanel.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/jdk/src/share/classes/sun/applet/AppletPanel.java b/jdk/src/share/classes/sun/applet/AppletPanel.java index 99b85a7bfc2..911324e150a 100644 --- a/jdk/src/share/classes/sun/applet/AppletPanel.java +++ b/jdk/src/share/classes/sun/applet/AppletPanel.java @@ -45,7 +45,6 @@ import java.util.*; import java.util.Collections; import java.util.Locale; import java.util.WeakHashMap; -import javax.swing.SwingUtilities; import sun.awt.AppContext; import sun.awt.EmbeddedFrame; import sun.awt.SunToolkit; @@ -450,7 +449,7 @@ abstract class AppletPanel extends Panel implements AppletStub, Runnable { try { final AppletPanel p = this; - SwingUtilities.invokeAndWait(new Runnable() { + EventQueue.invokeAndWait(new Runnable() { public void run() { p.validate(); } @@ -480,7 +479,7 @@ abstract class AppletPanel extends Panel implements AppletStub, Runnable { final AppletPanel p = this; final Applet a = applet; - SwingUtilities.invokeAndWait(new Runnable() { + EventQueue.invokeAndWait(new Runnable() { public void run() { p.validate(); a.setVisible(true); @@ -514,7 +513,7 @@ abstract class AppletPanel extends Panel implements AppletStub, Runnable { try { final Applet a = applet; - SwingUtilities.invokeAndWait(new Runnable() { + EventQueue.invokeAndWait(new Runnable() { public void run() { a.setVisible(false); From 76fedc71adf907c993c6ca1e920f9259f224fa1c Mon Sep 17 00:00:00 2001 From: Dmitry Cherepanov Date: Mon, 20 Apr 2009 17:05:34 +0400 Subject: [PATCH 58/91] 6770457: Using ToolTips causes inactive app window to exhibit active window behavior Reviewed-by: art, ant --- .../native/sun/windows/awt_Component.cpp | 7 +++- .../windows/native/sun/windows/awt_Window.cpp | 35 ++++++------------- .../windows/native/sun/windows/awt_Window.h | 1 - 3 files changed, 16 insertions(+), 27 deletions(-) diff --git a/jdk/src/windows/native/sun/windows/awt_Component.cpp b/jdk/src/windows/native/sun/windows/awt_Component.cpp index 9db8ec4b873..fb7ae4c40e2 100644 --- a/jdk/src/windows/native/sun/windows/awt_Component.cpp +++ b/jdk/src/windows/native/sun/windows/awt_Component.cpp @@ -1843,8 +1843,13 @@ LRESULT AwtComponent::WindowProc(UINT message, WPARAM wParam, LPARAM lParam) case WM_AWT_SETALWAYSONTOP: { AwtWindow* w = (AwtWindow*)lParam; BOOL value = (BOOL)wParam; + UINT flags = SWP_NOMOVE | SWP_NOSIZE; + // transient windows shouldn't change the owner window's position in the z-order + if (w->IsRetainingHierarchyZOrder()) { + flags |= SWP_NOOWNERZORDER; + } ::SetWindowPos(w->GetHWnd(), (value != 0 ? HWND_TOPMOST : HWND_NOTOPMOST), - 0,0,0,0, SWP_NOMOVE|SWP_NOSIZE); + 0,0,0,0, flags); break; } diff --git a/jdk/src/windows/native/sun/windows/awt_Window.cpp b/jdk/src/windows/native/sun/windows/awt_Window.cpp index ad0400bc08b..3b0b1d3c260 100644 --- a/jdk/src/windows/native/sun/windows/awt_Window.cpp +++ b/jdk/src/windows/native/sun/windows/awt_Window.cpp @@ -165,7 +165,6 @@ jmethodID AwtWindow::calculateSecurityWarningPositionMID; int AwtWindow::ms_instanceCounter = 0; HHOOK AwtWindow::ms_hCBTFilter; AwtWindow * AwtWindow::m_grabbedWindow = NULL; -HWND AwtWindow::sm_retainingHierarchyZOrderInShow = NULL; BOOL AwtWindow::sm_resizing = FALSE; UINT AwtWindow::untrustedWindowsCounter = 0; @@ -341,23 +340,6 @@ MsgRouting AwtWindow::WmNcMouseDown(WPARAM hitTest, int x, int y, int button) { } MsgRouting AwtWindow::WmWindowPosChanging(LPARAM windowPos) { - /* - * See 6178004. - * Some windows shouldn't trigger a change in z-order of - * any window from the hierarchy. - */ - if (IsRetainingHierarchyZOrder()) { - if (((WINDOWPOS *)windowPos)->flags & SWP_SHOWWINDOW) { - sm_retainingHierarchyZOrderInShow = GetHWnd(); - } - } else if (sm_retainingHierarchyZOrderInShow != NULL) { - HWND ancestor = ::GetAncestor(sm_retainingHierarchyZOrderInShow, GA_ROOTOWNER); - HWND windowAncestor = ::GetAncestor(GetHWnd(), GA_ROOTOWNER); - - if (windowAncestor == ancestor) { - ((WINDOWPOS *)windowPos)->flags |= SWP_NOZORDER; - } - } return mrDoDefault; } @@ -377,12 +359,6 @@ void AwtWindow::RepositionSecurityWarning(JNIEnv *env) MsgRouting AwtWindow::WmWindowPosChanged(LPARAM windowPos) { WINDOWPOS * wp = (WINDOWPOS *)windowPos; - if (IsRetainingHierarchyZOrder() && wp->flags & SWP_SHOWWINDOW) { - // By this time all the windows from the hierarchy are already notified about z-order change. - // Thus we may and we should reset the trigger in order not to affect other changes. - sm_retainingHierarchyZOrderInShow = NULL; - } - // Reposition the warning window if (IsUntrusted() && warningWindow != NULL) { if (wp->flags & SWP_HIDEWINDOW) { @@ -1251,7 +1227,16 @@ void AwtWindow::Show() } } if (!done) { - ::ShowWindow(GetHWnd(), nCmdShow); + // transient windows shouldn't change the owner window's position in the z-order + if (IsRetainingHierarchyZOrder()){ + UINT flags = SWP_NOSIZE | SWP_NOMOVE | SWP_SHOWWINDOW | SWP_NOOWNERZORDER; + if (nCmdShow == SW_SHOWNA) { + flags |= SWP_NOACTIVATE; + } + ::SetWindowPos(GetHWnd(), HWND_TOPMOST, 0, 0, 0, 0, flags); + } else { + ::ShowWindow(GetHWnd(), nCmdShow); + } } env->DeleteLocalRef(target); } diff --git a/jdk/src/windows/native/sun/windows/awt_Window.h b/jdk/src/windows/native/sun/windows/awt_Window.h index bf43150a7e8..05282f72320 100644 --- a/jdk/src/windows/native/sun/windows/awt_Window.h +++ b/jdk/src/windows/native/sun/windows/awt_Window.h @@ -248,7 +248,6 @@ private: static int ms_instanceCounter; static HHOOK ms_hCBTFilter; static LRESULT CALLBACK CBTFilter(int nCode, WPARAM wParam, LPARAM lParam); - static HWND sm_retainingHierarchyZOrderInShow; // a referred window in the process of show static BOOL sm_resizing; /* in the middle of a resizing operation */ RECT m_insets; /* a cache of the insets being used */ From fbea8d87f48d20ed662c28f36b8ab7ad0cb7d5a5 Mon Sep 17 00:00:00 2001 From: Dmitry Cherepanov Date: Mon, 20 Apr 2009 19:18:41 +0400 Subject: [PATCH 59/91] 6825362: Avoid calling peer.setZOrder on Window instances Reviewed-by: anthony --- jdk/src/share/classes/java/awt/Component.java | 9 +++- jdk/src/share/classes/java/awt/Container.java | 2 +- jdk/src/share/classes/java/awt/Window.java | 4 ++ .../classes/sun/awt/windows/WPanelPeer.java | 41 ------------------- 4 files changed, 13 insertions(+), 43 deletions(-) diff --git a/jdk/src/share/classes/java/awt/Component.java b/jdk/src/share/classes/java/awt/Component.java index 03743332fc1..84d7a81ae98 100644 --- a/jdk/src/share/classes/java/awt/Component.java +++ b/jdk/src/share/classes/java/awt/Component.java @@ -6666,7 +6666,7 @@ public abstract class Component implements ImageObserver, MenuContainer, // Update stacking order - peer.setZOrder(getHWPeerAboveMe()); + updateZOrder(); if (!isAddNotifyComplete) { mixOnShowing(); @@ -9838,4 +9838,11 @@ public abstract class Component implements ImageObserver, MenuContainer, return doesClassImplement(obj.getClass(), interfaceName); } + + // Note that the method is overriden in the Window class, + // a window doesn't need to be updated in the Z-order. + void updateZOrder() { + peer.setZOrder(getHWPeerAboveMe()); + } + } diff --git a/jdk/src/share/classes/java/awt/Container.java b/jdk/src/share/classes/java/awt/Container.java index ec77fb9bc87..305a4fe267e 100644 --- a/jdk/src/share/classes/java/awt/Container.java +++ b/jdk/src/share/classes/java/awt/Container.java @@ -840,7 +840,7 @@ public class Container extends Component { // Native container changed - need to reparent native widgets newNativeContainer.reparentChild(comp); } - comp.peer.setZOrder(comp.getHWPeerAboveMe()); + comp.updateZOrder(); if (!comp.isLightweight() && isLightweight()) { // If component is heavyweight and one of the containers is lightweight diff --git a/jdk/src/share/classes/java/awt/Window.java b/jdk/src/share/classes/java/awt/Window.java index 01d9ff59d00..a95edb901d1 100644 --- a/jdk/src/share/classes/java/awt/Window.java +++ b/jdk/src/share/classes/java/awt/Window.java @@ -3674,6 +3674,10 @@ public class Window extends Container implements Accessible { }); // WindowAccessor } // static + // a window doesn't need to be updated in the Z-order. + @Override + void updateZOrder() {} + } // class Window diff --git a/jdk/src/windows/classes/sun/awt/windows/WPanelPeer.java b/jdk/src/windows/classes/sun/awt/windows/WPanelPeer.java index 10ca423146c..3b4af6dd1f6 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WPanelPeer.java +++ b/jdk/src/windows/classes/sun/awt/windows/WPanelPeer.java @@ -99,45 +99,4 @@ class WPanelPeer extends WCanvasPeer implements PanelPeer { public Insets insets() { return getInsets(); } - - private native void pRestack(Object[] peers); - private void restack(Container cont, Vector peers) { - for (int i = 0; i < cont.getComponentCount(); i++) { - Component comp = cont.getComponent(i); - if (!comp.isLightweight()) { - ComponentPeer peer = comp.getPeer(); - if (peer != null && (peer instanceof WComponentPeer)) - { - peers.add(peer); - } else { - if (log.isLoggable(Level.FINE)) { - log.log(Level.FINE, - "peer of a {0} is null or not a WComponentPeer: {1}.", - new Object[]{comp, peer}); - } - } - } - if (comp.isLightweight() && comp instanceof Container) { - restack((Container)comp, peers); - } - } - } - - /** - * @see java.awt.peer.ContainerPeer#restack - */ - public void restack() { - Vector peers = new Vector(); - peers.add(this); - Container cont = (Container)target; - restack(cont, peers); - pRestack(peers.toArray()); - } - - /** - * @see java.awt.peer.ContainerPeer#isRestackSupported - */ - public boolean isRestackSupported() { - return true; - } } From 71315ac3a3258881e14aa07d0028a483fd3900d5 Mon Sep 17 00:00:00 2001 From: Tim Bell Date: Mon, 20 Apr 2009 15:14:39 -0700 Subject: [PATCH 60/91] 6831313: update jaxws in OpenJDK7 to 2.1 plus bug fixes from OpenJDK 6 6672868: Package javax.xml.ws.wsaddressing not included in make/docs/CORE_PKGS.gmk Reviewed-by: darcy --- jaxws/THIRD_PARTY_README | 32 +- jaxws/TRADEMARK | 41 + jaxws/make/Makefile | 2 +- jaxws/make/build.xml | 9 + jaxws/make/jprt.properties | 18 +- .../activation/registries/MailcapFile.java | 13 +- .../com/sun/codemodel/internal/ClassType.java | 3 +- .../sun/codemodel/internal/CodeWriter.java | 3 +- .../sun/codemodel/internal/JAnnotatable.java | 3 +- .../internal/JAnnotationArrayMember.java | 3 +- .../internal/JAnnotationStringValue.java | 3 +- .../codemodel/internal/JAnnotationUse.java | 3 +- .../codemodel/internal/JAnnotationValue.java | 3 +- .../codemodel/internal/JAnnotationWriter.java | 3 +- .../codemodel/internal/JAnonymousClass.java | 3 +- .../com/sun/codemodel/internal/JArray.java | 2 +- .../sun/codemodel/internal/JArrayClass.java | 3 +- .../sun/codemodel/internal/JArrayCompRef.java | 2 +- .../sun/codemodel/internal/JAssignment.java | 2 +- .../codemodel/internal/JAssignmentTarget.java | 2 +- .../com/sun/codemodel/internal/JAtom.java | 2 +- .../com/sun/codemodel/internal/JBlock.java | 14 +- .../com/sun/codemodel/internal/JBreak.java | 2 +- .../com/sun/codemodel/internal/JCase.java | 3 +- .../com/sun/codemodel/internal/JCast.java | 2 +- .../sun/codemodel/internal/JCatchBlock.java | 2 +- .../com/sun/codemodel/internal/JClass.java | 4 +- .../JClassAlreadyExistsException.java | 3 +- .../codemodel/internal/JClassContainer.java | 5 +- .../sun/codemodel/internal/JCodeModel.java | 20 +- .../sun/codemodel/internal/JCommentPart.java | 3 +- .../sun/codemodel/internal/JConditional.java | 9 +- .../com/sun/codemodel/internal/JContinue.java | 2 +- .../sun/codemodel/internal/JDeclaration.java | 2 +- .../sun/codemodel/internal/JDefinedClass.java | 27 +- .../sun/codemodel/internal/JDirectClass.java | 3 +- .../com/sun/codemodel/internal/JDoLoop.java | 2 +- .../sun/codemodel/internal/JDocComment.java | 3 +- .../sun/codemodel/internal/JEnumConstant.java | 3 +- .../com/sun/codemodel/internal/JExpr.java | 6 +- .../sun/codemodel/internal/JExpression.java | 2 +- .../codemodel/internal/JExpressionImpl.java | 3 +- .../com/sun/codemodel/internal/JFieldRef.java | 2 +- .../com/sun/codemodel/internal/JFieldVar.java | 2 +- .../com/sun/codemodel/internal/JForEach.java | 53 +- .../com/sun/codemodel/internal/JForLoop.java | 2 +- .../sun/codemodel/internal/JFormatter.java | 2 +- .../sun/codemodel/internal/JGenerable.java | 2 +- .../sun/codemodel/internal/JGenerifiable.java | 3 +- .../codemodel/internal/JGenerifiableImpl.java | 3 +- .../sun/codemodel/internal/JInvocation.java | 38 +- .../com/sun/codemodel/internal/JJavaName.java | 9 +- .../com/sun/codemodel/internal/JLabel.java | 3 +- .../com/sun/codemodel/internal/JMethod.java | 514 ++-- .../com/sun/codemodel/internal/JMod.java | 2 +- .../com/sun/codemodel/internal/JMods.java | 16 +- .../codemodel/internal/JNarrowedClass.java | 3 +- .../com/sun/codemodel/internal/JNullType.java | 3 +- .../com/sun/codemodel/internal/JOp.java | 2 +- .../com/sun/codemodel/internal/JPackage.java | 2 +- .../codemodel/internal/JPrimitiveType.java | 2 +- .../sun/codemodel/internal/JResourceFile.java | 2 +- .../com/sun/codemodel/internal/JReturn.java | 2 +- .../sun/codemodel/internal/JStatement.java | 2 +- .../codemodel/internal/JStringLiteral.java | 3 +- .../com/sun/codemodel/internal/JSwitch.java | 3 +- .../com/sun/codemodel/internal/JThrow.java | 2 +- .../com/sun/codemodel/internal/JTryBlock.java | 2 +- .../com/sun/codemodel/internal/JType.java | 2 +- .../com/sun/codemodel/internal/JTypeVar.java | 3 +- .../sun/codemodel/internal/JTypeWildcard.java | 3 +- .../com/sun/codemodel/internal/JVar.java | 2 +- .../sun/codemodel/internal/JWhileLoop.java | 2 +- .../internal/TypedAnnotationWriter.java | 3 +- .../codemodel/internal/fmt/JBinaryFile.java | 3 +- .../codemodel/internal/fmt/JPropertyFile.java | 3 +- .../internal/fmt/JSerializedObject.java | 2 +- .../codemodel/internal/fmt/JStaticFile.java | 3 +- .../internal/fmt/JStaticJavaFile.java | 3 +- .../sun/codemodel/internal/fmt/JTextFile.java | 3 +- .../sun/codemodel/internal/fmt/package.html | 24 + .../sun/codemodel/internal/package-info.java | 3 +- .../internal/util/ClassNameComparator.java | 3 +- .../internal/util/EncoderFactory.java | 6 +- .../internal/util/JavadocEscapeWriter.java | 3 +- .../internal/util/MS1252Encoder.java | 6 +- .../internal/util/SingleByteEncoder.java | 168 +- .../codemodel/internal/util/Surrogate.java | 5 +- .../internal/util/UnicodeEscapeWriter.java | 3 +- .../internal/writer/FileCodeWriter.java | 3 +- .../internal/writer/FilterCodeWriter.java | 3 +- .../internal/writer/ProgressCodeWriter.java | 3 +- .../internal/writer/PrologCodeWriter.java | 3 +- .../writer/SingleStreamCodeWriter.java | 3 +- .../internal/writer/ZipCodeWriter.java | 3 +- .../istack/internal/ByteArrayDataSource.java | 3 +- .../sun/istack/internal/FinalArrayList.java | 3 +- .../internal/FragmentContentHandler.java | 3 +- .../com/sun/istack/internal/Interned.java | 3 +- .../com/sun/istack/internal/NotNull.java | 3 +- .../com/sun/istack/internal/Nullable.java | 3 +- .../classes/com/sun/istack/internal/Pool.java | 3 +- .../sun/istack/internal/SAXException2.java | 3 +- .../istack/internal/SAXParseException2.java | 3 +- .../istack/internal/XMLStreamException2.java | 62 + .../XMLStreamReaderToContentHandler.java | 50 +- .../com/sun/istack/internal/package-info.java | 3 +- .../istack/internal/tools/APTTypeVisitor.java | 3 +- .../internal/tools/MaskingClassLoader.java} | 55 +- .../tools/ParallelWorldClassLoader.java | 139 + .../istack/internal/tools/package-info.java | 3 +- .../ws/AnnotationProcessorFactoryImpl.java | 4 +- .../sun/istack/internal/ws/package-info.java | 4 +- .../com.sun.tools.internal.xjc.Plugin | 4 + .../sun/tools/internal/jxc/ConfigReader.java | 3 +- .../internal/jxc/MessageBundle.properties | 38 +- .../com/sun/tools/internal/jxc/Messages.java | 3 +- .../sun/tools/internal/jxc/NGCCRuntimeEx.java | 3 +- .../tools/internal/jxc/SchemaGenerator.java | 15 +- .../internal/jxc/apt/AnnotationParser.java | 5 +- .../apt/AnnotationProcessorFactoryImpl.java | 3 +- .../com/sun/tools/internal/jxc/apt/Const.java | 3 +- .../internal/jxc/apt/ErrorReceiverImpl.java | 3 +- .../jxc/apt/InlineAnnotationReaderImpl.java | 38 +- .../internal/jxc/apt/MessageBundle.properties | 32 +- .../sun/tools/internal/jxc/apt/Messages.java | 6 +- .../sun/tools/internal/jxc/apt/Options.java | 17 +- .../internal/jxc/apt/SchemaGenerator.java | 17 +- .../sun/tools/internal/jxc/apt/package.html | 24 + .../jxc/gen/config/AttributesImpl.java | 4 +- .../internal/jxc/gen/config/Classes.java | 97 +- .../tools/internal/jxc/gen/config/Config.java | 15 +- .../jxc/gen/config/NGCCEventReceiver.java | 3 +- .../jxc/gen/config/NGCCEventSource.java | 3 +- .../internal/jxc/gen/config/NGCCHandler.java | 4 +- .../jxc/gen/config/NGCCInterleaveFilter.java | 3 +- .../internal/jxc/gen/config/NGCCRuntime.java | 4 +- .../tools/internal/jxc/gen/config/Schema.java | 139 +- .../tools/internal/jxc/gen/config/config.rng | 24 + .../tools/internal/jxc/gen/config/config.xsd | 4 +- .../internal/jxc/model/nav/APTNavigator.java | 24 +- .../com/sun/tools/internal/txw2/Main.java | 222 -- .../com/sun/tools/internal/txw2/NameUtil.java | 348 --- .../tools/internal/txw2/RELAXNGLoader.java | 57 - .../com/sun/tools/internal/txw2/TxwTask.java | 163 -- .../relaxng/DataPatternBuilderImpl.java | 60 - .../txw2/builder/relaxng/DatatypeFactory.java | 72 - .../txw2/builder/relaxng/GrammarImpl.java | 57 - .../builder/relaxng/GrammarSectionImpl.java | 80 - .../builder/relaxng/SchemaBuilderImpl.java | 213 -- .../txw2/builder/relaxng/package.html | 3 - .../txw2/builder/xsd/XmlSchemaBuilder.java | 282 -- .../internal/txw2/builder/xsd/package.html | 3 - .../tools/internal/txw2/model/Attribute.java | 93 - .../sun/tools/internal/txw2/model/Define.java | 99 - .../tools/internal/txw2/model/Element.java | 201 -- .../sun/tools/internal/txw2/model/Leaf.java | 125 - .../tools/internal/txw2/model/NodeSet.java | 163 -- .../com/sun/tools/internal/ws/Invoker.java | 191 +- .../sun/tools/internal/ws/ToolVersion.java | 2 +- .../com/sun/tools/internal/ws/WsGen.java | 35 +- .../com/sun/tools/internal/ws/WsImport.java | 35 +- .../ws/api/TJavaGeneratorExtension.java | 46 + .../internal/ws/api/wsdl/TWSDLExtensible.java | 78 + .../internal/ws/api/wsdl/TWSDLExtension.java} | 19 +- .../ws/api/wsdl/TWSDLExtensionHandler.java | 215 ++ .../internal/ws/api/wsdl/TWSDLOperation.java} | 28 +- .../ws/api/wsdl/TWSDLParserContext.java | 81 + .../sun/tools/internal/ws/package-info.java | 31 +- .../internal/ws/processor/Processor.java | 118 - .../ws/processor/ProcessorActionVersion.java | 44 - .../ws/processor/ProcessorConstants.java | 36 - .../ws/processor/ProcessorException.java | 9 +- .../ws/processor/ProcessorOptions.java | 57 - .../ws/processor/config/ClassModelInfo.java | 61 - .../ws/processor/config/ModelInfo.java | 118 - .../ws/processor/config/WSDLModelInfo.java | 92 - .../config/parser/CustomizationParser.java | 144 - .../processor/config/parser/InputParser.java | 122 - .../config/parser/JAXWSBindingInfoParser.java | 100 - .../processor/config/parser/ParserUtil.java | 50 - .../ws/processor/config/parser/Reader.java | 110 - .../generator/CustomExceptionGenerator.java | 68 +- .../ws/processor/generator/GeneratorBase.java | 481 +--- .../generator/GeneratorConstants.java | 46 +- .../generator/GeneratorException.java | 5 +- .../ws/processor/generator/GeneratorUtil.java | 128 +- .../generator/JAXBTypeGenerator.java | 174 -- .../JavaGeneratorExtensionFacade.java} | 30 +- .../ws/processor/generator/Names.java | 297 +- .../ws/processor/generator/SeiGenerator.java | 175 +- .../processor/generator/ServiceGenerator.java | 174 +- .../generator/SimpleToBoxedUtil.java | 113 - .../W3CAddressingJavaGeneratorExtension.java | 97 + .../ws/processor/model/AbstractType.java | 13 +- .../ws/processor/model/AsyncOperation.java | 26 +- .../processor/model/AsyncOperationType.java | 4 +- .../internal/ws/processor/model/Block.java | 30 +- .../processor/model/ExtendedModelVisitor.java | 2 +- .../internal/ws/processor/model/Fault.java | 57 +- .../ws/processor/model/HeaderFault.java | 12 +- .../internal/ws/processor/model/Message.java | 37 +- .../internal/ws/processor/model/Model.java | 49 +- .../ws/processor/model/ModelException.java | 4 +- .../ws/processor/model/ModelObject.java | 32 +- .../ws/processor/model/ModelProperties.java | 2 +- .../ws/processor/model/ModelVisitor.java | 2 +- .../ws/processor/model/Operation.java | 25 +- .../ws/processor/model/Parameter.java | 29 +- .../internal/ws/processor/model/Port.java | 78 +- .../internal/ws/processor/model/Request.java | 9 +- .../internal/ws/processor/model/Response.java | 9 +- .../internal/ws/processor/model/Service.java | 17 +- .../model/exporter/ExternalObject.java | 2 +- .../processor/model/java/JavaArrayType.java | 2 +- .../processor/model/java/JavaException.java | 2 +- .../processor/model/java/JavaInterface.java | 9 +- .../ws/processor/model/java/JavaMethod.java | 128 +- .../processor/model/java/JavaParameter.java | 2 +- .../processor/model/java/JavaSimpleType.java | 4 +- .../model/java/JavaStructureMember.java | 2 +- .../model/java/JavaStructureType.java | 12 +- .../ws/processor/model/java/JavaType.java | 4 +- .../model/jaxb/JAXBElementMember.java | 5 +- .../ws/processor/model/jaxb/JAXBMapping.java | 12 +- .../ws/processor/model/jaxb/JAXBModel.java | 16 +- .../ws/processor/model/jaxb/JAXBProperty.java | 7 +- .../model/jaxb/JAXBStructuredType.java | 15 +- .../ws/processor/model/jaxb/JAXBType.java | 4 +- .../model/jaxb/JAXBTypeAndAnnotation.java | 6 +- .../processor/model/jaxb/JAXBTypeVisitor.java | 2 +- .../ws/processor/model/jaxb/RpcLitMember.java | 6 +- .../processor/model/jaxb/RpcLitStructure.java | 9 +- .../ws/processor/model/jaxb/Util.java | 2 +- .../modeler/JavaSimpleTypeCreator.java | 7 +- .../ws/processor/modeler/Modeler.java | 2 +- .../processor/modeler/ModelerConstants.java | 2 +- .../processor/modeler/ModelerException.java | 4 +- .../AnnotationProcessorContext.java | 117 +- .../modeler/annotation/FaultInfo.java | 3 +- .../annotation/MakeSafeTypeVisitor.java | 21 +- .../modeler/annotation/MemberInfo.java | 38 +- .../modeler/annotation/ModelBuilder.java | 33 +- .../modeler/annotation/TypeModeler.java | 65 +- .../modeler/annotation/TypeMoniker.java | 5 +- .../annotation/TypeMonikerFactory.java | 13 +- .../modeler/annotation/WebServiceAP.java | 293 +- .../annotation/WebServiceConstants.java | 5 +- .../WebServiceReferenceCollector.java | 87 - .../modeler/annotation/WebServiceVisitor.java | 338 +-- .../WebServiceWrapperGenerator.java | 335 +-- .../modeler/annotation/WrapperInfo.java | 4 +- .../modeler/wsdl/AccessorElement.java | 2 +- .../modeler/wsdl/ClassNameAllocatorImpl.java | 8 +- .../modeler/wsdl/ConsoleErrorReporter.java | 90 +- .../modeler/wsdl/JAXBModelBuilder.java | 123 +- .../ws/processor/modeler/wsdl/MimeHelper.java | 6 +- .../modeler/{ => wsdl}/ModelerUtils.java | 35 +- .../modeler/wsdl/PseudoSchemaBuilder.java | 130 +- .../processor/modeler/wsdl/WSDLModeler.java | 2000 +++++++------- .../modeler/wsdl/WSDLModelerBase.java | 619 ++--- .../ws/processor/util/ClassNameCollector.java | 28 +- .../util/ClientProcessorEnvironment.java | 224 -- .../ws/processor/util/DirectoryUtil.java | 15 +- .../ws/processor/util/IndentingWriter.java | 6 +- .../processor/util/ProcessorEnvironment.java | 108 - .../util/ProcessorEnvironmentBase.java | 119 - .../ws/resources/ConfigurationMessages.java | 65 + .../ws/resources/GeneratorMessages.java | 101 + .../ws/resources/JavacompilerMessages.java | 77 + .../internal/ws/resources/ModelMessages.java | 702 +++++ .../ws/resources/ModelerMessages.java | 1602 +++++++++++ .../ProcessorMessages.java} | 33 +- .../internal/ws/resources/UtilMessages.java | 77 + .../ws/resources/WebserviceapMessages.java | 893 ++++++ .../ws/resources/WscompileMessages.java | 648 +++++ .../internal/ws/resources/WsdlMessages.java | 978 +++++++ .../ws/resources/configuration.properties | 4 +- .../ws/resources/generator.properties | 4 +- .../ws/resources/javacompiler.properties | 8 +- .../internal/ws/resources/model.properties | 9 +- .../internal/ws/resources/modeler.properties | 36 +- .../ws/resources/processor.properties | 4 +- .../internal/ws/resources/util.properties | 4 +- .../ws/resources/webserviceap.properties | 13 +- .../ws/resources/wscompile.properties | 70 +- .../internal/ws/resources/wsdl.properties | 52 +- .../internal/ws/spi/WSToolsObjectFactory.java | 46 +- .../tools/internal/ws/spi/package-info.java | 4 +- .../tools/internal/ws/util/ClassNameInfo.java | 2 +- .../internal/ws/util/ForkEntityResolver.java | 6 +- .../internal/ws/util/JAXWSClassFactory.java | 105 - .../internal/ws/util/JavaCompilerHelper.java | 176 -- .../sun/tools/internal/ws/util/MapBase.java | 691 ----- .../sun/tools/internal/ws/util/ToolBase.java | 142 - .../internal/ws/util/WSDLParseException.java | 5 +- .../ws/util/WSToolsObjectFactoryImpl.java | 15 +- .../ws/util/xml/NodeListIterator.java | 64 - .../ws/util/xml/PrettyPrintingXmlWriter.java | 646 ----- .../tools/internal/ws/util/xml/XmlUtil.java | 28 +- .../tools/internal/ws/util/xml/XmlWriter.java | 643 ----- .../sun/tools/internal/ws/version.properties | 32 +- .../wscompile/AbortException.java} | 23 +- .../ws/wscompile/ActionConstants.java | 45 - .../wscompile/BadCommandLineException.java} | 42 +- .../internal/ws/wscompile/CompileTool.java | 967 ------- .../internal/ws/wscompile/ErrorReceiver.java | 158 ++ .../wscompile/ErrorReceiverFilter.java} | 63 +- .../ws/wscompile/FilerCodeWriter.java | 22 +- .../ws/wscompile/JavaCompilerHelper.java | 89 + .../tools/internal/ws/wscompile/Options.java | 385 +++ .../internal/ws/wscompile/WSCodeWriter.java | 22 +- .../internal/ws/wscompile/WsgenOptions.java | 265 ++ .../internal/ws/wscompile/WsgenTool.java | 401 +++ .../ws/wscompile/WsimportListener.java | 89 + .../ws/wscompile/WsimportOptions.java | 364 +++ .../internal/ws/wscompile/WsimportTool.java | 248 ++ .../internal/ws/wsdl/document/Binding.java | 64 +- .../ws/wsdl/document/BindingFault.java | 44 +- .../ws/wsdl/document/BindingInput.java | 44 +- .../ws/wsdl/document/BindingOperation.java | 64 +- .../ws/wsdl/document/BindingOutput.java | 44 +- .../ws/wsdl/document/Definitions.java | 51 +- .../ws/wsdl/document/Documentation.java | 2 +- .../internal/ws/wsdl/document/Fault.java | 62 +- .../internal/ws/wsdl/document/Import.java | 10 +- .../internal/ws/wsdl/document/Input.java | 64 +- .../internal/ws/wsdl/document/Kinds.java | 2 +- .../internal/ws/wsdl/document/Message.java | 36 +- .../ws/wsdl/document/MessagePart.java | 16 +- .../internal/ws/wsdl/document/Operation.java | 82 +- .../ws/wsdl/document/OperationStyle.java | 2 +- .../internal/ws/wsdl/document/Output.java | 63 +- .../tools/internal/ws/wsdl/document/Port.java | 62 +- .../internal/ws/wsdl/document/PortType.java | 60 +- .../internal/ws/wsdl/document/Service.java | 46 +- .../internal/ws/wsdl/document/Types.java | 46 +- .../ws/wsdl/document/WSDLConstants.java | 2 +- .../ws/wsdl/document/WSDLDocument.java | 30 +- .../ws/wsdl/document/WSDLDocumentVisitor.java | 2 +- .../document/WSDLDocumentVisitorBase.java | 2 +- .../ws/wsdl/document/http/HTTPAddress.java | 12 +- .../ws/wsdl/document/http/HTTPBinding.java | 12 +- .../ws/wsdl/document/http/HTTPConstants.java | 2 +- .../ws/wsdl/document/http/HTTPOperation.java | 12 +- .../ws/wsdl/document/http/HTTPUrlEncoded.java | 13 +- .../document/http/HTTPUrlReplacement.java | 12 +- .../ws/wsdl/document/jaxws/CustomName.java | 2 +- .../ws/wsdl/document/jaxws/Exception.java | 2 +- .../ws/wsdl/document/jaxws/JAXWSBinding.java | 38 +- .../jaxws/JAXWSBindingsConstants.java | 13 +- .../ws/wsdl/document/jaxws/Parameter.java | 2 +- .../ws/wsdl/document/mime/MIMEConstants.java | 2 +- .../ws/wsdl/document/mime/MIMEContent.java | 12 +- .../document/mime/MIMEMultipartRelated.java | 25 +- .../ws/wsdl/document/mime/MIMEPart.java | 35 +- .../ws/wsdl/document/mime/MIMEXml.java | 12 +- .../ws/wsdl/document/schema/BuiltInTypes.java | 86 - .../ws/wsdl/document/schema/Schema.java | 188 -- .../wsdl/document/schema/SchemaAttribute.java | 106 - .../wsdl/document/schema/SchemaConstants.java | 2 +- .../wsdl/document/schema/SchemaDocument.java | 126 - .../wsdl/document/schema/SchemaElement.java | 347 --- .../ws/wsdl/document/schema/SchemaEntity.java | 84 - .../ws/wsdl/document/schema/SchemaKinds.java | 2 +- .../ws/wsdl/document/soap/SOAP12Binding.java | 8 +- .../wsdl/document/soap/SOAP12Constants.java | 2 +- .../ws/wsdl/document/soap/SOAPAddress.java | 12 +- .../ws/wsdl/document/soap/SOAPBinding.java | 12 +- .../ws/wsdl/document/soap/SOAPBody.java | 12 +- .../ws/wsdl/document/soap/SOAPConstants.java | 6 +- .../ws/wsdl/document/soap/SOAPFault.java | 12 +- .../ws/wsdl/document/soap/SOAPHeader.java | 19 +- .../wsdl/document/soap/SOAPHeaderFault.java | 14 +- .../ws/wsdl/document/soap/SOAPOperation.java | 13 +- .../ws/wsdl/document/soap/SOAPStyle.java | 2 +- .../ws/wsdl/document/soap/SOAPUse.java | 2 +- .../ws/wsdl/framework/AbstractDocument.java | 158 +- .../internal/ws/wsdl/framework/Defining.java | 2 +- .../framework/DuplicateEntityException.java | 4 +- .../internal/ws/wsdl/framework/Elemental.java | 5 +- .../internal/ws/wsdl/framework/Entity.java | 19 +- .../ws/wsdl/framework/EntityAction.java | 2 +- .../wsdl/framework/EntityReferenceAction.java | 2 +- .../framework/EntityReferenceValidator.java | 2 +- .../wsdl/framework/ExtensibilityHelper.java | 39 +- .../ws/wsdl/framework/Extensible.java | 38 - .../{Extension.java => ExtensionImpl.java} | 17 +- .../ws/wsdl/framework/ExtensionVisitor.java | 8 +- .../wsdl/framework/ExtensionVisitorBase.java | 8 +- .../framework/ExternalEntityReference.java | 2 +- .../ws/wsdl/framework/GlobalEntity.java | 9 +- .../ws/wsdl/framework/GloballyKnown.java | 2 +- .../ws/wsdl/framework/Identifiable.java | 2 +- .../internal/ws/wsdl/framework/Kind.java | 2 +- .../wsdl/framework/NoSuchEntityException.java | 4 +- .../ws/wsdl/framework/ParseException.java | 8 +- .../ws/wsdl/framework/ParserListener.java | 4 +- .../ws/wsdl/framework/QNameAction.java | 2 +- ...ntext.java => TWSDLParserContextImpl.java} | 68 +- .../wsdl/framework/ValidationException.java | 5 +- .../ws/wsdl/framework/WSDLLocation.java | 5 +- .../ws/wsdl/framework/WriterContext.java | 212 -- .../wsdl/parser/AbstractExtensionHandler.java | 84 + .../parser/AbstractReferenceFinderImpl.java | 111 + .../internal/ws/wsdl/parser/Constants.java | 2 +- .../internal/ws/wsdl/parser/DOMBuilder.java | 104 + .../internal/ws/wsdl/parser/DOMForest.java | 417 +++ .../ws/wsdl/parser/DOMForestScanner.java | 178 ++ .../ws/wsdl/parser/ExtensionHandlerBase.java | 130 - .../ws/wsdl/parser/HTTPExtensionHandler.java | 168 +- .../ws/wsdl/parser/InternalizationLogic.java | 109 + .../internal/ws/wsdl/parser/Internalizer.java | 270 +- .../parser/JAXWSBindingExtensionHandler.java | 244 +- .../ws/wsdl/parser/MIMEExtensionHandler.java | 138 +- ...rSubmissionAddressingExtensionHandler.java | 71 + .../ws/wsdl/parser/MetadataFinder.java | 252 ++ .../ws/wsdl/parser/NamespaceContextImpl.java | 29 +- .../wsdl/parser/SOAP12ExtensionHandler.java | 17 +- .../parser/SOAPEntityReferenceValidator.java | 11 +- .../ws/wsdl/parser/SOAPExtensionHandler.java | 264 +- .../wsdl/parser/SchemaExtensionHandler.java | 77 - .../internal/ws/wsdl/parser/SchemaParser.java | 353 --- .../internal/ws/wsdl/parser/SchemaWriter.java | 158 -- .../tools/internal/ws/wsdl/parser/Util.java | 29 +- .../ws/wsdl/parser/VersionChecker.java | 138 + .../parser/W3CAddressingExtensionHandler.java | 142 + .../wsdl/parser/WSDLInternalizationLogic.java | 142 + .../internal/ws/wsdl/parser/WSDLParser.java | 980 +++---- .../internal/ws/wsdl/parser/WSDLWriter.java | 371 --- .../ws/wsdl/parser/WhitespaceStripper.java | 124 + .../tools/internal/xjc/AbortException.java | 2 +- .../internal/xjc/BadCommandLineException.java | 3 +- .../internal/xjc/ConsoleErrorReporter.java | 3 +- .../com/sun/tools/internal/xjc/Driver.java | 15 +- .../sun/tools/internal/xjc/ErrorReceiver.java | 11 +- .../com/sun/tools/internal/xjc/Language.java | 3 +- .../internal/xjc/MessageBundle.properties | 79 +- .../com/sun/tools/internal/xjc/Messages.java | 33 +- .../sun/tools/internal/xjc/ModelLoader.java | 30 +- .../com/sun/tools/internal/xjc/Options.java | 186 +- .../com/sun/tools/internal/xjc/Plugin.java | 17 +- .../internal/xjc/ProgressCodeWriter.java | 5 +- .../sun/tools/internal/xjc/SchemaCache.java | 3 +- .../sun/tools/internal/xjc/XJCListener.java | 26 +- .../xjc/addon/at_generated/PluginImpl.java | 5 +- .../xjc/addon/code_injector/Const.java | 3 +- .../xjc/addon/code_injector/PluginImpl.java | 3 +- .../xjc/addon/episode/PluginImpl.java | 244 ++ .../xjc/addon/episode/package-info.java | 29 + .../addon/locator/SourceLocationAddOn.java | 8 +- .../addon/sync/SynchronizedMethodAddOn.java | 3 +- .../internal/xjc/api/ClassNameAllocator.java | 3 +- .../tools/internal/xjc/api/ErrorListener.java | 5 +- .../tools/internal/xjc/api/J2SJAXBModel.java | 32 +- .../sun/tools/internal/xjc/api/JAXBModel.java | 3 +- .../tools/internal/xjc/api/JavaCompiler.java | 3 +- .../sun/tools/internal/xjc/api/Mapping.java | 3 +- .../sun/tools/internal/xjc/api/Property.java | 3 +- .../sun/tools/internal/xjc/api/Reference.java | 3 +- .../tools/internal/xjc/api/S2JJAXBModel.java | 15 +- .../internal/xjc/api/SchemaCompiler.java | 20 +- .../tools/internal/xjc/api/SpecVersion.java | 57 + .../internal/xjc/api/TypeAndAnnotation.java | 3 +- .../com/sun/tools/internal/xjc/api/XJC.java | 3 +- .../xjc/api/impl/j2s/JAXBModelImpl.java | 44 +- .../xjc/api/impl/j2s/JavaCompilerImpl.java | 7 +- .../internal/xjc/api/impl/j2s/Messages.java | 3 +- .../xjc/api/impl/j2s/Messages.properties | 25 + .../xjc/api/impl/s2j/AbstractMappingImpl.java | 3 +- .../xjc/api/impl/s2j/BeanMappingImpl.java | 3 +- .../api/impl/s2j/DowngradingErrorHandler.java | 3 +- .../xjc/api/impl/s2j/ElementAdapter.java | 3 +- .../impl/s2j/ElementCollectionAdapter.java | 3 +- .../xjc/api/impl/s2j/ElementMappingImpl.java | 3 +- .../api/impl/s2j/ElementSingleAdapter.java | 3 +- .../xjc/api/impl/s2j/JAXBModelImpl.java | 11 +- .../xjc/api/impl/s2j/PropertyImpl.java | 3 +- .../xjc/api/impl/s2j/SchemaCompilerImpl.java | 26 +- .../api/impl/s2j/TypeAndAnnotationImpl.java | 3 +- .../internal/xjc/api/impl/s2j/package.html | 24 + .../sun/tools/internal/xjc/api/package.html | 24 + .../internal/xjc/api/util/APTClassLoader.java | 15 +- .../xjc/api/util/FilerCodeWriter.java | 3 +- .../tools/internal/xjc/api/util/Messages.java | 3 +- .../internal/xjc/api/util/Messages.properties | 25 + .../api/util/ToolsJarNotFoundException.java | 3 +- .../tools/internal/xjc/api/util/package.html | 24 + .../annotation/ri/XmlIsSetWriter.java | 4 +- .../annotation/ri/XmlLocationWriter.java | 4 +- .../spec/XmlAccessorOrderWriter.java | 4 +- .../spec/XmlAccessorTypeWriter.java | 4 +- .../spec/XmlAnyAttributeWriter.java | 4 +- .../annotation/spec/XmlAnyElementWriter.java | 4 +- .../spec/XmlAttachmentRefWriter.java | 4 +- .../annotation/spec/XmlAttributeWriter.java | 4 +- .../annotation/spec/XmlElementDeclWriter.java | 4 +- .../annotation/spec/XmlElementRefWriter.java | 4 +- .../annotation/spec/XmlElementRefsWriter.java | 4 +- .../spec/XmlElementWrapperWriter.java | 6 +- .../annotation/spec/XmlElementWriter.java | 4 +- .../annotation/spec/XmlElementsWriter.java | 4 +- .../annotation/spec/XmlEnumValueWriter.java | 4 +- .../annotation/spec/XmlEnumWriter.java | 4 +- .../annotation/spec/XmlIDREFWriter.java | 4 +- .../annotation/spec/XmlIDWriter.java | 4 +- .../spec/XmlInlineBinaryDataWriter.java | 4 +- .../spec/XmlJavaTypeAdapterWriter.java | 4 +- .../annotation/spec/XmlListWriter.java | 4 +- .../annotation/spec/XmlMimeTypeWriter.java | 4 +- .../annotation/spec/XmlMixedWriter.java | 4 +- .../annotation/spec/XmlNsWriter.java | 4 +- .../annotation/spec/XmlRegistryWriter.java | 4 +- .../annotation/spec/XmlRootElementWriter.java | 4 +- .../annotation/spec/XmlSchemaTypeWriter.java | 4 +- .../annotation/spec/XmlSchemaTypesWriter.java | 4 +- .../annotation/spec/XmlSchemaWriter.java | 6 +- .../annotation/spec/XmlSeeAlsoWriter.java | 40 + .../annotation/spec/XmlTransientWriter.java | 4 +- .../annotation/spec/XmlTypeWriter.java | 4 +- .../annotation/spec/XmlValueWriter.java | 4 +- .../xjc/generator/bean/BeanGenerator.java | 118 +- .../xjc/generator/bean/ClassOutlineImpl.java | 3 +- .../bean/DualObjectFactoryGenerator.java | 3 +- .../generator/bean/ElementOutlineImpl.java | 3 +- .../generator/bean/ImplStructureStrategy.java | 3 +- .../generator/bean/MessageBundle.properties | 25 + .../internal/xjc/generator/bean/Messages.java | 2 +- .../xjc/generator/bean/MethodWriter.java | 3 +- .../bean/ObjectFactoryGenerator.java | 3 +- .../bean/ObjectFactoryGeneratorImpl.java | 3 +- .../generator/bean/PackageOutlineImpl.java | 6 +- .../bean/PrivateObjectFactoryGenerator.java | 3 +- .../bean/PublicObjectFactoryGenerator.java | 3 +- .../generator/bean/field/AbstractField.java | 10 +- .../bean/field/AbstractFieldWithVar.java | 3 +- .../bean/field/AbstractListField.java | 3 +- .../xjc/generator/bean/field/ArrayField.java | 3 +- .../xjc/generator/bean/field/ConstField.java | 3 +- .../bean/field/ConstFieldRenderer.java | 3 +- .../bean/field/DefaultFieldRenderer.java | 3 +- .../generator/bean/field/FieldRenderer.java | 2 +- .../bean/field/FieldRendererFactory.java | 3 +- .../bean/field/GenericFieldRenderer.java | 3 +- .../xjc/generator/bean/field/IsSetField.java | 3 +- .../bean/field/IsSetFieldRenderer.java | 3 +- .../bean/field/MessageBundle.properties | 25 + .../xjc/generator/bean/field/Messages.java | 3 +- .../xjc/generator/bean/field/SingleField.java | 3 +- .../field/SinglePrimitiveAccessField.java | 3 +- .../generator/bean/field/UnboxedField.java | 3 +- .../bean/field/UntypedListField.java | 3 +- .../bean/field/UntypedListFieldRenderer.java | 3 +- .../xjc/generator/bean/field/package.html | 24 + .../internal/xjc/generator/package-info.java | 3 +- .../xjc/generator/util/BlockReference.java | 3 +- .../util/ExistingBlockReference.java | 3 +- .../generator/util/LazyBlockReference.java | 3 +- .../generator/util/WhitespaceNormalizer.java | 3 +- .../model/AbstractCElement.java} | 53 +- .../xjc/model/AbstractCTypeInfoImpl.java | 10 +- .../model/AutoClassNameAllocator.java} | 69 +- .../tools/internal/xjc/model/CAdapter.java | 3 +- .../tools/internal/xjc/model/CArrayInfo.java | 8 +- .../xjc/model/CAttributePropertyInfo.java | 15 +- .../internal/xjc/model/CBuiltinLeafInfo.java | 20 +- .../model/Text.java => xjc/model/CClass.java} | 17 +- .../tools/internal/xjc/model/CClassInfo.java | 137 +- .../internal/xjc/model/CClassInfoParent.java | 3 +- .../tools/internal/xjc/model/CClassRef.java | 133 + .../internal/xjc/model/CCustomizable.java | 3 +- .../internal/xjc/model/CCustomizations.java | 3 +- .../internal/xjc/model/CDefaultValue.java | 3 +- .../tools/internal/xjc/model/CElement.java | 7 +- .../internal/xjc/model/CElementInfo.java | 51 +- .../xjc/model/CElementPropertyInfo.java | 32 +- .../internal/xjc/model/CEnumConstant.java | 3 +- .../internal/xjc/model/CEnumLeafInfo.java | 10 +- .../tools/internal/xjc/model/CNonElement.java | 28 +- .../xjc/model/CPluginCustomization.java | 3 +- .../internal/xjc/model/CPropertyInfo.java | 67 +- .../internal/xjc/model/CPropertyVisitor.java | 3 +- .../xjc/model/CReferencePropertyInfo.java | 25 +- .../xjc/model/CSingleTypePropertyInfo.java | 29 +- .../tools/internal/xjc/model/CTypeInfo.java | 9 +- .../tools/internal/xjc/model/CTypeRef.java | 27 +- .../xjc/model/CValuePropertyInfo.java | 9 +- .../internal/xjc/model/CWildcardTypeInfo.java | 3 +- .../xjc/model/ClassNameAllocatorWrapper.java | 3 +- .../tools/internal/xjc/model/Constructor.java | 3 +- .../sun/tools/internal/xjc/model/Model.java | 67 +- .../internal/xjc/model/Multiplicity.java | 3 +- .../tools/internal/xjc/model/Populatable.java | 3 +- .../tools/internal/xjc/model/SymbolSpace.java | 3 +- .../sun/tools/internal/xjc/model/TypeUse.java | 6 +- .../internal/xjc/model/TypeUseFactory.java | 3 +- .../tools/internal/xjc/model/TypeUseImpl.java | 9 +- .../internal/xjc/model/nav/EagerNClass.java | 3 +- .../internal/xjc/model/nav/EagerNType.java | 3 +- .../tools/internal/xjc/model/nav/NClass.java | 3 +- .../xjc/model/nav/NClassByJClass.java | 3 +- .../xjc/model/nav/NParameterizedType.java | 3 +- .../tools/internal/xjc/model/nav/NType.java | 3 +- .../internal/xjc/model/nav/NavigatorImpl.java | 9 +- .../tools/internal/xjc/model/nav/package.html | 24 + .../internal/xjc/model/package-info.java | 3 +- .../tools/internal/xjc/outline/Aspect.java | 3 +- .../internal/xjc/outline/ClassOutline.java | 16 +- .../internal/xjc/outline/ElementOutline.java | 3 +- .../xjc/outline/EnumConstantOutline.java | 3 +- .../internal/xjc/outline/EnumOutline.java | 17 +- .../internal/xjc/outline/FieldAccessor.java | 3 +- .../internal/xjc/outline/FieldOutline.java | 3 +- .../tools/internal/xjc/outline/Outline.java | 3 +- .../internal/xjc/outline/PackageOutline.java | 3 +- .../tools/internal/xjc/outline/package.html | 24 + .../sun/tools/internal/xjc/package-info.java | 3 +- .../AbstractExtensionBindingChecker.java | 202 ++ .../sun/tools/internal/xjc/reader/Const.java | 3 +- .../xjc/reader/ExtensionBindingChecker.java | 210 +- .../xjc/reader/MessageBundle.properties | 32 +- .../tools/internal/xjc/reader/Messages.java | 6 +- .../internal/xjc/reader/ModelChecker.java | 15 +- .../tools/internal/xjc/reader/RawTypeSet.java | 125 +- .../sun/tools/internal/xjc/reader/Ring.java | 3 +- .../tools/internal/xjc/reader/TypeUtil.java | 3 +- .../sun/tools/internal/xjc/reader/Util.java | 3 +- .../tools/internal/xjc/reader/dtd/Block.java | 3 +- .../internal/xjc/reader/dtd/Element.java | 15 +- .../xjc/reader/dtd/MessageBundle.properties | 25 + .../internal/xjc/reader/dtd/Messages.java | 2 +- .../internal/xjc/reader/dtd/ModelGroup.java | 3 +- .../internal/xjc/reader/dtd/Occurence.java | 3 +- .../internal/xjc/reader/dtd/TDTDReader.java | 29 +- .../tools/internal/xjc/reader/dtd/Term.java | 3 +- .../xjc/reader/dtd/bindinfo/BIAttribute.java | 3 +- .../reader/dtd/bindinfo/BIConstructor.java | 5 +- .../xjc/reader/dtd/bindinfo/BIContent.java | 3 +- .../xjc/reader/dtd/bindinfo/BIConversion.java | 3 +- .../xjc/reader/dtd/bindinfo/BIElement.java | 7 +- .../reader/dtd/bindinfo/BIEnumeration.java | 7 +- .../xjc/reader/dtd/bindinfo/BIInterface.java | 5 +- .../reader/dtd/bindinfo/BIUserConversion.java | 11 +- .../xjc/reader/dtd/bindinfo/BindInfo.java | 49 +- .../xjc/reader/dtd/bindinfo/DOMBuilder.java | 5 +- .../{DOM4JLocator.java => DOMLocator.java} | 7 +- .../xjc/reader/dtd/bindinfo/DOMUtil.java | 3 +- .../bindinfo/DTDExtensionBindingChecker.java | 88 + .../dtd/bindinfo/MessageBundle.properties | 24 + .../xjc/reader/dtd/bindinfo/Messages.java | 2 +- .../xjc/reader/dtd/bindinfo/bindingfile.rng | 24 + .../xjc/reader/dtd/bindinfo/bindingfile.xsd | 4 +- .../xjc/reader/dtd/bindinfo/package.html | 24 + .../internal/xjc/reader/dtd/bindinfo/xjc.xsd | 4 +- .../internal/xjc/reader/gbind/Choice.java | 3 +- .../xjc/reader/gbind/ConnectedComponent.java | 3 +- .../internal/xjc/reader/gbind/Element.java | 9 +- .../internal/xjc/reader/gbind/ElementSet.java | 3 +- .../xjc/reader/gbind/ElementSets.java | 7 +- .../internal/xjc/reader/gbind/Expression.java | 3 +- .../internal/xjc/reader/gbind/Graph.java | 3 +- .../internal/xjc/reader/gbind/OneOrMore.java | 3 +- .../internal/xjc/reader/gbind/Sequence.java | 3 +- .../internal/xjc/reader/gbind/SinkNode.java | 3 +- .../internal/xjc/reader/gbind/SourceNode.java | 3 +- .../internal/xjc/reader/gbind/package.html | 24 + .../AbstractReferenceFinderImpl.java | 11 +- .../ContentHandlerNamespacePrefixAdapter.java | 3 +- .../xjc/reader/internalizer/DOMBuilder.java | 3 +- .../xjc/reader/internalizer/DOMForest.java | 27 +- .../reader/internalizer/DOMForestParser.java | 3 +- .../reader/internalizer/DOMForestScanner.java | 3 +- .../internalizer/InternalizationLogic.java | 3 +- .../xjc/reader/internalizer/Internalizer.java | 125 +- .../xjc/reader/internalizer/LocatorTable.java | 3 +- .../internalizer/MessageBundle.properties | 49 +- .../xjc/reader/internalizer/Messages.java | 18 +- .../internalizer/NamespaceContextImpl.java | 31 +- .../internalizer/SCDBasedBindingSet.java | 245 ++ .../reader/internalizer/VersionChecker.java | 11 +- .../internalizer/WhitespaceStripper.java | 6 +- .../xjc/reader/internalizer/package.html | 24 + .../tools/internal/xjc/reader/package.html | 24 + .../xjc/reader/relaxng/BindStyle.java | 3 +- .../reader/relaxng/ContentModelBinder.java | 5 +- .../xjc/reader/relaxng/DatatypeLib.java | 3 +- .../xjc/reader/relaxng/DefineFinder.java | 3 +- .../xjc/reader/relaxng/NameCalculator.java | 3 +- .../xjc/reader/relaxng/RELAXNGCompiler.java | 5 +- .../relaxng/RELAXNGInternalizationLogic.java | 3 +- .../xjc/reader/relaxng/RawTypeSetBuilder.java | 5 +- .../xjc/reader/relaxng/TypePatternBinder.java | 3 +- .../xjc/reader/relaxng/TypeUseBinder.java | 3 +- .../xjc/reader/xmlschema/Abstractifier.java | 8 +- .../xjc/reader/xmlschema/BGMBuilder.java | 82 +- .../xjc/reader/xmlschema/BindBlue.java | 3 +- .../xjc/reader/xmlschema/BindGreen.java | 9 +- .../xjc/reader/xmlschema/BindPurple.java | 6 +- .../xjc/reader/xmlschema/BindRed.java | 5 +- .../xjc/reader/xmlschema/BindYellow.java | 3 +- .../reader/xmlschema/BindingComponent.java | 3 +- .../xjc/reader/xmlschema/ClassBinder.java | 3 +- .../reader/xmlschema/ClassBinderFilter.java | 3 +- .../xjc/reader/xmlschema/ClassSelector.java | 66 +- .../xjc/reader/xmlschema/CollisionInfo.java | 6 +- .../xjc/reader/xmlschema/ColorBinder.java | 14 +- .../reader/xmlschema/DefaultClassBinder.java | 116 +- .../xmlschema/DefaultParticleBinder.java | 3 +- .../xjc/reader/xmlschema/ErrorReporter.java | 3 +- .../reader/xmlschema/ExpressionBuilder.java | 6 +- .../xmlschema/ExpressionParticleBinder.java | 7 +- .../xjc/reader/xmlschema/GElement.java | 3 +- .../xjc/reader/xmlschema/GElementImpl.java | 3 +- .../reader/xmlschema/GWildcardElement.java | 24 +- .../reader/xmlschema/MessageBundle.properties | 36 + .../xjc/reader/xmlschema/Messages.java | 10 +- .../reader/xmlschema/MultiplicityCounter.java | 3 +- .../xjc/reader/xmlschema/ParticleBinder.java | 3 +- .../reader/xmlschema/RawTypeSetBuilder.java | 127 +- .../xjc/reader/xmlschema/RefererFinder.java | 3 +- .../reader/xmlschema/SimpleTypeBuilder.java | 35 +- .../xmlschema/UnusedCustomizationChecker.java | 3 +- .../xmlschema/WildcardNameClassBuilder.java | 2 +- .../bindinfo/AbstractDeclarationImpl.java | 3 +- .../bindinfo/AnnotationParserFactoryImpl.java | 47 +- .../reader/xmlschema/bindinfo/BIClass.java | 42 +- .../xmlschema/bindinfo/BIConversion.java | 8 +- .../xmlschema/bindinfo/BIDeclaration.java | 7 +- .../xjc/reader/xmlschema/bindinfo/BIDom.java | 3 +- .../xjc/reader/xmlschema/bindinfo/BIEnum.java | 16 +- .../xmlschema/bindinfo/BIEnumMember.java | 3 +- .../xmlschema/bindinfo/BIGlobalBinding.java | 18 +- .../reader/xmlschema/bindinfo/BIProperty.java | 13 +- .../xmlschema/bindinfo/BISchemaBinding.java | 11 +- .../xmlschema/bindinfo/BISerializable.java | 3 +- .../xjc/reader/xmlschema/bindinfo/BIXDom.java | 3 +- .../bindinfo/BIXPluginCustomization.java | 3 +- .../xmlschema/bindinfo/BIXSubstitutable.java} | 41 +- .../reader/xmlschema/bindinfo/BindInfo.java | 45 +- .../bindinfo/CollectionTypeAttribute.java | 3 +- .../xmlschema/bindinfo/DomHandlerEx.java | 3 +- .../xmlschema/bindinfo/EnumMemberMode.java | 3 +- .../xmlschema/bindinfo/ForkingFilter.java | 3 +- .../xmlschema/bindinfo/LocalScoping.java | 3 +- .../bindinfo/MessageBundle.properties | 25 + .../reader/xmlschema/bindinfo/Messages.java | 2 +- .../bindinfo/OptionalPropertyMode.java | 3 +- .../xjc/reader/xmlschema/bindinfo/binding.rng | 24 + .../xjc/reader/xmlschema/bindinfo/binding.xsd | 32 +- .../xmlschema/bindinfo/package-info.java | 3 +- .../reader/xmlschema/bindinfo/package.html | 24 + .../xjc/reader/xmlschema/bindinfo/xjc.xsd | 10 +- .../xjc/reader/xmlschema/bindinfo/xs.xsd | 4 +- .../xjc/reader/xmlschema/ct/CTBuilder.java | 3 +- .../ct/ChoiceContentComplexTypeBuilder.java | 3 +- .../xmlschema/ct/ComplexTypeBindingMode.java | 5 +- .../xmlschema/ct/ComplexTypeFieldBuilder.java | 5 +- .../ct/ExtendedComplexTypeBuilder.java | 6 +- .../xmlschema/ct/FreshComplexTypeBuilder.java | 6 +- .../xmlschema/ct/MessageBundle.properties | 25 + .../xjc/reader/xmlschema/ct/Messages.java | 3 +- .../xmlschema/ct/MixedComplexTypeBuilder.java | 5 +- .../ct/RestrictedComplexTypeBuilder.java | 14 +- .../ct/STDerivedComplexTypeBuilder.java | 6 +- .../parser/CustomizationContextChecker.java | 3 +- .../parser/IncorrectNamespaceURIChecker.java | 3 +- .../xmlschema/parser/LSInputSAXWrapper.java | 3 +- .../xmlschema/parser/MessageBundle.properties | 25 + .../xjc/reader/xmlschema/parser/Messages.java | 2 +- .../parser/SchemaConstraintChecker.java | 3 +- .../parser/XMLSchemaInternalizationLogic.java | 3 +- .../xjc/runtime/JAXBContextFactory.java | 5 +- .../xjc/runtime/ZeroOneBooleanAdapter.java | 3 +- .../tools/internal/xjc/runtime/package.html | 24 + .../xjc/util/CodeModelClassFactory.java | 9 +- .../sun/tools/internal/xjc/util/DOMUtils.java | 4 +- .../xjc/util/ErrorReceiverFilter.java | 3 +- .../internal/xjc/util/ForkContentHandler.java | 4 +- .../internal/xjc/util/ForkEntityResolver.java | 3 +- .../xjc/util/MessageBundle.properties | 31 + .../sun/tools/internal/xjc/util/Messages.java | 5 +- .../internal/xjc/util/MimeTypeRange.java | 3 +- .../xjc/util/NamespaceContextAdapter.java | 3 +- .../tools/internal/xjc/util/NullStream.java | 3 +- .../internal/xjc/util/ReadOnlyAdapter.java | 3 +- .../tools/internal/xjc/util/StringCutter.java | 3 +- .../internal/xjc/util/SubtreeCutter.java | 107 + .../com/sun/tools/internal/xjc/util/Util.java | 25 +- .../util/XMLStreamReaderToContentHandler.java | 337 --- .../internal/xjc/writer/SignatureWriter.java | 3 +- .../xml/internal/bind/AccessorFactory.java | 61 + .../internal/bind/AccessorFactoryImpl.java | 78 + .../internal/bind/AnyTypeAdapter.java} | 40 +- .../xml/internal/bind/CycleRecoverable.java | 81 + .../internal/bind/DatatypeConverterImpl.java | 68 +- .../com/sun/xml/internal/bind/IDResolver.java | 7 +- .../com/sun/xml/internal/bind/Locatable.java | 6 +- .../com/sun/xml/internal/bind/Util.java | 3 +- .../bind/ValidationEventLocatorEx.java | 6 +- .../internal/bind/WhiteSpaceProcessor.java | 3 +- .../internal/bind/XmlAccessorFactory.java} | 27 +- .../internal/bind/annotation/XmlIsSet.java | 3 +- .../internal/bind/annotation/XmlLocation.java | 3 +- .../internal/bind/api/AccessorException.java | 3 +- .../com/sun/xml/internal/bind/api/Bridge.java | 12 +- .../xml/internal/bind/api/BridgeContext.java | 3 +- .../xml/internal/bind/api/ClassResolver.java | 103 + .../internal/bind/api/CompositeStructure.java | 3 +- .../api/ErrorListener.java} | 58 +- .../xml/internal/bind/api/JAXBRIContext.java | 138 +- .../xml/internal/bind/api/RawAccessor.java | 3 +- .../xml/internal/bind/api/TypeReference.java | 3 +- .../internal/bind/api/impl/NameConverter.java | 3 +- .../xml/internal/bind/api/impl/NameUtil.java | 3 +- .../xml/internal/bind/api/package-info.java | 3 +- .../marshaller/CharacterEscapeHandler.java | 3 +- .../internal/bind/marshaller/DataWriter.java | 4 +- .../bind/marshaller/DumbEscapeHandler.java | 3 +- .../internal/bind/marshaller/Messages.java | 2 +- .../bind/marshaller/Messages.properties | 25 + .../bind/marshaller/MinimumEscapeHandler.java | 6 +- .../marshaller/NamespacePrefixMapper.java | 3 +- .../bind/marshaller/NioEscapeHandler.java | 3 +- .../internal/bind/marshaller/SAX2DOMEx.java | 2 +- .../internal/bind/marshaller/XMLWriter.java | 4 +- .../bind/unmarshaller/DOMScanner.java | 6 +- .../bind/unmarshaller/InfosetScanner.java | 3 +- .../internal/bind/unmarshaller/Messages.java | 2 +- .../bind/unmarshaller/Messages.properties | 25 + .../internal/bind/unmarshaller/Patcher.java | 3 +- .../internal/bind/util/AttributesImpl.java | 3 +- .../util/ValidationEventLocatorExImpl.java | 6 +- .../com/sun/xml/internal/bind/util/Which.java | 6 +- .../xml/internal/bind/v2/ClassFactory.java | 3 +- .../xml/internal/bind/v2/ContextFactory.java | 43 +- .../sun/xml/internal/bind/v2/Messages.java | 3 +- .../xml/internal/bind/v2/Messages.properties | 27 + .../com/sun/xml/internal/bind/v2/TODO.java | 3 +- .../internal/bind/v2/WellKnownNamespace.java | 4 +- .../bind/v2/bytecode/ClassTailor.java | 11 +- .../internal/bind/v2/bytecode/package.html | 24 + .../internal/bind/v2/doc-files/packages.png | Bin 37912 -> 0 bytes .../internal/bind/v2/doc-files/packages.vsd | Bin 97279 -> 0 bytes .../xml/internal/bind/v2/doc-files/readme.txt | 1 - .../AbstractInlineAnnotationReaderImpl.java | 3 +- .../v2/model/annotation/AnnotationReader.java | 20 +- .../v2/model/annotation/AnnotationSource.java | 3 +- .../v2/model/annotation/ClassLocatable.java | 3 +- .../v2/model/annotation/FieldLocatable.java | 3 +- .../bind/v2/model/annotation/Init.java | 6 +- .../bind/v2/model/annotation/Locatable.java | 5 +- .../model/annotation/LocatableAnnotation.java | 7 +- .../bind/v2/model/annotation/Messages.java | 3 +- .../v2/model/annotation/Messages.properties | 25 + .../v2/model/annotation/MethodLocatable.java | 3 +- .../bind/v2/model/annotation/Quick.java | 3 +- .../annotation/RuntimeAnnotationReader.java | 3 +- .../RuntimeInlineAnnotationReader.java | 21 +- .../model/annotation/XmlAttributeQuick.java | 4 +- .../model/annotation/XmlElementDeclQuick.java | 4 +- .../v2/model/annotation/XmlElementQuick.java | 4 +- .../model/annotation/XmlElementRefQuick.java | 4 +- .../model/annotation/XmlElementRefsQuick.java | 4 +- .../v2/model/annotation/XmlEnumQuick.java | 4 +- .../model/annotation/XmlRootElementQuick.java | 4 +- .../v2/model/annotation/XmlSchemaQuick.java | 8 +- .../model/annotation/XmlTransientQuick.java | 4 +- .../v2/model/annotation/XmlTypeQuick.java | 4 +- .../v2/model/annotation/XmlValueQuick.java | 4 +- .../bind/v2/model/annotation/package.html | 24 + .../internal/bind/v2/model/core/Adapter.java | 3 +- .../bind/v2/model/core/ArrayInfo.java | 3 +- .../v2/model/core/AttributePropertyInfo.java | 3 +- .../bind/v2/model/core/BuiltinLeafInfo.java | 3 +- .../bind/v2/model/core/ClassInfo.java | 10 +- .../internal/bind/v2/model/core/Element.java | 3 +- .../bind/v2/model/core/ElementInfo.java | 3 +- .../v2/model/core/ElementPropertyInfo.java | 11 +- .../bind/v2/model/core/EnumConstant.java | 3 +- .../bind/v2/model/core/EnumLeafInfo.java | 3 +- .../bind/v2/model/core/ErrorHandler.java | 3 +- .../xml/internal/bind/v2/model/core/ID.java | 3 +- .../internal/bind/v2/model/core/LeafInfo.java | 3 +- .../bind/v2/model/core/MapPropertyInfo.java | 3 +- .../bind/v2/model/core/MaybeElement.java | 3 +- .../bind/v2/model/core/NonElement.java | 3 +- .../bind/v2/model/core/NonElementRef.java | 3 +- .../bind/v2/model/core/PropertyInfo.java | 6 +- .../bind/v2/model/core/PropertyKind.java | 3 +- .../xml/internal/bind/v2/model/core/Ref.java | 3 +- .../v2/model/core/ReferencePropertyInfo.java | 11 +- .../bind/v2/model/core/RegistryInfo.java | 3 +- .../internal/bind/v2/model/core/TypeInfo.java | 3 +- .../bind/v2/model/core/TypeInfoSet.java | 17 +- .../internal/bind/v2/model/core/TypeRef.java | 3 +- .../bind/v2/model/core/ValuePropertyInfo.java | 3 +- .../bind/v2/model/core/WildcardMode.java | 3 +- .../bind/v2/model/core/WildcardTypeInfo.java | 3 +- .../bind/v2/model/core/package-info.java | 3 +- .../bind/v2/model/impl/AnyTypeImpl.java | 3 +- .../bind/v2/model/impl/ArrayInfoImpl.java | 3 +- .../model/impl/AttributePropertyInfoImpl.java | 3 +- .../v2/model/impl/BuiltinLeafInfoImpl.java | 3 +- .../bind/v2/model/impl/ClassInfoImpl.java | 245 +- .../v2/model/impl/ERPropertyInfoImpl.java | 15 +- .../bind/v2/model/impl/ElementInfoImpl.java | 26 +- .../model/impl/ElementPropertyInfoImpl.java | 3 +- .../bind/v2/model/impl/EnumConstantImpl.java | 3 +- .../bind/v2/model/impl/EnumLeafInfoImpl.java | 7 +- .../bind/v2/model/impl/FieldPropertySeed.java | 3 +- .../model/impl/GetterSetterPropertySeed.java | 3 +- .../bind/v2/model/impl/LeafInfoImpl.java | 3 +- .../v2/model/impl/MapPropertyInfoImpl.java | 3 +- .../internal/bind/v2/model/impl/Messages.java | 15 +- .../bind/v2/model/impl/Messages.properties | 51 + .../bind/v2/model/impl/ModelBuilder.java | 134 +- .../bind/v2/model/impl/PropertyInfoImpl.java | 91 +- .../bind/v2/model/impl/PropertySeed.java | 3 +- .../model/impl/ReferencePropertyInfoImpl.java | 16 +- .../bind/v2/model/impl/RegistryInfoImpl.java | 3 +- .../v2/model/impl/RuntimeAnyTypeImpl.java | 3 +- .../v2/model/impl/RuntimeArrayInfoImpl.java | 3 +- .../RuntimeAttributePropertyInfoImpl.java | 3 +- .../impl/RuntimeBuiltinLeafInfoImpl.java | 3 +- .../v2/model/impl/RuntimeClassInfoImpl.java | 97 +- .../v2/model/impl/RuntimeElementInfoImpl.java | 6 +- .../impl/RuntimeElementPropertyInfoImpl.java | 3 +- .../model/impl/RuntimeEnumConstantImpl.java | 3 +- .../model/impl/RuntimeEnumLeafInfoImpl.java | 3 +- .../impl/RuntimeMapPropertyInfoImpl.java | 3 +- .../v2/model/impl/RuntimeModelBuilder.java | 19 +- .../RuntimeReferencePropertyInfoImpl.java | 3 +- .../v2/model/impl/RuntimeTypeInfoSetImpl.java | 3 +- .../v2/model/impl/RuntimeTypeRefImpl.java | 3 +- .../impl/RuntimeValuePropertyInfoImpl.java | 3 +- .../impl/SingleTypePropertyInfoImpl.java | 5 +- .../bind/v2/model/impl/TypeInfoImpl.java | 3 +- .../bind/v2/model/impl/TypeInfoSetImpl.java | 128 +- .../bind/v2/model/impl/TypeRefImpl.java | 3 +- .../xml/internal/bind/v2/model/impl/Util.java | 3 +- .../v2/model/impl/ValuePropertyInfoImpl.java | 3 +- .../internal/bind/v2/model/impl/package.html | 24 + .../v2/model/nav/GenericArrayTypeImpl.java | 3 +- .../internal/bind/v2/model/nav/Navigator.java | 15 +- .../v2/model/nav/ParameterizedTypeImpl.java | 3 +- .../v2/model/nav/ReflectionNavigator.java | 23 +- .../bind/v2/model/nav/TypeVisitor.java | 3 +- .../bind/v2/model/nav/WildcardTypeImpl.java | 3 +- .../internal/bind/v2/model/nav/package.html | 24 + .../v2/model/runtime/RuntimeArrayInfo.java | 3 +- .../runtime/RuntimeAttributePropertyInfo.java | 3 +- .../model/runtime/RuntimeBuiltinLeafInfo.java | 3 +- .../v2/model/runtime/RuntimeClassInfo.java | 4 +- .../bind/v2/model/runtime/RuntimeElement.java | 3 +- .../v2/model/runtime/RuntimeElementInfo.java | 3 +- .../runtime/RuntimeElementPropertyInfo.java | 3 +- .../v2/model/runtime/RuntimeEnumLeafInfo.java | 3 +- .../v2/model/runtime/RuntimeLeafInfo.java | 3 +- .../model/runtime/RuntimeMapPropertyInfo.java | 3 +- .../v2/model/runtime/RuntimeNonElement.java | 4 +- .../model/runtime/RuntimeNonElementRef.java | 3 +- .../v2/model/runtime/RuntimePropertyInfo.java | 3 +- .../runtime/RuntimeReferencePropertyInfo.java | 3 +- .../v2/model/runtime/RuntimeTypeInfo.java | 3 +- .../v2/model/runtime/RuntimeTypeInfoSet.java | 3 +- .../bind/v2/model/runtime/RuntimeTypeRef.java | 3 +- .../runtime/RuntimeValuePropertyInfo.java | 3 +- .../bind/v2/model/runtime/package-info.java | 3 +- .../xml/internal/bind/v2/package-info.java | 3 +- .../bind/v2/runtime/AnyTypeBeanInfo.java | 7 +- .../bind/v2/runtime/ArrayBeanInfoImpl.java | 3 +- .../bind/v2/runtime/AssociationMap.java | 11 +- .../internal/bind/v2/runtime/BinderImpl.java | 6 +- .../bind/v2/runtime/BridgeAdapter.java | 3 +- .../bind/v2/runtime/BridgeContextImpl.java | 3 +- .../internal/bind/v2/runtime/BridgeImpl.java | 5 +- .../bind/v2/runtime/ClassBeanInfoImpl.java | 3 +- .../runtime/CompositeStructureBeanInfo.java | 3 +- .../v2/runtime/ContentHandlerAdaptor.java | 39 +- .../internal/bind/v2/runtime/Coordinator.java | 13 +- .../bind/v2/runtime/DomPostInitAction.java | 3 +- .../bind/v2/runtime/ElementBeanInfoImpl.java | 34 +- .../bind/v2/runtime/FilterTransducer.java | 3 +- .../runtime/IllegalAnnotationException.java | 3 +- .../runtime/IllegalAnnotationsException.java | 3 +- .../v2/runtime/InlineBinaryTransducer.java | 3 +- .../bind/v2/runtime/InternalBridge.java | 3 +- .../bind/v2/runtime/JAXBContextImpl.java | 152 +- .../internal/bind/v2/runtime/JaxBeanInfo.java | 76 +- .../bind/v2/runtime/LeafBeanInfoImpl.java | 3 +- .../bind/v2/runtime/LifecycleMethods.java | 47 +- .../internal/bind/v2/runtime/Location.java | 3 +- .../bind/v2/runtime/MarshallerImpl.java | 37 +- .../internal/bind/v2/runtime/Messages.java | 6 +- .../bind/v2/runtime/Messages.properties | 34 + .../bind/v2/runtime/MimeTypedTransducer.java | 3 +- .../xml/internal/bind/v2/runtime/Name.java | 3 +- .../internal/bind/v2/runtime/NameBuilder.java | 3 +- .../internal/bind/v2/runtime/NameList.java | 3 +- .../bind/v2/runtime/NamespaceContext2.java | 13 +- .../internal/bind/v2/runtime/RuntimeUtil.java | 3 +- .../bind/v2/runtime/SchemaTypeTransducer.java | 3 +- .../bind/v2/runtime/StAXPostInitAction.java | 3 +- .../bind/v2/runtime/SwaRefAdapter.java | 3 +- .../internal/bind/v2/runtime/Transducer.java | 3 +- .../v2/runtime/ValueListBeanInfoImpl.java | 3 +- .../bind/v2/runtime/XMLSerializer.java | 99 +- .../bind/v2/runtime/output/C14nXmlOutput.java | 3 +- .../bind/v2/runtime/output/DOMOutput.java | 3 +- .../bind/v2/runtime/output/Encoded.java | 3 +- .../output/FastInfosetStreamWriterOutput.java | 409 ++- .../bind/v2/runtime/output/ForkXmlOutput.java | 9 +- .../v2/runtime/output/InPlaceDOMOutput.java | 3 +- .../output/IndentingUTF8XmlOutput.java | 3 +- .../bind/v2/runtime/output/MTOMXmlOutput.java | 7 +- .../runtime/output/NamespaceContextImpl.java | 30 +- .../bind/v2/runtime/output/Pcdata.java | 3 +- .../bind/v2/runtime/output/SAXOutput.java | 3 +- .../bind/v2/runtime/output/UTF8XmlOutput.java | 10 +- .../runtime/output/XMLEventWriterOutput.java | 7 +- .../runtime/output/XMLStreamWriterOutput.java | 37 +- .../bind/v2/runtime/output/XmlOutput.java | 14 +- .../runtime/output/XmlOutputAbstractImpl.java | 11 +- .../bind/v2/runtime/output/package-info.java | 3 +- .../xml/internal/bind/v2/runtime/package.html | 24 + .../v2/runtime/property/ArrayERProperty.java | 31 +- .../property/ArrayElementLeafProperty.java | 3 +- .../property/ArrayElementNodeProperty.java | 3 +- .../property/ArrayElementProperty.java | 5 +- .../v2/runtime/property/ArrayProperty.java | 5 +- .../property/ArrayReferenceNodeProperty.java | 3 +- .../runtime/property/AttributeProperty.java | 13 +- .../runtime/property/ListElementProperty.java | 3 +- .../bind/v2/runtime/property/Messages.java | 3 +- .../v2/runtime/property/Messages.properties | 25 + .../bind/v2/runtime/property/Property.java | 3 +- .../v2/runtime/property/PropertyFactory.java | 3 +- .../v2/runtime/property/PropertyImpl.java | 3 +- .../property/SingleElementLeafProperty.java | 9 +- .../property/SingleElementNodeProperty.java | 8 +- .../property/SingleMapNodeProperty.java | 6 +- .../property/SingleReferenceNodeProperty.java | 22 +- .../property/StructureLoaderBuilder.java | 3 +- .../bind/v2/runtime/property/TagAndType.java | 3 +- .../runtime/property/UnmarshallerChain.java | 5 +- .../v2/runtime/property/ValueProperty.java | 9 +- .../bind/v2/runtime/reflect/Accessor.java | 38 +- .../v2/runtime/reflect/AdaptedAccessor.java | 8 +- .../v2/runtime/reflect/AdaptedLister.java | 3 +- .../reflect/DefaultTransducedAccessor.java | 3 +- .../bind/v2/runtime/reflect/ListIterator.java | 3 +- .../reflect/ListTransducedAccessorImpl.java | 3 +- .../bind/v2/runtime/reflect/Lister.java | 34 +- .../bind/v2/runtime/reflect/Messages.java | 3 +- .../v2/runtime/reflect/Messages.properties | 25 + .../v2/runtime/reflect/NullSafeAccessor.java | 3 +- .../reflect/PrimitiveArrayListerBoolean.java | 3 +- .../reflect/PrimitiveArrayListerByte.java | 3 +- .../PrimitiveArrayListerCharacter.java | 3 +- .../reflect/PrimitiveArrayListerDouble.java | 3 +- .../reflect/PrimitiveArrayListerFloat.java | 3 +- .../reflect/PrimitiveArrayListerInteger.java | 3 +- .../reflect/PrimitiveArrayListerLong.java | 3 +- .../reflect/PrimitiveArrayListerShort.java | 3 +- .../runtime/reflect/TransducedAccessor.java | 27 +- .../runtime/reflect/opt/AccessorInjector.java | 7 +- .../bind/v2/runtime/reflect/opt/Bean.java | 3 +- .../bind/v2/runtime/reflect/opt/Const.java | 3 +- .../reflect/opt/FieldAccessor_Boolean.java | 3 +- .../reflect/opt/FieldAccessor_Byte.java | 3 +- .../reflect/opt/FieldAccessor_Character.java | 3 +- .../reflect/opt/FieldAccessor_Double.java | 3 +- .../reflect/opt/FieldAccessor_Float.java | 3 +- .../reflect/opt/FieldAccessor_Integer.java | 3 +- .../reflect/opt/FieldAccessor_Long.java | 3 +- .../reflect/opt/FieldAccessor_Ref.java | 3 +- .../reflect/opt/FieldAccessor_Short.java | 3 +- .../bind/v2/runtime/reflect/opt/Injector.java | 6 +- .../reflect/opt/MethodAccessor_Boolean.java | 3 +- .../reflect/opt/MethodAccessor_Byte.java | 3 +- .../reflect/opt/MethodAccessor_Character.java | 3 +- .../reflect/opt/MethodAccessor_Double.java | 3 +- .../reflect/opt/MethodAccessor_Float.java | 3 +- .../reflect/opt/MethodAccessor_Integer.java | 3 +- .../reflect/opt/MethodAccessor_Long.java | 3 +- .../reflect/opt/MethodAccessor_Ref.java | 3 +- .../reflect/opt/MethodAccessor_Short.java | 3 +- .../reflect/opt/OptimizedAccessorFactory.java | 3 +- .../OptimizedTransducedAccessorFactory.java | 3 +- .../bind/v2/runtime/reflect/opt/Ref.java | 3 +- .../opt/TransducedAccessor_field_Boolean.java | 3 +- .../opt/TransducedAccessor_field_Byte.java | 3 +- .../opt/TransducedAccessor_field_Double.java | 3 +- .../opt/TransducedAccessor_field_Float.java | 3 +- .../opt/TransducedAccessor_field_Integer.java | 3 +- .../opt/TransducedAccessor_field_Long.java | 3 +- .../opt/TransducedAccessor_field_Short.java | 3 +- .../TransducedAccessor_method_Boolean.java | 3 +- .../opt/TransducedAccessor_method_Byte.java | 3 +- .../opt/TransducedAccessor_method_Double.java | 3 +- .../opt/TransducedAccessor_method_Float.java | 3 +- .../TransducedAccessor_method_Integer.java | 3 +- .../opt/TransducedAccessor_method_Long.java | 3 +- .../opt/TransducedAccessor_method_Short.java | 3 +- .../bind/v2/runtime/reflect/opt/package.html | 24 + .../bind/v2/runtime/reflect/package.html | 24 + .../v2/runtime/unmarshaller/AttributesEx.java | 3 +- .../unmarshaller/AttributesExImpl.java | 3 +- .../v2/runtime/unmarshaller/Base64Data.java | 3 +- .../v2/runtime/unmarshaller/ChildLoader.java | 3 +- .../unmarshaller/DefaultIDResolver.java | 3 +- .../DefaultValueLoaderDecorator.java | 3 +- .../v2/runtime/unmarshaller/Discarder.java | 5 +- .../v2/runtime/unmarshaller/DomLoader.java | 3 +- .../unmarshaller/FastInfosetConnector.java | 190 +- .../v2/runtime/unmarshaller/IntArrayData.java | 3 +- .../bind/v2/runtime/unmarshaller/IntData.java | 3 +- .../v2/runtime/unmarshaller/Intercepter.java | 3 +- .../unmarshaller/InterningXmlVisitor.java | 3 +- .../unmarshaller/LeafPropertyLoader.java | 3 +- .../bind/v2/runtime/unmarshaller/Loader.java | 3 +- .../v2/runtime/unmarshaller/LocatorEx.java | 65 +- .../unmarshaller/LocatorExWrapper.java | 3 +- .../runtime/unmarshaller/MTOMDecorator.java | 3 +- .../v2/runtime/unmarshaller/Messages.java | 3 +- .../runtime/unmarshaller/Messages.properties | 25 + .../bind/v2/runtime/unmarshaller/Patcher.java | 3 +- .../v2/runtime/unmarshaller/ProxyLoader.java | 3 +- .../v2/runtime/unmarshaller/Receiver.java | 3 +- .../v2/runtime/unmarshaller/SAXConnector.java | 3 +- .../bind/v2/runtime/unmarshaller/Scope.java | 29 +- .../runtime/unmarshaller/StAXConnector.java | 3 +- .../unmarshaller/StAXEventConnector.java | 4 +- .../unmarshaller/StAXStreamConnector.java | 77 +- .../runtime/unmarshaller/StructureLoader.java | 3 +- .../bind/v2/runtime/unmarshaller/TagName.java | 3 +- .../v2/runtime/unmarshaller/TextLoader.java | 3 +- .../unmarshaller/UnmarshallerImpl.java | 8 +- .../unmarshaller/UnmarshallingContext.java | 71 +- .../unmarshaller/ValidatingUnmarshaller.java | 3 +- .../unmarshaller/ValuePropertyLoader.java | 3 +- .../runtime/unmarshaller/WildcardLoader.java | 9 +- .../v2/runtime/unmarshaller/XmlVisitor.java | 3 +- .../v2/runtime/unmarshaller/XsiNilLoader.java | 3 +- .../runtime/unmarshaller/XsiTypeLoader.java | 17 +- .../bind/v2/schemagen/FoolProofResolver.java | 3 +- .../xml/internal/bind/v2/schemagen/Form.java | 3 +- .../internal/bind/v2/schemagen/GroupKind.java | 50 + .../v2/schemagen/Messages.java} | 24 +- .../bind/v2/schemagen/Messages.properties | 27 + .../internal/bind/v2/schemagen/MultiMap.java | 3 +- .../xml/internal/bind/v2/schemagen/Tree.java | 243 ++ .../xml/internal/bind/v2/schemagen/Util.java | 3 +- .../bind/v2/schemagen/XmlSchemaGenerator.java | 643 +++-- .../bind/v2/schemagen/episode/Bindings.java} | 43 +- .../bind/v2/schemagen/episode/Klass.java | 39 + .../v2/schemagen/episode/SchemaBindings.java} | 17 +- .../v2/schemagen/episode/package-info.java | 33 + .../bind/v2/schemagen/package-info.java | 3 +- .../v2/schemagen/xmlschema/Annotated.java | 4 +- .../v2/schemagen/xmlschema/Annotation.java | 4 +- .../bind/v2/schemagen/xmlschema/Any.java | 4 +- .../bind/v2/schemagen/xmlschema/Appinfo.java | 4 +- .../v2/schemagen/xmlschema/AttrDecls.java | 4 +- .../v2/schemagen/xmlschema/AttributeType.java | 4 +- .../schemagen/xmlschema/ComplexContent.java | 4 +- .../schemagen/xmlschema/ComplexExtension.java | 4 +- .../xmlschema/ComplexRestriction.java | 4 +- .../v2/schemagen/xmlschema/ComplexType.java | 14 +- .../schemagen/xmlschema/ComplexTypeHost.java | 4 +- .../schemagen/xmlschema/ComplexTypeModel.java | 4 +- .../xmlschema/ContentModelContainer.java | 52 + .../v2/schemagen/xmlschema/Documentation.java | 4 +- .../bind/v2/schemagen/xmlschema/Element.java | 8 +- .../v2/schemagen/xmlschema/ExplicitGroup.java | 4 +- .../v2/schemagen/xmlschema/ExtensionType.java | 4 +- .../schemagen/xmlschema/FixedOrDefault.java | 4 +- .../bind/v2/schemagen/xmlschema/Import.java | 4 +- .../bind/v2/schemagen/xmlschema/List.java | 4 +- .../schemagen/xmlschema/LocalAttribute.java | 4 +- .../v2/schemagen/xmlschema/LocalElement.java | 4 +- .../schemagen/xmlschema/NestedParticle.java | 4 +- .../v2/schemagen/xmlschema/NoFixedFacet.java | 4 +- .../bind/v2/schemagen/xmlschema/Occurs.java | 10 +- .../v2/schemagen/xmlschema/Particle.java} | 10 +- .../v2/schemagen/xmlschema/Redefinable.java | 4 +- .../bind/v2/schemagen/xmlschema/Schema.java | 12 +- .../v2/schemagen/xmlschema/SchemaTop.java | 4 +- .../v2/schemagen/xmlschema/SimpleContent.java | 4 +- .../schemagen/xmlschema/SimpleDerivation.java | 4 +- .../schemagen/xmlschema/SimpleExtension.java | 4 +- .../xmlschema/SimpleRestriction.java | 4 +- .../xmlschema/SimpleRestrictionModel.java | 4 +- .../v2/schemagen/xmlschema/SimpleType.java | 4 +- .../schemagen/xmlschema/SimpleTypeHost.java | 4 +- .../xmlschema/TopLevelAttribute.java | 4 +- .../schemagen/xmlschema/TopLevelElement.java | 8 +- .../schemagen/xmlschema/TypeDefParticle.java | 4 +- .../bind/v2/schemagen/xmlschema/TypeHost.java | 4 +- .../bind/v2/schemagen/xmlschema/Union.java | 4 +- .../bind/v2/schemagen/xmlschema/Wildcard.java | 10 +- .../v2/schemagen/xmlschema/package-info.java | 3 +- .../bind/v2/schemagen/xmlschema/package.html | 24 + .../xmlschema/xmlschema-for-jaxb.rng | 24 + .../bind/v2/util/ByteArrayOutputStreamEx.java | 3 +- .../bind/v2/util/CollisionCheckStack.java | 47 +- .../bind/v2/util/DataSourceSource.java | 3 +- .../internal/bind/v2/util/EditDistance.java | 25 +- .../internal/bind/v2/util/FatalAdapter.java | 3 +- .../bind/v2/util/FlattenIterator.java | 3 +- .../xml/internal/bind/v2/util/QNameMap.java | 3 +- .../internal/bind/v2/util/TypeCast.java} | 47 +- .../internal/dtdparser/DTDEventListener.java | 2 +- .../internal/dtdparser/DTDHandlerBase.java | 2 +- .../sun/xml/internal/dtdparser/DTDParser.java | 3 +- .../dtdparser/EndOfInputException.java | 2 +- .../xml/internal/dtdparser/EntityDecl.java | 3 +- .../internal/dtdparser/ExternalEntity.java | 2 +- .../xml/internal/dtdparser/InputEntity.java | 3 +- .../internal/dtdparser/InternalEntity.java | 2 +- .../internal/dtdparser/MessageCatalog.java | 3 +- .../sun/xml/internal/dtdparser/Resolver.java | 3 +- .../internal/dtdparser/SimpleHashtable.java | 3 +- .../sun/xml/internal/dtdparser/XmlChars.java | 3 +- .../sun/xml/internal/dtdparser/XmlNames.java | 3 +- .../sun/xml/internal/dtdparser/XmlReader.java | 3 +- .../sun/xml/internal/dtdparser/package.html | 24 + .../dtdparser/resources/Messages.properties | 4 +- .../fastinfoset/AbstractResourceBundle.java | 42 +- .../fastinfoset/CommonResourceBundle.java | 48 +- .../sun/xml/internal/fastinfoset/Decoder.java | 354 ++- .../fastinfoset/DecoderStateTables.java | 71 +- .../sun/xml/internal/fastinfoset/Encoder.java | 367 ++- .../fastinfoset/EncodingConstants.java | 84 +- .../xml/internal/fastinfoset/Notation.java | 29 +- .../OctetBufferListener.java} | 21 +- .../internal/fastinfoset/QualifiedName.java | 170 +- .../internal/fastinfoset/UnparsedEntity.java | 29 +- .../algorithm/BASE64EncodingAlgorithm.java | 117 +- .../algorithm/BooleanEncodingAlgorithm.java | 32 +- .../algorithm/BuiltInEncodingAlgorithm.java | 33 +- .../BuiltInEncodingAlgorithmFactory.java | 30 +- .../BuiltInEncodingAlgorithmState.java | 30 +- .../algorithm/DoubleEncodingAlgorithm.java | 46 +- .../algorithm/FloatEncodingAlgorithm.java | 34 +- .../HexadecimalEncodingAlgorithm.java | 30 +- ...IEEE754FloatingPointEncodingAlgorithm.java | 30 +- .../algorithm/IntEncodingAlgorithm.java | 34 +- .../algorithm/IntegerEncodingAlgorithm.java | 30 +- .../algorithm/LongEncodingAlgorithm.java | 44 +- .../algorithm/ShortEncodingAlgorithm.java | 34 +- .../algorithm/UUIDEncodingAlgorithm.java | 36 +- .../alphabet/BuiltInRestrictedAlphabets.java | 30 +- .../fastinfoset/dom/DOMDocumentParser.java | 131 +- .../dom/DOMDocumentSerializer.java | 96 +- .../org/apache/xerces/util/XMLChar.java | 4 +- .../resources/ResourceBundle.properties | 25 + .../fastinfoset/sax/AttributesHolder.java | 37 +- .../internal/fastinfoset/sax/Features.java | 29 +- .../internal/fastinfoset/sax/Properties.java | 29 +- .../fastinfoset/sax/SAXDocumentParser.java | 359 ++- .../sax/SAXDocumentSerializer.java | 202 +- ...AXDocumentSerializerWithPrefixMapping.java | 271 ++ .../fastinfoset/sax/SystemIdResolver.java | 29 +- .../fastinfoset/stax/EventLocation.java | 29 +- .../fastinfoset/stax/StAXDocumentParser.java | 297 +- .../stax/StAXDocumentSerializer.java | 320 ++- .../fastinfoset/stax/StAXManager.java | 29 +- .../stax/events/AttributeBase.java | 29 +- .../stax/events/CharactersEvent.java | 29 +- .../fastinfoset/stax/events/CommentEvent.java | 29 +- .../fastinfoset/stax/events/DTDEvent.java | 29 +- .../stax/events/EmptyIterator.java | 34 +- .../stax/events/EndDocumentEvent.java | 29 +- .../stax/events/EndElementEvent.java | 29 +- .../stax/events/EntityDeclarationImpl.java | 41 +- .../stax/events/EntityReferenceEvent.java | 29 +- .../fastinfoset/stax/events/EventBase.java | 29 +- .../stax/events/NamespaceBase.java | 29 +- .../events/ProcessingInstructionEvent.java | 29 +- .../fastinfoset/stax/events/ReadIterator.java | 29 +- .../stax/events/StAXEventAllocator.java | 29 +- .../stax/events/StAXEventAllocatorBase.java | 29 +- .../stax/events/StAXEventReader.java | 29 +- .../stax/events/StAXEventWriter.java | 29 +- .../stax/events/StAXFilteredEvent.java | 5 +- .../stax/events/StartDocumentEvent.java | 29 +- .../stax/events/StartElementEvent.java | 29 +- .../fastinfoset/stax/events/Util.java | 29 +- .../fastinfoset/stax/events/XMLConstants.java | 29 +- .../stax/factory/StAXEventFactory.java | 29 +- .../stax/factory/StAXInputFactory.java | 29 +- .../stax/factory/StAXOutputFactory.java | 33 +- .../stax/util/StAXFilteredParser.java | 29 +- .../stax/util/StAXParserWrapper.java | 29 +- .../tools/FI_DOM_Or_XML_DOM_SAX_SAXEvent.java | 39 +- .../FI_SAX_Or_XML_SAX_DOM_SAX_SAXEvent.java | 58 +- .../tools/FI_SAX_Or_XML_SAX_SAXEvent.java | 48 +- .../fastinfoset/tools/FI_SAX_XML.java | 29 +- .../FI_StAX_SAX_Or_XML_SAX_SAXEvent.java | 29 +- .../fastinfoset/tools/PrintTable.java | 29 +- .../fastinfoset/tools/SAX2StAXWriter.java | 43 +- .../fastinfoset/tools/SAXEventSerializer.java | 31 +- .../fastinfoset/tools/StAX2SAXReader.java | 31 +- .../tools/TransformInputOutput.java | 119 +- .../tools/VocabularyGenerator.java | 41 +- .../fastinfoset/tools/XML_DOM_FI.java | 15 +- .../fastinfoset/tools/XML_DOM_SAX_FI.java | 39 +- .../fastinfoset/tools/XML_SAX_FI.java | 51 +- .../fastinfoset/tools/XML_SAX_StAX_FI.java | 50 +- .../internal/fastinfoset/util/CharArray.java | 32 +- .../fastinfoset/util/CharArrayArray.java | 29 +- .../fastinfoset/util/CharArrayIntMap.java | 42 +- .../fastinfoset/util/CharArrayString.java | 29 +- .../util/ContiguousCharArrayArray.java | 48 +- .../util/DuplicateAttributeVerifier.java | 6 +- .../util/FixedEntryStringIntMap.java | 38 +- .../internal/fastinfoset/util/KeyIntMap.java | 33 +- .../util/LocalNameQualifiedNamesMap.java | 47 +- .../util/NamespaceContextImplementation.java | 226 ++ .../fastinfoset/util/PrefixArray.java | 41 +- .../fastinfoset/util/QualifiedNameArray.java | 36 +- .../fastinfoset/util/StringArray.java | 38 +- .../fastinfoset/util/StringIntMap.java | 67 +- .../internal/fastinfoset/util/ValueArray.java | 29 +- .../util/ValueArrayResourceException.java | 29 +- .../fastinfoset/vocab/ParserVocabulary.java | 59 +- .../vocab/SerializerVocabulary.java | 29 +- .../fastinfoset/vocab/Vocabulary.java | 29 +- .../messaging/saaj/SOAPExceptionImpl.java | 15 +- .../saaj/client/p2p/HttpSOAPConnection.java | 15 +- .../client/p2p/HttpSOAPConnectionFactory.java | 15 +- .../saaj/client/p2p/LocalStrings.properties | 25 + .../messaging/saaj/packaging/mime/Header.java | 7 +- .../packaging/mime/MessagingException.java | 7 +- .../packaging/mime/MultipartDataSource.java | 8 +- .../mime/internet/BMMimeMultipart.java | 44 +- .../mime/internet/ContentDisposition.java | 8 +- .../packaging/mime/internet/ContentType.java | 8 +- .../mime/internet/HeaderTokenizer.java | 8 +- .../mime/internet/InternetHeaders.java | 7 +- .../packaging/mime/internet/MimeBodyPart.java | 7 +- .../mime/internet/MimeMultipart.java | 8 +- .../mime/internet/MimePartDataSource.java | 7 +- .../packaging/mime/internet/MimeUtility.java | 8 +- .../mime/internet/ParameterList.java | 8 +- .../mime/internet/ParseException.java | 7 +- .../mime/internet/SharedInputStream.java | 8 +- .../packaging/mime/internet/UniqueValue.java | 7 +- .../packaging/mime/util/ASCIIUtility.java | 7 +- .../mime/util/BASE64DecoderStream.java | 7 +- .../mime/util/BASE64EncoderStream.java | 7 +- .../packaging/mime/util/BEncoderStream.java | 7 +- .../packaging/mime/util/LineInputStream.java | 7 +- .../saaj/packaging/mime/util/OutputUtil.java | 7 +- .../packaging/mime/util/QDecoderStream.java | 7 +- .../packaging/mime/util/QEncoderStream.java | 7 +- .../packaging/mime/util/QPDecoderStream.java | 7 +- .../packaging/mime/util/QPEncoderStream.java | 7 +- .../packaging/mime/util/UUDecoderStream.java | 7 +- .../packaging/mime/util/UUEncoderStream.java | 7 +- .../saaj/soap/AttachmentPartImpl.java | 18 +- .../messaging/saaj/soap/Envelope.java | 15 +- .../messaging/saaj/soap/EnvelopeFactory.java | 15 +- .../soap/FastInfosetDataContentHandler.java | 15 +- .../saaj/soap/GifDataContentHandler.java | 20 +- .../saaj/soap/ImageDataContentHandler.java | 16 +- .../saaj/soap/JpegDataContentHandler.java | 18 +- .../saaj/soap/LocalStrings.properties | 25 + .../saaj/soap/MessageFactoryImpl.java | 15 +- .../messaging/saaj/soap/MessageImpl.java | 27 +- .../soap/MultipartDataContentHandler.java | 15 +- .../saaj/soap/SAAJMetaFactoryImpl.java | 3 +- .../messaging/saaj/soap/SOAPDocument.java | 11 +- .../saaj/soap/SOAPDocumentFragment.java | 11 +- .../messaging/saaj/soap/SOAPDocumentImpl.java | 11 +- .../messaging/saaj/soap/SOAPFactoryImpl.java | 15 +- .../messaging/saaj/soap/SOAPIOException.java | 3 +- .../messaging/saaj/soap/SOAPPartImpl.java | 15 +- .../soap/SOAPVersionMismatchException.java | 15 +- .../saaj/soap/StringDataContentHandler.java | 15 +- .../saaj/soap/XmlDataContentHandler.java | 15 +- .../soap/dynamic/SOAPFactoryDynamicImpl.java | 11 +- .../SOAPMessageFactoryDynamicImpl.java | 11 +- .../saaj/soap/impl/BodyElementImpl.java | 15 +- .../messaging/saaj/soap/impl/BodyImpl.java | 15 +- .../messaging/saaj/soap/impl/CDATAImpl.java | 15 +- .../messaging/saaj/soap/impl/CommentImpl.java | 15 +- .../saaj/soap/impl/DetailEntryImpl.java | 15 +- .../messaging/saaj/soap/impl/DetailImpl.java | 15 +- .../saaj/soap/impl/ElementFactory.java | 15 +- .../messaging/saaj/soap/impl/ElementImpl.java | 55 +- .../saaj/soap/impl/EnvelopeImpl.java | 15 +- .../saaj/soap/impl/FaultElementImpl.java | 15 +- .../messaging/saaj/soap/impl/FaultImpl.java | 25 +- .../saaj/soap/impl/HeaderElementImpl.java | 15 +- .../messaging/saaj/soap/impl/HeaderImpl.java | 15 +- .../saaj/soap/impl/LocalStrings.properties | 25 + .../messaging/saaj/soap/impl/TextImpl.java | 15 +- .../saaj/soap/impl/TreeException.java | 15 +- .../saaj/soap/name/LocalStrings.properties | 25 + .../messaging/saaj/soap/name/NameImpl.java | 15 +- .../saaj/soap/ver1_1/Body1_1Impl.java | 11 +- .../saaj/soap/ver1_1/BodyElement1_1Impl.java | 11 +- .../saaj/soap/ver1_1/Detail1_1Impl.java | 11 +- .../saaj/soap/ver1_1/DetailEntry1_1Impl.java | 11 +- .../saaj/soap/ver1_1/Envelope1_1Impl.java | 4 +- .../saaj/soap/ver1_1/Fault1_1Impl.java | 24 +- .../saaj/soap/ver1_1/FaultElement1_1Impl.java | 11 +- .../saaj/soap/ver1_1/Header1_1Impl.java | 11 +- .../soap/ver1_1/HeaderElement1_1Impl.java | 11 +- .../saaj/soap/ver1_1/LocalStrings.properties | 25 + .../saaj/soap/ver1_1/Message1_1Impl.java | 11 +- .../saaj/soap/ver1_1/SOAPFactory1_1Impl.java | 19 +- .../ver1_1/SOAPMessageFactory1_1Impl.java | 11 +- .../saaj/soap/ver1_1/SOAPPart1_1Impl.java | 11 +- .../saaj/soap/ver1_2/Body1_2Impl.java | 11 +- .../saaj/soap/ver1_2/BodyElement1_2Impl.java | 11 +- .../saaj/soap/ver1_2/Detail1_2Impl.java | 11 +- .../saaj/soap/ver1_2/DetailEntry1_2Impl.java | 11 +- .../saaj/soap/ver1_2/Envelope1_2Impl.java | 11 +- .../saaj/soap/ver1_2/Fault1_2Impl.java | 27 +- .../saaj/soap/ver1_2/FaultElement1_2Impl.java | 11 +- .../saaj/soap/ver1_2/Header1_2Impl.java | 11 +- .../soap/ver1_2/HeaderElement1_2Impl.java | 11 +- .../saaj/soap/ver1_2/LocalStrings.properties | 25 + .../saaj/soap/ver1_2/Message1_2Impl.java | 11 +- .../saaj/soap/ver1_2/SOAPFactory1_2Impl.java | 17 +- .../ver1_2/SOAPMessageFactory1_2Impl.java | 11 +- .../saaj/soap/ver1_2/SOAPPart1_2Impl.java | 11 +- .../internal/messaging/saaj/util/Base64.java | 16 +- .../messaging/saaj/util/ByteInputStream.java | 13 +- .../messaging/saaj/util/ByteOutputStream.java | 13 +- .../messaging/saaj/util/CharReader.java | 15 +- .../messaging/saaj/util/CharWriter.java | 15 +- .../saaj/util/FastInfosetReflection.java | 15 +- .../messaging/saaj/util/FinalArrayList.java | 2 +- .../messaging/saaj/util/JAXMStreamSource.java | 15 +- .../internal/messaging/saaj/util/JaxmURI.java | 16 +- .../saaj/util/LocalStrings.properties | 25 + .../saaj/util/LogDomainConstants.java | 15 +- .../messaging/saaj/util/MimeHeadersUtil.java | 11 +- .../saaj/util/NamespaceContextIterator.java | 11 +- .../messaging/saaj/util/ParseUtil.java | 15 +- .../messaging/saaj/util/ParserPool.java | 15 +- .../saaj/util/RejectDoctypeSaxFilter.java | 3 +- .../messaging/saaj/util/TeeInputStream.java | 3 +- .../saaj/util/XMLDeclarationParser.java | 4 +- .../EfficientStreamingTransformer.java | 3 +- .../jvnet/fastinfoset/EncodingAlgorithm.java | 30 +- .../EncodingAlgorithmException.java | 30 +- .../fastinfoset/EncodingAlgorithmIndexes.java | 29 +- .../jvnet/fastinfoset/ExternalVocabulary.java | 29 +- .../fastinfoset/FastInfosetException.java | 30 +- .../jvnet/fastinfoset/FastInfosetParser.java | 71 +- .../jvnet/fastinfoset/FastInfosetResult.java | 29 +- .../fastinfoset/FastInfosetSerializer.java | 116 +- .../jvnet/fastinfoset/FastInfosetSource.java | 29 +- .../jvnet/fastinfoset/RestrictedAlphabet.java | 29 +- .../org/jvnet/fastinfoset/Vocabulary.java | 29 +- .../VocabularyApplicationData.java | 47 + .../sax/EncodingAlgorithmAttributes.java | 48 +- .../sax/EncodingAlgorithmContentHandler.java | 30 +- .../sax/ExtendedContentHandler.java | 47 + .../fastinfoset/sax/FastInfosetReader.java | 30 +- .../fastinfoset/sax/FastInfosetWriter.java | 8 +- .../sax/PrimitiveTypeContentHandler.java | 29 +- .../sax/RestrictedAlphabetContentHandler.java | 30 +- .../EncodingAlgorithmAttributesImpl.java | 109 +- .../helpers/FastInfosetDefaultHandler.java | 30 +- .../stax/FastInfosetStreamReader.java | 62 + .../stax/LowLevelFastInfosetStreamWriter.java | 207 ++ .../internal/org/jvnet/staxex/Base64Data.java | 313 +++ .../org/jvnet/staxex/Base64Encoder.java | 100 + .../jvnet/staxex/ByteArrayOutputStreamEx.java | 69 + .../org/jvnet/staxex/NamespaceContextEx.java | 95 + .../org/jvnet/staxex/XMLStreamReaderEx.java | 184 ++ .../org/jvnet/staxex/XMLStreamWriterEx.java | 158 ++ .../rngom/ast/builder/Annotations.java | 3 +- .../rngom/ast/builder/BuildException.java | 3 +- .../rngom/ast/builder/CommentList.java | 3 +- .../rngom/ast/builder/DataPatternBuilder.java | 3 +- .../xml/internal/rngom/ast/builder/Div.java | 3 +- .../ast/builder/ElementAnnotationBuilder.java | 3 +- .../internal/rngom/ast/builder/Grammar.java | 3 +- .../rngom/ast/builder/GrammarSection.java | 3 +- .../internal/rngom/ast/builder/Include.java | 3 +- .../rngom/ast/builder/IncludedGrammar.java | 3 +- .../rngom/ast/builder/NameClassBuilder.java | 3 +- .../rngom/ast/builder/SchemaBuilder.java | 3 +- .../xml/internal/rngom/ast/builder/Scope.java | 3 +- .../xml/internal/rngom/ast/om/Location.java | 3 +- .../rngom/ast/om/ParsedElementAnnotation.java | 3 +- .../rngom/ast/om/ParsedNameClass.java | 3 +- .../internal/rngom/ast/om/ParsedPattern.java | 3 +- .../rngom/ast/util/CheckingSchemaBuilder.java | 3 +- .../internal/rngom/ast/util/LocatorImpl.java | 3 +- .../xml/internal/rngom/ast/util/package.html | 24 + .../internal/rngom/binary/AfterPattern.java | 3 +- .../xml/internal/rngom/binary/Alphabet.java | 3 +- .../rngom/binary/AttributePattern.java | 3 +- .../internal/rngom/binary/BinaryPattern.java | 3 +- .../internal/rngom/binary/ChoicePattern.java | 3 +- .../rngom/binary/DataExceptPattern.java | 3 +- .../internal/rngom/binary/DataPattern.java | 3 +- .../binary/DuplicateAttributeDetector.java | 3 +- .../internal/rngom/binary/ElementPattern.java | 3 +- .../internal/rngom/binary/EmptyPattern.java | 3 +- .../internal/rngom/binary/ErrorPattern.java | 3 +- .../internal/rngom/binary/GroupPattern.java | 3 +- .../rngom/binary/InterleavePattern.java | 3 +- .../internal/rngom/binary/ListPattern.java | 3 +- .../internal/rngom/binary/Messages.properties | 25 + .../rngom/binary/NotAllowedPattern.java | 3 +- .../rngom/binary/OneOrMorePattern.java | 3 +- .../xml/internal/rngom/binary/Pattern.java | 3 +- .../internal/rngom/binary/PatternBuilder.java | 3 +- .../rngom/binary/PatternInterner.java | 3 +- .../xml/internal/rngom/binary/RefPattern.java | 3 +- .../binary/RestrictionViolationException.java | 3 +- .../rngom/binary/SchemaBuilderImpl.java | 9 +- .../rngom/binary/SchemaPatternBuilder.java | 3 +- .../internal/rngom/binary/StringPattern.java | 3 +- .../internal/rngom/binary/TextPattern.java | 3 +- .../internal/rngom/binary/ValuePattern.java | 3 +- .../xml/internal/rngom/binary/package.html | 24 + .../binary/visitor/ChildElementFinder.java | 3 +- .../rngom/binary/visitor/PatternFunction.java | 3 +- .../rngom/binary/visitor/PatternVisitor.java | 3 +- .../rngom/binary/visitor/PatternWalker.java | 3 +- .../internal/rngom/digested/Annotation.java | 3 +- .../rngom/digested/CommentListImpl.java | 3 +- .../internal/rngom/digested/DAnnotation.java | 3 +- .../rngom/digested/DAttributePattern.java | 3 +- .../rngom/digested/DChoicePattern.java | 3 +- .../rngom/digested/DContainerPattern.java | 3 +- .../internal/rngom/digested/DDataPattern.java | 3 +- .../xml/internal/rngom/digested/DDefine.java | 3 +- .../rngom/digested/DElementPattern.java | 3 +- .../rngom/digested/DEmptyPattern.java | 3 +- .../rngom/digested/DGrammarPattern.java | 3 +- .../rngom/digested/DGroupPattern.java | 3 +- .../rngom/digested/DInterleavePattern.java | 3 +- .../internal/rngom/digested/DListPattern.java | 3 +- .../rngom/digested/DMixedPattern.java | 3 +- .../rngom/digested/DNotAllowedPattern.java | 3 +- .../internal/rngom/digested/DOMPrinter.java | 3 +- .../rngom/digested/DOneOrMorePattern.java | 3 +- .../rngom/digested/DOptionalPattern.java | 3 +- .../xml/internal/rngom/digested/DPattern.java | 3 +- .../rngom/digested/DPatternVisitor.java | 3 +- .../rngom/digested/DPatternWalker.java | 3 +- .../internal/rngom/digested/DRefPattern.java | 3 +- .../rngom/digested/DSchemaBuilderImpl.java | 3 +- .../internal/rngom/digested/DTextPattern.java | 3 +- .../rngom/digested/DUnaryPattern.java | 3 +- .../rngom/digested/DValuePattern.java | 3 +- .../internal/rngom/digested/DXMLPrinter.java | 3 +- .../rngom/digested/DXmlTokenPattern.java | 3 +- .../rngom/digested/DZeroOrMorePattern.java | 3 +- .../digested/DataPatternBuilderImpl.java | 3 +- .../ElementAnnotationBuilderImpl.java | 3 +- .../rngom/digested/ElementWrapper.java | 3 +- .../rngom/digested/GrammarBuilderImpl.java | 3 +- .../internal/rngom/digested/IncludeImpl.java | 3 +- .../sun/xml/internal/rngom/digested/Main.java | 3 +- .../rngom/digested/PatternParseable.java | 3 +- .../xml/internal/rngom/digested/package.html | 24 + .../dt/CachedDatatypeLibraryFactory.java | 3 +- .../dt/CascadingDatatypeLibraryFactory.java | 3 +- .../DoNothingDatatypeLibraryFactoryImpl.java | 3 +- .../dt/builtin/BuiltinDatatypeBuilder.java | 3 +- .../dt/builtin/BuiltinDatatypeLibrary.java | 3 +- .../BuiltinDatatypeLibraryFactory.java | 3 +- .../builtin/CompatibilityDatatypeLibrary.java | 3 +- .../rngom/dt/builtin/Messages.properties | 25 + .../internal/rngom/dt/builtin/package.html | 24 + .../xml/internal/rngom/nc/AnyNameClass.java | 3 +- .../rngom/nc/AnyNameExceptNameClass.java | 3 +- .../internal/rngom/nc/ChoiceNameClass.java | 3 +- .../sun/xml/internal/rngom/nc/NameClass.java | 3 +- .../rngom/nc/NameClassBuilderImpl.java | 3 +- .../internal/rngom/nc/NameClassVisitor.java | 3 +- .../internal/rngom/nc/NameClassWalker.java | 3 +- .../xml/internal/rngom/nc/NsNameClass.java | 3 +- .../rngom/nc/NsNameExceptNameClass.java | 3 +- .../xml/internal/rngom/nc/NullNameClass.java | 3 +- .../internal/rngom/nc/OverlapDetector.java | 3 +- .../internal/rngom/nc/SimpleNameClass.java | 3 +- .../sun/xml/internal/rngom/nc/package.html | 24 + .../sun/xml/internal/rngom/parse/Context.java | 3 +- .../rngom/parse/IllegalSchemaException.java | 3 +- .../internal/rngom/parse/Messages.properties | 25 + .../xml/internal/rngom/parse/Parseable.java | 3 +- .../rngom/parse/compact/CompactParseable.java | 3 +- .../rngom/parse/compact/CompactSyntax.java | 3 +- .../parse/compact/CompactSyntaxConstants.java | 3 +- .../compact/CompactSyntaxTokenManager.java | 3 +- .../rngom/parse/compact/EOFException.java | 3 +- .../parse/compact/EscapeSyntaxException.java | 3 +- .../rngom/parse/compact/JavaCharStream.java | 3 +- .../rngom/parse/compact/Messages.properties | 25 + .../rngom/parse/compact/ParseException.java | 3 +- .../internal/rngom/parse/compact/Token.java | 3 +- .../rngom/parse/compact/TokenMgrError.java | 3 +- .../compact/UCode_UCodeESC_CharStream.java | 3 +- .../rngom/parse/host/AnnotationsHost.java | 3 +- .../xml/internal/rngom/parse/host/Base.java | 3 +- .../rngom/parse/host/CommentListHost.java | 3 +- .../parse/host/DataPatternBuilderHost.java | 3 +- .../internal/rngom/parse/host/DivHost.java | 3 +- .../host/ElementAnnotationBuilderHost.java | 3 +- .../rngom/parse/host/GrammarHost.java | 3 +- .../rngom/parse/host/GrammarSectionHost.java | 3 +- .../rngom/parse/host/IncludeHost.java | 3 +- .../rngom/parse/host/LocationHost.java | 3 +- .../parse/host/NameClassBuilderHost.java | 3 +- .../host/ParsedElementAnnotationHost.java | 3 +- .../rngom/parse/host/ParsedNameClassHost.java | 3 +- .../rngom/parse/host/ParsedPatternHost.java | 3 +- .../rngom/parse/host/SchemaBuilderHost.java | 3 +- .../internal/rngom/parse/host/ScopeHost.java | 3 +- .../internal/rngom/parse/host/package.html | 24 + .../internal/rngom/parse/xml/DtdContext.java | 3 +- .../rngom/parse/xml/Messages.properties | 25 + .../rngom/parse/xml/SAXParseable.java | 3 +- .../rngom/parse/xml/SchemaParser.java | 3 +- .../xml/internal/rngom/util/Localizer.java | 3 +- .../com/sun/xml/internal/rngom/util/Uri.java | 3 +- .../sun/xml/internal/rngom/util/Utf16.java | 3 +- .../rngom/xml/sax/AbstractLexicalHandler.java | 3 +- .../rngom/xml/sax/JAXPXMLReaderCreator.java | 3 +- .../rngom/xml/sax/XMLReaderCreator.java | 3 +- .../rngom/xml/sax/XmlBaseHandler.java | 3 +- .../internal/rngom/xml/util/EncodingMap.java | 3 +- .../xml/internal/rngom/xml/util/Naming.java | 3 +- .../rngom/xml/util/WellKnownNamespaces.java | 3 +- .../stream/buffer/AbstractCreator.java | 188 ++ .../buffer/AbstractCreatorProcessor.java | 140 + .../stream/buffer/AbstractProcessor.java | 246 ++ .../stream/buffer/AttributesHolder.java | 192 ++ .../stream/buffer/FragmentedArray.java} | 75 +- .../stream/buffer/MutableXMLStreamBuffer.java | 246 ++ .../stream/buffer/XMLStreamBuffer.java | 473 ++++ .../buffer/XMLStreamBufferException.java | 40 + .../stream/buffer/XMLStreamBufferMark.java | 76 + .../stream/buffer/XMLStreamBufferResult.java | 117 + .../stream/buffer/XMLStreamBufferSource.java | 102 + .../sax/DefaultWithLexicalHandler.java} | 32 +- .../internal/stream/buffer/sax/Features.java} | 27 +- .../stream/buffer/sax/Properties.java | 33 + .../stream/buffer/sax/SAXBufferCreator.java | 265 ++ .../stream/buffer/sax/SAXBufferProcessor.java | 671 +++++ .../buffer/stax/NamespaceContexHelper.java | 289 ++ .../buffer/stax/StreamBufferCreator.java | 81 + .../stax/StreamReaderBufferCreator.java | 339 +++ .../stax/StreamReaderBufferProcessor.java | 1081 ++++++++ .../stax/StreamWriterBufferCreator.java | 269 ++ .../stax/StreamWriterBufferProcessor.java | 464 ++++ .../com/sun/xml/internal/txw2/Attribute.java | 3 +- .../com/sun/xml/internal/txw2/Cdata.java | 3 +- .../com/sun/xml/internal/txw2/Comment.java | 3 +- .../xml/internal/txw2/ContainerElement.java | 3 +- .../com/sun/xml/internal/txw2/Content.java | 3 +- .../sun/xml/internal/txw2/ContentVisitor.java | 3 +- .../sun/xml/internal/txw2/DatatypeWriter.java | 3 +- .../com/sun/xml/internal/txw2/Document.java | 3 +- .../sun/xml/internal/txw2/EndDocument.java | 3 +- .../com/sun/xml/internal/txw2/EndTag.java | 3 +- .../txw2/IllegalAnnotationException.java | 3 +- .../txw2/IllegalSignatureException.java | 3 +- .../sun/xml/internal/txw2/NamespaceDecl.java | 3 +- .../xml/internal/txw2/NamespaceResolver.java | 3 +- .../xml/internal/txw2/NamespaceSupport.java | 4 +- .../com/sun/xml/internal/txw2/Pcdata.java | 3 +- .../sun/xml/internal/txw2/StartDocument.java | 3 +- .../com/sun/xml/internal/txw2/StartTag.java | 3 +- .../com/sun/xml/internal/txw2/TXW.java | 3 +- .../com/sun/xml/internal/txw2/Text.java | 3 +- .../sun/xml/internal/txw2/TxwException.java | 3 +- .../sun/xml/internal/txw2/TypedXmlWriter.java | 3 +- .../txw2/annotation/XmlAttribute.java | 3 +- .../internal/txw2/annotation/XmlCDATA.java | 3 +- .../internal/txw2/annotation/XmlElement.java | 3 +- .../txw2/annotation/XmlNamespace.java | 3 +- .../internal/txw2/annotation/XmlValue.java | 3 +- .../xml/internal/txw2/annotation/package.html | 24 + .../txw2/output/CharacterEscapeHandler.java | 4 +- .../xml/internal/txw2/output/DataWriter.java | 4 +- .../output/DelegatingXMLStreamWriter.java | 170 ++ .../internal/txw2/output/DomSerializer.java | 9 +- .../txw2/output/DumbEscapeHandler.java | 4 +- .../internal/txw2/output/DumpSerializer.java | 3 +- .../txw2/output/IndentingXMLFilter.java | 311 +++ .../txw2/output/IndentingXMLStreamWriter.java | 194 ++ .../internal/txw2/output/ResultFactory.java | 3 +- .../internal/txw2/output/SaxSerializer.java | 19 +- .../internal/txw2/output/StaxSerializer.java | 9 +- .../txw2/output/StreamSerializer.java | 7 +- .../xml/internal/txw2/output/XMLWriter.java | 4 +- .../internal/txw2/output/XmlSerializer.java | 2 +- .../sun/xml/internal/txw2/output/package.html | 24 + .../com/sun/xml/internal/txw2/package.html | 24 + .../com/sun/xml/internal/ws/Closeable.java | 61 + .../ws/addressing/EndpointReferenceUtil.java | 368 +++ .../internal/ws/addressing/ProblemAction.java | 65 + .../ws/addressing/ProblemHeaderQName.java | 49 + .../ws/addressing/W3CAddressingConstants.java | 115 + .../internal/ws/addressing/WsaClientTube.java | 104 + .../internal/ws/addressing/WsaServerTube.java | 353 +++ .../xml/internal/ws/addressing/WsaTube.java | 346 +++ .../internal/ws/addressing/WsaTubeHelper.java | 330 +++ .../ws/addressing/WsaTubeHelperImpl.java | 89 + .../model/ActionNotSupportedException.java} | 28 +- .../model/InvalidMapException.java} | 29 +- .../model/MapRequiredException.java} | 19 +- .../MemberSubmissionAddressingConstants.java | 77 + .../ws/addressing/v200408/ProblemAction.java} | 54 +- .../v200408/ProblemHeaderQName.java | 49 + .../addressing/v200408/WsaTubeHelperImpl.java | 90 + .../sun/xml/internal/ws/api/BindingID.java | 411 +++ .../xml/internal/ws/api/BindingIDFactory.java | 66 + .../ws/api/DistributedPropertySet.java | 145 + .../xml/internal/ws/api/EndpointAddress.java | 205 ++ .../internal/ws/api/FeatureConstructor.java | 66 + .../sun/xml/internal/ws/api/PropertySet.java | 422 +++ .../sun/xml/internal/ws/api/SOAPVersion.java | 219 ++ .../sun/xml/internal/ws/api/WSBinding.java | 123 + .../internal/ws/api/WSFeatureList.java} | 63 +- .../sun/xml/internal/ws/api/WSService.java | 148 + .../ws/api/addressing/AddressingVersion.java | 744 +++++ .../internal/ws/api/addressing/EPRHeader.java | 110 + .../ws/api/addressing/OneWayFeature.java | 165 ++ .../OutboundReferenceParameterHeader.java | 330 +++ .../api/addressing/WSEndpointReference.java | 954 +++++++ .../ws/api/addressing/package-info.java | 28 + .../ws/api/client/ClientPipelineHook.java | 73 + .../client/SelectOptimalEncodingFeature.java | 89 + .../ws/api/client/ServiceInterceptor.java | 127 + .../api/client/ServiceInterceptorFactory.java | 102 + .../internal/ws/api/client/WSPortInfo.java | 64 + .../api/fastinfoset/FastInfosetFeature.java | 78 + .../internal/ws/api/message/Attachment.java | 86 + .../ws/api/message/AttachmentSet.java | 70 + .../message/ExceptionHasMessage.java} | 27 +- .../xml/internal/ws/api/message/Header.java | 325 +++ .../internal/ws/api/message/HeaderList.java | 794 ++++++ .../xml/internal/ws/api/message/Headers.java | 159 ++ .../xml/internal/ws/api/message/Message.java | 672 +++++ .../xml/internal/ws/api/message/Messages.java | 360 +++ .../xml/internal/ws/api/message/Packet.java | 763 +++++ .../message/package-info.java} | 10 +- .../message/stream/InputStreamMessage.java | 89 + .../message/stream/StreamBasedMessage.java} | 70 +- .../stream/XMLStreamReaderMessage.java | 73 + .../ws/api/model/CheckedException.java | 100 + .../internal/ws/api/model/ExceptionType.java | 52 + .../xml/internal/ws/api/model/JavaMethod.java | 122 + .../internal/ws/api/model/MEP.java} | 36 +- .../xml/internal/ws/api/model/Parameter.java | 163 ++ .../ws/{ => api}/model/ParameterBinding.java | 39 +- .../xml/internal/ws/api/model/SEIModel.java | 171 ++ .../ws/api/model/soap/SOAPBinding.java | 101 + .../ws/api/model/wsdl/WSDLBoundOperation.java | 67 + .../ws/api/model/wsdl/WSDLBoundPortType.java | 106 + .../ws/api/model/wsdl/WSDLDescriptorKind.java | 60 + .../ws/api/model/wsdl/WSDLExtensible.java | 85 + .../ws/api/model/wsdl/WSDLExtension.java | 48 + .../model/wsdl/WSDLFault.java} | 27 +- .../ws/api/model/wsdl/WSDLFeaturedObject.java | 61 + .../model/wsdl/WSDLInput.java} | 52 +- .../ws/api/model/wsdl/WSDLMessage.java} | 19 +- .../internal/ws/api/model/wsdl/WSDLModel.java | 124 + .../ws/api/model/wsdl/WSDLObject.java} | 28 +- .../ws/api/model/wsdl/WSDLOperation.java | 115 + .../model/wsdl/WSDLOutput.java} | 55 +- .../internal/ws/api/model/wsdl/WSDLPart.java | 56 + .../model/wsdl/WSDLPartDescriptor.java} | 32 +- .../model/wsdl/WSDLPort.java} | 66 +- .../ws/api/model/wsdl/WSDLPortType.java | 58 + .../ws/api/model/wsdl/WSDLService.java | 68 + .../Stub.java => api/package-info.java} | 49 +- .../api/pipe/ClientPipeAssemblerContext.java | 102 + .../api/pipe/ClientTubeAssemblerContext.java | 231 ++ .../sun/xml/internal/ws/api/pipe/Codec.java | 238 ++ .../sun/xml/internal/ws/api/pipe/Codecs.java | 82 + .../xml/internal/ws/api/pipe/ContentType.java | 60 + .../sun/xml/internal/ws/api/pipe/Engine.java | 90 + .../sun/xml/internal/ws/api/pipe/Fiber.java | 771 ++++++ .../pipe/FiberContextSwitchInterceptor.java | 105 + .../xml/internal/ws/api/pipe/NextAction.java | 139 + .../sun/xml/internal/ws/api/pipe/Pipe.java | 346 +++ .../xml/internal/ws/api/pipe/PipeCloner.java | 81 + .../ws/api/pipe/PipelineAssembler.java | 119 + .../ws/api/pipe/PipelineAssemblerFactory.java | 96 + .../ws/api/pipe/SOAPBindingCodec.java} | 20 +- .../api/pipe/ServerPipeAssemblerContext.java | 108 + .../api/pipe/ServerTubeAssemblerContext.java | 234 ++ .../pipe/StreamSOAPCodec.java} | 34 +- .../sun/xml/internal/ws/api/pipe/Stubs.java | 253 ++ .../ws/api/pipe/TransportPipeFactory.java | 116 + .../ws/api/pipe/TransportTubeFactory.java | 137 + .../sun/xml/internal/ws/api/pipe/Tube.java | 397 +++ .../xml/internal/ws/api/pipe/TubeCloner.java | 113 + .../ws/api/pipe/TubelineAssembler.java | 104 + .../ws/api/pipe/TubelineAssemblerFactory.java | 134 + .../pipe/helper/AbstractFilterPipeImpl.java | 121 + .../pipe/helper/AbstractFilterTubeImpl.java | 80 + .../ws/api/pipe/helper/AbstractPipeImpl.java} | 53 +- .../ws/api/pipe/helper/AbstractTubeImpl.java | 107 + .../ws/api/pipe/helper/PipeAdapter.java | 127 + .../ws/api/pipe/helper/package-info.java | 35 + .../internal/ws/api/pipe/package-info.java | 29 + .../server/AbstractServerAsyncTransport.java | 159 ++ .../xml/internal/ws/api/server/Adapter.java | 132 + .../internal/ws/api/server/AsyncProvider.java | 116 + .../ws/api/server/AsyncProviderCallback.java | 65 + .../ws/api/server/BoundEndpoint.java} | 44 +- .../xml/internal/ws/api/server/Container.java | 97 + .../ws/api/server/ContainerResolver.java | 94 + .../api/server/DocumentAddressResolver.java | 78 + .../ws/api/server/EndpointAwareCodec.java} | 24 +- .../ws/api/server/InstanceResolver.java | 230 ++ .../server/InstanceResolverAnnotation.java | 61 + .../xml/internal/ws/api/server/Invoker.java | 126 + .../xml/internal/ws/api/server/Module.java | 73 + .../ws/api/server/PortAddressResolver.java | 62 + .../ws/api/server/ResourceInjector.java | 73 + .../internal/ws/api/server/SDDocument.java | 154 ++ .../ws/api/server/SDDocumentFilter.java | 55 + .../ws/api/server/SDDocumentSource.java | 132 + .../ws/api/server/ServerPipelineHook.java | 99 + .../ws/api/server/ServiceDefinition.java | 79 + .../ws/api/server/TransportBackChannel.java | 66 + .../internal/ws/api/server/WSEndpoint.java | 485 ++++ .../ws/api/server/WSWebServiceContext.java | 52 + .../xml/internal/ws/api/server/WebModule.java | 56 + .../api/server/WebServiceContextDelegate.java | 151 + .../internal/ws/api/server/package-info.java | 31 + .../api/streaming/XMLStreamReaderFactory.java | 367 +++ .../api/streaming/XMLStreamWriterFactory.java | 305 ++ .../ws/api/wsdl/parser/MetaDataResolver.java | 50 + .../wsdl/parser/MetadataResolverFactory.java | 53 + .../wsdl/parser/ServiceDescriptor.java} | 38 +- .../api/wsdl/parser/WSDLParserExtension.java | 282 ++ .../parser/WSDLParserExtensionContext.java | 46 + .../ws/api/wsdl/parser/XMLEntityResolver.java | 77 + .../ws/api/wsdl/parser/package-info.java | 29 + .../api/wsdl/writer/WSDLGenExtnContext.java | 90 + .../wsdl/writer/WSDLGeneratorExtension.java | 270 ++ .../xml/internal/ws/binding/BindingImpl.java | 245 +- .../binding/{http => }/HTTPBindingImpl.java | 64 +- .../internal/ws/binding/SOAPBindingImpl.java | 188 ++ .../ws/binding/WebServiceFeatureList.java | 309 +++ .../ws/binding/soap/SOAPBindingImpl.java | 226 -- .../ws/client/AsyncHandlerService.java | 68 - .../AsyncInvoker.java} | 31 +- .../internal/ws/client/AsyncResponseImpl.java | 130 + .../ws/client/BindingProviderProperties.java | 85 +- .../ws/client/ClientTransportException.java | 12 +- .../internal/ws/client/ContactInfoBase.java | 136 - .../ws/client/ContactInfoListImpl.java | 64 - .../ws/client/ContentNegotiation.java | 77 +- .../xml/internal/ws/client/ContextMap.java | 248 -- .../internal/ws/client/EndpointIFBase.java | 137 - .../internal/ws/client/EndpointIFContext.java | 123 - .../client/EndpointIFInvocationHandler.java | 215 -- .../ws/client/HandlerConfiguration.java | 115 + .../ws/client/HandlerConfigurator.java | 182 ++ .../sun/xml/internal/ws/client/PortInfo.java | 170 ++ .../xml/internal/ws/client/PortInfoBase.java | 87 - .../internal/ws/client/RequestContext.java | 359 ++- .../internal/ws/client/ResponseContext.java | 139 +- ...ider.java => ResponseContextReceiver.java} | 24 +- .../xml/internal/ws/client/ResponseImpl.java | 118 + .../xml/internal/ws/client/SCAnnotations.java | 88 + .../xml/internal/ws/client/SEIPortInfo.java | 68 + .../internal/ws/client/SenderException.java | 4 +- .../internal/ws/client/ServiceContext.java | 148 - .../ws/client/ServiceContextBuilder.java | 157 -- .../com/sun/xml/internal/ws/client/Stub.java | 406 +++ .../internal/ws/client/WSServiceDelegate.java | 750 +++-- .../client/dispatch/DataSourceDispatch.java | 79 + .../ws/client/dispatch/DispatchBase.java | 710 ----- .../ws/client/dispatch/DispatchContext.java | 80 - .../ws/client/dispatch/DispatchImpl.java | 457 +++ .../ws/client/dispatch/JAXBDispatch.java | 113 + .../ws/client/dispatch/MessageDispatch.java | 60 + .../client/dispatch/RESTSourceDispatch.java | 80 + .../ws/client/dispatch/ResponseImpl.java | 132 - .../client/dispatch/SOAPMessageDispatch.java | 101 + .../client/dispatch/SOAPSourceDispatch.java | 98 + .../impl/DispatchContactInfoList.java | 73 - .../dispatch/impl/DispatchDelegate.java | 119 - .../impl/encoding/DispatchSerializer.java | 326 --- .../dispatch/impl/encoding/DispatchUtil.java | 72 - .../protocol/MessageDispatcherHelper.java | 76 - .../xml/internal/ws/client/package-info.java | 146 +- .../internal/ws/client/sei/AsyncBuilder.java | 244 ++ .../ws/client/sei/AsyncMethodHandler.java | 243 ++ .../internal/ws/client/sei/BodyBuilder.java | 285 ++ .../ws/client/sei/CallbackMethodHandler.java | 56 + .../internal/ws/client/sei/MessageFiller.java | 178 ++ .../internal/ws/client/sei/MethodHandler.java | 67 + .../ws/client/sei/PollingMethodHandler.java | 45 + .../ws/client/sei/ResponseBuilder.java | 649 +++++ .../xml/internal/ws/client/sei/SEIStub.java | 142 + .../ws/client/sei/SyncMethodHandler.java | 266 ++ .../internal/ws/client/sei/ValueGetter.java | 90 + .../internal/ws/client/sei/ValueSetter.java | 128 + .../internal/ws/client/sei/package-info.java | 29 + .../xml/internal/ws/developer/EPRRecipe.java | 132 + .../ws/developer/JAXWSProperties.java | 78 +- .../developer/MemberSubmissionAddressing.java | 93 + .../MemberSubmissionAddressingFeature.java | 97 + .../MemberSubmissionEndpointReference.java | 200 ++ .../ws/developer/ServerSideException.java} | 43 +- .../Encoder.java => developer/Stateful.java} | 65 +- .../ws/developer/StatefulFeature.java} | 47 +- .../developer/StatefulWebServiceManager.java | 381 +++ .../ws/developer/WSBindingProvider.java | 102 + .../internal/ws/developer/package-info.java | 29 + .../AbstractXMLStreamWriterExImpl.java | 83 + .../internal/ws/encoding/ContentTypeImpl.java | 79 + .../ws/encoding/EncoderDecoderBase.java | 140 - .../encoding/JAXWSAttachmentMarshaller.java | 227 -- .../encoding/JAXWSAttachmentUnmarshaller.java | 121 - .../xml/internal/ws/encoding/MimeCodec.java | 154 ++ .../ws/encoding/MimeMultipartParser.java | 480 ++++ .../xml/internal/ws/encoding/MtomCodec.java | 560 ++++ .../ws/encoding/SOAPBindingCodec.java | 439 +++ .../ws/encoding/StreamSOAP11Codec.java | 73 + .../ws/encoding/StreamSOAP12Codec.java | 78 + .../internal/ws/encoding/StreamSOAPCodec.java | 304 ++ .../xml/internal/ws/encoding/SwACodec.java | 74 + .../xml/internal/ws/encoding/TagInfoset.java | 219 ++ .../ws/encoding/XMLHTTPBindingCodec.java | 363 +++ .../fastinfoset/FastInfosetCodec.java | 281 ++ .../fastinfoset/FastInfosetMIMETypes.java} | 64 +- .../FastInfosetStreamReaderFactory.java | 71 + .../FastInfosetStreamReaderRecyclable.java} | 34 +- .../FastInfosetStreamSOAP11Codec.java | 69 + .../FastInfosetStreamSOAP12Codec.java | 70 + .../FastInfosetStreamSOAPCodec.java | 178 ++ .../ws/encoding/internal/InternalEncoder.java | 34 - .../ws/encoding/jaxb/JAXBBeanInfo.java | 111 - .../ws/encoding/jaxb/JAXBBridgeInfo.java | 153 - .../ws/encoding/jaxb/JAXBTypeSerializer.java | 219 -- .../ws/encoding/jaxb/RpcLitPayload.java | 78 - .../jaxb/RpcLitPayloadSerializer.java | 138 - .../ws/encoding/simpletype/EncoderUtils.java | 142 - .../encoding/soap/ClientEncoderDecoder.java | 343 --- .../soap/DeserializationException.java | 4 +- .../ws/encoding/soap/EncoderDecoder.java | 406 --- .../ws/encoding/soap/SOAP12Constants.java | 8 +- .../ws/encoding/soap/SOAPConstants.java | 8 +- .../ws/encoding/soap/SOAPDecoder.java | 680 ----- .../ws/encoding/soap/SOAPEncoder.java | 780 ------ .../encoding/soap/SerializationException.java | 4 +- .../ws/encoding/soap/SerializerConstants.java | 2 +- .../encoding/soap/ServerEncoderDecoder.java | 236 -- .../soap/client/SOAP12XMLDecoder.java | 350 --- .../soap/client/SOAP12XMLEncoder.java | 135 - .../encoding/soap/client/SOAPXMLDecoder.java | 581 ---- .../encoding/soap/client/SOAPXMLEncoder.java | 265 -- .../soap/internal/AttachmentBlock.java | 435 --- .../ws/encoding/soap/internal/BodyBlock.java | 86 - .../encoding/soap/internal/DelegateBase.java | 102 - .../soap/internal/InternalMessage.java | 103 - .../soap/internal/MessageInfoBase.java | 195 -- .../SOAP12NotUnderstoodHeaderBlock.java | 72 - .../ws/encoding/soap/message/FaultCode.java | 93 - .../encoding/soap/message/FaultCodeEnum.java | 74 - .../ws/encoding/soap/message/FaultReason.java | 70 - .../soap/message/FaultReasonText.java | 69 - .../encoding/soap/message/FaultSubcode.java | 102 - .../soap/message/SOAP12FaultInfo.java | 241 -- .../encoding/soap/message/SOAPFaultInfo.java | 104 - .../ws/encoding/soap/server/ProviderSED.java | 84 - .../soap/server/SOAP12XMLDecoder.java | 188 -- .../soap/server/SOAP12XMLEncoder.java | 135 - .../encoding/soap/server/SOAPXMLDecoder.java | 204 -- .../encoding/soap/server/SOAPXMLEncoder.java | 253 -- .../streaming/SOAP12NamespaceConstants.java | 2 +- .../streaming/SOAPNamespaceConstants.java | 2 +- .../internal/ws/encoding/xml/XMLCodec.java | 90 + .../internal/ws/encoding/xml/XMLDecoder.java | 116 - .../ws/encoding/xml/XMLEPTFactory.java | 38 - .../internal/ws/encoding/xml/XMLEncoder.java | 87 - .../internal/ws/encoding/xml/XMLMessage.java | 1184 +++----- .../sun/xml/internal/ws/fault/CodeType.java | 87 + .../sun/xml/internal/ws/fault/DetailType.java | 82 + .../xml/internal/ws/fault/ExceptionBean.java | 193 ++ .../ReasonType.java} | 41 +- .../xml/internal/ws/fault/SOAP11Fault.java | 179 ++ .../xml/internal/ws/fault/SOAP12Fault.java | 213 ++ .../internal/ws/fault/SOAPFaultBuilder.java | 496 ++++ .../xml/internal/ws/fault/SubcodeType.java | 84 + .../sun/xml/internal/ws/fault/TextType.java | 59 + .../ws/handler/ClientLogicalHandlerTube.java | 196 ++ .../ws/handler/ClientSOAPHandlerTube.java | 197 ++ .../ws/handler/HandlerChainCaller.java | 1064 ------- .../ws/handler/HandlerChainsModel.java | 116 +- .../internal/ws/handler/HandlerContext.java | 174 -- .../internal/ws/handler/HandlerException.java | 4 +- .../internal/ws/handler/HandlerProcessor.java | 411 +++ .../ws/handler/HandlerResolverImpl.java | 129 - .../xml/internal/ws/handler/HandlerTube.java | 280 ++ .../ws/handler/LogicalMessageContextImpl.java | 119 +- .../ws/handler/LogicalMessageImpl.java | 257 +- .../ws/handler/MessageContextImpl.java | 196 +- .../ws/handler/MessageContextUtil.java | 151 - ...Impl.java => MessageUpdatableContext.java} | 78 +- .../xml/internal/ws/handler/PortInfoImpl.java | 20 +- .../ws/handler/SHDSOAPMessageContext.java | 116 - .../ws/handler/SOAPHandlerContext.java | 112 - .../ws/handler/SOAPHandlerProcessor.java | 101 + .../ws/handler/SOAPMessageContextImpl.java | 208 +- .../ws/handler/ServerLogicalHandlerTube.java | 199 ++ .../ws/handler/ServerSOAPHandlerTube.java | 206 ++ .../ws/handler/XMLHandlerContext.java | 124 - .../ws/handler/XMLHandlerProcessor.java | 70 + .../ws/handler/XMLLogicalMessageImpl.java | 91 - .../xml/internal/ws/handler/package-info.java | 101 - .../ws/message/AbstractHeaderImpl.java | 142 + .../ws/message/AbstractMessageImpl.java | 221 ++ .../ws/message/AttachmentSetImpl.java | 81 + .../message/AttachmentUnmarshallerImpl.java | 82 + .../ws/message/ByteArrayAttachment.java | 110 + .../xml/internal/ws/message/DOMHeader.java | 121 + .../xml/internal/ws/message/DOMMessage.java | 149 + .../ws/message/DataHandlerAttachment.java | 113 + .../internal/ws/message/EmptyMessageImpl.java | 126 + .../ws/message/FaultDetailHeader.java | 117 + .../internal/ws/message/JAXBAttachment.java | 127 + .../ws/message/MimeAttachmentSet.java | 111 + .../ws/message/ProblemActionHeader.java | 135 + .../internal/ws/message/RelatesToHeader.java | 81 + .../ws/message/RootElementSniffer.java | 81 + .../xml/internal/ws/message/StringHeader.java | 109 + .../runtime/Tie.java => message/Util.java} | 28 +- .../internal/ws/message/XMLReaderImpl.java | 81 + .../jaxb/AttachmentMarshallerImpl.java | 100 + .../ws/message/jaxb/JAXBBridgeSource.java | 125 + .../internal/ws/message/jaxb/JAXBHeader.java | 194 ++ .../internal/ws/message/jaxb/JAXBMessage.java | 313 +++ .../ws/message/jaxb/MarshallerBridge.java | 121 + .../ws/message/jaxb/package-info.java} | 24 +- .../package-info.java} | 13 +- .../internal/ws/message/saaj/SAAJHeader.java | 54 + .../internal/ws/message/saaj/SAAJMessage.java | 504 ++++ .../message/source/PayloadSourceMessage.java | 59 + .../message/source/ProtocolSourceMessage.java | 130 + .../ws/message/source/SourceUtils.java | 253 ++ .../message/stream/OutboundStreamHeader.java | 167 ++ .../stream/PayloadStreamReaderMessage.java | 116 + .../ws/message/stream/StreamAttachment.java | 107 + .../ws/message/stream/StreamHeader.java | 233 ++ .../ws/message/stream/StreamHeader11.java | 82 + .../ws/message/stream/StreamHeader12.java | 87 + .../ws/message/stream/StreamMessage.java | 446 +++ .../ws/model/AbstractSEIModelImpl.java | 490 ++++ ...ception.java => CheckedExceptionImpl.java} | 59 +- .../sun/xml/internal/ws/model/JavaMethod.java | 236 -- .../xml/internal/ws/model/JavaMethodImpl.java | 326 +++ .../{Parameter.java => ParameterImpl.java} | 94 +- .../xml/internal/ws/model/RuntimeModel.java | 621 ----- .../ws/{modeler => model}/RuntimeModeler.java | 632 ++--- .../RuntimeModelerException.java | 6 +- .../xml/internal/ws/model/SOAPSEIModel.java | 95 + .../internal/ws/model/WrapperParameter.java | 80 +- .../internal/ws/model/soap/SOAPBinding.java | 130 - .../ws/model/soap/SOAPBindingImpl.java | 70 + .../ws/model/soap/SOAPRuntimeModel.java | 408 --- .../ws/model/wsdl/AbstractExtensibleImpl.java | 139 + .../wsdl/AbstractFeaturedObjectImpl.java | 78 + .../ws/model/wsdl/AbstractObjectImpl.java | 62 + .../ws/model/wsdl/WSDLBoundOperationImpl.java | 382 +++ .../ws/model/wsdl/WSDLBoundPortTypeImpl.java | 237 ++ .../wsdl/WSDLFaultImpl.java} | 35 +- .../internal/ws/model/wsdl/WSDLInputImpl.java | 82 + .../ws/model/wsdl/WSDLMessageImpl.java | 61 + .../internal/ws/model/wsdl/WSDLModelImpl.java | 233 ++ .../ws/model/wsdl/WSDLOperationImpl.java | 143 + .../wsdl/WSDLOutputImpl.java} | 66 +- .../wsdl/WSDLPartDescriptorImpl.java} | 44 +- .../internal/ws/model/wsdl/WSDLPartImpl.java | 81 + .../internal/ws/model/wsdl/WSDLPortImpl.java | 119 + .../ws/model/wsdl/WSDLPortTypeImpl.java | 83 + .../ws/model/wsdl/WSDLProperties.java} | 63 +- .../ws/model/wsdl/WSDLServiceImpl.java | 110 + .../com/sun/xml/internal/ws/package-info.java | 12 +- .../internal/ws/pept/encoding/Decoder.java | 67 - .../xml/internal/ws/pept/ept/Acceptor.java | 51 - .../xml/internal/ws/pept/ept/ContactInfo.java | 55 - .../internal/ws/pept/ept/ContactInfoList.java | 52 - .../ws/pept/ept/ContactInfoListIterator.java | 61 - .../xml/internal/ws/pept/ept/EPTFactory.java | 104 - .../xml/internal/ws/pept/ept/MessageInfo.java | 149 - .../ws/pept/presentation/MessageStruct.java | 222 -- .../ws/pept/presentation/TargetFinder.java | 56 - .../internal/ws/pept/presentation/Tie.java | 76 - .../ws/pept/protocol/Interceptors.java | 56 - .../ws/pept/protocol/MessageDispatcher.java | 67 - .../ws/protocol/soap/ClientMUTube.java | 92 + .../xml/internal/ws/protocol/soap/MUTube.java | 194 ++ .../ws/protocol/soap/ServerMUTube.java | 76 + .../soap/VersionMismatchException.java | 65 + .../soap/client/SOAPMessageDispatcher.java | 1012 ------- .../protocol/soap/server/ProviderSOAPMD.java | 153 - .../soap/server/SOAPMessageDispatcher.java | 632 ----- .../ws/protocol/xml/XMLMessageException.java | 4 +- .../xml/client/XMLMessageDispatcher.java | 976 ------- .../ws/protocol/xml/server/ProviderXMLMD.java | 114 - .../xml/server/XMLMessageDispatcher.java | 512 ---- .../ws/resources/AddressingMessages.java | 341 +++ .../internal/ws/resources/ClientMessages.java | 369 +++ .../ws/resources/DispatchMessages.java | 221 ++ .../ws/resources/EncodingMessages.java | 173 ++ .../ws/resources/HandlerMessages.java | 125 + .../ws/resources/HttpserverMessages.java | 53 + .../ws/resources/ModelerMessages.java | 281 ++ .../ws/resources/ProviderApiMessages.java | 149 + .../internal/ws/resources/SenderMessages.java | 89 + .../internal/ws/resources/ServerMessages.java | 697 +++++ .../internal/ws/resources/SoapMessages.java | 113 + .../ws/resources/StreamingMessages.java | 269 ++ .../internal/ws/resources/UtilMessages.java | 137 + .../ws/resources/WsdlmodelMessages.java | 78 + .../ws/resources/WsservletMessages.java | 1913 +++++++++++++ .../ws/resources/XmlmessageMessages.java | 173 ++ .../ws/resources/addressing.properties | 53 + .../internal/ws/resources/client.properties | 31 +- .../internal/ws/resources/dispatch.properties | 21 +- .../internal/ws/resources/encoding.properties | 8 +- .../internal/ws/resources/handler.properties | 5 +- .../ws/resources/httpserver.properties | 6 +- .../internal/ws/resources/modeler.properties | 19 +- .../ws/resources/providerApi.properties | 35 + .../internal/ws/resources/sender.properties | 4 +- .../internal/ws/resources/server.properties | 43 +- .../xml/internal/ws/resources/soap.properties | 5 +- .../ws/resources/streaming.properties | 5 +- .../xml/internal/ws/resources/util.properties | 5 +- .../ws/resources/wsdlmodel.properties | 31 + .../ws/resources/wsservlet.properties | 11 +- .../ws/resources/xmlmessage.properties | 4 +- .../ws/server/AbstractInstanceResolver.java | 254 ++ .../server/AbstractMultiInstanceResolver.java | 90 + .../ws/server/AbstractWebServiceContext.java | 97 + .../internal/ws/server/AppMsgContextImpl.java | 158 -- ...Impl.java => DefaultResourceInjector.java} | 32 +- .../sun/xml/internal/ws/server/DocInfo.java | 100 - .../internal/ws/server/EPTFactoryBase.java | 116 - .../ws/server/EPTFactoryFactoryBase.java | 148 - .../internal/ws/server/EndpointFactory.java | 541 ++++ .../ws/server/EndpointMessageContextImpl.java | 191 ++ .../xml/internal/ws/server/InvokerTube.java | 168 ++ .../sun/xml/internal/ws/server/PeptTie.java | 93 - .../internal/ws/server/RuntimeContext.java | 124 - .../ws/server/RuntimeEndpointInfo.java | 846 ------ .../internal/ws/server/SDDocumentImpl.java | 322 +++ .../ws/server/ServerPropertyConstants.java | 2 +- .../internal/ws/server/ServerRtException.java | 7 +- .../ws/server/ServiceDefinitionImpl.java | 119 + .../ws/server/SingletonResolver.java} | 44 +- .../ws/server/StatefulInstanceResolver.java | 420 +++ .../com/sun/xml/internal/ws/server/Tie.java | 110 - .../ws/server/UnsupportedMediaException.java} | 38 +- .../internal/ws/server/WSDLGenResolver.java | 289 +- .../xml/internal/ws/server/WSDLPatcher.java | 437 ++- .../internal/ws/server/WSEndpointImpl.java | 308 +++ .../internal/ws/server/XMLEPTFactoryImpl.java | 115 - .../xml/internal/ws/server/package-info.java | 114 +- .../provider/AsyncProviderInvokerTube.java | 134 + .../MessageProviderArgumentBuilder.java} | 32 +- .../provider/ProviderArgumentsBuilder.java | 80 + ...rModel.java => ProviderEndpointModel.java} | 110 +- .../server/provider/ProviderInvokerTube.java | 57 + .../ws/server/provider/ProviderPeptTie.java | 86 - .../provider/SOAPProviderArgumentBuilder.java | 161 ++ .../provider/SyncProviderInvokerTube.java | 92 + .../provider/XMLProviderArgumentBuilder.java | 102 + .../ws/server/sei/ActionBasedDispatcher.java | 98 + .../ws/server/sei/DispatchException.java | 44 + .../server/sei/EndpointArgumentsBuilder.java | 628 +++++ .../server/sei/EndpointMethodDispatcher.java | 55 + .../sei/EndpointMethodDispatcherGetter.java | 67 + .../ws/server/sei/EndpointMethodHandler.java | 280 ++ .../sei/EndpointResponseMessageBuilder.java | 297 ++ .../ws/server/sei/EndpointValueSetter.java | 123 + .../internal/ws/server/sei/MessageFiller.java | 178 ++ .../sei/PayloadQNameBasedDispatcher.java | 94 + .../ws/server/sei/SEIInvokerTube.java | 99 + .../internal/ws/server/sei/ValueGetter.java | 92 + .../sun/xml/internal/ws/spi/ProviderImpl.java | 163 +- .../xml/internal/ws/spi/runtime/Binding.java | 37 - .../spi/runtime/ClientTransportFactory.java | 35 - .../ws/spi/runtime/InternalSoapEncoder.java | 57 - .../ws/spi/runtime/RuntimeEndpointInfo.java | 130 - .../ws/spi/runtime/SystemHandlerDelegate.java | 114 - .../runtime/SystemHandlerDelegateFactory.java | 143 - .../internal/ws/spi/runtime/WSConnection.java | 107 - .../xml/internal/ws/streaming/Attributes.java | 2 +- .../ws/streaming/DOMStreamReader.java | 532 ++-- .../internal/ws/streaming/PrefixFactory.java | 2 +- .../ws/streaming/PrefixFactoryImpl.java | 2 +- .../ws/streaming/SourceReaderFactory.java | 78 +- .../ws/streaming/TidyXMLStreamReader.java | 204 +- .../xml/internal/ws/streaming/XMLReader.java | 4 +- .../ws/streaming/XMLReaderException.java | 4 +- .../streaming/XMLStreamReaderException.java | 4 +- .../ws/streaming/XMLStreamReaderFactory.java | 259 -- .../ws/streaming/XMLStreamReaderUtil.java | 52 +- .../streaming/XMLStreamWriterException.java | 4 +- .../ws/streaming/XMLStreamWriterFactory.java | 118 - .../ws/streaming/XMLStreamWriterUtil.java | 40 +- .../ws/transport/DeferredTransportPipe.java | 134 + .../xml/internal/ws/transport/Headers.java | 12 +- .../ws/transport/WSConnectionImpl.java | 189 -- .../http/DeploymentDescriptorParser.java | 564 ++++ .../ws/transport/http/HttpAdapter.java | 545 ++++ .../ws/transport/http/HttpAdapterList.java | 133 + .../ws/transport/http/ResourceLoader.java | 72 + .../ws/transport/http/WSHTTPConnection.java | 257 ++ .../ws/transport/http/client/CookieJar.java | 2 +- .../http/client/HttpClientTransport.java | 491 ++-- .../client/HttpClientTransportFactory.java | 69 - .../ws/transport/http/client/HttpCookie.java | 2 +- .../http/client/HttpResponseProperties.java} | 57 +- .../http/client/HttpTransportPipe.java | 221 ++ .../transport/http/client/RfcDateParser.java | 9 +- .../http/server/EndpointDocInfo.java | 101 - .../http/server/EndpointEntityResolver.java | 76 - .../transport/http/server/EndpointImpl.java | 246 +- .../transport/http/server/HttpEndpoint.java | 307 +- .../http/server/ServerConnectionImpl.java | 343 ++- .../ws/transport/http/server/ServerMgr.java | 35 +- .../transport/http/server/WSHttpHandler.java | 256 +- .../http/server/WebServiceContextImpl.java | 63 - .../local/client/LocalClientTransport.java | 167 -- .../client/LocalClientTransportFactory.java | 61 - .../local/server/LocalConnectionImpl.java | 74 - .../local/server/LocalWSContextImpl.java | 56 - .../xml/internal/ws/util/ASCIIUtility.java | 2 +- .../sun/xml/internal/ws/util/Base64Util.java | 177 -- .../xml/internal/ws/util/ByteArrayBuffer.java | 47 +- .../internal/ws/util/ByteArrayDataSource.java | 2 +- .../xml/internal/ws/util/CompletedFuture.java | 69 + .../sun/xml/internal/ws/util/Constants.java | 2 +- .../com/sun/xml/internal/ws/util/DOMUtil.java | 184 +- .../ws/util/FastInfosetReflection.java | 244 +- .../xml/internal/ws/util/FastInfosetUtil.java | 85 +- .../ws/util/HandlerAnnotationInfo.java | 2 +- .../ws/util/HandlerAnnotationProcessor.java | 80 +- .../sun/xml/internal/ws/util/JAXWSUtils.java | 2 +- .../xml/internal/ws/util/MessageInfoUtil.java | 106 - .../internal/ws/util/NamespaceSupport.java | 22 +- .../internal/ws/util/NoCloseInputStream.java | 50 + .../internal/ws/util/NoCloseOutputStream.java | 50 + .../com/sun/xml/internal/ws/util/Pool.java | 144 + .../sun/xml/internal/ws/util/QNameMap.java | 485 ++++ ...or.java => ReadOnlyPropertyException.java} | 38 +- .../xml/internal/ws/util/RuntimeVersion.java | 2 +- .../internal/ws/util/SOAPConnectionUtil.java | 217 -- .../sun/xml/internal/ws/util/SOAPUtil.java | 187 -- ...on.java => ServiceConfigurationError.java} | 52 +- .../xml/internal/ws/util/ServiceFinder.java | 378 +++ .../sun/xml/internal/ws/util/StringUtils.java | 2 +- .../xml/internal/ws/util/UtilException.java | 4 +- .../com/sun/xml/internal/ws/util/Version.java | 9 +- .../sun/xml/internal/ws/util/VersionUtil.java | 2 +- .../internal/ws/util/XMLConnectionUtil.java | 149 - .../ws/util/exception/JAXWSExceptionBase.java | 74 +- .../LocatableWebServiceException.java | 106 + .../ws/util/localization/Localizable.java | 2 +- .../localization/LocalizableImpl.java} | 32 +- .../util/localization/LocalizableMessage.java | 2 +- .../LocalizableMessageFactory.java | 2 +- .../ws/util/localization/Localizer.java | 14 +- .../ws/util/localization/NullLocalizable.java | 2 +- .../xml/internal/ws/util/pipe/DumpTube.java | 143 + .../ws/util/pipe/StandalonePipeAssembler.java | 91 + .../ws/util/pipe/StandaloneTubeAssembler.java | 91 + .../ws/util/resources/Messages_en.properties | 4 +- .../xml/internal/ws/util/version.properties | 31 +- .../sun/xml/internal/ws/util/xml/CDATA.java | 2 +- .../xml/ContentHandlerToXMLStreamWriter.java | 283 ++ .../internal/ws/util/xml/DummyLocation.java} | 36 +- .../ws/util/xml/NamedNodeMapIterator.java | 2 +- .../ws/util/xml/NodeListIterator.java | 2 +- .../xml/internal/ws/util/xml/StAXResult.java | 89 + .../xml/internal/ws/util/xml/StAXSource.java | 6 +- .../ws/util/xml/XMLStreamReaderFilter.java | 239 ++ .../xml/XMLStreamReaderToXMLStreamWriter.java | 219 ++ .../ws/util/xml/XMLStreamWriterFilter.java | 183 ++ .../sun/xml/internal/ws/util/xml/XmlUtil.java | 82 +- .../sun/xml/internal/ws/wsdl/WSDLContext.java | 177 -- .../xml/internal/ws/wsdl/parser/Binding.java | 116 - .../ws/wsdl/parser/BindingOperation.java | 175 -- .../parser/DelegatingParserExtension.java | 187 ++ .../ws/wsdl/parser/EntityResolverWrapper.java | 67 + .../parser/ErrorHandler.java} | 26 +- .../wsdl/parser/FoolProofParserExtension.java | 139 + .../parser/InaccessibleWSDLException.java | 91 + .../ws/wsdl/parser/MIMEConstants.java | 4 +- ...bmissionAddressingWSDLParserExtension.java | 121 + .../ws/wsdl/parser/MexEntityResolver.java | 79 + .../internal/ws/wsdl/parser/ParserUtil.java | 12 +- .../ws/wsdl/parser/RuntimeWSDLParser.java | 779 ++++-- .../ws/wsdl/parser/SOAPConstants.java | 4 +- .../W3CAddressingWSDLParserExtension.java | 282 ++ .../ws/wsdl/parser/WSDLConstants.java | 3 +- .../internal/ws/wsdl/parser/WSDLDocument.java | 253 -- .../WSDLParserExtensionContextImpl.java | 55 + .../parser/WSDLParserExtensionFacade.java | 347 +++ .../writer/UsingAddressing.java} | 33 +- .../W3CAddressingWSDLGeneratorExtension.java | 127 + .../ws/wsdl/writer/WSDLGenerator.java | 870 ++++-- .../writer/WSDLGeneratorExtensionFacade.java | 143 + .../internal/ws/wsdl/writer/WSDLResolver.java | 75 + .../ws/wsdl/writer/document/Binding.java | 2 +- .../writer/document/BindingOperationType.java | 2 +- .../ws/wsdl/writer/document/Definitions.java | 2 +- .../ws/wsdl/writer/document/Documented.java | 2 +- .../ws/wsdl/writer/document/Fault.java | 2 +- .../ws/wsdl/writer/document/FaultType.java | 2 +- .../ws/wsdl/writer/document/Import.java | 2 +- .../ws/wsdl/writer/document/Message.java | 2 +- .../ws/wsdl/writer/document/OpenAtts.java | 2 +- .../ws/wsdl/writer/document/Operation.java | 2 +- .../ws/wsdl/writer/document/ParamType.java | 2 +- .../ws/wsdl/writer/document/Part.java | 2 +- .../ws/wsdl/writer/document/Port.java | 2 +- .../ws/wsdl/writer/document/PortType.java | 2 +- .../ws/wsdl/writer/document/Service.java | 2 +- .../document/StartWithExtensionsType.java | 2 +- .../ws/wsdl/writer/document/Types.java | 2 +- .../ws/wsdl/writer/document/http/Address.java | 2 +- .../ws/wsdl/writer/document/http/Binding.java | 2 +- .../wsdl/writer/document/http/Operation.java | 2 +- .../writer/document/http/package-info.java | 2 +- .../ws/wsdl/writer/document/package-info.java | 2 +- .../ws/wsdl/writer/document/soap/Body.java | 2 +- .../wsdl/writer/document/soap/BodyType.java | 2 +- .../ws/wsdl/writer/document/soap/Header.java | 2 +- .../writer/document/soap/HeaderFault.java | 2 +- .../writer/document/soap/SOAPAddress.java | 2 +- .../writer/document/soap/SOAPBinding.java | 2 +- .../wsdl/writer/document/soap/SOAPFault.java | 2 +- .../writer/document/soap/SOAPOperation.java | 2 +- .../writer/document/soap/package-info.java | 2 +- .../ws/wsdl/writer/document/soap12/Body.java | 2 +- .../wsdl/writer/document/soap12/BodyType.java | 2 +- .../wsdl/writer/document/soap12/Header.java | 2 +- .../writer/document/soap12/HeaderFault.java | 2 +- .../writer/document/soap12/SOAPAddress.java | 2 +- .../writer/document/soap12/SOAPBinding.java | 2 +- .../writer/document/soap12/SOAPFault.java | 2 +- .../writer/document/soap12/SOAPOperation.java | 2 +- .../writer/document/soap12/package-info.java | 2 +- .../ws/wsdl/writer/document/xsd/Import.java | 2 +- .../ws/wsdl/writer/document/xsd/Schema.java | 2 +- .../writer/document/xsd/package-info.java | 2 +- .../xml/internal/xsom/ForeignAttributes.java | 3 +- .../com/sun/xml/internal/xsom/SCD.java | 175 ++ .../sun/xml/internal/xsom/XSAnnotation.java | 13 +- .../sun/xml/internal/xsom/XSAttContainer.java | 3 +- .../sun/xml/internal/xsom/XSAttGroupDecl.java | 3 +- .../xml/internal/xsom/XSAttributeDecl.java | 3 +- .../sun/xml/internal/xsom/XSAttributeUse.java | 3 +- .../sun/xml/internal/xsom/XSComplexType.java | 3 +- .../sun/xml/internal/xsom/XSComponent.java | 61 +- .../sun/xml/internal/xsom/XSContentType.java | 3 +- .../sun/xml/internal/xsom/XSDeclaration.java | 5 +- .../sun/xml/internal/xsom/XSElementDecl.java | 16 +- .../com/sun/xml/internal/xsom/XSFacet.java | 3 +- .../internal/xsom/XSIdentityConstraint.java | 3 +- .../xml/internal/xsom/XSListSimpleType.java | 3 +- .../sun/xml/internal/xsom/XSModelGroup.java | 3 +- .../xml/internal/xsom/XSModelGroupDecl.java | 3 +- .../com/sun/xml/internal/xsom/XSNotation.java | 3 +- .../com/sun/xml/internal/xsom/XSParticle.java | 3 +- .../xsom/XSRestrictionSimpleType.java | 3 +- .../com/sun/xml/internal/xsom/XSSchema.java | 10 +- .../sun/xml/internal/xsom/XSSchemaSet.java | 34 +- .../sun/xml/internal/xsom/XSSimpleType.java | 34 +- .../com/sun/xml/internal/xsom/XSTerm.java | 3 +- .../com/sun/xml/internal/xsom/XSType.java | 3 +- .../xml/internal/xsom/XSUnionSimpleType.java | 3 +- .../com/sun/xml/internal/xsom/XSVariety.java | 3 +- .../com/sun/xml/internal/xsom/XSWildcard.java | 3 +- .../com/sun/xml/internal/xsom/XSXPath.java | 3 +- .../com/sun/xml/internal/xsom/XmlString.java | 3 +- .../internal/xsom/impl/AnnotationImpl.java | 18 +- .../internal/xsom/impl/AttGroupDeclImpl.java | 2 +- .../internal/xsom/impl/AttributeDeclImpl.java | 3 +- .../internal/xsom/impl/AttributeUseImpl.java | 2 +- .../internal/xsom/impl/AttributesHolder.java | 23 +- .../internal/xsom/impl/ComplexTypeImpl.java | 15 +- .../xml/internal/xsom/impl/ComponentImpl.java | 53 +- .../com/sun/xml/internal/xsom/impl/Const.java | 3 +- .../internal/xsom/impl/ContentTypeImpl.java | 3 +- .../internal/xsom/impl/DeclarationImpl.java | 8 +- .../xml/internal/xsom/impl/ElementDecl.java | 3 +- .../sun/xml/internal/xsom/impl/EmptyImpl.java | 3 +- .../sun/xml/internal/xsom/impl/FacetImpl.java | 3 +- .../xsom/impl/ForeignAttributesImpl.java | 3 +- .../xsom/impl/IdentityConstraintImpl.java | 3 +- .../xsom/impl/ListSimpleTypeImpl.java | 7 +- .../xsom/impl/ModelGroupDeclImpl.java | 3 +- .../internal/xsom/impl/ModelGroupImpl.java | 3 +- .../xml/internal/xsom/impl/NotationImpl.java | 3 +- .../xml/internal/xsom/impl/ParticleImpl.java | 3 +- .../com/sun/xml/internal/xsom/impl/Ref.java | 2 +- .../xsom/impl/RestrictionSimpleTypeImpl.java | 13 +- .../xml/internal/xsom/impl/SchemaImpl.java | 61 +- .../xml/internal/xsom/impl/SchemaSetImpl.java | 155 +- .../internal/xsom/impl/SimpleTypeImpl.java | 12 +- .../com/sun/xml/internal/xsom/impl/UName.java | 3 +- .../xsom/impl/UnionSimpleTypeImpl.java | 9 +- .../com/sun/xml/internal/xsom/impl/Util.java | 3 +- .../xml/internal/xsom/impl/WildcardImpl.java | 3 +- .../sun/xml/internal/xsom/impl/XPathImpl.java | 3 +- .../sun/xml/internal/xsom/impl/package.html | 24 + .../xsom/impl/parser/BaseContentRef.java | 65 + .../impl/parser/DefaultAnnotationParser.java | 2 +- .../internal/xsom/impl/parser/DelayedRef.java | 7 +- .../internal/xsom/impl/parser/Messages.java | 5 +- .../xsom/impl/parser/Messages.properties | 29 +- .../xsom/impl/parser/Messages_ja.properties | 25 + .../xsom/impl/parser/NGCCRuntimeEx.java | 22 +- .../xsom/impl/parser/ParserContext.java | 17 +- .../xml/internal/xsom/impl/parser/Patch.java | 2 +- .../xsom/impl/parser/PatcherManager.java | 3 +- .../impl/parser/SAXParserFactoryAdaptor.java | 2 +- .../xsom/impl/parser/SchemaDocumentImpl.java | 3 +- .../impl/parser/SubstGroupBaseTypeRef.java | 2 +- .../internal/xsom/impl/parser/datatypes.xsd | 4 +- .../internal/xsom/impl/parser/package.html | 24 + .../impl/parser/state/AttributesImpl.java | 4 +- .../impl/parser/state/NGCCEventReceiver.java | 3 +- .../impl/parser/state/NGCCEventSource.java | 3 +- .../xsom/impl/parser/state/NGCCHandler.java | 4 +- .../parser/state/NGCCInterleaveFilter.java | 3 +- .../xsom/impl/parser/state/NGCCRuntime.java | 4 +- .../xsom/impl/parser/state/Schema.java | 1069 ++++--- .../impl/parser/state/SimpleType_List.java | 135 +- .../parser/state/SimpleType_Restriction.java | 293 +- .../impl/parser/state/SimpleType_Union.java | 227 +- .../xsom/impl/parser/state/annotation.java | 23 +- .../impl/parser/state/attributeDeclBody.java | 351 ++- .../impl/parser/state/attributeGroupDecl.java | 221 +- .../xsom/impl/parser/state/attributeUses.java | 861 +++--- .../xsom/impl/parser/state/complexType.java | 2194 ++++++++------- .../complexType_complexContent_body.java | 73 +- .../impl/parser/state/elementDeclBody.java | 1215 ++++---- .../xsom/impl/parser/state/erSet.java | 13 +- .../xsom/impl/parser/state/ersSet.java | 13 +- .../xsom/impl/parser/state/facet.java | 75 +- .../impl/parser/state/foreignAttributes.java | 3 +- .../xsom/impl/parser/state/group.java | 207 +- .../impl/parser/state/identityConstraint.java | 295 +- .../xsom/impl/parser/state/importDecl.java | 203 +- .../xsom/impl/parser/state/includeDecl.java | 51 +- .../impl/parser/state/modelGroupBody.java | 87 +- .../xsom/impl/parser/state/notation.java | 287 +- .../xsom/impl/parser/state/occurs.java | 109 +- .../xsom/impl/parser/state/particle.java | 733 +++-- .../xsom/impl/parser/state/qname.java | 13 +- .../xsom/impl/parser/state/qualification.java | 3 +- .../xsom/impl/parser/state/redefine.java | 199 +- .../xsom/impl/parser/state/simpleType.java | 255 +- .../xsom/impl/parser/state/wildcardBody.java | 217 +- .../xsom/impl/parser/state/xpath.java | 159 +- .../xsom/impl/scd/AbstractAxisImpl.java | 186 ++ .../sun/xml/internal/xsom/impl/scd/Axis.java | 578 ++++ .../xml/internal/xsom/impl/scd/Iterators.java | 214 ++ .../xsom/impl/scd/ParseException.java | 216 ++ .../xml/internal/xsom/impl/scd/SCDImpl.java | 83 + .../xml/internal/xsom/impl/scd/SCDParser.java | 561 ++++ .../xsom/impl/scd/SCDParserConstants.java | 93 + .../xsom/impl/scd/SCDParserTokenManager.java | 2457 +++++++++++++++++ .../xsom/impl/scd/SimpleCharStream.java | 463 ++++ .../sun/xml/internal/xsom/impl/scd/Step.java | 186 ++ .../sun/xml/internal/xsom/impl/scd/Token.java | 105 + .../internal/xsom/impl/scd/TokenMgrError.java | 157 ++ .../xsom/impl/util/DraconianErrorHandler.java | 2 +- .../xsom/impl/util/FilterIterator.java | 71 - .../impl/util/ResourceEntityResolver.java | 2 +- .../xsom/impl/util/SchemaTreeTraverser.java | 3 +- .../internal/xsom/impl/util/SchemaWriter.java | 2 +- .../sun/xml/internal/xsom/impl/util/Uri.java | 24 + .../com/sun/xml/internal/xsom/package.html | 24 + .../xsom/parser/AnnotationContext.java | 3 +- .../xsom/parser/AnnotationParser.java | 3 +- .../xsom/parser/AnnotationParserFactory.java | 3 +- .../xml/internal/xsom/parser/JAXPParser.java | 3 +- .../internal/xsom/parser/SchemaDocument.java | 3 +- .../xml/internal/xsom/parser/XMLParser.java | 3 +- .../xml/internal/xsom/parser/XSOMParser.java | 3 +- .../sun/xml/internal/xsom/parser/package.html | 24 + .../xsom/util/ComponentNameFunction.java | 4 +- .../internal/xsom/util/DeferedCollection.java | 157 ++ .../xsom/util/DomAnnotationParserFactory.java | 15 +- .../xml/internal/xsom/util/NameGetter.java | 3 +- .../internal/xsom/util/NameGetter.properties | 27 +- .../xml/internal/xsom/util/SimpleTypeSet.java | 3 +- .../xml/internal/xsom/util/TypeClosure.java | 3 +- .../sun/xml/internal/xsom/util/TypeSet.java | 3 +- .../sun/xml/internal/xsom/util/XSFinder.java | 3 +- .../internal/xsom/util/XSFunctionFilter.java | 3 +- .../xsom/visitor/XSContentTypeFunction.java | 3 +- .../xsom/visitor/XSContentTypeVisitor.java | 3 +- .../xml/internal/xsom/visitor/XSFunction.java | 3 +- .../xsom/visitor/XSSimpleTypeFunction.java | 3 +- .../xsom/visitor/XSSimpleTypeVisitor.java | 3 +- .../internal/xsom/visitor/XSTermFunction.java | 3 +- .../xsom/visitor/XSTermFunctionWithParam.java | 3 +- .../internal/xsom/visitor/XSTermVisitor.java | 3 +- .../xml/internal/xsom/visitor/XSVisitor.java | 3 +- .../xsom/visitor/XSWildcardFunction.java | 3 +- .../xsom/visitor/XSWildcardVisitor.java | 3 +- .../xml/internal/xsom/visitor/package.html | 24 + .../activation/ActivationDataFlavor.java | 5 +- .../javax/activation/MailcapCommandMap.java | 10 +- .../classes/javax/activation/MimeType.java | 25 +- .../activation/MimeTypeParameterList.java | 10 +- .../classes/javax/xml/bind/ContextFinder.java | 81 +- .../xml/bind/DataBindingException.java} | 28 +- .../javax/xml/bind/DatatypeConverter.java | 3 +- .../javax/xml/bind/DatatypeConverterImpl.java | 915 ++++++ .../xml/bind/DatatypeConverterInterface.java | 1 + .../share/classes/javax/xml/bind/Element.java | 1 + .../javax/xml/bind/GetPropertyAction.java | 43 + .../share/classes/javax/xml/bind/JAXB.java | 628 +++++ .../classes/javax/xml/bind/JAXBContext.java | 1 + .../classes/javax/xml/bind/JAXBElement.java | 2 +- .../classes/javax/xml/bind/JAXBException.java | 1 + .../javax/xml/bind/MarshalException.java | 1 + .../classes/javax/xml/bind/Marshaller.java | 29 +- .../javax/xml/bind/Messages.properties | 25 + .../javax/xml/bind/NotIdentifiableEvent.java | 1 + .../javax/xml/bind/ParseConversionEvent.java | 1 + .../javax/xml/bind/PrintConversionEvent.java | 1 + .../javax/xml/bind/PropertyException.java | 1 + .../javax/xml/bind/SchemaOutputResolver.java | 3 +- .../xml/bind/TypeConstraintException.java | 1 + .../javax/xml/bind/UnmarshalException.java | 1 + .../classes/javax/xml/bind/Unmarshaller.java | 7 +- .../javax/xml/bind/UnmarshallerHandler.java | 1 + .../javax/xml/bind/ValidationEvent.java | 1 + .../xml/bind/ValidationEventHandler.java | 1 + .../xml/bind/ValidationEventLocator.java | 1 + .../javax/xml/bind/ValidationException.java | 1 + .../classes/javax/xml/bind/Validator.java | 1 + .../javax/xml/bind/WhiteSpaceProcessor.java | 197 ++ .../xml/bind/annotation/XmlAccessOrder.java | 3 +- .../xml/bind/annotation/XmlAccessType.java | 3 +- .../xml/bind/annotation/XmlAccessorOrder.java | 29 +- .../xml/bind/annotation/XmlAccessorType.java | 1 + .../xml/bind/annotation/XmlAttribute.java | 1 + .../javax/xml/bind/annotation/XmlElement.java | 3 +- .../xml/bind/annotation/XmlElementRef.java | 2 +- .../bind/annotation/XmlElementWrapper.java | 19 +- .../javax/xml/bind/annotation/XmlID.java | 1 + .../javax/xml/bind/annotation/XmlIDREF.java | 1 + .../javax/xml/bind/annotation/XmlList.java | 1 - .../javax/xml/bind/annotation/XmlNs.java | 1 + .../javax/xml/bind/annotation/XmlNsForm.java | 5 +- .../javax/xml/bind/annotation/XmlSchema.java | 66 +- .../javax/xml/bind/annotation/XmlSeeAlso.java | 79 + .../xml/bind/annotation/XmlTransient.java | 12 +- .../javax/xml/bind/annotation/XmlType.java | 3 +- .../javax/xml/bind/annotation/XmlValue.java | 1 + .../annotation/adapters/HexBinaryAdapter.java | 2 + .../adapters/NormalizedStringAdapter.java | 5 +- .../bind/annotation/adapters/XmlAdapter.java | 7 +- .../adapters/XmlJavaTypeAdapter.java | 1 + .../xml/bind/annotation/adapters/package.html | 49 +- .../javax/xml/bind/annotation/package.html | 50 +- .../bind/attachment/AttachmentMarshaller.java | 1 - .../attachment/AttachmentUnmarshaller.java | 1 - .../javax/xml/bind/attachment/package.html | 49 +- .../bind/helpers/AbstractMarshallerImpl.java | 27 +- .../helpers/AbstractUnmarshallerImpl.java | 1 + .../DefaultValidationEventHandler.java | 1 + .../xml/bind/helpers/Messages.properties | 25 + .../helpers/NotIdentifiableEventImpl.java | 1 + .../helpers/ParseConversionEventImpl.java | 1 + .../helpers/PrintConversionEventImpl.java | 1 + .../xml/bind/helpers/ValidationEventImpl.java | 1 + .../helpers/ValidationEventLocatorImpl.java | 1 + .../javax/xml/bind/helpers/package.html | 49 +- .../share/classes/javax/xml/bind/package.html | 49 +- .../javax/xml/bind/util/Messages.properties | 25 + .../bind/util/ValidationEventCollector.java | 10 +- .../classes/javax/xml/bind/util/package.html | 49 +- .../javax/xml/soap/AttachmentPart.java | 13 +- .../share/classes/javax/xml/soap/Detail.java | 13 +- .../classes/javax/xml/soap/DetailEntry.java | 13 +- .../classes/javax/xml/soap/FactoryFinder.java | 13 +- .../javax/xml/soap/MessageFactory.java | 13 +- .../classes/javax/xml/soap/MimeHeader.java | 13 +- .../classes/javax/xml/soap/MimeHeaders.java | 13 +- .../share/classes/javax/xml/soap/Name.java | 15 +- .../share/classes/javax/xml/soap/Node.java | 13 +- .../javax/xml/soap/SAAJMetaFactory.java | 24 +- .../classes/javax/xml/soap/SAAJResult.java | 9 +- .../classes/javax/xml/soap/SOAPBody.java | 15 +- .../javax/xml/soap/SOAPBodyElement.java | 13 +- .../javax/xml/soap/SOAPConnection.java | 13 +- .../javax/xml/soap/SOAPConnectionFactory.java | 13 +- .../classes/javax/xml/soap/SOAPConstants.java | 13 +- .../classes/javax/xml/soap/SOAPElement.java | 13 +- .../javax/xml/soap/SOAPElementFactory.java | 13 +- .../classes/javax/xml/soap/SOAPEnvelope.java | 13 +- .../classes/javax/xml/soap/SOAPException.java | 13 +- .../classes/javax/xml/soap/SOAPFactory.java | 13 +- .../classes/javax/xml/soap/SOAPFault.java | 13 +- .../javax/xml/soap/SOAPFaultElement.java | 13 +- .../classes/javax/xml/soap/SOAPHeader.java | 13 +- .../javax/xml/soap/SOAPHeaderElement.java | 13 +- .../classes/javax/xml/soap/SOAPMessage.java | 13 +- .../classes/javax/xml/soap/SOAPPart.java | 13 +- .../share/classes/javax/xml/soap/Text.java | 13 +- .../share/classes/javax/xml/soap/package.html | 50 +- .../share/classes/javax/xml/ws/Action.java | 77 + .../classes/javax/xml/ws/AsyncHandler.java | 2 +- .../share/classes/javax/xml/ws/Binding.java | 51 +- .../classes/javax/xml/ws/BindingProvider.java | 169 +- .../classes/javax/xml/ws/BindingType.java | 2 +- .../share/classes/javax/xml/ws/Dispatch.java | 16 +- .../share/classes/javax/xml/ws/Endpoint.java | 451 +-- .../javax/xml/ws/EndpointReference.java | 190 ++ .../classes/javax/xml/ws/FaultAction.java | 63 + .../share/classes/javax/xml/ws/Holder.java | 2 +- .../classes/javax/xml/ws/LogicalMessage.java | 13 +- .../javax/xml/ws/ProtocolException.java | 14 +- .../share/classes/javax/xml/ws/Provider.java | 8 +- .../classes/javax/xml/ws/RequestWrapper.java | 12 +- .../classes/javax/xml/ws/RespectBinding.java | 107 + .../javax/xml/ws/RespectBindingFeature.java | 126 + .../share/classes/javax/xml/ws/Response.java | 6 +- .../classes/javax/xml/ws/ResponseWrapper.java | 12 +- .../share/classes/javax/xml/ws/Service.java | 904 ++++-- .../classes/javax/xml/ws/ServiceMode.java | 10 +- .../classes/javax/xml/ws/WebEndpoint.java | 2 +- .../share/classes/javax/xml/ws/WebFault.java | 6 +- .../javax/xml/ws/WebServiceClient.java | 2 +- .../javax/xml/ws/WebServiceContext.java | 154 +- .../javax/xml/ws/WebServiceException.java | 2 +- .../javax/xml/ws/WebServiceFeature.java | 81 + .../javax/xml/ws/WebServicePermission.java | 2 +- .../classes/javax/xml/ws/WebServiceRef.java | 8 +- .../classes/javax/xml/ws/WebServiceRefs.java | 2 +- .../javax/xml/ws/handler/HandlerResolver.java | 2 +- .../xml/ws/handler/LogicalMessageContext.java | 4 +- .../javax/xml/ws/handler/MessageContext.java | 277 +- .../javax/xml/ws/handler/PortInfo.java | 2 +- .../classes/javax/xml/ws/handler/package.html | 24 + .../xml/ws/handler/soap/SOAPHandler.java | 4 +- .../ws/handler/soap/SOAPMessageContext.java | 22 +- .../javax/xml/ws/handler/soap/package.html | 24 + .../classes/javax/xml/ws/http/package.html | 24 + .../share/classes/javax/xml/ws/package.html | 24 + .../classes/javax/xml/ws/soap/Addressing.java | 108 + .../javax/xml/ws/soap/AddressingFeature.java | 162 ++ .../share/classes/javax/xml/ws/soap/MTOM.java | 69 + .../javax/xml/ws/soap/MTOMFeature.java | 134 + .../javax/xml/ws/soap/SOAPBinding.java | 6 +- .../javax/xml/ws/soap/SOAPFaultException.java | 2 +- .../classes/javax/xml/ws/soap/package.html | 24 + .../javax/xml/ws/spi/FactoryFinder.java | 40 +- .../classes/javax/xml/ws/spi/Provider.java | 205 +- .../javax/xml/ws/spi/ServiceDelegate.java | 741 +++-- .../ws/spi/WebServiceFeatureAnnotation.java | 73 + .../classes/javax/xml/ws/spi/package.html | 26 +- .../ws/wsaddressing/W3CEndpointReference.java | 155 ++ .../W3CEndpointReferenceBuilder.java | 259 ++ .../xml/ws/wsaddressing/package-info.java | 29 + .../javax/xml/ws/wsaddressing/package.html | 29 + .../org/relaxng/datatype/Datatype.java | 262 ++ .../org/relaxng/datatype/DatatypeBuilder.java | 70 + .../relaxng/datatype/DatatypeException.java} | 58 +- .../org/relaxng/datatype/DatatypeLibrary.java | 62 + .../datatype/DatatypeLibraryFactory.java} | 36 +- .../datatype/DatatypeStreamingValidator.java | 71 + .../relaxng/datatype/ValidationContext.java | 91 + .../helpers/DatatypeLibraryLoader.java | 262 ++ .../helpers/ParameterlessDatatypeBuilder.java | 67 + .../helpers/StreamingValidatorImpl.java | 80 + 2692 files changed, 120166 insertions(+), 63522 deletions(-) create mode 100644 jaxws/TRADEMARK create mode 100644 jaxws/src/share/classes/com/sun/istack/internal/XMLStreamException2.java rename jaxws/src/share/classes/com/sun/{xml/internal/ws/util/xml => istack/internal}/XMLStreamReaderToContentHandler.java (93%) rename jaxws/src/share/classes/com/sun/{tools/internal/txw2/AntErrorListener.java => istack/internal/tools/MaskingClassLoader.java} (51%) create mode 100644 jaxws/src/share/classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java create mode 100644 jaxws/src/share/classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/txw2/Main.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/txw2/NameUtil.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/txw2/RELAXNGLoader.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/txw2/TxwTask.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/DataPatternBuilderImpl.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/DatatypeFactory.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/GrammarImpl.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/GrammarSectionImpl.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/SchemaBuilderImpl.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/package.html delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/xsd/XmlSchemaBuilder.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/xsd/package.html delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/txw2/model/Attribute.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/txw2/model/Define.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/txw2/model/Element.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/txw2/model/Leaf.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/txw2/model/NodeSet.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/api/TJavaGeneratorExtension.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensible.java rename jaxws/src/share/classes/com/sun/{xml/internal/ws/model/Mode.java => tools/internal/ws/api/wsdl/TWSDLExtension.java} (80%) create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensionHandler.java rename jaxws/src/share/classes/com/sun/{xml/internal/ws/model/ExceptionType.java => tools/internal/ws/api/wsdl/TWSDLOperation.java} (74%) create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLParserContext.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/processor/Processor.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/processor/ProcessorActionVersion.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/processor/ProcessorConstants.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/processor/ProcessorOptions.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/processor/config/ClassModelInfo.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/processor/config/ModelInfo.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/processor/config/WSDLModelInfo.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/processor/config/parser/CustomizationParser.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/processor/config/parser/InputParser.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/processor/config/parser/JAXWSBindingInfoParser.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/processor/config/parser/ParserUtil.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/processor/config/parser/Reader.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/JAXBTypeGenerator.java rename jaxws/src/share/classes/com/sun/tools/internal/{txw2/builder/relaxng/DivImpl.java => ws/processor/generator/JavaGeneratorExtensionFacade.java} (59%) delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/SimpleToBoxedUtil.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/W3CAddressingJavaGeneratorExtension.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceReferenceCollector.java rename jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/{ => wsdl}/ModelerUtils.java (93%) delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/processor/util/ClientProcessorEnvironment.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/processor/util/ProcessorEnvironment.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/processor/util/ProcessorEnvironmentBase.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/resources/ConfigurationMessages.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/resources/GeneratorMessages.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/resources/JavacompilerMessages.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/resources/ModelMessages.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/resources/ModelerMessages.java rename jaxws/src/share/classes/com/sun/tools/internal/ws/{processor/ProcessorNotificationListener.java => resources/ProcessorMessages.java} (57%) create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/resources/UtilMessages.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/resources/WebserviceapMessages.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/resources/WscompileMessages.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/resources/WsdlMessages.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/util/JAXWSClassFactory.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/util/JavaCompilerHelper.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/util/MapBase.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/util/ToolBase.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/util/xml/NodeListIterator.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/util/xml/PrettyPrintingXmlWriter.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/util/xml/XmlWriter.java rename jaxws/src/share/classes/com/sun/tools/internal/{txw2/ErrorListener.java => ws/wscompile/AbortException.java} (73%) delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/ActionConstants.java rename jaxws/src/share/classes/com/sun/{xml/internal/ws/transport/local/LocalMessage.java => tools/internal/ws/wscompile/BadCommandLineException.java} (61%) delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/CompileTool.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiver.java rename jaxws/src/share/classes/com/sun/tools/internal/{txw2/ConsoleErrorReporter.java => ws/wscompile/ErrorReceiverFilter.java} (55%) create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/JavaCompilerHelper.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/Options.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsgenOptions.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportListener.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportOptions.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/BuiltInTypes.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/Schema.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaAttribute.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaDocument.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaElement.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaEntity.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Extensible.java rename jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/{Extension.java => ExtensionImpl.java} (75%) rename jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/{ParserContext.java => TWSDLParserContextImpl.java} (74%) delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/WriterContext.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/AbstractExtensionHandler.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/AbstractReferenceFinderImpl.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMBuilder.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestScanner.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/ExtensionHandlerBase.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/InternalizationLogic.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/MemberSubmissionAddressingExtensionHandler.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/MetadataFinder.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SchemaExtensionHandler.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SchemaParser.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SchemaWriter.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/VersionChecker.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingExtensionHandler.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLInternalizationLogic.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLWriter.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WhitespaceStripper.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/episode/PluginImpl.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/episode/package-info.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/xjc/api/SpecVersion.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSeeAlsoWriter.java rename jaxws/src/share/classes/com/sun/tools/internal/{txw2/model/Value.java => xjc/model/AbstractCElement.java} (58%) rename jaxws/src/share/classes/com/sun/tools/internal/{txw2/model/XmlNode.java => xjc/model/AutoClassNameAllocator.java} (50%) rename jaxws/src/share/classes/com/sun/tools/internal/{txw2/model/Text.java => xjc/model/CClass.java} (78%) create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CClassRef.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/AbstractExtensionBindingChecker.java rename jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/{DOM4JLocator.java => DOMLocator.java} (95%) create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DTDExtensionBindingChecker.java create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java rename jaxws/src/share/classes/com/sun/tools/internal/{txw2/model/prop/XmlItemProp.java => xjc/reader/xmlschema/bindinfo/BIXSubstitutable.java} (61%) create mode 100644 jaxws/src/share/classes/com/sun/tools/internal/xjc/util/SubtreeCutter.java delete mode 100644 jaxws/src/share/classes/com/sun/tools/internal/xjc/util/XMLStreamReaderToContentHandler.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/bind/AccessorFactory.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/bind/AccessorFactoryImpl.java rename jaxws/src/share/classes/com/sun/{tools/internal/txw2/model/Data.java => xml/internal/bind/AnyTypeAdapter.java} (63%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/bind/CycleRecoverable.java rename jaxws/src/share/classes/com/sun/{tools/internal/ws/util/xml/NullEntityResolver.java => xml/internal/bind/XmlAccessorFactory.java} (68%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/bind/api/ClassResolver.java rename jaxws/src/share/classes/com/sun/xml/internal/{ws/pept/Delegate.java => bind/api/ErrorListener.java} (53%) delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/bind/v2/doc-files/packages.png delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/bind/v2/doc-files/packages.vsd delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/bind/v2/doc-files/readme.txt create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/GroupKind.java rename jaxws/src/share/classes/com/sun/xml/internal/{ws/encoding/soap/message/SOAPMsgCreateException.java => bind/v2/schemagen/Messages.java} (69%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.properties create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Tree.java rename jaxws/src/share/classes/com/sun/{tools/internal/txw2/XmlSchemaLoader.java => xml/internal/bind/v2/schemagen/episode/Bindings.java} (63%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Klass.java rename jaxws/src/share/classes/com/sun/{tools/internal/txw2/model/prop/LeafElementProp.java => xml/internal/bind/v2/schemagen/episode/SchemaBindings.java} (77%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/package-info.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ContentModelContainer.java rename jaxws/src/share/classes/com/sun/{tools/internal/txw2/builder/relaxng/CommentListImpl.java => xml/internal/bind/v2/schemagen/xmlschema/Particle.java} (80%) rename jaxws/src/share/classes/com/sun/{tools/internal/txw2/model/CycleIterator.java => xml/internal/bind/v2/util/TypeCast.java} (61%) rename jaxws/src/share/classes/com/sun/xml/internal/{ws/spi/runtime/WebServiceContext.java => fastinfoset/OctetBufferListener.java} (69%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializerWithPrefixMapping.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/NamespaceContextImplementation.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/VocabularyApplicationData.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/ExtendedContentHandler.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/FastInfosetStreamReader.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/LowLevelFastInfosetStreamWriter.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64Data.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64Encoder.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/ByteArrayOutputStreamEx.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/NamespaceContextEx.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamReaderEx.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamWriterEx.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/AbstractCreator.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/AbstractCreatorProcessor.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/AbstractProcessor.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/AttributesHolder.java rename jaxws/src/share/classes/com/sun/{tools/internal/ws/processor/config/HandlerChainInfo.java => xml/internal/stream/buffer/FragmentedArray.java} (53%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/MutableXMLStreamBuffer.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferException.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferMark.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferResult.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferSource.java rename jaxws/src/share/classes/com/sun/xml/internal/{ws/encoding/soap/SOAPVersion.java => stream/buffer/sax/DefaultWithLexicalHandler.java} (59%) rename jaxws/src/share/classes/com/sun/{tools/internal/ws/processor/ProcessorAction.java => xml/internal/stream/buffer/sax/Features.java} (61%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/sax/Properties.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferCreator.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferProcessor.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/NamespaceContexHelper.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamBufferCreator.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferCreator.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferProcessor.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferCreator.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferProcessor.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/txw2/output/DelegatingXMLStreamWriter.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/txw2/output/IndentingXMLFilter.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/txw2/output/IndentingXMLStreamWriter.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/Closeable.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/EndpointReferenceUtil.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/ProblemAction.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/ProblemHeaderQName.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/W3CAddressingConstants.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaClientTube.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaServerTube.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaTube.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelper.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelperImpl.java rename jaxws/src/share/classes/com/sun/xml/internal/ws/{wsdl/parser/Service.java => addressing/model/ActionNotSupportedException.java} (71%) rename jaxws/src/share/classes/com/sun/xml/internal/ws/{wsdl/parser/Message.java => addressing/model/InvalidMapException.java} (71%) rename jaxws/src/share/classes/com/sun/xml/internal/ws/{wsdl/parser/PortType.java => addressing/model/MapRequiredException.java} (77%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionAddressingConstants.java rename jaxws/src/share/classes/com/sun/{tools/internal/ws/wsdl/parser/ExtensionHandler.java => xml/internal/ws/addressing/v200408/ProblemAction.java} (53%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/ProblemHeaderQName.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/WsaTubeHelperImpl.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/BindingID.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/BindingIDFactory.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/DistributedPropertySet.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/EndpointAddress.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/FeatureConstructor.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/PropertySet.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/SOAPVersion.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/WSBinding.java rename jaxws/src/share/classes/com/sun/{tools/internal/txw2/model/Node.java => xml/internal/ws/api/WSFeatureList.java} (54%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/WSService.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/AddressingVersion.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/EPRHeader.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/OneWayFeature.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/OutboundReferenceParameterHeader.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/WSEndpointReference.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/package-info.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/client/ClientPipelineHook.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/client/SelectOptimalEncodingFeature.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/client/ServiceInterceptor.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/client/ServiceInterceptorFactory.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/client/WSPortInfo.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/fastinfoset/FastInfosetFeature.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Attachment.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/AttachmentSet.java rename jaxws/src/share/classes/com/sun/xml/internal/ws/{encoding/soap/message/SOAPMsgFactoryCreateException.java => api/message/ExceptionHasMessage.java} (57%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Header.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/HeaderList.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Headers.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Message.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Messages.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Packet.java rename jaxws/src/share/classes/com/sun/xml/internal/ws/{spi/runtime/ClientTransportFactoryTypes.java => api/message/package-info.java} (79%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/stream/InputStreamMessage.java rename jaxws/src/share/classes/com/sun/{tools/internal/ws/processor/util/GeneratedFileInfo.java => xml/internal/ws/api/message/stream/StreamBasedMessage.java} (52%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/stream/XMLStreamReaderMessage.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/CheckedException.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/ExceptionType.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/JavaMethod.java rename jaxws/src/share/classes/com/sun/{tools/internal/txw2/model/prop/ValueProp.java => xml/internal/ws/api/model/MEP.java} (69%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/Parameter.java rename jaxws/src/share/classes/com/sun/xml/internal/ws/{ => api}/model/ParameterBinding.java (81%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/SEIModel.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/soap/SOAPBinding.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundOperation.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundPortType.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLDescriptorKind.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtensible.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtension.java rename jaxws/src/share/classes/com/sun/xml/internal/ws/{spi/runtime/Invoker.java => api/model/wsdl/WSDLFault.java} (62%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFeaturedObject.java rename jaxws/src/share/classes/com/sun/xml/internal/ws/{spi/runtime/MessageContext.java => api/model/wsdl/WSDLInput.java} (52%) rename jaxws/src/share/classes/com/sun/{tools/internal/txw2/model/prop/AttributeProp.java => xml/internal/ws/api/model/wsdl/WSDLMessage.java} (78%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLModel.java rename jaxws/src/share/classes/com/sun/{tools/internal/txw2/model/Empty.java => xml/internal/ws/api/model/wsdl/WSDLObject.java} (72%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOperation.java rename jaxws/src/share/classes/com/sun/xml/internal/ws/{spi/runtime/SOAPMessageContext.java => api/model/wsdl/WSDLOutput.java} (51%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPart.java rename jaxws/src/share/classes/com/sun/xml/internal/ws/{encoding/soap/internal/HeaderBlock.java => api/model/wsdl/WSDLPartDescriptor.java} (69%) rename jaxws/src/share/classes/com/sun/xml/internal/ws/{encoding/soap/internal/MessageBlock.java => api/model/wsdl/WSDLPort.java} (58%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPortType.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLService.java rename jaxws/src/share/classes/com/sun/xml/internal/ws/{pept/presentation/Stub.java => api/package-info.java} (59%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ClientPipeAssemblerContext.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ClientTubeAssemblerContext.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Codec.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Codecs.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ContentType.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Engine.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Fiber.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptor.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/NextAction.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Pipe.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/PipeCloner.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/PipelineAssembler.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/PipelineAssemblerFactory.java rename jaxws/src/share/classes/com/sun/{tools/internal/txw2/model/prop/ElementProp.java => xml/internal/ws/api/pipe/SOAPBindingCodec.java} (73%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ServerPipeAssemblerContext.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ServerTubeAssemblerContext.java rename jaxws/src/share/classes/com/sun/xml/internal/ws/{spi/runtime/MtomCallback.java => api/pipe/StreamSOAPCodec.java} (57%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Stubs.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/TransportPipeFactory.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/TransportTubeFactory.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Tube.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/TubeCloner.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/TubelineAssembler.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/TubelineAssemblerFactory.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterPipeImpl.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterTubeImpl.java rename jaxws/src/share/classes/com/sun/{tools/internal/txw2/model/Grammar.java => xml/internal/ws/api/pipe/helper/AbstractPipeImpl.java} (57%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractTubeImpl.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/PipeAdapter.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/package-info.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/package-info.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/AbstractServerAsyncTransport.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/Adapter.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/AsyncProvider.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/AsyncProviderCallback.java rename jaxws/src/share/classes/com/sun/{tools/internal/txw2/model/WriterNode.java => xml/internal/ws/api/server/BoundEndpoint.java} (59%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/Container.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/ContainerResolver.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/DocumentAddressResolver.java rename jaxws/src/share/classes/com/sun/{tools/internal/txw2/model/prop/Prop.java => xml/internal/ws/api/server/EndpointAwareCodec.java} (68%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/InstanceResolverAnnotation.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/Invoker.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/Module.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/PortAddressResolver.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/ResourceInjector.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/SDDocument.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentFilter.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentSource.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/ServerPipelineHook.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/ServiceDefinition.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/TransportBackChannel.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/WSEndpoint.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/WSWebServiceContext.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/WebModule.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/WebServiceContextDelegate.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/package-info.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/MetaDataResolver.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/MetadataResolverFactory.java rename jaxws/src/share/classes/com/sun/xml/internal/ws/{wsdl/writer/WSDLOutputResolver.java => api/wsdl/parser/ServiceDescriptor.java} (60%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtension.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtensionContext.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/XMLEntityResolver.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/package-info.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGenExtnContext.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGeneratorExtension.java rename jaxws/src/share/classes/com/sun/xml/internal/ws/binding/{http => }/HTTPBindingImpl.java (52%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/binding/SOAPBindingImpl.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/binding/WebServiceFeatureList.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/binding/soap/SOAPBindingImpl.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/AsyncHandlerService.java rename jaxws/src/share/classes/com/sun/xml/internal/ws/{spi/runtime/package-info.java => client/AsyncInvoker.java} (58%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/AsyncResponseImpl.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/ContactInfoBase.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/ContactInfoListImpl.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/ContextMap.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/EndpointIFBase.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/EndpointIFContext.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/EndpointIFInvocationHandler.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/HandlerConfiguration.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/HandlerConfigurator.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/PortInfo.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/PortInfoBase.java rename jaxws/src/share/classes/com/sun/xml/internal/ws/client/{InternalBindingProvider.java => ResponseContextReceiver.java} (72%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/ResponseImpl.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/SCAnnotations.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/SEIPortInfo.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/ServiceContext.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/ServiceContextBuilder.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/Stub.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/dispatch/DataSourceDispatch.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/dispatch/DispatchBase.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/dispatch/DispatchContext.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/dispatch/DispatchImpl.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/dispatch/JAXBDispatch.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/dispatch/MessageDispatch.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/dispatch/RESTSourceDispatch.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/dispatch/ResponseImpl.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/dispatch/SOAPMessageDispatch.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/dispatch/SOAPSourceDispatch.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/dispatch/impl/DispatchContactInfoList.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/dispatch/impl/DispatchDelegate.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/dispatch/impl/encoding/DispatchSerializer.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/dispatch/impl/encoding/DispatchUtil.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/dispatch/impl/protocol/MessageDispatcherHelper.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/AsyncBuilder.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/AsyncMethodHandler.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/BodyBuilder.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/CallbackMethodHandler.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/MessageFiller.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/MethodHandler.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/PollingMethodHandler.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/ResponseBuilder.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/SEIStub.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/SyncMethodHandler.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/ValueGetter.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetter.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/package-info.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/developer/EPRRecipe.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressing.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressingFeature.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionEndpointReference.java rename jaxws/src/share/classes/com/sun/{tools/internal/txw2/model/Ref.java => xml/internal/ws/developer/ServerSideException.java} (60%) rename jaxws/src/share/classes/com/sun/xml/internal/ws/{pept/encoding/Encoder.java => developer/Stateful.java} (53%) rename jaxws/src/share/classes/com/sun/{tools/internal/txw2/model/List.java => xml/internal/ws/developer/StatefulFeature.java} (59%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/developer/StatefulWebServiceManager.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/developer/WSBindingProvider.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/developer/package-info.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/AbstractXMLStreamWriterExImpl.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/ContentTypeImpl.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/EncoderDecoderBase.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/JAXWSAttachmentMarshaller.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/JAXWSAttachmentUnmarshaller.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/MimeCodec.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/MimeMultipartParser.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/MtomCodec.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/SOAPBindingCodec.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAP11Codec.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAP12Codec.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAPCodec.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/SwACodec.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/TagInfoset.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/XMLHTTPBindingCodec.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetCodec.java rename jaxws/src/share/classes/com/sun/{tools/internal/txw2/TxwOptions.java => xml/internal/ws/encoding/fastinfoset/FastInfosetMIMETypes.java} (50%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderFactory.java rename jaxws/src/share/classes/com/sun/{tools/internal/ws/processor/config/Configuration.java => xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderRecyclable.java} (60%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP11Codec.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP12Codec.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAPCodec.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/internal/InternalEncoder.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/jaxb/JAXBBeanInfo.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/jaxb/JAXBBridgeInfo.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/jaxb/JAXBTypeSerializer.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/jaxb/RpcLitPayload.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/jaxb/RpcLitPayloadSerializer.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/simpletype/EncoderUtils.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/ClientEncoderDecoder.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/EncoderDecoder.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/SOAPDecoder.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/SOAPEncoder.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/ServerEncoderDecoder.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/client/SOAP12XMLDecoder.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/client/SOAP12XMLEncoder.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/client/SOAPXMLDecoder.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/client/SOAPXMLEncoder.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/internal/AttachmentBlock.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/internal/BodyBlock.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/internal/DelegateBase.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/internal/InternalMessage.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/internal/MessageInfoBase.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/internal/SOAP12NotUnderstoodHeaderBlock.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/message/FaultCode.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/message/FaultCodeEnum.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/message/FaultReason.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/message/FaultReasonText.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/message/FaultSubcode.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/message/SOAP12FaultInfo.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/message/SOAPFaultInfo.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/server/ProviderSED.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/server/SOAP12XMLDecoder.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/server/SOAP12XMLEncoder.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/server/SOAPXMLDecoder.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/server/SOAPXMLEncoder.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLCodec.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLDecoder.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLEPTFactory.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLEncoder.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/fault/CodeType.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/fault/DetailType.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/fault/ExceptionBean.java rename jaxws/src/share/classes/com/sun/xml/internal/ws/{client/ContactInfoListIteratorBase.java => fault/ReasonType.java} (62%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/fault/SOAP11Fault.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/fault/SOAP12Fault.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/fault/SubcodeType.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/fault/TextType.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/handler/ClientLogicalHandlerTube.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/handler/ClientSOAPHandlerTube.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/handler/HandlerChainCaller.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/handler/HandlerContext.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/handler/HandlerProcessor.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/handler/HandlerResolverImpl.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/handler/HandlerTube.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/handler/MessageContextUtil.java rename jaxws/src/share/classes/com/sun/xml/internal/ws/handler/{XMLLogicalMessageContextImpl.java => MessageUpdatableContext.java} (61%) delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/handler/SHDSOAPMessageContext.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/handler/SOAPHandlerContext.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/handler/SOAPHandlerProcessor.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/handler/ServerLogicalHandlerTube.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/handler/ServerSOAPHandlerTube.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/handler/XMLHandlerContext.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/handler/XMLHandlerProcessor.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/handler/XMLLogicalMessageImpl.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/handler/package-info.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/message/AbstractHeaderImpl.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/message/AbstractMessageImpl.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/message/AttachmentSetImpl.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/message/AttachmentUnmarshallerImpl.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/message/ByteArrayAttachment.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/message/DOMHeader.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/message/DOMMessage.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/message/DataHandlerAttachment.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/message/EmptyMessageImpl.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/message/FaultDetailHeader.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/message/JAXBAttachment.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/message/MimeAttachmentSet.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/message/ProblemActionHeader.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/message/RelatesToHeader.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/message/RootElementSniffer.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/message/StringHeader.java rename jaxws/src/share/classes/com/sun/xml/internal/ws/{spi/runtime/Tie.java => message/Util.java} (65%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/message/XMLReaderImpl.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/message/jaxb/AttachmentMarshallerImpl.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBBridgeSource.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBHeader.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/message/jaxb/MarshallerBridge.java rename jaxws/src/share/classes/com/sun/{tools/internal/txw2/SchemaBuilder.java => xml/internal/ws/message/jaxb/package-info.java} (68%) rename jaxws/src/share/classes/com/sun/xml/internal/ws/{spi/runtime/StubBase.java => message/package-info.java} (80%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/message/saaj/SAAJHeader.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/message/saaj/SAAJMessage.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/message/source/PayloadSourceMessage.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/message/source/ProtocolSourceMessage.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/message/source/SourceUtils.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/message/stream/OutboundStreamHeader.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/message/stream/PayloadStreamReaderMessage.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/message/stream/StreamAttachment.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader11.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader12.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/message/stream/StreamMessage.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/model/AbstractSEIModelImpl.java rename jaxws/src/share/classes/com/sun/xml/internal/ws/model/{CheckedException.java => CheckedExceptionImpl.java} (66%) delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/model/JavaMethod.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/model/JavaMethodImpl.java rename jaxws/src/share/classes/com/sun/xml/internal/ws/model/{Parameter.java => ParameterImpl.java} (65%) delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/model/RuntimeModel.java rename jaxws/src/share/classes/com/sun/xml/internal/ws/{modeler => model}/RuntimeModeler.java (68%) rename jaxws/src/share/classes/com/sun/xml/internal/ws/{modeler => model}/RuntimeModelerException.java (92%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/model/SOAPSEIModel.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/model/soap/SOAPBinding.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/model/soap/SOAPBindingImpl.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/model/soap/SOAPRuntimeModel.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/AbstractExtensibleImpl.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/AbstractFeaturedObjectImpl.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/AbstractObjectImpl.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundOperationImpl.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundPortTypeImpl.java rename jaxws/src/share/classes/com/sun/xml/internal/ws/{wsdl/parser/Part.java => model/wsdl/WSDLFaultImpl.java} (62%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLInputImpl.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLMessageImpl.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLModelImpl.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLOperationImpl.java rename jaxws/src/share/classes/com/sun/xml/internal/ws/{wsdl/parser/PortTypeOperation.java => model/wsdl/WSDLOutputImpl.java} (52%) rename jaxws/src/share/classes/com/sun/xml/internal/ws/{wsdl/parser/Port.java => model/wsdl/WSDLPartDescriptorImpl.java} (65%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPartImpl.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPortImpl.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPortTypeImpl.java rename jaxws/src/share/classes/com/sun/{tools/internal/ws/processor/config/HandlerInfo.java => xml/internal/ws/model/wsdl/WSDLProperties.java} (51%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLServiceImpl.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/pept/encoding/Decoder.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/pept/ept/Acceptor.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/pept/ept/ContactInfo.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/pept/ept/ContactInfoList.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/pept/ept/ContactInfoListIterator.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/pept/ept/EPTFactory.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/pept/ept/MessageInfo.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/pept/presentation/MessageStruct.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/pept/presentation/TargetFinder.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/pept/presentation/Tie.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/pept/protocol/Interceptors.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/pept/protocol/MessageDispatcher.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/protocol/soap/ClientMUTube.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/protocol/soap/MUTube.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/protocol/soap/ServerMUTube.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/protocol/soap/VersionMismatchException.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/protocol/soap/client/SOAPMessageDispatcher.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/protocol/soap/server/ProviderSOAPMD.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/protocol/soap/server/SOAPMessageDispatcher.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/protocol/xml/client/XMLMessageDispatcher.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/protocol/xml/server/ProviderXMLMD.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/protocol/xml/server/XMLMessageDispatcher.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/resources/AddressingMessages.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/resources/ClientMessages.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/resources/DispatchMessages.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/resources/EncodingMessages.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/resources/HandlerMessages.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/resources/HttpserverMessages.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/resources/ModelerMessages.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/resources/ProviderApiMessages.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/resources/SenderMessages.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/resources/ServerMessages.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/resources/SoapMessages.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/resources/StreamingMessages.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/resources/UtilMessages.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/resources/WsdlmodelMessages.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/resources/WsservletMessages.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/resources/XmlmessageMessages.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/resources/addressing.properties create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/resources/providerApi.properties create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel.properties create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/AbstractInstanceResolver.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/AbstractMultiInstanceResolver.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/AbstractWebServiceContext.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/AppMsgContextImpl.java rename jaxws/src/share/classes/com/sun/xml/internal/ws/server/{TargetFinderImpl.java => DefaultResourceInjector.java} (63%) delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/DocInfo.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/EPTFactoryBase.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/EPTFactoryFactoryBase.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/EndpointFactory.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/EndpointMessageContextImpl.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/InvokerTube.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/PeptTie.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/RuntimeContext.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/RuntimeEndpointInfo.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/SDDocumentImpl.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/ServiceDefinitionImpl.java rename jaxws/src/share/classes/com/sun/{tools/internal/txw2/builder/relaxng/ElementAnnotationBuilderImpl.java => xml/internal/ws/server/SingletonResolver.java} (50%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/StatefulInstanceResolver.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/Tie.java rename jaxws/src/share/classes/com/sun/{tools/internal/ws/processor/config/parser/ClassModelParser.java => xml/internal/ws/server/UnsupportedMediaException.java} (56%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/WSEndpointImpl.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/XMLEPTFactoryImpl.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/provider/AsyncProviderInvokerTube.java rename jaxws/src/share/classes/com/sun/{tools/internal/txw2/builder/relaxng/AnnotationsImpl.java => xml/internal/ws/server/provider/MessageProviderArgumentBuilder.java} (56%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/provider/ProviderArgumentsBuilder.java rename jaxws/src/share/classes/com/sun/xml/internal/ws/server/provider/{ProviderModel.java => ProviderEndpointModel.java} (53%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/provider/ProviderInvokerTube.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/provider/ProviderPeptTie.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/provider/SOAPProviderArgumentBuilder.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/provider/SyncProviderInvokerTube.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/provider/XMLProviderArgumentBuilder.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/ActionBasedDispatcher.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/DispatchException.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointArgumentsBuilder.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointMethodDispatcher.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointMethodDispatcherGetter.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointMethodHandler.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointResponseMessageBuilder.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointValueSetter.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/MessageFiller.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/PayloadQNameBasedDispatcher.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/SEIInvokerTube.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/ValueGetter.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/spi/runtime/Binding.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/spi/runtime/ClientTransportFactory.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/spi/runtime/InternalSoapEncoder.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/spi/runtime/RuntimeEndpointInfo.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/spi/runtime/SystemHandlerDelegate.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/spi/runtime/SystemHandlerDelegateFactory.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/spi/runtime/WSConnection.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderFactory.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterFactory.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/transport/DeferredTransportPipe.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/transport/WSConnectionImpl.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/DeploymentDescriptorParser.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/HttpAdapter.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/HttpAdapterList.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/ResourceLoader.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/WSHTTPConnection.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpClientTransportFactory.java rename jaxws/src/share/classes/com/sun/xml/internal/ws/{client/WSFuture.java => transport/http/client/HttpResponseProperties.java} (53%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpTransportPipe.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/server/EndpointDocInfo.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/server/EndpointEntityResolver.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/server/WebServiceContextImpl.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/transport/local/client/LocalClientTransport.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/transport/local/client/LocalClientTransportFactory.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/transport/local/server/LocalConnectionImpl.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/transport/local/server/LocalWSContextImpl.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/util/Base64Util.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/util/CompletedFuture.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/util/MessageInfoUtil.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/util/NoCloseInputStream.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/util/NoCloseOutputStream.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/util/Pool.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/util/QNameMap.java rename jaxws/src/share/classes/com/sun/xml/internal/ws/util/{NullIterator.java => ReadOnlyPropertyException.java} (64%) delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/util/SOAPConnectionUtil.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/util/SOAPUtil.java rename jaxws/src/share/classes/com/sun/xml/internal/ws/util/{SunStAXReflection.java => ServiceConfigurationError.java} (55%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/util/ServiceFinder.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/util/XMLConnectionUtil.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/util/exception/LocatableWebServiceException.java rename jaxws/src/share/classes/com/sun/xml/internal/ws/{client/ClientConfigurationException.java => util/localization/LocalizableImpl.java} (62%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/util/pipe/DumpTube.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/util/pipe/StandalonePipeAssembler.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/util/pipe/StandaloneTubeAssembler.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/util/xml/ContentHandlerToXMLStreamWriter.java rename jaxws/src/share/classes/com/sun/{tools/internal/ws/processor/config/ConfigurationException.java => xml/internal/ws/util/xml/DummyLocation.java} (63%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/util/xml/StAXResult.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderFilter.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderToXMLStreamWriter.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamWriterFilter.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/WSDLContext.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/Binding.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/BindingOperation.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/DelegatingParserExtension.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/EntityResolverWrapper.java rename jaxws/src/share/classes/com/sun/xml/internal/ws/{model/soap/Use.java => wsdl/parser/ErrorHandler.java} (76%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/FoolProofParserExtension.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/InaccessibleWSDLException.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/MemberSubmissionAddressingWSDLParserExtension.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/MexEntityResolver.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingWSDLParserExtension.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLDocument.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionContextImpl.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionFacade.java rename jaxws/src/share/classes/com/sun/xml/internal/ws/{encoding/simpletype/SimpleTypeConstants.java => wsdl/writer/UsingAddressing.java} (57%) create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/W3CAddressingWSDLGeneratorExtension.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGeneratorExtensionFacade.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLResolver.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/xsom/SCD.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/BaseContentRef.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/AbstractAxisImpl.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/Axis.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/Iterators.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/ParseException.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDImpl.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParser.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParserConstants.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParserTokenManager.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/SimpleCharStream.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/Step.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/Token.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/TokenMgrError.java delete mode 100644 jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/util/FilterIterator.java create mode 100644 jaxws/src/share/classes/com/sun/xml/internal/xsom/util/DeferedCollection.java rename jaxws/src/share/classes/{com/sun/xml/internal/ws/model/soap/Style.java => javax/xml/bind/DataBindingException.java} (66%) create mode 100644 jaxws/src/share/classes/javax/xml/bind/DatatypeConverterImpl.java create mode 100644 jaxws/src/share/classes/javax/xml/bind/GetPropertyAction.java create mode 100644 jaxws/src/share/classes/javax/xml/bind/JAXB.java create mode 100644 jaxws/src/share/classes/javax/xml/bind/WhiteSpaceProcessor.java create mode 100644 jaxws/src/share/classes/javax/xml/bind/annotation/XmlSeeAlso.java create mode 100644 jaxws/src/share/classes/javax/xml/ws/Action.java create mode 100644 jaxws/src/share/classes/javax/xml/ws/EndpointReference.java create mode 100644 jaxws/src/share/classes/javax/xml/ws/FaultAction.java create mode 100644 jaxws/src/share/classes/javax/xml/ws/RespectBinding.java create mode 100644 jaxws/src/share/classes/javax/xml/ws/RespectBindingFeature.java create mode 100644 jaxws/src/share/classes/javax/xml/ws/WebServiceFeature.java create mode 100644 jaxws/src/share/classes/javax/xml/ws/soap/Addressing.java create mode 100644 jaxws/src/share/classes/javax/xml/ws/soap/AddressingFeature.java create mode 100644 jaxws/src/share/classes/javax/xml/ws/soap/MTOM.java create mode 100644 jaxws/src/share/classes/javax/xml/ws/soap/MTOMFeature.java create mode 100644 jaxws/src/share/classes/javax/xml/ws/spi/WebServiceFeatureAnnotation.java create mode 100644 jaxws/src/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReference.java create mode 100644 jaxws/src/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java create mode 100644 jaxws/src/share/classes/javax/xml/ws/wsaddressing/package-info.java create mode 100644 jaxws/src/share/classes/javax/xml/ws/wsaddressing/package.html create mode 100644 jaxws/src/share/classes/org/relaxng/datatype/Datatype.java create mode 100644 jaxws/src/share/classes/org/relaxng/datatype/DatatypeBuilder.java rename jaxws/src/share/classes/{com/sun/xml/internal/xsom/impl/util/ConcatIterator.java => org/relaxng/datatype/DatatypeException.java} (51%) create mode 100644 jaxws/src/share/classes/org/relaxng/datatype/DatatypeLibrary.java rename jaxws/src/share/classes/{com/sun/xml/internal/ws/encoding/soap/SOAPEPTFactory.java => org/relaxng/datatype/DatatypeLibraryFactory.java} (56%) create mode 100644 jaxws/src/share/classes/org/relaxng/datatype/DatatypeStreamingValidator.java create mode 100644 jaxws/src/share/classes/org/relaxng/datatype/ValidationContext.java create mode 100644 jaxws/src/share/classes/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java create mode 100644 jaxws/src/share/classes/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java create mode 100644 jaxws/src/share/classes/org/relaxng/datatype/helpers/StreamingValidatorImpl.java diff --git a/jaxws/THIRD_PARTY_README b/jaxws/THIRD_PARTY_README index 9f4d7e5087a..690890548f2 100644 --- a/jaxws/THIRD_PARTY_README +++ b/jaxws/THIRD_PARTY_README @@ -61,6 +61,28 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +%% This notice is provided with respect to littlecms, which may be included with this software: + +Little cms +Copyright (C) 1998-2004 Marti Maria + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. %% This notice is provided with respect to zlib 1.1.3, which may be included with this software: Acknowledgments: @@ -115,16 +137,6 @@ COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQ The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders. ____________________________________ This formulation of W3C's notice and license became active on August 14 1998 so as to improve compatibility with GPL. This version ensures that W3C software licensing terms are no more restrictive than GPL and consequently W3C software may be distributed in GPL packages. See the older formulation for the policy prior to this date. Please see our Copyright FAQ for common questions about using materials from our site, including specific terms and conditions for packages like libwww, Amaya, and Jigsaw. Other questions about this notice can be directed to site-policy@w3.org. -  -%% This notice is provided with respect to jscheme.jar, which may be included with this software: -Software License Agreement -Copyright © 1998-2002 by Peter Norvig. -Permission is granted to anyone to use this software, in source or object code form, on any computer system, and to modify, compile, decompile, run, and redistribute it to anyone else, subject to the following restrictions: -1.The author makes no warranty of any kind, either expressed or implied, about the suitability of this software for any purpose. -2.The author accepts no liability of any kind for damages or other consequences of the use of this software, even if they arise from defects in the software. -3.The origin of this software must not be misrepresented, either by explicit claim or by omission. -4.Altered versions must be plainly marked as such, and must not be misrepresented as being the original software. Altered versions may be distributed in packages under other licenses (such as the GNU license). -If you find this software useful, it would be nice if you let me (peter@norvig.com) know about it, and nicer still if you send me modifications that you are willing to share. However, you are not required to do so. %% This notice is provided with respect to PC/SC Lite for Suse Linux v. 1.1.1, which may be included with this software: diff --git a/jaxws/TRADEMARK b/jaxws/TRADEMARK new file mode 100644 index 00000000000..6587bafba88 --- /dev/null +++ b/jaxws/TRADEMARK @@ -0,0 +1,41 @@ +OpenJDK Trademark Notice +Version 1.1, 2008/3/10 + +OpenJDK (the "Name") is a trademark of Sun Microsystems, Inc. (the "Owner"). +Owner permits any person obtaining a copy of this software (the "Software") +which is based on original software retrieved from one of the following +websites: http://download.java.net/openjdk, http://hg.openjdk.java.net/jdk6, +or http://openjdk.java.net (each a "Website", with the original software made +available by the Owner on a Website being known as the "Website Software") to +use the Name in package names and version strings of the Software subject to +the following conditions: + + - The Software is a substantially complete implementation of the OpenJDK + development kit or runtime environment code made available by Owner on a + Website, and the vast majority of the Software code is identical to the + upstream Website Software; + + - No permission is hereby granted to use the Name in any other manner, + unless such use constitutes "fair use." + + - The Owner makes no warranties of any kind respecting the Name and all + representations and warranties, including any implied warranty of + merchantability, fitness for a particular purpose or non-infringement + are hereby disclaimed; and + + - This notice and the following legend are included in all copies of the + Software or portions of it: + + OpenJDK is a trademark or registered trademark of Sun Microsystems, + Inc. in the United States and other countries. + +The Name may also be used in connection with descriptions of the Software that +constitute "fair use," such as "derived from the OpenJDK code base" or "based +on the OpenJDK source code." + +Owner intends to revise this Notice as necessary in order to meet the needs of +the OpenJDK Community. Please send questions or comments about this Notice to +Sun Microsystems at openjdk-tm@sun.com. Revisions to this Notice will be +announced on the public mailing list announce@openjdk.java.net, to which you +may subscribe by visiting http://mail.openjdk.java.net. The latest version of +this Notice may be found at http://openjdk.java.net/legal. diff --git a/jaxws/make/Makefile b/jaxws/make/Makefile index 56696720183..3dc17bfa39f 100644 --- a/jaxws/make/Makefile +++ b/jaxws/make/Makefile @@ -1,5 +1,5 @@ # -# Copyright 2007-2009 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2007 Sun Microsystems, Inc. All Rights Reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/jaxws/make/build.xml b/jaxws/make/build.xml index 9f013e992a8..5b83e558dfc 100644 --- a/jaxws/make/build.xml +++ b/jaxws/make/build.xml @@ -78,6 +78,15 @@ + + + + + + diff --git a/jaxws/make/jprt.properties b/jaxws/make/jprt.properties index 26ffd61a5b5..6e213dd2343 100644 --- a/jaxws/make/jprt.properties +++ b/jaxws/make/jprt.properties @@ -24,13 +24,13 @@ # # Properties for jprt -jprt.tools.default.release=jdk1.7.0 +jprt.tools.default.release=openjdk6 # Specific platform list jprt.build.platforms=\ -solaris_sparc_5.10,\ -solaris_sparcv9_5.10,\ -solaris_i586_5.10,\ +solaris_sparc_5.8,\ +solaris_sparcv9_5.8,\ +solaris_i586_5.8,\ solaris_x64_5.10,\ linux_i586,\ linux_x64,\ @@ -41,10 +41,12 @@ windows_x64 jprt.build.flavors=product # Explicitly designate what the 32bit match is for the 64bit build -jprt.solaris_sparcv9.build.platform.match32=solaris_sparc_5.10 -jprt.solaris_sparcv9_5.10.build.platform.match32=solaris_sparc_5.10 -jprt.solaris_x64.build.platform.match32=solaris_i586_5.10 -jprt.solaris_x64_5.10.build.platform.match32=solaris_i586_5.10 +jprt.solaris_sparcv9.build.platform.match32=solaris_sparc_5.8 +jprt.solaris_sparcv9_5.8.build.platform.match32=solaris_sparc_5.8 +jprt.solaris_sparcv9_5.10.build.platform.match32=solaris_sparc_5.8 +jprt.solaris_x64.build.platform.match32=solaris_i586_5.8 +jprt.solaris_x64_5.8.build.platform.match32=solaris_i586_5.8 +jprt.solaris_x64_5.10.build.platform.match32=solaris_i586_5.8 # Standard list of jprt test targets for this workspace jprt.test.targets= diff --git a/jaxws/src/share/classes/com/sun/activation/registries/MailcapFile.java b/jaxws/src/share/classes/com/sun/activation/registries/MailcapFile.java index 6e5e6a6e7b8..5fd26866922 100644 --- a/jaxws/src/share/classes/com/sun/activation/registries/MailcapFile.java +++ b/jaxws/src/share/classes/com/sun/activation/registries/MailcapFile.java @@ -182,7 +182,8 @@ public class MailcapFile { */ public String[] getNativeCommands(String mime_type) { String[] cmds = null; - List v = (List)native_commands.get(mime_type.toLowerCase()); + List v = + (List)native_commands.get(mime_type.toLowerCase(Locale.ENGLISH)); if (v != null) { cmds = new String[v.size()]; cmds = (String[])v.toArray(cmds); @@ -301,7 +302,8 @@ public class MailcapFile { reportParseError(MailcapTokenizer.STRING_TOKEN, currentToken, tokenizer.getCurrentTokenValue()); } - String primaryType = tokenizer.getCurrentTokenValue().toLowerCase(); + String primaryType = + tokenizer.getCurrentTokenValue().toLowerCase(Locale.ENGLISH); String subType = "*"; // parse the '/' between primary and sub @@ -322,7 +324,8 @@ public class MailcapFile { reportParseError(MailcapTokenizer.STRING_TOKEN, currentToken, tokenizer.getCurrentTokenValue()); } - subType = tokenizer.getCurrentTokenValue().toLowerCase(); + subType = + tokenizer.getCurrentTokenValue().toLowerCase(Locale.ENGLISH); // get the next token to simplify the next step currentToken = tokenizer.nextToken(); @@ -386,8 +389,8 @@ public class MailcapFile { reportParseError(MailcapTokenizer.STRING_TOKEN, currentToken, tokenizer.getCurrentTokenValue()); } - String paramName = - tokenizer.getCurrentTokenValue().toLowerCase(); + String paramName = tokenizer.getCurrentTokenValue(). + toLowerCase(Locale.ENGLISH); // parse the '=' which separates the name from the value currentToken = tokenizer.nextToken(); diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/ClassType.java b/jaxws/src/share/classes/com/sun/codemodel/internal/ClassType.java index 7943701af5a..845fbdb0292 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/ClassType.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/ClassType.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal; /** * This helps enable whether the JDefinedClass is a Class or Interface or diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/CodeWriter.java b/jaxws/src/share/classes/com/sun/codemodel/internal/CodeWriter.java index 9e2174d9940..602e8ecb725 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/CodeWriter.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/CodeWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal; import java.io.IOException; diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotatable.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotatable.java index 1c9e580fe29..c42297a82cc 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotatable.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotatable.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal; import java.lang.annotation.Annotation; diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationArrayMember.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationArrayMember.java index 12d68285f10..01b766f0cc6 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationArrayMember.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationArrayMember.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal; diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationStringValue.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationStringValue.java index f7bc5eaeda7..07cd44f73c0 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationStringValue.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationStringValue.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal; diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationUse.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationUse.java index df2d90cfdfb..1e9f8c6d201 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationUse.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationUse.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal; diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationValue.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationValue.java index 77e61cecc1e..a66be614977 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationValue.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationValue.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal; /** diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationWriter.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationWriter.java index 426ebd5d273..83fe71629f5 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationWriter.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal; import java.lang.annotation.Annotation; diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JAnonymousClass.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JAnonymousClass.java index 6a8727d3441..440d4001d6c 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JAnonymousClass.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JAnonymousClass.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal; /** diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JArray.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JArray.java index a9d0efd3689..d10da44d93f 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JArray.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JArray.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JArrayClass.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JArrayClass.java index b6934c93c85..d86d08695cc 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JArrayClass.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JArrayClass.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal; import java.util.Iterator; diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JArrayCompRef.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JArrayCompRef.java index 87e78dd324d..6a433c0d4fb 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JArrayCompRef.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JArrayCompRef.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JAssignment.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JAssignment.java index d5a1934a0ab..91bfa57a68e 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JAssignment.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JAssignment.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JAssignmentTarget.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JAssignmentTarget.java index 75368a3d0e7..f352498fd3d 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JAssignmentTarget.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JAssignmentTarget.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JAtom.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JAtom.java index fe7bb364e5a..e4f9560f406 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JAtom.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JAtom.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JBlock.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JBlock.java index c64b5e9c795..57d7552d7ab 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JBlock.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JBlock.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -220,16 +220,14 @@ public final class JBlock implements JGenerable, JStatement { * @return Newly generated JInvocation */ public JInvocation invoke(JExpression expr, JMethod method) { - return invoke(expr, method.name()); + return insert(new JInvocation(expr, method)); } /** * Creates a static invocation statement. */ public JInvocation staticInvoke(JClass type, String method) { - JInvocation i = new JInvocation(type, method); - insert(i); - return i; + return insert(new JInvocation(type, method)); } /** @@ -241,9 +239,7 @@ public final class JBlock implements JGenerable, JStatement { * @return Newly generated JInvocation */ public JInvocation invoke(String method) { - JInvocation i = new JInvocation((JExpression)null, method); - insert(i); - return i; + return insert(new JInvocation((JExpression)null, method)); } /** @@ -255,7 +251,7 @@ public final class JBlock implements JGenerable, JStatement { * @return Newly generated JInvocation */ public JInvocation invoke(JMethod method) { - return invoke(method.name()); + return insert(new JInvocation((JExpression)null, method)); } /** diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JBreak.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JBreak.java index 6d82275c790..e4df8bfd412 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JBreak.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JBreak.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JCase.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JCase.java index 3b415031129..27a4c3210e5 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JCase.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal; /** diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JCast.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JCast.java index d840b4954b9..b427526e120 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JCast.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JCast.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JCatchBlock.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JCatchBlock.java index 731e0b32191..a7c31207d49 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JCatchBlock.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JCatchBlock.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JClass.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JClass.java index d4b7a9de58b..bbfd4aa685c 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JClass.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JClass.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -321,7 +321,7 @@ public abstract class JClass extends JType /** Generates a static method invocation. */ public final JInvocation staticInvoke(JMethod method) { - return staticInvoke(method.name()); + return new JInvocation(this,method); } /** Generates a static method invocation. */ diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JClassAlreadyExistsException.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JClassAlreadyExistsException.java index 21b95114e88..850cfe837bf 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JClassAlreadyExistsException.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JClassAlreadyExistsException.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal; /** diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JClassContainer.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JClassContainer.java index 43cf24c391c..6f0e76a02d6 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JClassContainer.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JClassContainer.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal; import java.util.Iterator; @@ -146,7 +145,6 @@ public interface JClassContainer { * newly created Annotation Type Declaration * @exception JClassAlreadyExistsException * When the specified class/interface was already created. - */ public JDefinedClass _annotationTypeDeclaration(String name) throws JClassAlreadyExistsException; @@ -158,7 +156,6 @@ public interface JClassContainer { * newly created Enum * @exception JClassAlreadyExistsException * When the specified class/interface was already created. - */ public JDefinedClass _enum (String name) throws JClassAlreadyExistsException; diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JCodeModel.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JCodeModel.java index 25791e0c1e7..1f674412186 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JCodeModel.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JCodeModel.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -446,13 +446,29 @@ public final class JCodeModel { JClass clazz = ref(s.substring(start,idx)); + return parseSuffix(clazz); + } + + /** + * Parses additional left-associative suffixes, like type arguments + * and array specifiers. + */ + private JClass parseSuffix(JClass clazz) throws ClassNotFoundException { if(idx==s.length()) return clazz; // hit EOL char ch = s.charAt(idx); if(ch=='<') - return parseArguments(clazz); + return parseSuffix(parseArguments(clazz)); + + if(ch=='[') { + if(s.charAt(idx+1)==']') { + idx+=2; + return parseSuffix(clazz.array()); + } + throw new IllegalArgumentException("Expected ']' but found "+s.substring(idx+1)); + } return clazz; } diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JCommentPart.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JCommentPart.java index 3001b3c8fed..efd7eddede4 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JCommentPart.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JCommentPart.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal; import java.util.ArrayList; diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JConditional.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JConditional.java index 58534f4ebee..9e01118b907 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JConditional.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JConditional.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * 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,6 +75,13 @@ public class JConditional implements JStatement { return _else; } + /** + * Creates ... else if(...) ... code. + */ + public JConditional _elseif(JExpression boolExp) { + return _else()._if(boolExp); + } + public void state(JFormatter f) { if(test==JExpr.TRUE) { _then.generateBody(f); diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JContinue.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JContinue.java index bc49f8122a9..fe89d7d7038 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JContinue.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JContinue.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JDeclaration.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JDeclaration.java index 79ddbe154bb..50eaa1ef9fa 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JDeclaration.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JDeclaration.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JDefinedClass.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JDefinedClass.java index b95e41524c9..ff22fae97fc 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JDefinedClass.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JDefinedClass.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -251,6 +251,13 @@ public class JDefinedClass if (superClass == null) throw new NullPointerException(); + for( JClass o=superClass.outer(); o!=null; o=o.outer() ){ + if(this==o){ + throw new IllegalArgumentException("Illegal class inheritance loop." + + " Outer class " + this.name + " may not subclass from inner class: " + o.name()); + } + } + this.superClass = superClass; return this; } @@ -307,8 +314,9 @@ public class JDefinedClass } /** - * This method generates reference to the JEnumConstant in - * the class + * If the named enum already exists, the reference to it is returned. + * Otherwise this method generates a new enum reference with the given + * name and returns it. * * @param name * The name of the constant. @@ -316,8 +324,11 @@ public class JDefinedClass * The generated type-safe enum constant. */ public JEnumConstant enumConstant(String name){ - JEnumConstant ec = new JEnumConstant(this, name); - enumConstantsByName.put(name, ec); + JEnumConstant ec = enumConstantsByName.get(name); + if (null == ec) { + ec = new JEnumConstant(this, name); + enumConstantsByName.put(name, ec); + } return ec; } @@ -417,7 +428,6 @@ public class JDefinedClass * newly created Annotation Type Declaration * @exception JClassAlreadyExistsException * When the specified class/interface was already created. - */ public JDefinedClass _annotationTypeDeclaration(String name) throws JClassAlreadyExistsException { return _class (JMod.PUBLIC,name,ClassType.ANNOTATION_TYPE_DECL); @@ -576,7 +586,6 @@ public class JDefinedClass * null if not found. */ public JMethod getMethod(String name, JType[] argTypes) { - outer : for (JMethod m : methods) { if (!m.name().equals(name)) continue; @@ -740,8 +749,8 @@ public class JDefinedClass f.nl().g(jdoc); if (annotations != null){ - for( int i=0; i= 0) - throw new IllegalArgumentException("JClass name contains '.': " - + name); + throw new IllegalArgumentException("method name contains '.': " + name); this.name = name; } + private JInvocation(JGenerable object, JMethod method) { + this.object = object; + this.method =method; + } + /** * Invokes a constructor of an object (i.e., creates * a new object.) @@ -131,10 +148,15 @@ public final class JInvocation extends JExpressionImpl implements JStatement { } else { if (isConstructor) f.p("new").g(type).p('('); - else if (object != null) - f.g(object).p('.').p(name).p('('); - else - f.id(name).p('('); + else { + String name = this.name; + if(name==null) name=this.method.name(); + + if (object != null) + f.g(object).p('.').p(name).p('('); + else + f.id(name).p('('); + } } f.g(args); diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JJavaName.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JJavaName.java index 3cf2c87da27..6b56e9251f7 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JJavaName.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JJavaName.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * 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,6 +51,13 @@ public class JJavaName { return true; } + /** + * Checks if the given string is a valid fully qualified name. + */ + public static boolean isFullyQualifiedClassName(String s) { + return isJavaPackageName(s); + } + /** * Checks if the given string is a valid Java package name. */ diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JLabel.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JLabel.java index 84a4b575a0c..e46ba3d3724 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JLabel.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JLabel.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal; /** diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JMethod.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JMethod.java index 13c3c8b4797..b3d9f6223ca 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JMethod.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JMethod.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * 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,49 +38,49 @@ import com.sun.codemodel.internal.util.ClassNameComparator; */ public class JMethod extends JGenerifiableImpl implements JDeclaration, JAnnotatable { - /** - * Modifiers for this method - */ - private JMods mods; + /** + * Modifiers for this method + */ + private JMods mods; - /** - * Return type for this method - */ - private JType type = null; + /** + * Return type for this method + */ + private JType type = null; - /** - * Name of this method - */ - private String name = null; + /** + * Name of this method + */ + private String name = null; - /** - * List of parameters for this method's declaration - */ - private final List params = new ArrayList(); + /** + * List of parameters for this method's declaration + */ + private final List params = new ArrayList(); - /** - * Set of exceptions that this method may throw. + /** + * Set of exceptions that this method may throw. * A set instance lazily created. - */ - private Set _throws; + */ + private Set _throws; - /** - * JBlock of statements that makes up the body this method - */ - private JBlock body = null; + /** + * JBlock of statements that makes up the body this method + */ + private JBlock body = null; - private JDefinedClass outer; + private JDefinedClass outer; - /** - * javadoc comments for this JMethod - */ - private JDocComment jdoc = null; + /** + * javadoc comments for this JMethod + */ + private JDocComment jdoc = null; - /** - * Variable parameter for this method's varargs declaration - * introduced in J2SE 1.5 - */ - private JVar varParam = null; + /** + * Variable parameter for this method's varargs declaration + * introduced in J2SE 1.5 + */ + private JVar varParam = null; /** * Annotations on this variable. Lazily created. @@ -88,9 +88,9 @@ public class JMethod extends JGenerifiableImpl implements JDeclaration, JAnnotat private List annotations = null; - private boolean isConstructor() { - return type == null; - } + private boolean isConstructor() { + return type == null; + } /** To set the default value for the * annotation member @@ -98,40 +98,40 @@ public class JMethod extends JGenerifiableImpl implements JDeclaration, JAnnotat private JExpression defaultValue = null; - /** - * JMethod constructor - * - * @param mods - * Modifiers for this method's declaration - * - * @param type - * Return type for the method - * - * @param name - * Name of this method - */ - JMethod(JDefinedClass outer, int mods, JType type, String name) { - this.mods = JMods.forMethod(mods); - this.type = type; - this.name = name; - this.outer = outer; - } + /** + * JMethod constructor + * + * @param mods + * Modifiers for this method's declaration + * + * @param type + * Return type for the method + * + * @param name + * Name of this method + */ + JMethod(JDefinedClass outer, int mods, JType type, String name) { + this.mods = JMods.forMethod(mods); + this.type = type; + this.name = name; + this.outer = outer; + } - /** - * Constructor constructor - * - * @param mods - * Modifiers for this constructor's declaration - * - * @param _class - * JClass containing this constructor - */ - JMethod(int mods, JDefinedClass _class) { - this.mods = JMods.forMethod(mods); - this.type = null; - this.name = _class.name(); - this.outer = _class; - } + /** + * Constructor constructor + * + * @param mods + * Modifiers for this constructor's declaration + * + * @param _class + * JClass containing this constructor + */ + JMethod(int mods, JDefinedClass _class) { + this.mods = JMods.forMethod(mods); + this.type = null; + this.name = _class.name(); + this.outer = _class; + } private Set getThrows() { if(_throws==null) @@ -139,56 +139,56 @@ public class JMethod extends JGenerifiableImpl implements JDeclaration, JAnnotat return _throws; } - /** - * Add an exception to the list of exceptions that this - * method may throw. - * - * @param exception - * Name of an exception that this method may throw - */ - public JMethod _throws(JClass exception) { + /** + * Add an exception to the list of exceptions that this + * method may throw. + * + * @param exception + * Name of an exception that this method may throw + */ + public JMethod _throws(JClass exception) { getThrows().add(exception); - return this; - } + return this; + } - public JMethod _throws(Class exception) { - return _throws(outer.owner().ref(exception)); - } + public JMethod _throws(Class exception) { + return _throws(outer.owner().ref(exception)); + } - /** - * Add the specified variable to the list of parameters - * for this method signature. - * - * @param type - * JType of the parameter being added - * - * @param name - * Name of the parameter being added - * - * @return New parameter variable - */ - public JVar param(int mods, JType type, String name) { - JVar v = new JVar(JMods.forVar(mods), type, name, null); - params.add(v); - return v; - } + /** + * Add the specified variable to the list of parameters + * for this method signature. + * + * @param type + * JType of the parameter being added + * + * @param name + * Name of the parameter being added + * + * @return New parameter variable + */ + public JVar param(int mods, JType type, String name) { + JVar v = new JVar(JMods.forVar(mods), type, name, null); + params.add(v); + return v; + } - public JVar param(JType type, String name) { - return param(JMod.NONE, type, name); - } + public JVar param(JType type, String name) { + return param(JMod.NONE, type, name); + } - public JVar param(int mods, Class type, String name) { - return param(mods, outer.owner()._ref(type), name); - } + public JVar param(int mods, Class type, String name) { + return param(mods, outer.owner()._ref(type), name); + } - public JVar param(Class type, String name) { - return param(outer.owner()._ref(type), name); - } + public JVar param(Class type, String name) { + return param(outer.owner()._ref(type), name); + } - /** - * @see #varParam(JType, String) - */ - public JVar varParam(Class type, String name) { + /** + * @see #varParam(JType, String) + */ + public JVar varParam(Class type, String name) { return varParam(outer.owner()._ref(type),name); } @@ -210,25 +210,25 @@ public class JMethod extends JGenerifiableImpl implements JDeclaration, JAnnotat * method signature. */ public JVar varParam(JType type, String name) { - if (!hasVarArgs()) { + if (!hasVarArgs()) { varParam = - new JVar( - JMods.forVar(JMod.NONE), - type.array(), - name, - null); - return varParam; - } else { - throw new IllegalStateException( - "Cannot have two varargs in a method,\n" - + "Check if varParam method of JMethod is" - + " invoked more than once"); - - } + new JVar( + JMods.forVar(JMod.NONE), + type.array(), + name, + null); + return varParam; + } else { + throw new IllegalStateException( + "Cannot have two varargs in a method,\n" + + "Check if varParam method of JMethod is" + + " invoked more than once"); } + } + /** * Adds an annotation to this variable. * @param clazz @@ -256,92 +256,106 @@ public class JMethod extends JGenerifiableImpl implements JDeclaration, JAnnotat return TypedAnnotationWriter.create(clazz,this); } - /** - * Check if there are any varargs declared - * for this method signature. - */ - public boolean hasVarArgs() { - return this.varParam!=null; - } + /** + * Check if there are any varargs declared + * for this method signature. + */ + public boolean hasVarArgs() { + return this.varParam!=null; + } - public String name() { - return name; - } + public String name() { + return name; + } - /** - * Returns the return type. - */ - public JType type() { - return type; - } + /** + * Changes the name of the method. + */ + public void name(String n) { + this.name = n; + } - /** - * Returns all the parameter types in an array. - * @return - * If there's no parameter, an empty array will be returned. - */ - public JType[] listParamTypes() { - JType[] r = new JType[params.size()]; - for (int i = 0; i < r.length; i++) - r[i] = params.get(i).type(); - return r; - } + /** + * Returns the return type. + */ + public JType type() { + return type; + } - /** - * Returns the varags parameter type. - * @return - * If there's no vararg parameter type, null will be returned. - */ - public JType listVarParamType() { - if (varParam != null) - return varParam.type(); - else - return null; - } + /** + * Overrides the return type. + */ + public void type(JType t) { + this.type = t; + } - /** - * Returns all the parameters in an array. - * @return - * If there's no parameter, an empty array will be returned. - */ - public JVar[] listParams() { - return params.toArray(new JVar[params.size()]); - } + /** + * Returns all the parameter types in an array. + * @return + * If there's no parameter, an empty array will be returned. + */ + public JType[] listParamTypes() { + JType[] r = new JType[params.size()]; + for (int i = 0; i < r.length; i++) + r[i] = params.get(i).type(); + return r; + } - /** - * Returns the variable parameter - * @return - * If there's no parameter, null will be returned. - */ - public JVar listVarParam() { - return varParam; - } + /** + * Returns the varags parameter type. + * @return + * If there's no vararg parameter type, null will be returned. + */ + public JType listVarParamType() { + if (varParam != null) + return varParam.type(); + else + return null; + } - /** - * Returns true if the method has the specified signature. - */ - public boolean hasSignature(JType[] argTypes) { - JVar[] p = listParams(); - if (p.length != argTypes.length) - return false; + /** + * Returns all the parameters in an array. + * @return + * If there's no parameter, an empty array will be returned. + */ + public JVar[] listParams() { + return params.toArray(new JVar[params.size()]); + } - for (int i = 0; i < p.length; i++) - if (!p[i].type().equals(argTypes[i])) - return false; + /** + * Returns the variable parameter + * @return + * If there's no parameter, null will be returned. + */ + public JVar listVarParam() { + return varParam; + } - return true; - } + /** + * Returns true if the method has the specified signature. + */ + public boolean hasSignature(JType[] argTypes) { + JVar[] p = listParams(); + if (p.length != argTypes.length) + return false; - /** - * Get the block that makes up body of this method - * - * @return Body of method - */ - public JBlock body() { - if (body == null) - body = new JBlock(); - return body; - } + for (int i = 0; i < p.length; i++) + if (!p[i].type().equals(argTypes[i])) + return false; + + return true; + } + + /** + * Get the block that makes up body of this method + * + * @return Body of method + */ + public JBlock body() { + if (body == null) + body = new JBlock(); + return body; + } /** * Specify the default value for this annotation member @@ -353,37 +367,37 @@ public class JMethod extends JGenerifiableImpl implements JDeclaration, JAnnotat this.defaultValue = value; } - /** - * Creates, if necessary, and returns the class javadoc for this - * JDefinedClass - * - * @return JDocComment containing javadocs for this class - */ - public JDocComment javadoc() { - if (jdoc == null) - jdoc = new JDocComment(owner()); - return jdoc; - } + /** + * Creates, if necessary, and returns the class javadoc for this + * JDefinedClass + * + * @return JDocComment containing javadocs for this class + */ + public JDocComment javadoc() { + if (jdoc == null) + jdoc = new JDocComment(owner()); + return jdoc; + } - public void declare(JFormatter f) { - if (jdoc != null) - f.g(jdoc); + public void declare(JFormatter f) { + if (jdoc != null) + f.g(jdoc); if (annotations != null){ for (JAnnotationUse a : annotations) f.g(a).nl(); } - // declare the generics parameters - super.declare(f); + // declare the generics parameters + super.declare(f); - f.g(mods); - if (!isConstructor()) - f.g(type); - f.id(name).p('(').i(); + f.g(mods); + if (!isConstructor()) + f.g(type); + f.id(name).p('(').i(); // when parameters are printed in new lines, we want them to be indented. // there's a good chance no newlines happen, too, but just in case it does. - boolean first = true; + boolean first = true; for (JVar var : params) { if (!first) f.p(','); @@ -392,33 +406,33 @@ public class JMethod extends JGenerifiableImpl implements JDeclaration, JAnnotat f.b(var); first = false; } - if (hasVarArgs()) { - if (!first) - f.p(','); - f.g(varParam.type().elementType()); - f.p("... "); - f.id(varParam.name()); - } + if (hasVarArgs()) { + if (!first) + f.p(','); + f.g(varParam.type().elementType()); + f.p("... "); + f.id(varParam.name()); + } - f.o().p(')'); - if (_throws!=null && !_throws.isEmpty()) { - f.nl().i().p("throws").g(_throws).nl().o(); - } + f.o().p(')'); + if (_throws!=null && !_throws.isEmpty()) { + f.nl().i().p("throws").g(_throws).nl().o(); + } if (defaultValue != null) { f.p("default "); f.g(defaultValue); } - if (body != null) { - f.s(body); - } else if ( - !outer.isInterface() && !outer.isAnnotationTypeDeclaration() && !mods.isAbstract() && !mods.isNative()) { - // Print an empty body for non-native, non-abstract methods - f.s(new JBlock()); - } else { - f.p(';').nl(); - } + if (body != null) { + f.s(body); + } else if ( + !outer.isInterface() && !outer.isAnnotationTypeDeclaration() && !mods.isAbstract() && !mods.isNative()) { + // Print an empty body for non-native, non-abstract methods + f.s(new JBlock()); + } else { + f.p(';').nl(); } + } /** * @return @@ -433,10 +447,10 @@ public class JMethod extends JGenerifiableImpl implements JDeclaration, JAnnotat * @deprecated use {@link #mods()} */ public JMods getMods() { - return mods; - } + return mods; + } - protected JCodeModel owner() { - return outer.owner(); - } + protected JCodeModel owner() { + return outer.owner(); + } } diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JMod.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JMod.java index 0f32e76144a..64e0c93e04c 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JMod.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JMod.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JMods.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JMods.java index daf5b8529b6..60aad8fef62 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JMods.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JMods.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * 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,17 +41,17 @@ public class JMods implements JGenerable { = JMod.FINAL; private static int FIELD - = (JMod.PUBLIC | JMod.PRIVATE | JMod.PROTECTED - | JMod.STATIC | JMod.FINAL - | JMod.TRANSIENT | JMod.VOLATILE); + = (JMod.PUBLIC | JMod.PRIVATE | JMod.PROTECTED + | JMod.STATIC | JMod.FINAL + | JMod.TRANSIENT | JMod.VOLATILE); private static int METHOD - = (JMod.PUBLIC | JMod.PRIVATE | JMod.PROTECTED | JMod.FINAL - | JMod.ABSTRACT | JMod.STATIC | JMod.NATIVE | JMod.SYNCHRONIZED); + = (JMod.PUBLIC | JMod.PRIVATE | JMod.PROTECTED | JMod.FINAL + | JMod.ABSTRACT | JMod.STATIC | JMod.NATIVE | JMod.SYNCHRONIZED); private static int CLASS - = (JMod.PUBLIC | JMod.PRIVATE | JMod.PROTECTED - | JMod.STATIC | JMod.FINAL | JMod.ABSTRACT ); + = (JMod.PUBLIC | JMod.PRIVATE | JMod.PROTECTED + | JMod.STATIC | JMod.FINAL | JMod.ABSTRACT ); private static int INTERFACE = JMod.PUBLIC; diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JNarrowedClass.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JNarrowedClass.java index dc136f4c034..3320e7dd967 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JNarrowedClass.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JNarrowedClass.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal; import java.util.Iterator; diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JNullType.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JNullType.java index 7be3c061a66..93ff0491064 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JNullType.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JNullType.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal; import java.util.Collections; diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JOp.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JOp.java index cd436549591..23f75d5e4bd 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JOp.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JOp.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JPackage.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JPackage.java index 76b0252b310..e26a961dec2 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JPackage.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JPackage.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JPrimitiveType.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JPrimitiveType.java index 8e6fbfe87e2..f1c9283d8ff 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JPrimitiveType.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JPrimitiveType.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JResourceFile.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JResourceFile.java index d1e09254b3c..c88d370edc6 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JResourceFile.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JResourceFile.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JReturn.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JReturn.java index 7df52148824..a690732cefc 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JReturn.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JReturn.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JStatement.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JStatement.java index 51a9492a6de..8df7b37c4cd 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JStatement.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JStatement.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JStringLiteral.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JStringLiteral.java index 6178a58a1bb..afe70124d4c 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JStringLiteral.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JStringLiteral.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal; /** diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JSwitch.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JSwitch.java index 1bb0bdbfcf7..44af487e089 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JSwitch.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JSwitch.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal; import java.util.ArrayList; diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JThrow.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JThrow.java index 7bf099f43f4..050cf8a87d2 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JThrow.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JThrow.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JTryBlock.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JTryBlock.java index 35cc1e5c8bb..1739e1308b1 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JTryBlock.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JTryBlock.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JType.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JType.java index 489cc1789dc..b208d49bb12 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JType.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JType.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JTypeVar.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JTypeVar.java index ce9c8bae3f8..de745686080 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JTypeVar.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JTypeVar.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal; import java.util.Iterator; diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JTypeWildcard.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JTypeWildcard.java index 4bb2511b09c..9412d3e3156 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JTypeWildcard.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JTypeWildcard.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal; import java.util.Iterator; diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JVar.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JVar.java index 0a94f7339b4..15b0c4f212e 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JVar.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JVar.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JWhileLoop.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JWhileLoop.java index 4c67388a70d..930e2be1eb1 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/JWhileLoop.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JWhileLoop.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/TypedAnnotationWriter.java b/jaxws/src/share/classes/com/sun/codemodel/internal/TypedAnnotationWriter.java index 11fa7e39ea4..b58d1f50d14 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/TypedAnnotationWriter.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/TypedAnnotationWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal; import java.lang.reflect.InvocationHandler; diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JBinaryFile.java b/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JBinaryFile.java index f53937f705b..61a22e8ffa7 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JBinaryFile.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JBinaryFile.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal.fmt; import java.io.ByteArrayOutputStream; diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JPropertyFile.java b/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JPropertyFile.java index 67c09b7f4e2..81e29f04f02 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JPropertyFile.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JPropertyFile.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal.fmt; import java.io.IOException; diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JSerializedObject.java b/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JSerializedObject.java index 68e8b8dbd3d..12452641a09 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JSerializedObject.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JSerializedObject.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JStaticFile.java b/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JStaticFile.java index 3c5d9128db3..450aac31a43 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JStaticFile.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JStaticFile.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal.fmt; import java.io.DataInputStream; diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JStaticJavaFile.java b/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JStaticJavaFile.java index 234b768abdd..00d88e876ef 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JStaticJavaFile.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JStaticJavaFile.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal.fmt; import java.io.BufferedReader; diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JTextFile.java b/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JTextFile.java index ee9b629ac6e..dbc44daee95 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JTextFile.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/JTextFile.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal.fmt; import java.io.IOException; diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/package.html b/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/package.html index c5227a2d1f1..2493ed41413 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/package.html +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/package.html @@ -1,3 +1,27 @@ + Various resource file formats (classes that implement JResourceFile). diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/package-info.java b/jaxws/src/share/classes/com/sun/codemodel/internal/package-info.java index 45f2d5f838c..aa7a1695eb1 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/package-info.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - /** *

    Library for generating Java source code

    . * diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/util/ClassNameComparator.java b/jaxws/src/share/classes/com/sun/codemodel/internal/util/ClassNameComparator.java index 40874364279..46b4270ff89 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/util/ClassNameComparator.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/util/ClassNameComparator.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal.util; import java.util.Comparator; diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/util/EncoderFactory.java b/jaxws/src/share/classes/com/sun/codemodel/internal/util/EncoderFactory.java index c4d3f07c6b6..c759b2b249e 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/util/EncoderFactory.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/util/EncoderFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,10 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ +/* + * @(#)$Id: EncoderFactory.java,v 1.3 2005/09/10 19:07:33 kohsuke Exp $ + */ + package com.sun.codemodel.internal.util; diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/util/JavadocEscapeWriter.java b/jaxws/src/share/classes/com/sun/codemodel/internal/util/JavadocEscapeWriter.java index d8947ff2d4e..6db471edcf5 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/util/JavadocEscapeWriter.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/util/JavadocEscapeWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal.util; import java.io.FilterWriter; diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/util/MS1252Encoder.java b/jaxws/src/share/classes/com/sun/codemodel/internal/util/MS1252Encoder.java index 2dbcd787fdb..4fa997964ce 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/util/MS1252Encoder.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/util/MS1252Encoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,10 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ +/* + * @(#)$Id: MS1252Encoder.java,v 1.2 2005/09/10 19:07:33 kohsuke Exp $ + */ + package com.sun.codemodel.internal.util; diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/util/SingleByteEncoder.java b/jaxws/src/share/classes/com/sun/codemodel/internal/util/SingleByteEncoder.java index 3f0d31303ad..3e025a7a5ed 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/util/SingleByteEncoder.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/util/SingleByteEncoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * 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,6 +23,10 @@ * have any questions. */ +/* + * @(#)SingleByteEncoder.java 1.14 03/01/23 + */ + package com.sun.codemodel.internal.util; import java.nio.ByteBuffer; @@ -47,109 +51,109 @@ abstract class SingleByteEncoder private final Surrogate.Parser sgp = new Surrogate.Parser(); protected SingleByteEncoder(Charset cs, - short[] index1, String index2, - int mask1, int mask2, int shift) + short[] index1, String index2, + int mask1, int mask2, int shift) { - super(cs, 1.0f, 1.0f); - this.index1 = index1; - this.index2 = index2; - this.mask1 = mask1; - this.mask2 = mask2; - this.shift = shift; + super(cs, 1.0f, 1.0f); + this.index1 = index1; + this.index2 = index2; + this.mask1 = mask1; + this.mask2 = mask2; + this.shift = shift; } public boolean canEncode(char c) { - char testEncode; - testEncode = index2.charAt(index1[(c & mask1) >> shift] - + (c & mask2)); - if (testEncode == '\u0000') - return false; - else - return true; + char testEncode; + testEncode = index2.charAt(index1[(c & mask1) >> shift] + + (c & mask2)); + if (testEncode == '\u0000') + return false; + else + return true; } private CoderResult encodeArrayLoop(CharBuffer src, ByteBuffer dst) { - char[] sa = src.array(); - int sp = src.arrayOffset() + src.position(); - int sl = src.arrayOffset() + src.limit(); - sp = (sp <= sl ? sp : sl); - byte[] da = dst.array(); - int dp = dst.arrayOffset() + dst.position(); - int dl = dst.arrayOffset() + dst.limit(); - dp = (dp <= dl ? dp : dl); + char[] sa = src.array(); + int sp = src.arrayOffset() + src.position(); + int sl = src.arrayOffset() + src.limit(); + sp = (sp <= sl ? sp : sl); + byte[] da = dst.array(); + int dp = dst.arrayOffset() + dst.position(); + int dl = dst.arrayOffset() + dst.limit(); + dp = (dp <= dl ? dp : dl); - try { - while (sp < sl) { - char c = sa[sp]; - if (Surrogate.is(c)) { - if (sgp.parse(c, sa, sp, sl) < 0) - return sgp.error(); - return sgp.unmappableResult(); - } - if (c >= '\uFFFE') - return CoderResult.unmappableForLength(1); - if (dl - dp < 1) - return CoderResult.OVERFLOW; + try { + while (sp < sl) { + char c = sa[sp]; + if (Surrogate.is(c)) { + if (sgp.parse(c, sa, sp, sl) < 0) + return sgp.error(); + return sgp.unmappableResult(); + } + if (c >= '\uFFFE') + return CoderResult.unmappableForLength(1); + if (dl - dp < 1) + return CoderResult.OVERFLOW; - char e = index2.charAt(index1[(c & mask1) >> shift] - + (c & mask2)); + char e = index2.charAt(index1[(c & mask1) >> shift] + + (c & mask2)); - // If output byte is zero because input char is zero - // then character is mappable, o.w. fail - if (e == '\u0000' && c != '\u0000') - return CoderResult.unmappableForLength(1); + // If output byte is zero because input char is zero + // then character is mappable, o.w. fail + if (e == '\u0000' && c != '\u0000') + return CoderResult.unmappableForLength(1); - sp++; - da[dp++] = (byte)e; - } - return CoderResult.UNDERFLOW; - } finally { - src.position(sp - src.arrayOffset()); - dst.position(dp - dst.arrayOffset()); - } + sp++; + da[dp++] = (byte)e; + } + return CoderResult.UNDERFLOW; + } finally { + src.position(sp - src.arrayOffset()); + dst.position(dp - dst.arrayOffset()); + } } private CoderResult encodeBufferLoop(CharBuffer src, ByteBuffer dst) { - int mark = src.position(); - try { - while (src.hasRemaining()) { - char c = src.get(); - if (Surrogate.is(c)) { - if (sgp.parse(c, src) < 0) - return sgp.error(); - return sgp.unmappableResult(); - } - if (c >= '\uFFFE') - return CoderResult.unmappableForLength(1); - if (!dst.hasRemaining()) - return CoderResult.OVERFLOW; + int mark = src.position(); + try { + while (src.hasRemaining()) { + char c = src.get(); + if (Surrogate.is(c)) { + if (sgp.parse(c, src) < 0) + return sgp.error(); + return sgp.unmappableResult(); + } + if (c >= '\uFFFE') + return CoderResult.unmappableForLength(1); + if (!dst.hasRemaining()) + return CoderResult.OVERFLOW; - char e = index2.charAt(index1[(c & mask1) >> shift] - + (c & mask2)); + char e = index2.charAt(index1[(c & mask1) >> shift] + + (c & mask2)); - // If output byte is zero because input char is zero - // then character is mappable, o.w. fail - if (e == '\u0000' && c != '\u0000') - return CoderResult.unmappableForLength(1); + // If output byte is zero because input char is zero + // then character is mappable, o.w. fail + if (e == '\u0000' && c != '\u0000') + return CoderResult.unmappableForLength(1); - mark++; - dst.put((byte)e); - } - return CoderResult.UNDERFLOW; - } finally { - src.position(mark); - } + mark++; + dst.put((byte)e); + } + return CoderResult.UNDERFLOW; + } finally { + src.position(mark); + } } protected CoderResult encodeLoop(CharBuffer src, ByteBuffer dst) { - if (true && src.hasArray() && dst.hasArray()) - return encodeArrayLoop(src, dst); - else - return encodeBufferLoop(src, dst); + if (true && src.hasArray() && dst.hasArray()) + return encodeArrayLoop(src, dst); + else + return encodeBufferLoop(src, dst); } public byte encode(char inputChar) { - return (byte)index2.charAt(index1[(inputChar & mask1) >> shift] + - (inputChar & mask2)); + return (byte)index2.charAt(index1[(inputChar & mask1) >> shift] + + (inputChar & mask2)); } } diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/util/Surrogate.java b/jaxws/src/share/classes/com/sun/codemodel/internal/util/Surrogate.java index 0081f24bf5d..9cf6b2108f1 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/util/Surrogate.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/util/Surrogate.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * 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.nio.charset.CoderResult; * Utility class for dealing with surrogates. * * @author Mark Reinhold + * @version 1.11, 03/01/23 */ class Surrogate { @@ -111,7 +112,7 @@ class Surrogate { public Parser() { } - private int character; // UCS-4 + private int character; // UCS-4 private CoderResult error = CoderResult.UNDERFLOW; private boolean isPair; diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/util/UnicodeEscapeWriter.java b/jaxws/src/share/classes/com/sun/codemodel/internal/util/UnicodeEscapeWriter.java index 549c89cc13b..ad09f15817a 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/util/UnicodeEscapeWriter.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/util/UnicodeEscapeWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal.util; import java.io.FilterWriter; diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/writer/FileCodeWriter.java b/jaxws/src/share/classes/com/sun/codemodel/internal/writer/FileCodeWriter.java index 58cd9d76d7f..5a55423b4c5 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/writer/FileCodeWriter.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/writer/FileCodeWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal.writer; import java.io.File; diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/writer/FilterCodeWriter.java b/jaxws/src/share/classes/com/sun/codemodel/internal/writer/FilterCodeWriter.java index cad99ce6155..1523d1a8d0f 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/writer/FilterCodeWriter.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/writer/FilterCodeWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal.writer; import java.io.OutputStream; diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/writer/ProgressCodeWriter.java b/jaxws/src/share/classes/com/sun/codemodel/internal/writer/ProgressCodeWriter.java index 4b923ad098b..1bf8f845c75 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/writer/ProgressCodeWriter.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/writer/ProgressCodeWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal.writer; import java.io.File; diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/writer/PrologCodeWriter.java b/jaxws/src/share/classes/com/sun/codemodel/internal/writer/PrologCodeWriter.java index cb785a7a76e..cbb5b203ba5 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/writer/PrologCodeWriter.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/writer/PrologCodeWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal.writer; import java.io.IOException; diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/writer/SingleStreamCodeWriter.java b/jaxws/src/share/classes/com/sun/codemodel/internal/writer/SingleStreamCodeWriter.java index 52b959739aa..10740dfa422 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/writer/SingleStreamCodeWriter.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/writer/SingleStreamCodeWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal.writer; import java.io.FilterOutputStream; diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/writer/ZipCodeWriter.java b/jaxws/src/share/classes/com/sun/codemodel/internal/writer/ZipCodeWriter.java index 44975d934bb..0d345993bf5 100644 --- a/jaxws/src/share/classes/com/sun/codemodel/internal/writer/ZipCodeWriter.java +++ b/jaxws/src/share/classes/com/sun/codemodel/internal/writer/ZipCodeWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.codemodel.internal.writer; import java.io.FilterOutputStream; diff --git a/jaxws/src/share/classes/com/sun/istack/internal/ByteArrayDataSource.java b/jaxws/src/share/classes/com/sun/istack/internal/ByteArrayDataSource.java index 74193498dbb..b11eb1bb3c3 100644 --- a/jaxws/src/share/classes/com/sun/istack/internal/ByteArrayDataSource.java +++ b/jaxws/src/share/classes/com/sun/istack/internal/ByteArrayDataSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.istack.internal; import javax.activation.DataSource; diff --git a/jaxws/src/share/classes/com/sun/istack/internal/FinalArrayList.java b/jaxws/src/share/classes/com/sun/istack/internal/FinalArrayList.java index 357e6ff28bc..6cc67b466e4 100644 --- a/jaxws/src/share/classes/com/sun/istack/internal/FinalArrayList.java +++ b/jaxws/src/share/classes/com/sun/istack/internal/FinalArrayList.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.istack.internal; import java.util.ArrayList; diff --git a/jaxws/src/share/classes/com/sun/istack/internal/FragmentContentHandler.java b/jaxws/src/share/classes/com/sun/istack/internal/FragmentContentHandler.java index 81a71bedee0..c9b77721c9a 100644 --- a/jaxws/src/share/classes/com/sun/istack/internal/FragmentContentHandler.java +++ b/jaxws/src/share/classes/com/sun/istack/internal/FragmentContentHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.istack.internal; import org.xml.sax.helpers.XMLFilterImpl; diff --git a/jaxws/src/share/classes/com/sun/istack/internal/Interned.java b/jaxws/src/share/classes/com/sun/istack/internal/Interned.java index 17bf5c36892..26e6bff8648 100644 --- a/jaxws/src/share/classes/com/sun/istack/internal/Interned.java +++ b/jaxws/src/share/classes/com/sun/istack/internal/Interned.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.istack.internal; import java.lang.annotation.Documented; diff --git a/jaxws/src/share/classes/com/sun/istack/internal/NotNull.java b/jaxws/src/share/classes/com/sun/istack/internal/NotNull.java index b8a103ca9f8..f31eb46f248 100644 --- a/jaxws/src/share/classes/com/sun/istack/internal/NotNull.java +++ b/jaxws/src/share/classes/com/sun/istack/internal/NotNull.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.istack.internal; import java.lang.annotation.Documented; diff --git a/jaxws/src/share/classes/com/sun/istack/internal/Nullable.java b/jaxws/src/share/classes/com/sun/istack/internal/Nullable.java index 2a785fe6db3..269d2498193 100644 --- a/jaxws/src/share/classes/com/sun/istack/internal/Nullable.java +++ b/jaxws/src/share/classes/com/sun/istack/internal/Nullable.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.istack.internal; import java.lang.annotation.Documented; diff --git a/jaxws/src/share/classes/com/sun/istack/internal/Pool.java b/jaxws/src/share/classes/com/sun/istack/internal/Pool.java index 67405219be7..957a3362e3a 100644 --- a/jaxws/src/share/classes/com/sun/istack/internal/Pool.java +++ b/jaxws/src/share/classes/com/sun/istack/internal/Pool.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.istack.internal; import java.util.concurrent.ConcurrentLinkedQueue; diff --git a/jaxws/src/share/classes/com/sun/istack/internal/SAXException2.java b/jaxws/src/share/classes/com/sun/istack/internal/SAXException2.java index 99fb6630926..558d8ce57c5 100644 --- a/jaxws/src/share/classes/com/sun/istack/internal/SAXException2.java +++ b/jaxws/src/share/classes/com/sun/istack/internal/SAXException2.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.istack.internal; import org.xml.sax.SAXException; diff --git a/jaxws/src/share/classes/com/sun/istack/internal/SAXParseException2.java b/jaxws/src/share/classes/com/sun/istack/internal/SAXParseException2.java index dfd68fe6cd6..0c6095f0a5a 100644 --- a/jaxws/src/share/classes/com/sun/istack/internal/SAXParseException2.java +++ b/jaxws/src/share/classes/com/sun/istack/internal/SAXParseException2.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.istack.internal; import org.xml.sax.SAXParseException; diff --git a/jaxws/src/share/classes/com/sun/istack/internal/XMLStreamException2.java b/jaxws/src/share/classes/com/sun/istack/internal/XMLStreamException2.java new file mode 100644 index 00000000000..c88f6aea2c4 --- /dev/null +++ b/jaxws/src/share/classes/com/sun/istack/internal/XMLStreamException2.java @@ -0,0 +1,62 @@ +/* + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. + * 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. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ +package com.sun.istack.internal; + +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.Location; + +/** + * {@link XMLStreamException} that properly handles exception chaining. + * + * @author Kohsuke Kawaguchi + */ +public class XMLStreamException2 extends XMLStreamException { + public XMLStreamException2(String msg) { + super(msg); + } + + public XMLStreamException2(Throwable th) { + super(th); + } + + public XMLStreamException2(String msg, Throwable th) { + super(msg, th); + } + + public XMLStreamException2(String msg, Location location) { + super(msg, location); + } + + public XMLStreamException2(String msg, Location location, Throwable th) { + super(msg, location, th); + } + + /** + * {@link XMLStreamException} doesn't return the correct cause. + */ + public Throwable getCause() { + return getNestedException(); + } +} diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderToContentHandler.java b/jaxws/src/share/classes/com/sun/istack/internal/XMLStreamReaderToContentHandler.java similarity index 93% rename from jaxws/src/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderToContentHandler.java rename to jaxws/src/share/classes/com/sun/istack/internal/XMLStreamReaderToContentHandler.java index 5c544fcc02c..cf6c0d46d40 100644 --- a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderToContentHandler.java +++ b/jaxws/src/share/classes/com/sun/istack/internal/XMLStreamReaderToContentHandler.java @@ -1,5 +1,5 @@ /* - * Portions Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,20 +22,19 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ +package com.sun.istack.internal; -package com.sun.xml.internal.ws.util.xml; - -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamConstants; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; - -import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; -import org.xml.sax.Locator; import org.xml.sax.SAXException; +import org.xml.sax.Locator; +import org.xml.sax.Attributes; import org.xml.sax.helpers.AttributesImpl; +import javax.xml.stream.XMLStreamReader; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamConstants; +import javax.xml.namespace.QName; + /** * This is a simple utility class that adapts StAX events from an * {@link XMLStreamReader} to SAX events on a @@ -43,6 +42,7 @@ import org.xml.sax.helpers.AttributesImpl; * parser technologies. * * @author Ryan.Shoemaker@Sun.COM + * @version 1.0 */ public class XMLStreamReaderToContentHandler { @@ -56,6 +56,11 @@ public class XMLStreamReaderToContentHandler { // event that was fired (such as end element) private boolean eagerQuit; + /** + * If true, not start/endDocument event. + */ + private boolean fragment; + /** * Construct a new StAX to SAX adapter that will convert a StAX event * stream into a SAX event stream. @@ -65,10 +70,11 @@ public class XMLStreamReaderToContentHandler { * @param saxCore * SAXevent sink */ - public XMLStreamReaderToContentHandler(XMLStreamReader staxCore, ContentHandler saxCore, boolean eagerQuit) { + public XMLStreamReaderToContentHandler(XMLStreamReader staxCore, ContentHandler saxCore, boolean eagerQuit, boolean fragment) { this.staxStreamReader = staxCore; this.saxHandler = saxCore; this.eagerQuit = eagerQuit; + this.fragment = fragment; } /* @@ -152,15 +158,21 @@ public class XMLStreamReaderToContentHandler { handleEndDocument(); } catch (SAXException e) { - throw new XMLStreamException(e); + throw new XMLStreamException2(e); } } private void handleEndDocument() throws SAXException { + if(fragment) + return; + saxHandler.endDocument(); } private void handleStartDocument() throws SAXException { + if(fragment) + return; + saxHandler.setDocumentLocator(new Locator() { public int getColumnNumber() { return staxStreamReader.getLocation().getColumnNumber(); @@ -184,7 +196,7 @@ public class XMLStreamReaderToContentHandler { staxStreamReader.getPITarget(), staxStreamReader.getPIData()); } catch (SAXException e) { - throw new XMLStreamException(e); + throw new XMLStreamException2(e); } } @@ -195,7 +207,7 @@ public class XMLStreamReaderToContentHandler { staxStreamReader.getTextStart(), staxStreamReader.getTextLength() ); } catch (SAXException e) { - throw new XMLStreamException(e); + throw new XMLStreamException2(e); } } @@ -203,11 +215,15 @@ public class XMLStreamReaderToContentHandler { QName qName = staxStreamReader.getName(); try { + String pfix = qName.getPrefix(); + String rawname = (pfix == null || pfix.length() == 0) + ? qName.getLocalPart() + : pfix + ':' + qName.getLocalPart(); // fire endElement saxHandler.endElement( qName.getNamespaceURI(), qName.getLocalPart(), - qName.toString()); + rawname); // end namespace bindings int nsCount = staxStreamReader.getNamespaceCount(); @@ -219,7 +235,7 @@ public class XMLStreamReaderToContentHandler { saxHandler.endPrefixMapping(prefix); } } catch (SAXException e) { - throw new XMLStreamException(e); + throw new XMLStreamException2(e); } } @@ -249,7 +265,7 @@ public class XMLStreamReaderToContentHandler { rawname, attrs); } catch (SAXException e) { - throw new XMLStreamException(e); + throw new XMLStreamException2(e); } } diff --git a/jaxws/src/share/classes/com/sun/istack/internal/package-info.java b/jaxws/src/share/classes/com/sun/istack/internal/package-info.java index a9772934dfb..60a915df58d 100644 --- a/jaxws/src/share/classes/com/sun/istack/internal/package-info.java +++ b/jaxws/src/share/classes/com/sun/istack/internal/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - /** * istack-commons runtime utilities. */ diff --git a/jaxws/src/share/classes/com/sun/istack/internal/tools/APTTypeVisitor.java b/jaxws/src/share/classes/com/sun/istack/internal/tools/APTTypeVisitor.java index 55dd90b60e5..2678f1437b3 100644 --- a/jaxws/src/share/classes/com/sun/istack/internal/tools/APTTypeVisitor.java +++ b/jaxws/src/share/classes/com/sun/istack/internal/tools/APTTypeVisitor.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.istack.internal.tools; import com.sun.mirror.type.TypeMirror; diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/AntErrorListener.java b/jaxws/src/share/classes/com/sun/istack/internal/tools/MaskingClassLoader.java similarity index 51% rename from jaxws/src/share/classes/com/sun/tools/internal/txw2/AntErrorListener.java rename to jaxws/src/share/classes/com/sun/istack/internal/tools/MaskingClassLoader.java index 9a666ee92d2..8159a7e677b 100644 --- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/AntErrorListener.java +++ b/jaxws/src/share/classes/com/sun/istack/internal/tools/MaskingClassLoader.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,46 +22,47 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ +package com.sun.istack.internal.tools; -package com.sun.tools.internal.txw2; - -import org.apache.tools.ant.Project; -import org.xml.sax.SAXParseException; - -import java.text.MessageFormat; +import java.util.Collection; /** + * {@link ClassLoader} that masks a specified set of classes + * from its parent class loader. + * + *

    + * This code is used to create an isolated environment. + * * @author Kohsuke Kawaguchi */ -public class AntErrorListener implements ErrorListener { - private final Project project; +public class MaskingClassLoader extends ClassLoader { - public AntErrorListener(Project p) { - this.project = p; + private final String[] masks; + + public MaskingClassLoader(String... masks) { + this.masks = masks; } - public void error(SAXParseException e) { - print(e,Project.MSG_ERR); + public MaskingClassLoader(Collection masks) { + this(masks.toArray(new String[masks.size()])); } - public void fatalError(SAXParseException e) { - print(e,Project.MSG_ERR); + public MaskingClassLoader(ClassLoader parent, String... masks) { + super(parent); + this.masks = masks; } - public void warning(SAXParseException e) { - print(e,Project.MSG_WARN); + public MaskingClassLoader(ClassLoader parent, Collection masks) { + this(parent, masks.toArray(new String[masks.size()])); } - private void print(SAXParseException e, int level) { - project.log(e.getMessage(),level); - project.log(getLocation(e),level); - } + @Override + protected synchronized Class loadClass(String name, boolean resolve) throws ClassNotFoundException { + for (String mask : masks) { + if(name.startsWith(mask)) + throw new ClassNotFoundException(); + } - String getLocation(SAXParseException e) { - return MessageFormat.format(" {0}:{1} of {2}", - new Object[]{ - String.valueOf(e.getLineNumber()), - String.valueOf(e.getColumnNumber()), - e.getSystemId()}); + return super.loadClass(name, resolve); } } diff --git a/jaxws/src/share/classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java b/jaxws/src/share/classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java new file mode 100644 index 00000000000..013a0aa12ad --- /dev/null +++ b/jaxws/src/share/classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java @@ -0,0 +1,139 @@ +/* + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. + * 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. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ +package com.sun.istack.internal.tools; + +import java.io.InputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.net.URL; +import java.net.MalformedURLException; +import java.util.Enumeration; + +/** + * Load classes/resources from a side folder, so that + * classes of the same package can live in a single jar file. + * + *

    + * For example, with the following jar file: + * 

    + *  /
+ *  +- foo
+ *     +- X.class
+ *  +- bar
+ *     +- X.class
+ *
    + *

    + * {@link ParallelWorldClassLoader}("foo/") would load X.class from + * /foo/X.class (note that X is defined in the root package, not + * foo.X. + * + *

    + * This can be combined with {@link MaskingClassLoader} to mask classes which are loaded by the parent + * class loader so that the child class loader + * classes living in different folders are loaded + * before the parent class loader loads classes living the jar file publicly + * visible + * For example, with the following jar file: + * 

    + *  /
+ *  +- foo
+ *     +- X.class
+ *  +- bar
+ *     +-foo
+ *        +- X.class
+ *
    + *

    + * {@link ParallelWorldClassLoader}(MaskingClassLoader.class.getClassLoader()) would load foo.X.class from + * /bar/foo.X.class not the foo.X.class in the publicly visible place in the jar file, thus + * masking the parent classLoader from loading the class from foo.X.class + * (note that X is defined in the package foo, not + * bar.foo.X. + * + * @author Kohsuke Kawaguchi + */ +public class ParallelWorldClassLoader extends ClassLoader { + + /** + * Strings like "prefix/", "abc/", or "" to indicate + * classes should be loaded normally. + */ + private final String prefix; + + public ParallelWorldClassLoader(ClassLoader parent,String prefix) { + super(parent); + this.prefix = prefix; + } + + protected Class findClass(String name) throws ClassNotFoundException { + StringBuffer sb = new StringBuffer(name.length()+prefix.length()+6); + sb.append(prefix).append(name.replace('.','/')).append(".class"); + + InputStream is = getParent().getResourceAsStream(sb.toString()); + if (is==null) + throw new ClassNotFoundException(name); + + try { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + byte[] buf = new byte[1024]; + int len; + while((len=is.read(buf))>=0) + baos.write(buf,0,len); + + buf = baos.toByteArray(); + int packIndex = name.lastIndexOf('.'); + if (packIndex != -1) { + String pkgname = name.substring(0, packIndex); + // Check if package already loaded. + Package pkg = getPackage(pkgname); + if (pkg == null) { + definePackage(pkgname, null, null, null, null, null, null, null); + } + } + return defineClass(name,buf,0,buf.length); + } catch (IOException e) { + throw new ClassNotFoundException(name,e); + } + } + + protected URL findResource(String name) { + return getParent().getResource(prefix+name); + } + + protected Enumeration findResources(String name) throws IOException { + return getParent().getResources( prefix+name); + } + + /** + * Given the URL inside jar, returns the URL to the jar itself. + */ + public static URL toJarUrl(URL res) throws ClassNotFoundException, MalformedURLException { + String url = res.toExternalForm(); + if(!url.startsWith("jar:")) + throw new ClassNotFoundException("Loaded outside a jar "+url); + url = url.substring(4); // cut off jar: + url = url.substring(0,url.lastIndexOf('!')); // cut off everything after '!' + return new URL(url); + } +} diff --git a/jaxws/src/share/classes/com/sun/istack/internal/tools/package-info.java b/jaxws/src/share/classes/com/sun/istack/internal/tools/package-info.java index f77048324be..3ce8c80627f 100644 --- a/jaxws/src/share/classes/com/sun/istack/internal/tools/package-info.java +++ b/jaxws/src/share/classes/com/sun/istack/internal/tools/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - /** * istack-commons tool time utilities. * diff --git a/jaxws/src/share/classes/com/sun/istack/internal/ws/AnnotationProcessorFactoryImpl.java b/jaxws/src/share/classes/com/sun/istack/internal/ws/AnnotationProcessorFactoryImpl.java index d976cd66459..c4f8f825a3b 100644 --- a/jaxws/src/share/classes/com/sun/istack/internal/ws/AnnotationProcessorFactoryImpl.java +++ b/jaxws/src/share/classes/com/sun/istack/internal/ws/AnnotationProcessorFactoryImpl.java @@ -1,5 +1,5 @@ /* - * Portions Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -103,7 +103,7 @@ public class AnnotationProcessorFactoryImpl implements AnnotationProcessorFactor if (wsAP == null) { AnnotationProcessorContext context = new AnnotationProcessorContext(); - wsAP = new WebServiceAP(null, null, null, context); + wsAP = new WebServiceAP(null, context, null, null); } wsAP.init(apEnv); diff --git a/jaxws/src/share/classes/com/sun/istack/internal/ws/package-info.java b/jaxws/src/share/classes/com/sun/istack/internal/ws/package-info.java index 9cf442544df..31850e07dd2 100644 --- a/jaxws/src/share/classes/com/sun/istack/internal/ws/package-info.java +++ b/jaxws/src/share/classes/com/sun/istack/internal/ws/package-info.java @@ -1,5 +1,5 @@ /* - * Portions Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ /** * *

    This document describes the {@link com.sun.mirror.apt.AnnotationProcessor AnnotationProcessor} - * included with JAX-WS 2.0. + * included with JAX-WS 2.0.1. * *

    The {@link com.sun.istack.internal.ws.AnnotationProcessorFactoryImpl AnnoatationnProcessorFactoryImpl} class * tells the APT diff --git a/jaxws/src/share/classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin b/jaxws/src/share/classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin new file mode 100644 index 00000000000..6b19c805ad8 --- /dev/null +++ b/jaxws/src/share/classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin @@ -0,0 +1,4 @@ +com.sun.tools.internal.xjc.addon.locator.SourceLocationAddOn +com.sun.tools.internal.xjc.addon.sync.SynchronizedMethodAddOn +com.sun.tools.internal.xjc.addon.at_generated.PluginImpl +com.sun.tools.internal.xjc.addon.episode.PluginImpl diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/ConfigReader.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/ConfigReader.java index c9afcaa1792..2ec45591cc3 100644 --- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/ConfigReader.java +++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/ConfigReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.tools.internal.jxc; import java.io.File; diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/MessageBundle.properties b/jaxws/src/share/classes/com/sun/tools/internal/jxc/MessageBundle.properties index ddc5a4ac95b..5dec6daad65 100644 --- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/MessageBundle.properties +++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/MessageBundle.properties @@ -1,3 +1,28 @@ +# +# Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. +# 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. Sun designates this +# particular file as subject to the "Classpath" exception as provided +# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, +# CA 95054 USA or visit www.sun.com if you need additional information or +# have any questions. +# + UNEXPECTED_NGCC_TOKEN = \ Unexpected {0} appears at line {1} column {2} @@ -5,15 +30,16 @@ BASEDIR_DOESNT_EXIST = \ Non-existent directory: {0} VERSION = \ - schemagen version "JAXB 2.0 in JDK 1.6" \n\ - JavaTM Architecture for XML Binding(JAXB) Reference Implementation, (build JAXB 2.0 in JDK 1.6) + schemagen version "JAXB 2.1.3" \n\ + JavaTM Architecture for XML Binding(JAXB) Reference Implementation, (build JAXB 2.1.3 in JDK) USAGE = \ Usage: schemagen [-options ...] \n\ Options: \n\ -\ \ \ \ -d : specify where to place processor and javac generated class files \n\ -\ \ \ \ -cp : specify where to find user specified files \n\ -\ \ \ \ -classpath : specify where to find user specified files \n\ -\ \ \ \ -version : display version information +\ \ \ \ -d : specify where to place processor and javac generated class files\n\ +\ \ \ \ -cp : specify where to find user specified files\n\ +\ \ \ \ -classpath : specify where to find user specified files\n\ +\ \ \ \ -episode : generate episode file for separate compilation\n\ +\ \ \ \ -version : display version information\n\ \ \ \ \ -help : display this usage message diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/Messages.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/Messages.java index b1f22f42c8e..8a9656f43f3 100644 --- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/Messages.java +++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/Messages.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.tools.internal.jxc; import java.text.MessageFormat; diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/NGCCRuntimeEx.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/NGCCRuntimeEx.java index 8f538075766..699f47828cd 100644 --- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/NGCCRuntimeEx.java +++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/NGCCRuntimeEx.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.tools.internal.jxc; import java.io.File; diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java index ef178300eb2..3b268d5e530 100644 --- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java +++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.tools.internal.jxc; import java.io.File; @@ -122,7 +121,7 @@ public class SchemaGenerator { } Class schemagenRunner = classLoader.loadClass(Runner.class.getName()); - Method mainMethod = schemagenRunner.getDeclaredMethod("main",String[].class); + Method mainMethod = schemagenRunner.getDeclaredMethod("main",String[].class,File.class); List aptargs = new ArrayList(); @@ -150,7 +149,7 @@ public class SchemaGenerator { aptargs.addAll(options.arguments); String[] argsarray = aptargs.toArray(new String[aptargs.size()]); - return (Integer)mainMethod.invoke(null,new Object[]{argsarray}); + return (Integer)mainMethod.invoke(null,new Object[]{argsarray,options.episodeFile}); } /** @@ -204,11 +203,15 @@ public class SchemaGenerator { } public static final class Runner { - public static int main(String[] args) throws Exception { + public static int main(String[] args, File episode) throws Exception { ClassLoader cl = Runner.class.getClassLoader(); Class apt = cl.loadClass("com.sun.tools.apt.Main"); Method processMethod = apt.getMethod("process",AnnotationProcessorFactory.class, String[].class); - return (Integer) processMethod.invoke(null, new com.sun.tools.internal.jxc.apt.SchemaGenerator(), args); + + com.sun.tools.internal.jxc.apt.SchemaGenerator r = new com.sun.tools.internal.jxc.apt.SchemaGenerator(); + if(episode!=null) + r.setEpisodeFile(episode); + return (Integer) processMethod.invoke(null, r, args); } } } diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/AnnotationParser.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/AnnotationParser.java index 09175235a11..47d1fc41874 100644 --- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/AnnotationParser.java +++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/AnnotationParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.tools.internal.jxc.apt; import java.io.File; @@ -88,7 +87,7 @@ final class AnnotationParser implements AnnotationProcessor { // -Aconfig=foo.config:bar.config where : is the pathSeparatorChar StringTokenizer st = new StringTokenizer(value,File.pathSeparator); if(!st.hasMoreTokens()) { - errorListener.error(null,Messages.NO_FILE_SPECIFIED.format()); + errorListener.error(null,Messages.OPERAND_MISSING.format(Const.CONFIG_FILE_OPTION)); continue; } diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/AnnotationProcessorFactoryImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/AnnotationProcessorFactoryImpl.java index ce842f980b3..68aa512346a 100644 --- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/AnnotationProcessorFactoryImpl.java +++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/AnnotationProcessorFactoryImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.tools.internal.jxc.apt; import java.util.Arrays; diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Const.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Const.java index 6b6008b92bd..8ec9cdb55c5 100644 --- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Const.java +++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Const.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.tools.internal.jxc.apt; import java.io.File; diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/ErrorReceiverImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/ErrorReceiverImpl.java index 117fec778fe..e9a053414fd 100644 --- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/ErrorReceiverImpl.java +++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/ErrorReceiverImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.tools.internal.jxc.apt; import com.sun.mirror.apt.AnnotationProcessorEnvironment; diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/InlineAnnotationReaderImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/InlineAnnotationReaderImpl.java index 553dc68dd99..3390a5f5502 100644 --- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/InlineAnnotationReaderImpl.java +++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/InlineAnnotationReaderImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,21 +22,22 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.tools.internal.jxc.apt; import java.lang.annotation.Annotation; import java.lang.reflect.InvocationTargetException; -import java.util.List; import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import com.sun.mirror.declaration.AnnotationMirror; +import com.sun.mirror.declaration.Declaration; import com.sun.mirror.declaration.FieldDeclaration; import com.sun.mirror.declaration.MethodDeclaration; import com.sun.mirror.declaration.ParameterDeclaration; import com.sun.mirror.declaration.TypeDeclaration; -import com.sun.mirror.declaration.AnnotationMirror; -import com.sun.mirror.declaration.Declaration; import com.sun.mirror.type.MirroredTypeException; +import com.sun.mirror.type.MirroredTypesException; import com.sun.mirror.type.TypeMirror; import com.sun.xml.internal.bind.v2.model.annotation.AbstractInlineAnnotationReaderImpl; import com.sun.xml.internal.bind.v2.model.annotation.AnnotationReader; @@ -67,6 +68,10 @@ public final class InlineAnnotationReaderImpl extends AbstractInlineAnnotationRe return f.getAnnotation(annotationType)!=null; } + public boolean hasClassAnnotation(TypeDeclaration clazz, Class annotationType) { + return clazz.getAnnotation(annotationType)!=null; + } + public Annotation[] getAllFieldAnnotations(FieldDeclaration field, Locatable srcPos) { return getAllAnnotations(field,srcPos); } @@ -94,7 +99,8 @@ public final class InlineAnnotationReaderImpl extends AbstractInlineAnnotationRe for( AnnotationMirror m : decl.getAnnotationMirrors() ) { try { String fullName = m.getAnnotationType().getDeclaration().getQualifiedName(); - Class type = getClass().getClassLoader().loadClass(fullName); + Class type = + getClass().getClassLoader().loadClass(fullName).asSubclass(Annotation.class); Annotation annotation = decl.getAnnotation(type); if(annotation!=null) r.add( LocatableAnnotation.create(annotation,srcPos) ); @@ -135,6 +141,26 @@ public final class InlineAnnotationReaderImpl extends AbstractInlineAnnotationRe } } + public TypeMirror[] getClassArrayValue(Annotation a, String name) { + try { + a.annotationType().getMethod(name).invoke(a); + assert false; + throw new IllegalStateException("should throw a MirroredTypesException"); + } catch (IllegalAccessException e) { + throw new IllegalAccessError(e.getMessage()); + } catch (InvocationTargetException e) { + if( e.getCause() instanceof MirroredTypesException ) { + MirroredTypesException me = (MirroredTypesException)e.getCause(); + Collection r = me.getTypeMirrors(); + return r.toArray(new TypeMirror[r.size()]); + } + // impossible + throw new RuntimeException(e); + } catch (NoSuchMethodException e) { + throw new NoSuchMethodError(e.getMessage()); + } + } + protected String fullName(MethodDeclaration m) { return m.getDeclaringType().getQualifiedName()+'#'+m.getSimpleName(); } diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/MessageBundle.properties b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/MessageBundle.properties index 9f69124cbb2..c9a4d4dd55e 100644 --- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/MessageBundle.properties +++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/MessageBundle.properties @@ -1,12 +1,34 @@ +# +# Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. +# 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. Sun designates this +# particular file as subject to the "Classpath" exception as provided +# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, +# CA 95054 USA or visit www.sun.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. -NO_FILE_SPECIFIED = \ - No directory was specified. - -NO_CLASSPATH_SPECIFIED = \ - No classpath was specified. +OPERAND_MISSING = \ + Option "{0}" is missing an operand. diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Messages.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Messages.java index 61fc613136d..13f3293fef0 100644 --- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Messages.java +++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Messages.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.tools.internal.jxc.apt; import java.text.MessageFormat; @@ -36,9 +35,8 @@ import java.util.ResourceBundle; enum Messages { // Accessor NON_EXISTENT_FILE, // 1 arg - NO_FILE_SPECIFIED, // 0 args - NO_CLASSPATH_SPECIFIED, // 0 args UNRECOGNIZED_PARAMETER, //1 arg + OPERAND_MISSING, // 1 arg ; private static final ResourceBundle rb = ResourceBundle.getBundle(Messages.class.getPackage().getName() +".MessageBundle"); diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Options.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Options.java index a63f4f9b7bd..fbeb61d75d7 100644 --- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Options.java +++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Options.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.tools.internal.jxc.apt; import java.io.File; @@ -44,6 +43,8 @@ public class Options { public File targetDir = null; + public File episodeFile = null; + public final List arguments = new ArrayList(); public void parseArguments(String[] args) throws BadCommandLineException { @@ -64,7 +65,7 @@ public class Options { if (args[i].equals("-d")) { if (i == args.length - 1) throw new BadCommandLineException( - (Messages.NO_FILE_SPECIFIED.format())); + (Messages.OPERAND_MISSING.format(args[i]))); targetDir = new File(args[++i]); if( !targetDir.exists() ) throw new BadCommandLineException( @@ -72,10 +73,18 @@ public class Options { return 1; } + if (args[i].equals("-episode")) { + if (i == args.length - 1) + throw new BadCommandLineException( + (Messages.OPERAND_MISSING.format(args[i]))); + episodeFile = new File(args[++i]); + return 1; + } + if (args[i].equals("-cp") || args[i].equals("-classpath")) { if (i == args.length - 1) throw new BadCommandLineException( - (Messages.NO_CLASSPATH_SPECIFIED.format())); + (Messages.OPERAND_MISSING.format(args[i]))); classpath = args[++i]; return 1; diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/SchemaGenerator.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/SchemaGenerator.java index 63f1a508125..bbadce081cc 100644 --- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/SchemaGenerator.java +++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/SchemaGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.tools.internal.jxc.apt; import java.io.File; @@ -67,6 +66,8 @@ public class SchemaGenerator implements AnnotationProcessorFactory { */ private final Map schemaLocations = new HashMap(); + private File episodeFile; + public SchemaGenerator() { } @@ -74,6 +75,10 @@ public class SchemaGenerator implements AnnotationProcessorFactory { schemaLocations.putAll(m); } + public void setEpisodeFile(File episodeFile) { + this.episodeFile = episodeFile; + } + public Collection supportedOptions() { return Collections.emptyList(); } @@ -113,14 +118,20 @@ public class SchemaGenerator implements AnnotationProcessorFactory { // use the default file = new File(suggestedFileName); out = env.getFiler().createBinaryFile(Filer.Location.CLASS_TREE,"",file); + file = file.getAbsoluteFile(); } StreamResult ss = new StreamResult(out); env.getMessager().printNotice("Writing "+file); - ss.setSystemId(file.getPath()); + ss.setSystemId(file.toURL().toExternalForm()); return ss; } }, errorListener); + + if(episodeFile!=null) { + env.getMessager().printNotice("Writing "+episodeFile); + model.generateEpisodeFile(new StreamResult(episodeFile)); + } } catch (IOException e) { errorListener.error(e.getMessage(),e); } diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/package.html b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/package.html index 6042da9a78f..c3bb171c271 100644 --- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/package.html +++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/package.html @@ -1,3 +1,27 @@ + APT related code. diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java index e6e3a929406..86f8fda6b44 100644 --- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java +++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - // AttributesImpl.java - default implementation of Attributes. // Written by David Megginson, sax@megginson.com // NO WARRANTY! This class is in the public domain. @@ -67,6 +66,7 @@ import org.xml.sax.Attributes; * @since SAX 2.0 * @author David Megginson, * sax@megginson.com + * @version 2.0 */ public class AttributesImpl implements Attributes { diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/Classes.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/Classes.java index ad701c23a66..475c8311397 100644 --- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/Classes.java +++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/Classes.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - /* this file is generated by RelaxNGCC */ package com.sun.tools.internal.jxc.gen.config; import org.xml.sax.SAXException; @@ -76,12 +75,6 @@ public class Classes extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 4: - { - $_ngcc_current_state = 3; - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); - } - break; case 12: { if(($__uri == "" && $__local == "classes")) { @@ -93,6 +86,12 @@ public class Classes extends NGCCHandler { } } break; + case 4: + { + $_ngcc_current_state = 3; + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); + } + break; case 2: { if(($__uri == "" && $__local == "excludes")) { @@ -134,6 +133,17 @@ public class Classes extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { + case 3: + { + if(($__uri == "" && $__local == "excludes")) { + $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); + $_ngcc_current_state = 1; + } + else { + unexpectedLeaveElement($__qname); + } + } + break; case 4: { $_ngcc_current_state = 3; @@ -157,11 +167,6 @@ public class Classes extends NGCCHandler { } } break; - case 0: - { - revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname); - } - break; case 8: { if(($__uri == "" && $__local == "includes")) { @@ -173,15 +178,9 @@ public class Classes extends NGCCHandler { } } break; - case 3: + case 0: { - if(($__uri == "" && $__local == "excludes")) { - $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); - $_ngcc_current_state = 1; - } - else { - unexpectedLeaveElement($__qname); - } + revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname); } break; default: @@ -254,6 +253,20 @@ public class Classes extends NGCCHandler { public void text(String $value) throws SAXException { switch($_ngcc_current_state) { + case 9: + { + include_content = $value; + $_ngcc_current_state = 8; + action2(); + } + break; + case 3: + { + exclude_content = $value; + $_ngcc_current_state = 3; + action0(); + } + break; case 4: { exclude_content = $value; @@ -261,7 +274,20 @@ public class Classes extends NGCCHandler { action0(); } break; - case 9: + case 2: + { + $_ngcc_current_state = 1; + $runtime.sendText(super._cookie, $value); + } + break; + case 10: + { + __text = $value; + $_ngcc_current_state = 9; + action3(); + } + break; + case 8: { include_content = $value; $_ngcc_current_state = 8; @@ -275,38 +301,11 @@ public class Classes extends NGCCHandler { action1(); } break; - case 2: - { - $_ngcc_current_state = 1; - $runtime.sendText(super._cookie, $value); - } - break; case 0: { revertToParentFromText(this, super._cookie, $value); } break; - case 8: - { - include_content = $value; - $_ngcc_current_state = 8; - action2(); - } - break; - case 10: - { - __text = $value; - $_ngcc_current_state = 9; - action3(); - } - break; - case 3: - { - exclude_content = $value; - $_ngcc_current_state = 3; - action0(); - } - break; } } diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/Config.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/Config.java index 961df1c35a8..b58719a3969 100644 --- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/Config.java +++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/Config.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - /* this file is generated by RelaxNGCC */ package com.sun.tools.internal.jxc.gen.config; import org.xml.sax.SAXException; @@ -79,7 +78,7 @@ public class Config extends NGCCHandler { case 1: { if(($__uri == "" && $__local == "schema")) { - NGCCHandler h = new Schema(this, super._source, $runtime, 31, baseDir); + NGCCHandler h = new Schema(this, super._source, $runtime, 3, baseDir); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -101,7 +100,7 @@ public class Config extends NGCCHandler { case 2: { if(($__uri == "" && $__local == "schema")) { - NGCCHandler h = new Schema(this, super._source, $runtime, 32, baseDir); + NGCCHandler h = new Schema(this, super._source, $runtime, 4, baseDir); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -124,7 +123,7 @@ public class Config extends NGCCHandler { case 4: { if(($__uri == "" && $__local == "classes")) { - NGCCHandler h = new Classes(this, super._source, $runtime, 34); + NGCCHandler h = new Classes(this, super._source, $runtime, 6); spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); } else { @@ -289,21 +288,21 @@ public class Config extends NGCCHandler { public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException { switch($__cookie__) { - case 31: + case 3: { _schema = ((Schema)$__result__); action0(); $_ngcc_current_state = 1; } break; - case 32: + case 4: { _schema = ((Schema)$__result__); action0(); $_ngcc_current_state = 1; } break; - case 34: + case 6: { classes = ((Classes)$__result__); $_ngcc_current_state = 2; diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCEventReceiver.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCEventReceiver.java index b4ee9898ad1..3c6624a93cc 100644 --- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCEventReceiver.java +++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCEventReceiver.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.tools.internal.jxc.gen.config; import org.xml.sax.Attributes; diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java index ed59a08bb79..6ef8d69e971 100644 --- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java +++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.tools.internal.jxc.gen.config; import org.xml.sax.Attributes; diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java index db72354e9a4..279d5651868 100644 --- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java +++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.tools.internal.jxc.gen.config; import org.xml.sax.Attributes; @@ -31,6 +30,7 @@ import org.xml.sax.SAXException; /** * * + * @version $Id: NGCCHandler.java,v 1.9 2002/09/29 02:55:48 okajima Exp $ * @author Kohsuke Kawaguchi (kk@kohsuke.org) */ public abstract class NGCCHandler implements NGCCEventReceiver { diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java index 180a830b71a..2bd6dc42be5 100644 --- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java +++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.tools.internal.jxc.gen.config; import org.xml.sax.Attributes; diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java index 6d942a358f3..581fef308b1 100644 --- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java +++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.tools.internal.jxc.gen.config; import java.text.MessageFormat; @@ -51,6 +50,7 @@ import org.xml.sax.SAXParseException; * *

  • TODO: provide support for interleaving. * + * @version $Id: NGCCRuntime.java,v 1.16 2003/03/23 02:47:46 okajima Exp $ * @author Kohsuke Kawaguchi (kk@kohsuke.org) */ public class NGCCRuntime implements ContentHandler, NGCCEventSource { diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/Schema.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/Schema.java index 4895421cafe..1a7f41f9ca3 100644 --- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/Schema.java +++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/Schema.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - /* this file is generated by RelaxNGCC */ package com.sun.tools.internal.jxc.gen.config; import org.xml.sax.SAXException; @@ -66,14 +65,14 @@ public class Schema extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 2: + case 6: { - if(($ai = $runtime.getAttributeIndex("","location"))>=0) { + if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 1; + $_ngcc_current_state = 2; $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } @@ -94,14 +93,14 @@ public class Schema extends NGCCHandler { revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs); } break; - case 6: + case 2: { - if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) { + if(($ai = $runtime.getAttributeIndex("","location"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 2; + $_ngcc_current_state = 1; $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } @@ -120,6 +119,23 @@ public class Schema extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { + case 6: + { + if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + else { + $_ngcc_current_state = 2; + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); + } + } + break; + case 0: + { + revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname); + } + break; case 1: { if(($__uri == "" && $__local == "schema")) { @@ -143,23 +159,6 @@ public class Schema extends NGCCHandler { } } break; - case 0: - { - revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname); - } - break; - case 6: - { - if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - else { - $_ngcc_current_state = 2; - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); - } - } - break; default: { unexpectedLeaveElement($__qname); @@ -173,13 +172,13 @@ public class Schema extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 2: + case 6: { - if(($__uri == "" && $__local == "location")) { - $_ngcc_current_state = 4; + if(($__uri == "" && $__local == "namespace")) { + $_ngcc_current_state = 8; } else { - $_ngcc_current_state = 1; + $_ngcc_current_state = 2; $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } } @@ -189,13 +188,13 @@ public class Schema extends NGCCHandler { revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname); } break; - case 6: + case 2: { - if(($__uri == "" && $__local == "namespace")) { - $_ngcc_current_state = 8; + if(($__uri == "" && $__local == "location")) { + $_ngcc_current_state = 4; } else { - $_ngcc_current_state = 2; + $_ngcc_current_state = 1; $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); } } @@ -213,6 +212,17 @@ public class Schema extends NGCCHandler { $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { + case 6: + { + $_ngcc_current_state = 2; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; + case 0: + { + revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname); + } + break; case 7: { if(($__uri == "" && $__local == "namespace")) { @@ -223,12 +233,6 @@ public class Schema extends NGCCHandler { } } break; - case 2: - { - $_ngcc_current_state = 1; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; case 3: { if(($__uri == "" && $__local == "location")) { @@ -239,14 +243,9 @@ public class Schema extends NGCCHandler { } } break; - case 0: + case 2: { - revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname); - } - break; - case 6: - { - $_ngcc_current_state = 2; + $_ngcc_current_state = 1; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; @@ -261,11 +260,27 @@ public class Schema extends NGCCHandler { public void text(String $value) throws SAXException { int $ai; switch($_ngcc_current_state) { - case 4: + case 8: { - loc = $value; - $_ngcc_current_state = 3; - action0(); + namespace = $value; + $_ngcc_current_state = 7; + } + break; + case 6: + { + if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) { + $runtime.consumeAttribute($ai); + $runtime.sendText(super._cookie, $value); + } + else { + $_ngcc_current_state = 2; + $runtime.sendText(super._cookie, $value); + } + } + break; + case 0: + { + revertToParentFromText(this, super._cookie, $value); } break; case 2: @@ -280,27 +295,11 @@ public class Schema extends NGCCHandler { } } break; - case 8: + case 4: { - namespace = $value; - $_ngcc_current_state = 7; - } - break; - case 0: - { - revertToParentFromText(this, super._cookie, $value); - } - break; - case 6: - { - if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) { - $runtime.consumeAttribute($ai); - $runtime.sendText(super._cookie, $value); - } - else { - $_ngcc_current_state = 2; - $runtime.sendText(super._cookie, $value); - } + loc = $value; + $_ngcc_current_state = 3; + action0(); } break; } diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/config.rng b/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/config.rng index 697f3ac9c23..e3c593f25d0 100644 --- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/config.rng +++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/config.rng @@ -1,4 +1,28 @@ + - - diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/model/nav/APTNavigator.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/model/nav/APTNavigator.java index 836f191f7ba..4eb70a1e304 100644 --- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/model/nav/APTNavigator.java +++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/model/nav/APTNavigator.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. */ - package com.sun.tools.internal.jxc.model.nav; import java.util.ArrayList; @@ -281,24 +280,21 @@ public class APTNavigator implements Navigator\n"+ - " -o : Specify the directory to place generated source files\n"+ - " -p : Specify the Java package to put the generated classes into\n"+ - " -c : The input schema is written in the RELAX NG compact syntax\n"+ - " -x : The input schema is written in the RELAX NG XML syntax\n"+ - " -xsd : The input schema is written in the XML SChema\n"+ - " -h : Generate code that allows method invocation chaining\n" - ); - } - - public static int run(TxwOptions opts) { - return new Main(opts).run(); - } - - private int run() { - try { - NodeSet ns = opts.source.build(opts); - ns.write(opts); - opts.codeModel.build(opts.codeWriter); - return 0; - } catch (IOException e) { - opts.errorListener.error(new SAXParseException(e.getMessage(),null,e)); - return 1; - } catch (IllegalSchemaException e) { - opts.errorListener.error(new SAXParseException(e.getMessage(),null,e)); - return 1; - } catch (SAXParseException e) { - opts.errorListener.error(e); - return 1; - } catch (SAXException e) { - opts.errorListener.error(new SAXParseException(e.getMessage(),null,e)); - return 1; - } - } - - - /** - * Gets the version number of TXW. - */ - public static String getVersion() { - try { - Properties p = new Properties(); - p.load(Main.class.getResourceAsStream("version.properties")); - return p.get("version").toString(); - } catch( Throwable _ ) { - return "unknown"; - } - } - -} diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/NameUtil.java b/jaxws/src/share/classes/com/sun/tools/internal/txw2/NameUtil.java deleted file mode 100644 index 99ac2db9ccd..00000000000 --- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/NameUtil.java +++ /dev/null @@ -1,348 +0,0 @@ -/* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. - * 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. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - */ - -package com.sun.tools.internal.txw2; - -import com.sun.codemodel.JJavaName; - -import java.util.ArrayList; - -/** - * @author Kohsuke Kawaguchi - */ -public class NameUtil { - - protected static boolean isPunct(char c) { - return (c == '-' || c == '.' || c == ':' || c == '_' || c == '\u00b7' - || c == '\u0387' || c == '\u06dd' || c == '\u06de'); - } - - protected static boolean isDigit(char c) { - return ((c >= '0' && c <= '9') || Character.isDigit(c)); - } - - protected static boolean isUpper(char c) { - return ((c >= 'A' && c <= 'Z') || Character.isUpperCase(c)); - } - - protected static boolean isLower(char c) { - return ((c >= 'a' && c <= 'z') || Character.isLowerCase(c)); - } - - protected static boolean isLetter(char c) { - return ((c >= 'A' && c <= 'Z') - || (c >= 'a' && c <= 'z') - || Character.isLetter(c)); - } - - /** - * Capitalizes the first character of the specified string, - * and de-capitalize the rest of characters. - */ - public static String capitalize(String s) { - if (!isLower(s.charAt(0))) - return s; - StringBuffer sb = new StringBuffer(s.length()); - sb.append(Character.toUpperCase(s.charAt(0))); - sb.append(s.substring(1).toLowerCase()); - return sb.toString(); - } - - // Precondition: s[start] is not punctuation - protected static int nextBreak(String s, int start) { - int n = s.length(); - for (int i = start; i < n; i++) { - char c0 = s.charAt(i); - if (i < n - 1) { - char c1 = s.charAt(i + 1); - if (isPunct(c1)) return i + 1; - if (isDigit(c0) && !isDigit(c1)) return i + 1; - if (!isDigit(c0) && isDigit(c1)) return i + 1; - if (isLower(c0) && !isLower(c1)) return i + 1; - if (isLetter(c0) && !isLetter(c1)) return i + 1; - if (!isLetter(c0) && isLetter(c1)) return i + 1; - if (i < n - 2) { - char c2 = s.charAt(i + 2); - if (isUpper(c0) && isUpper(c1) && isLower(c2)) - return i + 1; - } - } - } - return -1; - } - - - /** - * Tokenizes a string into words and capitalizes the first - * character of each word. - * - *

    - * This method uses a change in character type as a splitter - * of two words. For example, "abc100ghi" will be splitted into - * {"Abc", "100","Ghi"}. - */ - public static String[] toWordList(String s) { - ArrayList ss = new ArrayList(); - int n = s.length(); - for (int i = 0; i < n;) { - - // Skip punctuation - while (i < n) { - if (!isPunct(s.charAt(i))) - break; - i++; - } - if (i >= n) break; - - // Find next break and collect word - int b = nextBreak(s, i); - String w = (b == -1) ? s.substring(i) : s.substring(i, b); - ss.add(escape(capitalize(w))); - if (b == -1) break; - i = b; - } - -// we can't guarantee a valid Java identifier anyway, -// so there's not much point in rejecting things in this way. -// if (ss.size() == 0) -// throw new IllegalArgumentException("Zero-length identifier"); - return (String[])(ss.toArray(new String[0])); - } - - protected static String toMixedCaseName(String[] ss, boolean startUpper) { - StringBuffer sb = new StringBuffer(); - if(ss.length>0) { - sb.append(startUpper ? ss[0] : ss[0].toLowerCase()); - for (int i = 1; i < ss.length; i++) - sb.append(ss[i]); - } - return sb.toString(); - } - - protected static String toMixedCaseVariableName(String[] ss, - boolean startUpper, - boolean cdrUpper) { - if (cdrUpper) - for (int i = 1; i < ss.length; i++) - ss[i] = capitalize(ss[i]); - StringBuffer sb = new StringBuffer(); - if( ss.length>0 ) { - sb.append(startUpper ? ss[0] : ss[0].toLowerCase()); - for (int i = 1; i < ss.length; i++) - sb.append(ss[i]); - } - return sb.toString(); - } - - - /** - * Formats a string into "THIS_KIND_OF_FORMAT_ABC_DEF". - * - * @return - * Always return a string but there's no guarantee that - * the generated code is a valid Java identifier. - */ - public static String toConstantName(String s) { - return toConstantName(toWordList(s)); - } - - /** - * Formats a string into "THIS_KIND_OF_FORMAT_ABC_DEF". - * - * @return - * Always return a string but there's no guarantee that - * the generated code is a valid Java identifier. - */ - public static String toConstantName(String[] ss) { - StringBuffer sb = new StringBuffer(); - if( ss.length>0 ) { - sb.append(ss[0].toUpperCase()); - for (int i = 1; i < ss.length; i++) { - sb.append('_'); - sb.append(ss[i].toUpperCase()); - } - } - return sb.toString(); - } - - - - /** - * Escapes characters is the given string so that they can be - * printed by only using US-ASCII characters. - * - * The escaped characters will be appended to the given - * StringBuffer. - * - * @param sb - * StringBuffer that receives escaped string. - * @param s - * String to be escaped. s.substring(start) - * will be escaped and copied to the string buffer. - */ - public static void escape(StringBuffer sb, String s, int start) { - int n = s.length(); - for (int i = start; i < n; i++) { - char c = s.charAt(i); - if (Character.isJavaIdentifierPart(c)) - sb.append(c); - else { - sb.append("_"); - if (c <= '\u000f') sb.append("000"); - else if (c <= '\u00ff') sb.append("00"); - else if (c <= '\u0fff') sb.append("0"); - sb.append(Integer.toString(c, 16)); - } - } - } - - /** - * Escapes characters that are unusable as Java identifiers - * by replacing unsafe characters with safe characters. - */ - private static String escape(String s) { - int n = s.length(); - for (int i = 0; i < n; i++) - if (!Character.isJavaIdentifierPart(s.charAt(i))) { - StringBuffer sb = new StringBuffer(s.substring(0, i)); - escape(sb, s, i); - return sb.toString(); - } - return s; - } - - /** - * Escape any characters that would cause the single arg constructor - * of java.net.URI to complain about illegal chars. - * - * @param s source string to be escaped - */ - public static String escapeURI(String s) { - StringBuffer sb = new StringBuffer(); - for( int i = 0; i < s.length(); i++ ) { - char c = s.charAt(i); - if(Character.isSpaceChar(c)) { - sb.append("%20"); - } else { - sb.append(c); - } - } - return sb.toString(); - } - - /** - * Calculate the parent URI path of the given URI path. - * - * @param uriPath the uriPath (as returned by java.net.URI#getPath() - * @return the parent URI path of the given URI path - */ - public static String getParentUriPath(String uriPath) { - int idx = uriPath.lastIndexOf('/'); - - if (uriPath.endsWith("/")) { - uriPath = uriPath.substring(0,idx); // trim trailing slash - idx = uriPath.lastIndexOf('/'); // move idx to parent context - } - - return uriPath.substring(0, idx)+"/"; - } - - /** - * Calculate the normalized form of the given uriPath. - * - * For example: - * /a/b/c/ -> /a/b/c/ - * /a/b/c -> /a/b/ - * /a/ -> /a/ - * /a -> / - * - * @param uriPath path of a URI (as returned by java.net.URI#getPath() - * @return the normalized uri path - */ - public static String normalizeUriPath(String uriPath) { - if (uriPath.endsWith("/")) - return uriPath; - - // the uri path should always have at least a leading slash, - // so no need to make sure that ( idx == -1 ) - int idx = uriPath.lastIndexOf('/'); - return uriPath.substring(0, idx+1); - } - - /** - * determine if two Strings are equal ignoring case allowing null values - * - * @param s string 1 - * @param t string 2 - * @return true iff the given strings are equal ignoring case, false if they aren't - * equal or either of them are null. - */ - public static boolean equalsIgnoreCase(String s, String t) { - if (s == t) return true; - if ((s != null) && (t != null)) { - return s.equalsIgnoreCase(t); - } - return false; - } - - /** - * determine if two Strings are iqual allowing null values - * - * @param s string 1 - * @param t string 2 - * @return true iff the strings are equal, false if they aren't equal or either of - * them are null. - */ - public static boolean equal(String s, String t) { - if (s == t) return true; - if ((s != null) && (t != null)) { - return s.equals(t); - } - return false; - } - - public static String toClassName(String s) { - return toMixedCaseName(toWordList(s), true); - } - public static String toVariableName(String s) { - return toMixedCaseName(toWordList(s), false); - } - public static String toMethodName(String s) { - String m = toMixedCaseName(toWordList(s), false); - if(JJavaName.isJavaIdentifier(m)) - return m; - else - return '_'+m; - } - public static String toInterfaceName( String token ) { - return toClassName(token); - } - public static String toPropertyName(String s) { - return toClassName(s); - } - public static String toPackageName( String s ) { - return toMixedCaseName(toWordList(s), false ); - } -} diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/RELAXNGLoader.java b/jaxws/src/share/classes/com/sun/tools/internal/txw2/RELAXNGLoader.java deleted file mode 100644 index 854bfb25133..00000000000 --- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/RELAXNGLoader.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. - * 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. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - */ - -package com.sun.tools.internal.txw2; - -import org.kohsuke.rngom.parse.Parseable; -import org.kohsuke.rngom.parse.IllegalSchemaException; -import org.kohsuke.rngom.ast.util.CheckingSchemaBuilder; -import org.kohsuke.rngom.dt.CascadingDatatypeLibraryFactory; -import org.kohsuke.rngom.dt.builtin.BuiltinDatatypeLibraryFactory; -import org.relaxng.datatype.helpers.DatatypeLibraryLoader; -import com.sun.tools.internal.txw2.model.NodeSet; -import com.sun.tools.internal.txw2.model.Leaf; -import com.sun.tools.internal.txw2.builder.relaxng.SchemaBuilderImpl; - -/** - * @author Kohsuke Kawaguchi - */ -class RELAXNGLoader implements SchemaBuilder { - private final Parseable parseable; - - public RELAXNGLoader(Parseable parseable) { - this.parseable = parseable; - } - - public NodeSet build(TxwOptions options) throws IllegalSchemaException { - SchemaBuilderImpl stage1 = new SchemaBuilderImpl(options.codeModel); - Leaf pattern = (Leaf)parseable.parse(new CheckingSchemaBuilder(stage1,options.errorListener, - new CascadingDatatypeLibraryFactory( - new BuiltinDatatypeLibraryFactory(new DatatypeLibraryLoader()), - new DatatypeLibraryLoader()))); - - return new NodeSet(options,pattern); - } -} diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/TxwTask.java b/jaxws/src/share/classes/com/sun/tools/internal/txw2/TxwTask.java deleted file mode 100644 index e8f8d5ab5d5..00000000000 --- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/TxwTask.java +++ /dev/null @@ -1,163 +0,0 @@ -/* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. - * 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. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - */ - -package com.sun.tools.internal.txw2; - -import com.sun.codemodel.writer.FileCodeWriter; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; -import org.kohsuke.rngom.parse.compact.CompactParseable; -import org.kohsuke.rngom.parse.xml.SAXParseable; -import org.xml.sax.InputSource; - -import java.io.File; -import java.io.IOException; -import java.net.MalformedURLException; - -/** - * Ant task interface for txw compiler. - * - * @author ryan_shoemaker@dev.java.net - */ -public class TxwTask extends org.apache.tools.ant.Task { - - // txw options - reuse command line options from the main driver - private final TxwOptions options = new TxwOptions(); - - // schema file - private File schemaFile; - - // syntax style of RELAX NG source schema - "xml" or "compact" - private static enum Style { - COMPACT, XML, XMLSCHEMA, AUTO_DETECT - } - private Style style = Style.AUTO_DETECT; - - public TxwTask() { - // default package - options._package = options.codeModel.rootPackage(); - - // default codewriter - try { - options.codeWriter = new FileCodeWriter(new File(".")); - } catch (IOException e) { - throw new BuildException(e); - } - } - - /** - * Parse @package - * - * @param pkg name of the package to generate the java classes into - */ - public void setPackage( String pkg ) { - options._package = options.codeModel._package( pkg ); - } - - /** - * Parse @syntax - * - * @param style either "compact" for RELAX NG compact syntax or "XML" - * for RELAX NG xml syntax - */ - public void setSyntax( String style ) { - this.style = Style.valueOf(style.toUpperCase()); - } - - /** - * parse @schema - * - * @param schema the schema file to be processed by txw - */ - public void setSchema( File schema ) { - schemaFile = schema; - } - - /** - * parse @destdir - * - * @param dir the directory to produce generated source code in - */ - public void setDestdir( File dir ) { - try { - options.codeWriter = new FileCodeWriter(dir); - } catch (IOException e) { - throw new BuildException(e); - } - } - - /** - * parse @methodChaining - * - * @param flg true if the txw should generate api's that allow - * method chaining (when possible, false otherwise - */ - public void setMethodChaining( boolean flg ) { - options.chainMethod = flg; - } - - /** - * launch txw - */ - public void execute() throws BuildException { - options.errorListener = new AntErrorListener(getProject()); - - try { - InputSource in = new InputSource(schemaFile.toURL().toExternalForm()); - - String msg = "Compiling: " + in.getSystemId(); - log( msg, Project.MSG_INFO ); - - if(style==Style.AUTO_DETECT) { - String fileName = schemaFile.getPath().toLowerCase(); - if(fileName.endsWith("rnc")) - style = Style.COMPACT; - else - if(fileName.endsWith("xsd")) - style = Style.XMLSCHEMA; - else - style = Style.XML; - } - - switch(style) { - case COMPACT: - options.source = new RELAXNGLoader(new CompactParseable(in,options.errorListener)); - break; - case XML: - options.source = new RELAXNGLoader(new SAXParseable(in,options.errorListener)); - break; - case XMLSCHEMA: - options.source = new XmlSchemaLoader(in); - break; - } - } catch (MalformedURLException e) { - throw new BuildException(e); - } - - // kick off the compiler - Main.run(options); - log( "Compilation complete.", Project.MSG_INFO ); - } -} diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/DataPatternBuilderImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/DataPatternBuilderImpl.java deleted file mode 100644 index 0c219e6ce2c..00000000000 --- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/DataPatternBuilderImpl.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. - * 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. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - */ - -package com.sun.tools.internal.txw2.builder.relaxng; - -import com.sun.codemodel.JType; -import com.sun.tools.internal.txw2.model.Data; -import com.sun.tools.internal.txw2.model.Leaf; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.DataPatternBuilder; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; -import org.kohsuke.rngom.ast.util.LocatorImpl; -import org.kohsuke.rngom.parse.Context; - -/** - * @author Kohsuke Kawaguchi - */ -final class DataPatternBuilderImpl implements DataPatternBuilder { - final JType type; - - public DataPatternBuilderImpl(JType type) { - this.type = type; - } - - public Leaf makePattern(LocatorImpl locator, AnnotationsImpl annotations) throws BuildException { - return new Data(locator,type); - } - - public void addParam(String name, String value, Context context, String ns, LocatorImpl locator, AnnotationsImpl annotations) throws BuildException { - } - - public void annotation(ParsedElementAnnotation parsedElementAnnotation) { - } - - public Leaf makePattern(Leaf except, LocatorImpl locator, AnnotationsImpl annotations) throws BuildException { - return makePattern(locator,annotations); - } -} diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/DatatypeFactory.java b/jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/DatatypeFactory.java deleted file mode 100644 index 37dd621dad8..00000000000 --- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/DatatypeFactory.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. - * 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. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - */ - -package com.sun.tools.internal.txw2.builder.relaxng; - -import com.sun.tools.internal.txw2.model.Data; -import com.sun.codemodel.JType; -import com.sun.codemodel.JCodeModel; - -import javax.xml.namespace.QName; - -/** - * Builds {@link Data} from a XML Schema datatype. - * @author Kohsuke Kawaguchi - */ -public class DatatypeFactory { - private final JCodeModel codeModel; - - public DatatypeFactory(JCodeModel codeModel) { - this.codeModel = codeModel; - } - - /** - * Decides the Java datatype from XML datatype. - * - * @return null - * if none is found. - */ - public JType getType(String datatypeLibrary, String type) { - if(datatypeLibrary.equals("http://www.w3.org/2001/XMLSchema-datatypes") - || datatypeLibrary.equals("http://www.w3.org/2001/XMLSchema")) { - type = type.intern(); - - if(type=="boolean") - return codeModel.BOOLEAN; - if(type=="int" || type=="nonNegativeInteger" || type=="positiveInteger") - return codeModel.INT; - if(type=="QName") - return codeModel.ref(QName.class); - if(type=="float") - return codeModel.FLOAT; - if(type=="double") - return codeModel.DOUBLE; - if(type=="anySimpleType" || type=="anyType") - return codeModel.ref(String.class); - } - - return null; - } -} diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/GrammarImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/GrammarImpl.java deleted file mode 100644 index cc49844f001..00000000000 --- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/GrammarImpl.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. - * 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. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - */ - -package com.sun.tools.internal.txw2.builder.relaxng; - -import com.sun.tools.internal.txw2.model.Leaf; -import com.sun.tools.internal.txw2.model.Ref; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.Grammar; -import org.kohsuke.rngom.ast.builder.Scope; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; -import org.kohsuke.rngom.ast.util.LocatorImpl; - -/** - * @author Kohsuke Kawaguchi - */ -class GrammarImpl extends GrammarSectionImpl - implements Grammar { - - GrammarImpl(Scope scope) { - super(scope,new com.sun.tools.internal.txw2.model.Grammar()); - } - - public Leaf endGrammar(LocatorImpl locator, AnnotationsImpl annotations) throws BuildException { - return new Ref(locator,grammar,com.sun.tools.internal.txw2.model.Grammar.START); - } - - public Leaf makeParentRef(String name, LocatorImpl locator, AnnotationsImpl annotations) throws BuildException { - return parent.makeRef(name,locator,annotations); - } - - public Leaf makeRef(String name, LocatorImpl locator, AnnotationsImpl annotations) throws BuildException { - return new Ref(locator,grammar,name); - } -} diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/GrammarSectionImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/GrammarSectionImpl.java deleted file mode 100644 index 635074998d6..00000000000 --- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/GrammarSectionImpl.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. - * 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. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - */ - -package com.sun.tools.internal.txw2.builder.relaxng; - -import com.sun.tools.internal.txw2.model.Define; -import com.sun.tools.internal.txw2.model.Grammar; -import com.sun.tools.internal.txw2.model.Leaf; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.Div; -import org.kohsuke.rngom.ast.builder.GrammarSection; -import org.kohsuke.rngom.ast.builder.Include; -import org.kohsuke.rngom.ast.builder.Scope; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; -import org.kohsuke.rngom.ast.util.LocatorImpl; - -/** - * @author Kohsuke Kawaguchi - */ -abstract class GrammarSectionImpl implements GrammarSection { - - protected final Scope parent; - - protected final Grammar grammar; - - GrammarSectionImpl( - Scope scope, - Grammar grammar ) { - this.parent = scope; - this.grammar = grammar; - } - - public void topLevelAnnotation(ParsedElementAnnotation parsedElementAnnotation) throws BuildException { - } - - public void topLevelComment(CommentListImpl commentList) throws BuildException { - } - - public Div makeDiv() { - return new DivImpl(parent,grammar); - } - - public Include makeInclude() { - // TODO - throw new UnsupportedOperationException(); - } - - public void define(String name, Combine combine, Leaf leaf, LocatorImpl locator, AnnotationsImpl annotations) throws BuildException { - Define def = grammar.get(name); - def.location = locator; - - if(combine==null || def.leaf==null) { - def.leaf = leaf; - } else { - def.leaf.merge(leaf); - } - } -} diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/SchemaBuilderImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/SchemaBuilderImpl.java deleted file mode 100644 index 921676d8765..00000000000 --- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/SchemaBuilderImpl.java +++ /dev/null @@ -1,213 +0,0 @@ -/* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. - * 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. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - */ - -package com.sun.tools.internal.txw2.builder.relaxng; - -import com.sun.codemodel.JClass; -import com.sun.codemodel.JCodeModel; -import com.sun.codemodel.JType; -import com.sun.tools.internal.txw2.model.Attribute; -import com.sun.tools.internal.txw2.model.Data; -import com.sun.tools.internal.txw2.model.Element; -import com.sun.tools.internal.txw2.model.Empty; -import com.sun.tools.internal.txw2.model.Leaf; -import com.sun.tools.internal.txw2.model.List; -import com.sun.tools.internal.txw2.model.Value; -import org.kohsuke.rngom.ast.builder.BuildException; -import org.kohsuke.rngom.ast.builder.DataPatternBuilder; -import org.kohsuke.rngom.ast.builder.ElementAnnotationBuilder; -import org.kohsuke.rngom.ast.builder.Grammar; -import org.kohsuke.rngom.ast.builder.NameClassBuilder; -import org.kohsuke.rngom.ast.builder.SchemaBuilder; -import org.kohsuke.rngom.ast.builder.Scope; -import org.kohsuke.rngom.ast.om.ParsedElementAnnotation; -import org.kohsuke.rngom.ast.util.LocatorImpl; -import org.kohsuke.rngom.nc.NameClass; -import org.kohsuke.rngom.nc.NameClassBuilderImpl; -import org.kohsuke.rngom.parse.Context; -import org.kohsuke.rngom.parse.IllegalSchemaException; -import org.kohsuke.rngom.parse.Parseable; - -import javax.xml.namespace.QName; - -/** - * Builds a model from a RELAX NG grammar. - * - * @author Kohsuke Kawaguchi - */ -public final class SchemaBuilderImpl implements SchemaBuilder { - private final NameClassBuilderImpl ncb = new NameClassBuilderImpl(); - private final JClass string; - private final DatatypeFactory dtf; - - public SchemaBuilderImpl(JCodeModel codeModel) { - string = codeModel.ref(String.class); - dtf = new DatatypeFactory(codeModel); - } - - - public Leaf expandPattern(Leaf leaf) throws BuildException { - return leaf; - } - - - - public NameClassBuilder getNameClassBuilder() throws BuildException { - return ncb; - } - - private Leaf merge(java.util.List leaves) { - for( int i=1; i leaves, LocatorImpl locator, AnnotationsImpl annotations) throws BuildException { - return merge(leaves); - } - - public Leaf makeInterleave(java.util.List leaves, LocatorImpl locator, AnnotationsImpl annotations) throws BuildException { - return merge(leaves); - } - - public Leaf makeGroup(java.util.List leaves, LocatorImpl locator, AnnotationsImpl annotations) throws BuildException { - return merge(leaves); - } - - public Leaf makeOneOrMore(Leaf leaf, LocatorImpl locator, AnnotationsImpl annotations) throws BuildException { - return leaf; - } - - public Leaf makeZeroOrMore(Leaf leaf, LocatorImpl locator, AnnotationsImpl annotations) throws BuildException { - return leaf.merge(new Empty(locator)); - } - - public Leaf makeOptional(Leaf leaf, LocatorImpl locator, AnnotationsImpl annotations) throws BuildException { - return leaf.merge(new Empty(locator)); - } - - public Leaf makeList(Leaf leaf, LocatorImpl locator, AnnotationsImpl annotations) throws BuildException { - return new List(locator,leaf); - } - - public Leaf makeMixed(Leaf leaf, LocatorImpl locator, AnnotationsImpl annotations) throws BuildException { - return leaf.merge(new Data(locator,string)); - } - - public Leaf makeEmpty(LocatorImpl locator, AnnotationsImpl annotations) { - return new Empty(locator); - } - - public Leaf makeNotAllowed(LocatorImpl locator, AnnotationsImpl annotations) { - // technically this is incorrect, but we won't be - // able to handle correctly anyway. - return new Empty(locator); - } - - public Leaf makeText(LocatorImpl locator, AnnotationsImpl annotations) { - return new Data(locator,string); - } - - public Leaf makeAttribute(NameClass nameClass, Leaf leaf, LocatorImpl locator, AnnotationsImpl annotations) throws BuildException { - Leaf r = null; - for( QName n : nameClass.listNames() ) { - Leaf l = new Attribute(locator,n,leaf); - if(r!=null) r = r.merge(l); - else r = l; - } - if(r==null) return new Empty(locator); - return r; - } - - public Leaf makeElement(NameClass nameClass, Leaf leaf, LocatorImpl locator, AnnotationsImpl annotations) throws BuildException { - Leaf r = null; - for( QName n : nameClass.listNames() ) { - Leaf l = new Element(locator,n,leaf); - if(r!=null) r = r.merge(l); - else r = l; - } - if(r==null) return new Empty(locator); - return r; - } - - public DataPatternBuilder makeDataPatternBuilder(String datatypeLibrary, String type, LocatorImpl locator) throws BuildException { - return new DataPatternBuilderImpl(getType(datatypeLibrary, type)); - } - - private JType getType(String datatypeLibrary, String type) { - JType t = dtf.getType(datatypeLibrary,type); - if(t==null) t = string; - return t; - } - - public Leaf makeValue(String datatypeLibrary, String type, String value, Context c, String ns, LocatorImpl locator, AnnotationsImpl annotations) throws BuildException { - return new Value(locator,getType(datatypeLibrary, type),value); - } - - public Grammar makeGrammar(Scope scope) { - return new GrammarImpl(scope); - } - - public Leaf annotate(Leaf leaf, AnnotationsImpl annotations) throws BuildException { - return leaf; - } - - public Leaf annotateAfter(Leaf leaf, ParsedElementAnnotation parsedElementAnnotation) throws BuildException { - return leaf; - } - - public Leaf makeErrorPattern() { - return new Empty(null); - } - - public boolean usesComments() { - return false; - } - - public Leaf makeExternalRef(Parseable current, String uri, String ns, Scope scope, LocatorImpl locator, AnnotationsImpl annotations) throws BuildException, IllegalSchemaException { - // I'm not too sure if this is correct - return current.parseExternal(uri, this, scope, ns ); - } - - public LocatorImpl makeLocation(String systemId, int lineNumber, int columnNumber) { - return new LocatorImpl(systemId,lineNumber,columnNumber); - } - - public AnnotationsImpl makeAnnotations(CommentListImpl commentList, Context context) { - return new AnnotationsImpl(); - } - - public ElementAnnotationBuilder makeElementAnnotationBuilder(String ns, String localName, String prefix, LocatorImpl locator, CommentListImpl commentList, Context context) { - return new ElementAnnotationBuilderImpl(); - } - - public CommentListImpl makeCommentList() { - return null; - } - - public Leaf commentAfter(Leaf leaf, CommentListImpl commentList) throws BuildException { - return leaf; - } -} diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/package.html b/jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/package.html deleted file mode 100644 index 587ef120494..00000000000 --- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/package.html +++ /dev/null @@ -1,3 +0,0 @@ - - Reads RELAX NG grammar from RNGOM and builds the model for TXW. - diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/xsd/XmlSchemaBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/xsd/XmlSchemaBuilder.java deleted file mode 100644 index 804a2154757..00000000000 --- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/xsd/XmlSchemaBuilder.java +++ /dev/null @@ -1,282 +0,0 @@ -/* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. - * 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. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - */ - -package com.sun.tools.internal.txw2.builder.xsd; - -import com.sun.codemodel.JType; -import com.sun.tools.internal.txw2.TxwOptions; -import com.sun.tools.internal.txw2.builder.relaxng.DatatypeFactory; -import com.sun.tools.internal.txw2.model.Attribute; -import com.sun.tools.internal.txw2.model.Data; -import com.sun.tools.internal.txw2.model.Define; -import com.sun.tools.internal.txw2.model.Empty; -import com.sun.tools.internal.txw2.model.Grammar; -import com.sun.tools.internal.txw2.model.Leaf; -import com.sun.tools.internal.txw2.model.List; -import com.sun.tools.internal.txw2.model.NodeSet; -import com.sun.tools.internal.txw2.model.Element; -import com.sun.tools.internal.txw2.model.Ref; -import com.sun.xml.xsom.XSAnnotation; -import com.sun.xml.xsom.XSAttributeDecl; -import com.sun.xml.xsom.XSAttributeUse; -import com.sun.xml.xsom.XSComplexType; -import com.sun.xml.xsom.XSContentType; -import com.sun.xml.xsom.XSDeclaration; -import com.sun.xml.xsom.XSFacet; -import com.sun.xml.xsom.XSIdentityConstraint; -import com.sun.xml.xsom.XSListSimpleType; -import com.sun.xml.xsom.XSNotation; -import com.sun.xml.xsom.XSParticle; -import com.sun.xml.xsom.XSRestrictionSimpleType; -import com.sun.xml.xsom.XSSchema; -import com.sun.xml.xsom.XSSchemaSet; -import com.sun.xml.xsom.XSSimpleType; -import com.sun.xml.xsom.XSUnionSimpleType; -import com.sun.xml.xsom.XSXPath; -import com.sun.xml.xsom.XSWildcard; -import com.sun.xml.xsom.XSModelGroupDecl; -import com.sun.xml.xsom.XSModelGroup; -import com.sun.xml.xsom.XSElementDecl; -import com.sun.xml.xsom.XSType; -import com.sun.xml.xsom.XSAttContainer; -import com.sun.xml.xsom.XSAttGroupDecl; -import com.sun.xml.xsom.visitor.XSFunction; -import com.sun.xml.xsom.visitor.XSSimpleTypeFunction; - -import javax.xml.namespace.QName; -import java.util.Map; -import java.util.HashMap; - -/** - * @author Kohsuke Kawaguchi - */ -public final class XmlSchemaBuilder implements XSFunction, XSSimpleTypeFunction { - public static NodeSet build( XSSchemaSet xs, TxwOptions opts ) { - XmlSchemaBuilder builder = new XmlSchemaBuilder(xs,opts); - builder.build(xs); - return builder.nodeSet; - } - - private void build(XSSchemaSet xs) { - // make sure that we bind all complex types - for( XSSchema s : xs.getSchemas() ) { - for( XSComplexType t : s.getComplexTypes().values() ) { - t.apply(this); - } - } - - nodeSet.addAll(complexTypes.values()); - nodeSet.addAll(modelGroups.values()); - nodeSet.addAll(attGroups.values()); - } - - public Leaf simpleType(XSSimpleType simpleType) { - return simpleType.apply((XSSimpleTypeFunction)this); - } - - public Leaf particle(XSParticle particle) { - return particle.getTerm().apply(this); - } - - public Leaf empty(XSContentType empty) { - return new Empty(empty.getLocator()); - } - - public Attribute attributeDecl(XSAttributeDecl decl) { - return new Attribute(decl.getLocator(), - getQName(decl), - simpleType(decl.getType())); - } - - public Attribute attributeUse(XSAttributeUse use) { - return attributeDecl(use.getDecl()); - } - - public Leaf wildcard(XSWildcard wc) { - // wildcard can be always written through the well-formedness method. - // no need to generate anything for this. - return new Empty(wc.getLocator()); - } - - public Leaf modelGroupDecl(XSModelGroupDecl mg) { - Define def = modelGroups.get(mg); - if(def==null) { - def = grammar.get(mg.getName()); // TODO: name collision detection and avoidance - modelGroups.put(mg,def); - - def.addChild(mg.getModelGroup().apply(this)); - } - return new Ref(mg.getLocator(),def); - } - - public Leaf modelGroup(XSModelGroup mg) { - XSParticle[] children = mg.getChildren(); - if(children.length==0) return new Empty(mg.getLocator()); - - Leaf l = particle(children[0]); - for( int i=1; i modelGroups = new HashMap(); - - /** - * We map complex types to interfaces. - */ - private final Map complexTypes = new HashMap(); - - /** - * ... and attribute groups - */ - private final Map attGroups = new HashMap(); - - private final Grammar grammar = new Grammar(); - - private XmlSchemaBuilder(XSSchemaSet xs,TxwOptions opts) { - this.schemaSet = xs; - grammar.addChild(new Empty(null)); - this.nodeSet = new NodeSet(opts,grammar); - this.dtf = new DatatypeFactory(opts.codeModel); - } - - - -// won't be used - public Leaf annotation(XSAnnotation xsAnnotation) { - throw new IllegalStateException(); - } - - public Leaf schema(XSSchema xsSchema) { - throw new IllegalStateException(); - } - - public Leaf facet(XSFacet xsFacet) { - throw new IllegalStateException(); - } - - public Leaf notation(XSNotation xsNotation) { - throw new IllegalStateException(); - } - - public Leaf identityConstraint(XSIdentityConstraint xsIdentityConstraint) { - throw new IllegalStateException(); - } - - public Leaf xpath(XSXPath xsxPath) { - throw new IllegalStateException(); - } -} diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/xsd/package.html b/jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/xsd/package.html deleted file mode 100644 index 1b90dc339cf..00000000000 --- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/xsd/package.html +++ /dev/null @@ -1,3 +0,0 @@ - - Reads XML Schema grammar from XSOM and builds the model for TXW. - diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/Attribute.java b/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/Attribute.java deleted file mode 100644 index 8b901d1f10b..00000000000 --- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/Attribute.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. - * 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. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - */ - -package com.sun.tools.internal.txw2.model; - -import com.sun.codemodel.JAnnotationUse; -import com.sun.codemodel.JDefinedClass; -import com.sun.codemodel.JMethod; -import com.sun.codemodel.JMod; -import com.sun.codemodel.JType; -import com.sun.tools.internal.txw2.NameUtil; -import com.sun.tools.internal.txw2.model.prop.AttributeProp; -import com.sun.tools.internal.txw2.model.prop.Prop; -import com.sun.xml.internal.txw2.annotation.XmlAttribute; -import org.xml.sax.Locator; - -import javax.xml.namespace.QName; -import java.util.HashSet; -import java.util.Set; - -/** - * Attribute declaration. - * - * @author Kohsuke Kawaguchi - */ -public class Attribute extends XmlNode { - public Attribute(Locator location, QName name, Leaf leaf) { - super(location, name, leaf); - } - - void declare(NodeSet nset) { - ; // attributes won't produce a class - } - - void generate(NodeSet nset) { - ; // nothing - } - - void generate(JDefinedClass clazz, NodeSet nset, Set props) { - Set types = new HashSet(); - - for( Leaf l : collectChildren() ) { - if (l instanceof Text) { - types.add(((Text)l).getDatatype(nset)); - } - } - - String methodName = NameUtil.toMethodName(name.getLocalPart()); - - for( JType t : types ) { - if(!props.add(new AttributeProp(name,t))) - continue; - - JMethod m = clazz.method(JMod.PUBLIC, - nset.opts.chainMethod? (JType)clazz : nset.codeModel.VOID, - methodName); - m.param(t,"value"); - - JAnnotationUse a = m.annotate(XmlAttribute.class); - if(!methodName.equals(name.getLocalPart())) - a.param("value",name.getLocalPart()); - if(!name.getNamespaceURI().equals("")) - a.param("ns",name.getNamespaceURI()); - - } - } - - public String toString() { - return "Attribute "+name; - } -} diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/Define.java b/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/Define.java deleted file mode 100644 index c25127fb126..00000000000 --- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/Define.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. - * 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. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - */ - -package com.sun.tools.internal.txw2.model; - -import com.sun.codemodel.JDefinedClass; -import com.sun.tools.internal.txw2.model.prop.Prop; -import com.sun.xml.internal.txw2.TypedXmlWriter; - -import java.util.HashSet; -import java.util.Set; - - -/** - * A named pattern. - * - * @author Kohsuke Kawaguchi - */ -public class Define extends WriterNode { - public final Grammar scope; - public final String name; - - JDefinedClass clazz; - - public Define(Grammar scope, String name) { - super(null,null); - if(scope==null) scope = (Grammar)this; // hack for start pattern - this.scope = scope; - this.name = name; - assert name!=null; - } - - /** - * Returns true if this define only contains - * one child (and thus considered inlinable.) - * - * A pattern definition is also inlineable if - * it's the start of the grammar (because "start" isn't a meaningful name) - */ - public boolean isInline() { - return hasOneChild() || name==Grammar.START; - } - - void declare(NodeSet nset) { - if(isInline()) return; - - clazz = nset.createClass(name); - clazz._implements(TypedXmlWriter.class); - } - - void generate(NodeSet nset) { - if(clazz==null) return; - - HashSet props = new HashSet(); - for( Leaf l : this ) - l.generate(clazz,nset,props); - } - - void generate(JDefinedClass clazz, NodeSet nset, Set props) { - if(isInline()) { - for( Leaf l : this ) - l.generate(clazz,nset, props); - } else { - assert this.clazz!=null; - clazz._implements(this.clazz); - } - } - - void prepare(NodeSet nset) { - if(isInline() && leaf instanceof WriterNode && !name.equals(Grammar.START)) - ((WriterNode)leaf).alternativeName = name; - } - - public String toString() { - return "Define "+name; - } -} diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/Element.java b/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/Element.java deleted file mode 100644 index 8dad70f6c3b..00000000000 --- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/Element.java +++ /dev/null @@ -1,201 +0,0 @@ -/* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. - * 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. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - */ - -package com.sun.tools.internal.txw2.model; - -import com.sun.codemodel.JAnnotationUse; -import com.sun.codemodel.JDefinedClass; -import com.sun.codemodel.JMethod; -import com.sun.codemodel.JMod; -import com.sun.codemodel.JType; -import com.sun.tools.internal.txw2.NameUtil; -import com.sun.tools.internal.txw2.model.prop.ElementProp; -import com.sun.tools.internal.txw2.model.prop.LeafElementProp; -import com.sun.tools.internal.txw2.model.prop.Prop; -import com.sun.xml.internal.txw2.TypedXmlWriter; -import com.sun.xml.internal.txw2.annotation.XmlElement; -import org.xml.sax.Locator; - -import javax.xml.namespace.QName; -import java.util.HashSet; -import java.util.Set; - -/** - * Element declaration. - * - * @author Kohsuke Kawaguchi - */ -public class Element extends XmlNode { - /** - * True if this element can be a root element. - */ - public boolean isRoot; - - private Strategy strategy; - - public Element(Locator location, QName name, Leaf leaf) { - super(location, name, leaf); - } - - /** - * Returns true if this element should generate an interface. - */ - private Strategy decideStrategy() { - if(isRoot) - return new ToInterface(); - - if(hasOneChild() && leaf instanceof Ref && !((Ref)leaf).isInline()) - return new HasOneRef((Ref)leaf); - - Set children = collectChildren(); - for( Leaf l : children ) { - if( l instanceof XmlNode ) - // if it has attributes/elements in children - // generate an interface - return new ToInterface(); - } - - // otherwise this element only has data, so just generate methods for them. - return new DataOnly(); - } - - void declare(NodeSet nset) { - strategy = decideStrategy(); - strategy.declare(nset); - } - - void generate(NodeSet nset) { - strategy.generate(nset); - } - - void generate(JDefinedClass clazz, NodeSet nset, Set props) { - strategy.generate(clazz,nset,props); - } - - - private JMethod generateMethod(JDefinedClass clazz, NodeSet nset, JType retT) { - String methodName = NameUtil.toMethodName(name.getLocalPart()); - - JMethod m = clazz.method(JMod.PUBLIC, retT, methodName); - - JAnnotationUse a = m.annotate(XmlElement.class); - if(!methodName.equals(name.getLocalPart())) - a.param("value",name.getLocalPart()); - if(nset.defaultNamespace==null || !nset.defaultNamespace.equals(name.getNamespaceURI())) - a.param("ns",name.getNamespaceURI()); - - return m; - } - - public String toString() { - return "Element "+name; - } - - - interface Strategy { - void declare(NodeSet nset); - void generate(NodeSet nset); - void generate(JDefinedClass clazz, NodeSet nset, Set props); - } - - /** - * Maps to an interface - */ - private class ToInterface implements Strategy { - private JDefinedClass clazz; - - public void declare(NodeSet nset) { - String cname; - if(alternativeName!=null) - cname = alternativeName; - else - cname = name.getLocalPart(); - clazz = nset.createClass(cname); - clazz._implements(TypedXmlWriter.class); - - clazz.annotate(XmlElement.class) - .param("value",name.getLocalPart()); - // TODO: namespace - } - - public void generate(NodeSet nset) { - HashSet props = new HashSet(); - for( Leaf l : Element.this ) - l.generate(clazz,nset, props); - } - - public void generate(JDefinedClass outer, NodeSet nset, Set props) { - if(props.add(new ElementProp(name,clazz))) - generateMethod(outer, nset, clazz); - } - } - - /** - * For things like "element foo {refToAnotherPattern}" - */ - private class HasOneRef implements Strategy { - private final Ref ref; - - public HasOneRef(Ref ref) { - this.ref = ref; - } - - public void declare(NodeSet nset) { - } - public void generate(NodeSet nset) { - } - - public void generate(JDefinedClass clazz, NodeSet nset, Set props) { - if(props.add(new ElementProp(name,ref.def.clazz))) - generateMethod(clazz, nset, ref.def.clazz); - } - } - - private class DataOnly implements Strategy { - public void declare(NodeSet nset) { - } - public void generate(NodeSet nset) { - } - - // TODO: code share with Attribute - public void generate(JDefinedClass clazz, NodeSet nset, Set props) { - Set types = new HashSet(); - - for( Leaf l : collectChildren() ) { - if (l instanceof Text) { - types.add(((Text)l).getDatatype(nset)); - } - } - - for( JType t : types ) { - if(!props.add(new LeafElementProp(name,t))) - continue; - generateMethod(clazz, - nset, nset.opts.chainMethod? (JType)clazz : nset.codeModel.VOID - ).param(t,"value"); - } - } - } -} diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/Leaf.java b/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/Leaf.java deleted file mode 100644 index 5fccf0c04c0..00000000000 --- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/Leaf.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. - * 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. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - */ - -package com.sun.tools.internal.txw2.model; - -import com.sun.codemodel.JDefinedClass; -import com.sun.codemodel.JMethod; -import com.sun.codemodel.JMod; -import com.sun.codemodel.JType; -import com.sun.tools.internal.txw2.model.prop.Prop; -import com.sun.tools.internal.txw2.model.prop.ValueProp; -import com.sun.xml.internal.txw2.annotation.XmlValue; -import org.kohsuke.rngom.ast.om.ParsedPattern; -import org.xml.sax.Locator; - -import java.util.Iterator; -import java.util.Set; - -/** - * {@link Leaf}s form a set (by a cyclic doubly-linked list.) - * - * @author Kohsuke Kawaguchi - */ -public abstract class Leaf implements ParsedPattern { - private Leaf next; - private Leaf prev; - - /** - * Source location where this leaf was defined. - */ - public Locator location; - - protected Leaf(Locator location) { - this.location = location; - prev = next = this; - } - - public final Leaf getNext() { - assert next!=null; - assert next.prev == this; - return next; - } - - public final Leaf getPrev() { - assert prev!=null; - assert prev.next == this; - return prev; - } - - /** - * Combines two sets into one set. - * - * @return this - */ - public final Leaf merge(Leaf that) { - Leaf n1 = this.next; - Leaf n2 = that.next; - - that.next = n1; - that.next.prev = that; - this.next = n2; - this.next.prev = this; - - return this; - } - - /** - * Returns the collection of all the siblings - * (including itself) - */ - public final Iterable siblings() { - return new Iterable() { - public Iterator iterator() { - return new CycleIterator(Leaf.this); - } - }; - } - - /** - * Populate the body of the writer class. - * - * @param props - * captures the generatesd {@link Prop}s to - */ - abstract void generate(JDefinedClass clazz, NodeSet nset, Set props); - - - - - /** - * Creates a prop of the data value method. - */ - protected final void createDataMethod(JDefinedClass clazz, JType valueType, NodeSet nset, Set props) { - if(!props.add(new ValueProp(valueType))) - return; - - JMethod m = clazz.method(JMod.PUBLIC, - nset.opts.chainMethod? (JType)clazz : nset.codeModel.VOID, - "_text"); - m.annotate(XmlValue.class); - m.param(valueType,"value"); - } -} diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/NodeSet.java b/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/NodeSet.java deleted file mode 100644 index 64c3839271e..00000000000 --- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/NodeSet.java +++ /dev/null @@ -1,163 +0,0 @@ -/* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. - * 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. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - */ - -package com.sun.tools.internal.txw2.model; - -import com.sun.codemodel.ClassType; -import com.sun.codemodel.JClassAlreadyExistsException; -import com.sun.codemodel.JCodeModel; -import com.sun.codemodel.JDefinedClass; -import com.sun.codemodel.JMod; -import com.sun.tools.internal.txw2.NameUtil; -import com.sun.tools.internal.txw2.TxwOptions; -import com.sun.xml.internal.txw2.annotation.XmlNamespace; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.Set; - -/** - * Root of the model. - * - * @author Kohsuke Kawaguchi - */ -public class NodeSet extends LinkedHashSet { - - /*package*/ final TxwOptions opts; - /*package*/ final JCodeModel codeModel; - - /** - * Set of all the {@link Element}s that can be root. - */ - private final Set rootElements = new HashSet(); - - /** The namespace URI declared in {@link XmlNamespace}. */ - /*package*/ final String defaultNamespace; - - public NodeSet(TxwOptions opts, Leaf entry) { - this.opts = opts; - this.codeModel = opts.codeModel; - addAll(entry.siblings()); - markRoot(entry.siblings(),rootElements); - - // decide what to put in @XmlNamespace - Set ns = new HashSet(); - for( Element e : rootElements ) - ns.add(e.name.getNamespaceURI()); - - if(ns.size()!=1 || opts.noPackageNamespace || opts._package.isUnnamed()) - defaultNamespace = null; - else { - defaultNamespace = ns.iterator().next(); - - opts._package.annotate(XmlNamespace.class) - .param("value",defaultNamespace); - } - } - - /** - * Marks all the element children as root. - */ - private void markRoot(Iterable c, Set rootElements) { - for( Leaf l : c ) { - if( l instanceof Element ) { - Element e = (Element)l; - rootElements.add(e); - e.isRoot = true; - } - if( l instanceof Ref ) { - markRoot(((Ref)l).def,rootElements); - } - } - } - - private void addAll(Iterable c) { - for( Leaf l : c ) { - if(l instanceof Element) - if(add((Element)l)) - addAll((Element)l); - if(l instanceof Grammar) { - Grammar g = (Grammar)l; - for( Define d : g.getDefinitions() ) - add(d); - } - if(l instanceof Ref) { - Ref r = (Ref)l; - Define def = r.def; -// if(def instanceof Grammar) { -// for( Define d : ((Grammar)def).getDefinitions() ) -// if(add(d)) -// addAll(d); -// } - add(def); - } - } - } - - private boolean add(Define def) { - boolean b = super.add(def); - if(b) - addAll(def); - return b; - } - - public Collection subset(Class t) { - ArrayList r = new ArrayList(size()); - for( WriterNode n : this ) - if(t.isInstance(n)) - r.add((T)n); - return r; - } - - /** - * Generate code - */ - public void write(TxwOptions opts) { - for( WriterNode n : this ) - n.prepare(this); - for( WriterNode n : this ) - n.declare(this); - for( WriterNode n : this ) - n.generate(this); - } - - /*package*/ final JDefinedClass createClass(String name) { - try { - return opts._package._class( - JMod.PUBLIC, NameUtil.toClassName(name), ClassType.INTERFACE ); - } catch (JClassAlreadyExistsException e) { - for( int i=2; true; i++ ) { - try { - return opts._package._class( - JMod.PUBLIC, NameUtil.toClassName(name+String.valueOf(i)), ClassType.INTERFACE ); - } catch (JClassAlreadyExistsException e1) { - ; // continue - } - } - } - } -} diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/Invoker.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/Invoker.java index d2edca837e5..6f53444edb1 100644 --- a/jaxws/src/share/classes/com/sun/tools/internal/ws/Invoker.java +++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/Invoker.java @@ -1,5 +1,5 @@ /* - * Portions Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * 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,13 +25,25 @@ package com.sun.tools.internal.ws; -import com.sun.tools.internal.xjc.api.util.APTClassLoader; +import com.sun.istack.internal.tools.MaskingClassLoader; +import com.sun.istack.internal.tools.ParallelWorldClassLoader; +import com.sun.tools.internal.ws.resources.WscompileMessages; import com.sun.tools.internal.xjc.api.util.ToolsJarNotFoundException; +import com.sun.xml.internal.bind.util.Which; +import javax.xml.ws.Service; +import javax.xml.ws.WebServiceFeature; +import java.io.File; import java.io.OutputStream; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; /** * Invokes JAX-WS tools in a special class loader that can pick up APT classes, @@ -39,40 +51,173 @@ import java.lang.reflect.Method; * * @author Kohsuke Kawaguchi */ -final class Invoker { - /** - * List of packages that need to be loaded in {@link APTClassLoader}. - */ - private static final String[] prefixes = { - "com.sun.tools.internal.jxc.", - "com.sun.tools.internal.xjc.", - "com.sun.tools.apt.", - "com.sun.tools.internal.ws.", - "com.sun.tools.javac.", - "com.sun.tools.javadoc.", - "com.sun.mirror." - }; +public final class Invoker { + static int invoke(String mainClass, String[] args) throws Throwable { + // use the platform default proxy if available. + // see sun.net.spi.DefaultProxySelector for details. + try { + System.setProperty("java.net.useSystemProxies","true"); + } catch (SecurityException e) { + // failing to set this property isn't fatal + } - static void main(String toolName, String[] args) throws Throwable { ClassLoader oldcc = Thread.currentThread().getContextClassLoader(); try { - APTClassLoader cl = new APTClassLoader(Invoker.class.getClassLoader(),prefixes); + ClassLoader cl = Invoker.class.getClassLoader(); + if(Arrays.asList(args).contains("-Xendorsed")) + cl = createClassLoader(cl); // perform JDK6 workaround hack + else { + if(!checkIfLoading21API()) { + if(Service.class.getClassLoader()==null) + System.err.println(WscompileMessages.INVOKER_NEED_ENDORSED()); + else + System.err.println(WscompileMessages.WRAPPER_TASK_LOADING_20_API(Which.which(Service.class))); + return -1; + } + //find and load tools.jar + List urls = new ArrayList(); + findToolsJar(cl, urls); + + if(urls.size() > 0){ + List mask = new ArrayList(Arrays.asList(maskedPackages)); + + // first create a protected area so that we load JAXB/WS 2.1 API + // and everything that depends on them inside + cl = new MaskingClassLoader(cl,mask); + + // then this classloader loads the API and tools.jar + cl = new URLClassLoader(urls.toArray(new URL[urls.size()]), cl); + + // finally load the rest of the RI. The actual class files are loaded from ancestors + cl = new ParallelWorldClassLoader(cl,""); + } + + } + Thread.currentThread().setContextClassLoader(cl); - Class compileTool = cl.loadClass("com.sun.tools.internal.ws.wscompile.CompileTool"); - Constructor ctor = compileTool.getConstructor(OutputStream.class,String.class); - Object tool = ctor.newInstance(System.out,toolName); + Class compileTool = cl.loadClass(mainClass); + Constructor ctor = compileTool.getConstructor(OutputStream.class); + Object tool = ctor.newInstance(System.out); Method runMethod = compileTool.getMethod("run",String[].class); boolean r = (Boolean)runMethod.invoke(tool,new Object[]{args}); - System.exit(r ? 0 : 1); + return r ? 0 : 1; } catch (ToolsJarNotFoundException e) { System.err.println(e.getMessage()); } catch (InvocationTargetException e) { throw e.getCause(); - } finally { + } catch(ClassNotFoundException e){ + throw e; + }finally { Thread.currentThread().setContextClassLoader(oldcc); } - System.exit(1); + return -1; } + + /** + * Returns true if the RI appears to be loading the JAX-WS 2.1 API. + */ + public static boolean checkIfLoading21API() { + try { + Service.class.getMethod("getPort",Class.class, WebServiceFeature[].class); + // yup. things look good. + return true; + } catch (NoSuchMethodException e) { + } catch (LinkageError e) { + } + // nope + return false; + } + + /** + * Creates a classloader that can load JAXB/WS 2.1 API and tools.jar, + * and then return a classloader that can RI classes, which can see all those APIs and tools.jar. + */ + public static ClassLoader createClassLoader(ClassLoader cl) throws ClassNotFoundException, MalformedURLException, ToolsJarNotFoundException { + + URL[] urls = findIstackAPIs(cl); + if(urls.length==0) + return cl; // we seem to be able to load everything already. no need for the hack + + List mask = new ArrayList(Arrays.asList(maskedPackages)); + if(urls.length>1) { + // we need to load 2.1 API from side. so add them to the mask + mask.add("javax.xml.bind."); + mask.add("javax.xml.ws."); + } + + // first create a protected area so that we load JAXB/WS 2.1 API + // and everything that depends on them inside + cl = new MaskingClassLoader(cl,mask); + + // then this classloader loads the API and tools.jar + cl = new URLClassLoader(urls, cl); + + // finally load the rest of the RI. The actual class files are loaded from ancestors + cl = new ParallelWorldClassLoader(cl,""); + + return cl; + } + + /** + * Creates a classloader for loading JAXB/WS 2.1 jar and tools.jar + */ + private static URL[] findIstackAPIs(ClassLoader cl) throws ClassNotFoundException, MalformedURLException, ToolsJarNotFoundException { + List urls = new ArrayList(); + + if(Service.class.getClassLoader()==null) { + // JAX-WS API is loaded from bootstrap classloader + URL res = cl.getResource("javax/xml/ws/EndpointReference.class"); + if(res==null) + throw new ClassNotFoundException("There's no JAX-WS 2.1 API in the classpath"); + urls.add(ParallelWorldClassLoader.toJarUrl(res)); + + res = cl.getResource("javax/xml/bind/annotation/XmlSeeAlso.class"); + if(res==null) + throw new ClassNotFoundException("There's no JAXB 2.1 API in the classpath"); + urls.add(ParallelWorldClassLoader.toJarUrl(res)); + } + + findToolsJar(cl, urls); + + return urls.toArray(new URL[urls.size()]); + } + + private static void findToolsJar(ClassLoader cl, List urls) throws ToolsJarNotFoundException, MalformedURLException { + try { + Class.forName("com.sun.tools.javac.Main",false,cl); + Class.forName("com.sun.tools.apt.Main",false,cl); + // we can already load them in the parent class loader. + // so no need to look for tools.jar. + // this happens when we are run inside IDE/Ant, or + // in Mac OS. + } catch (ClassNotFoundException e) { + // otherwise try to find tools.jar + File jreHome = new File(System.getProperty("java.home")); + File toolsJar = new File( jreHome.getParent(), "lib/tools.jar" ); + + if (!toolsJar.exists()) { + throw new ToolsJarNotFoundException(toolsJar); + } + urls.add(toolsJar.toURL()); + } + } + + /** + * The list of package prefixes we want the + * {@link MaskingClassLoader} to prevent the parent + * classLoader from loading + */ + public static String[] maskedPackages = new String[]{ + "com.sun.istack.internal.tools.", + "com.sun.tools.internal.jxc.", + "com.sun.tools.internal.xjc.", + "com.sun.tools.internal.ws.", + "com.sun.codemodel.internal.", + "com.sun.relaxng.", + "com.sun.xml.internal.xsom.", + "com.sun.xml.internal.bind.", + "com.sun.xml.internal.ws." + }; } diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/ToolVersion.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/ToolVersion.java index fa3c51393dc..7d5aa32531e 100644 --- a/jaxws/src/share/classes/com/sun/tools/internal/ws/ToolVersion.java +++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/ToolVersion.java @@ -1,5 +1,5 @@ /* - * Portions Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/WsGen.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/WsGen.java index 7f6fc1ea8d7..a4b3de5da4d 100644 --- a/jaxws/src/share/classes/com/sun/tools/internal/ws/WsGen.java +++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/WsGen.java @@ -1,5 +1,5 @@ /* - * Portions Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -24,12 +24,37 @@ */ package com.sun.tools.internal.ws; -/** - * @author Vivek Pandey - */ +import com.sun.tools.internal.ws.wscompile.WsgenTool; +/** + * WsGen tool entry point. + * + * @author Vivek Pandey + * @author Kohsuke Kawaguchi + */ public class WsGen { + /** + * CLI entry point. Use {@link Invoker} to + * load tools.jar + */ public static void main(String[] args) throws Throwable { - Invoker.main("wsgen",args); + System.exit(Invoker.invoke("com.sun.tools.internal.ws.wscompile.WsgenTool", args)); + } + + /** + * Entry point for tool integration. + * + *

    + * This does the same as {@link #main(String[])} except + * it doesn't invoke {@link System#exit(int)}. This method + * also doesn't play with classloaders. It's the caller's + * responsibility to set up the classloader to load all jars + * needed to run the tool, including $JAVA_HOME/lib/tools.jar + * + * @return + * 0 if the tool runs successfully. + */ + public static int doMain(String[] args) throws Throwable { + return new WsgenTool(System.out).run(args) ? 0 : 1; } } diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/WsImport.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/WsImport.java index 98be2983479..94fd2a83a41 100644 --- a/jaxws/src/share/classes/com/sun/tools/internal/ws/WsImport.java +++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/WsImport.java @@ -1,5 +1,5 @@ /* - * Portions Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -24,12 +24,37 @@ */ package com.sun.tools.internal.ws; -/** - * @author Vivek Pandey - */ +import com.sun.tools.internal.ws.wscompile.WsimportTool; +/** + * WsImport tool entry point. + * + * @author Vivek Pandey + * @author Kohsuke Kawaguchi + */ public class WsImport { + /** + * CLI entry point. Use {@link Invoker} to + * load tools.jar + */ public static void main(String[] args) throws Throwable { - Invoker.main("wsimport",args); + System.exit(Invoker.invoke("com.sun.tools.internal.ws.wscompile.WsimportTool", args)); + } + + /** + * Entry point for tool integration. + * + *

    + * This does the same as {@link #main(String[])} except + * it doesn't invoke {@link System#exit(int)}. This method + * also doesn't play with classloaders. It's the caller's + * responsibility to set up the classloader to load all jars + * needed to run the tool, including $JAVA_HOME/lib/tools.jar + * + * @return + * 0 if the tool runs successfully. + */ + public static int doMain(String[] args) throws Throwable { + return new WsimportTool(System.out).run(args) ? 0 : 1; } } diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/api/TJavaGeneratorExtension.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/api/TJavaGeneratorExtension.java new file mode 100644 index 00000000000..c9c2ff3d62b --- /dev/null +++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/api/TJavaGeneratorExtension.java @@ -0,0 +1,46 @@ +/* + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. + * 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. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +package com.sun.tools.internal.ws.api; + +import com.sun.codemodel.internal.JMethod; +import com.sun.tools.internal.ws.api.wsdl.TWSDLOperation; +import com.sun.tools.internal.ws.processor.generator.JavaGeneratorExtensionFacade; + +/** + * Provides Java SEI Code generation Extensiblity mechanism. + * + * @see JavaGeneratorExtensionFacade + * @author Vivek Pandey + */ +public abstract class TJavaGeneratorExtension { + /** + * This method should be used to write annotations on {@link JMethod}. + * + * @param wsdlOperation non-null wsdl extensiblity element - wsdl:portType/wsdl:operation. + * @param jMethod non-null {@link JMethod} + */ + public abstract void writeMethodAnnotations(TWSDLOperation wsdlOperation, JMethod jMethod); +} diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensible.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensible.java new file mode 100644 index 00000000000..0f5be2fa8a3 --- /dev/null +++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensible.java @@ -0,0 +1,78 @@ +/* + * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. + * 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. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +package com.sun.tools.internal.ws.api.wsdl; + + +import javax.xml.namespace.QName; + +/** + * A WSDL element or attribute that can be extended. + * + * @author Vivek Pandey + */ +public interface TWSDLExtensible { + /** + * Gives the wsdl extensiblity element's name attribute value. It can be null as @name on some of the wsdl + * extensibility elements are optinal such as wsdl:input + */ + String getNameValue(); + + /** + * Gives namespace URI of a wsdl extensibility element. + */ + String getNamespaceURI(); + + /** + * Gives the WSDL element or WSDL extensibility element name + */ + QName getWSDLElementName(); + + /** + * An {@link TWSDLExtensionHandler} will call this method to add an {@link TWSDLExtension} object + * + * @param e non-null extension object + */ + void addExtension(TWSDLExtension e); + + /** + * Gives iterator over {@link TWSDLExtension}s + */ + Iterable extensions(); + + /** + * Gives the parent of a wsdl extensibility element. + * 

    +     * For example,
+     *
+     *     
+     *         
+     *     ...
+     * Here, the {@link TWSDLExtensible}representing wsdl:operation's parent would be wsdl:portType
+     *
+     * @return null if the {@link TWSDLExtensible} has no parent, root of wsdl document - wsdl:definition.
+     */
+    TWSDLExtensible getParent();
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/model/Mode.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtension.java
similarity index 80%
rename from jaxws/src/share/classes/com/sun/xml/internal/ws/model/Mode.java
rename to jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtension.java
index 3691fce609d..c709b30e5c1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/model/Mode.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtension.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,19 +23,16 @@
  * have any questions.
  */
 
-package com.sun.xml.internal.ws.model;
+package com.sun.tools.internal.ws.api.wsdl;
 
 /**
- * Defines parameter mode, IN, OUT or INOUT
+ * A WSDL extension
  *
  * @author Vivek Pandey
  */
-
-public enum Mode {
-    IN(0), OUT(1), INOUT(2);
-
-    private Mode(int mode){
-        this.mode = mode;
-    }
-    private final int mode;
+public interface TWSDLExtension {
+    /**
+     * Gives Parent {@link TWSDLExtensible} element
+     */
+    TWSDLExtensible getParent();
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensionHandler.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensionHandler.java
new file mode 100644
index 00000000000..5b7fe935ca4
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensionHandler.java
@@ -0,0 +1,215 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.tools.internal.ws.api.wsdl;
+
+import com.sun.tools.internal.ws.wsdl.document.WSDLConstants;
+import org.w3c.dom.Element;
+
+/**
+ * JAXWS WSDL parser {@link com.sun.tools.internal.ws.wsdl.parser.WSDLParser} will call an {@link TWSDLExtensionHandler} registered
+ * with it for the WSDL extensibility elements thats not already defined in the WSDL 1.1 spec, such as SOAP or MIME.
+ *
+ * @author Vivek Pandey
+ */
+public abstract class TWSDLExtensionHandler {
+    /**
+     * Gives the namespace of an extensibility element.
+     * 
    
+     * For example a soap 1.1 XXExtensionHandler would return ""http://schemas.xmlsoap.org/wsdl/soap/"
+     */
+    public String getNamespaceURI() {
+        return null;
+    }
+
+    /**
+     * This interface is called during WSDL parsing on detecting any wsdl extension.
+     *
+     * @param context Parser context that will be passed on by the wsdl parser
+     * @param parent  The Parent element within which the extensibility element is defined
+     * @param e       The extensibility elemenet
+     * @return false if there was some error during the extension handling otherwise returns true. If returned false
+     *         then the WSDL parser can abort if the wsdl extensibility element had required attribute set to true
+     */
+    public boolean doHandleExtension(TWSDLParserContext context, TWSDLExtensible parent, Element e) {
+        if (parent.getWSDLElementName().equals(WSDLConstants.QNAME_DEFINITIONS)) {
+            return handleDefinitionsExtension(context, parent, e);
+        } else if (parent.getWSDLElementName().equals(WSDLConstants.QNAME_TYPES)) {
+            return handleTypesExtension(context, parent, e);
+        } else if (parent.getWSDLElementName().equals(WSDLConstants.QNAME_PORT_TYPE)) {
+            return handlePortTypeExtension(context, parent, e);
+        } else if (
+            parent.getWSDLElementName().equals(WSDLConstants.QNAME_BINDING)) {
+            return handleBindingExtension(context, parent, e);
+        } else if (
+            parent.getWSDLElementName().equals(WSDLConstants.QNAME_OPERATION)) {
+            return handleOperationExtension(context, parent, e);
+        } else if (parent.getWSDLElementName().equals(WSDLConstants.QNAME_INPUT)) {
+            return handleInputExtension(context, parent, e);
+        } else if (
+            parent.getWSDLElementName().equals(WSDLConstants.QNAME_OUTPUT)) {
+            return handleOutputExtension(context, parent, e);
+        } else if (parent.getWSDLElementName().equals(WSDLConstants.QNAME_FAULT)) {
+            return handleFaultExtension(context, parent, e);
+        } else if (
+            parent.getWSDLElementName().equals(WSDLConstants.QNAME_SERVICE)) {
+            return handleServiceExtension(context, parent, e);
+        } else if (parent.getWSDLElementName().equals(WSDLConstants.QNAME_PORT)) {
+            return handlePortExtension(context, parent, e);
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Callback for wsdl:portType
+     *
+     * @param context Parser context that will be passed on by the wsdl parser
+     * @param parent  The Parent element within which the extensibility element is defined
+     * @param e       The extensibility elemenet
+     * @return false if there was some error during the extension handling otherwise returns true. If returned false
+     *         then the WSDL parser can abort if the wsdl extensibility element had required attribute set to true
+     */
+    public boolean handlePortTypeExtension(TWSDLParserContext context, TWSDLExtensible parent, Element e) {
+        return false;
+    }
+
+    /**
+     * Callback for wsdl:definitions
+     *
+     * @param context Parser context that will be passed on by the wsdl parser
+     * @param parent  The Parent element within which the extensibility element is defined
+     * @param e       The extensibility elemenet
+     * @return false if there was some error during the extension handling otherwise returns true. If returned false
+     *         then the WSDL parser can abort if the wsdl extensibility element had required attribute set to true
+     */
+    public boolean handleDefinitionsExtension(TWSDLParserContext context, TWSDLExtensible parent, Element e) {
+        return false;
+    }
+
+    /**
+     * Callback for wsdl:type
+     *
+     * @param context Parser context that will be passed on by the wsdl parser
+     * @param parent  The Parent element within which the extensibility element is defined
+     * @param e       The extensibility elemenet
+     * @return false if there was some error during the extension handling otherwise returns true. If returned false
+     *         then the WSDL parser can abort if the wsdl extensibility element had required attribute set to true
+     */
+    public boolean handleTypesExtension(TWSDLParserContext context, TWSDLExtensible parent, Element e) {
+        return false;
+    }
+
+    /**
+     * Callback for wsdl:binding
+     *
+     * @param context Parser context that will be passed on by the wsdl parser
+     * @param parent  The Parent element within which the extensibility element is defined
+     * @param e       The extensibility elemenet
+     * @return false if there was some error during the extension handling otherwise returns true. If returned false
+     *         then the WSDL parser can abort if the wsdl extensibility element had required attribute set to true
+     */
+    public boolean handleBindingExtension(TWSDLParserContext context, TWSDLExtensible parent, Element e) {
+        return false;
+    }
+
+    /**
+     * Callback for wsdl:portType/wsdl:operation.
+     *
+     * @param context Parser context that will be passed on by the wsdl parser
+     * @param parent  The Parent element within which the extensibility element is defined
+     * @param e       The extensibility elemenet
+     * @return false if there was some error during the extension handling otherwise returns true. If returned false
+     *         then the WSDL parser can abort if the wsdl extensibility element had required attribute set to true
+     */
+    public boolean handleOperationExtension(TWSDLParserContext context, TWSDLExtensible parent, Element e) {
+        return false;
+    }
+
+    /**
+     * Callback for wsdl:input
+     *
+     * @param context Parser context that will be passed on by the wsdl parser
+     * @param parent  The Parent element within which the extensibility element is defined
+     * @param e       The extensibility elemenet
+     * @return false if there was some error during the extension handling otherwise returns true. If returned false
+     *         then the WSDL parser can abort if the wsdl extensibility element had required attribute set to true
+     */
+    public boolean handleInputExtension(TWSDLParserContext context, TWSDLExtensible parent, Element e) {
+        return false;
+    }
+
+    /**
+     * Callback for wsdl:output
+     *
+     * @param context Parser context that will be passed on by the wsdl parser
+     * @param parent  The Parent element within which the extensibility element is defined
+     * @param e       The extensibility elemenet
+     * @return false if there was some error during the extension handling otherwise returns true. If returned false
+     *         then the WSDL parser can abort if the wsdl extensibility element had required attribute set to true
+     */
+    public boolean handleOutputExtension(TWSDLParserContext context, TWSDLExtensible parent, Element e) {
+        return false;
+    }
+
+    /**
+     * Callback for wsdl:fault
+     *
+     * @param context Parser context that will be passed on by the wsdl parser
+     * @param parent  The Parent element within which the extensibility element is defined
+     * @param e       The extensibility elemenet
+     * @return false if there was some error during the extension handling otherwise returns true. If returned false
+     *         then the WSDL parser can abort if the wsdl extensibility element had required attribute set to true
+     */
+    public boolean handleFaultExtension(TWSDLParserContext context, TWSDLExtensible parent, Element e) {
+        return false;
+    }
+
+    /**
+     * Callback for wsdl:service
+     *
+     * @param context Parser context that will be passed on by the wsdl parser
+     * @param parent  The Parent element within which the extensibility element is defined
+     * @param e       The extensibility elemenet
+     * @return false if there was some error during the extension handling otherwise returns true. If returned false
+     *         then the WSDL parser can abort if the wsdl extensibility element had required attribute set to true
+     */
+    public boolean handleServiceExtension(TWSDLParserContext context, TWSDLExtensible parent, Element e) {
+        return false;
+    }
+
+    /**
+     * Callback for wsdl:port
+     *
+     * @param context Parser context that will be passed on by the wsdl parser
+     * @param parent  The Parent element within which the extensibility element is defined
+     * @param e       The extensibility elemenet
+     * @return false if there was some error during the extension handling otherwise returns true. If returned false
+     *         then the WSDL parser can abort if the wsdl extensibility element had required attribute set to true
+     */
+    public boolean handlePortExtension(TWSDLParserContext context, TWSDLExtensible parent, Element e) {
+        return false;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/model/ExceptionType.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLOperation.java
similarity index 74%
rename from jaxws/src/share/classes/com/sun/xml/internal/ws/model/ExceptionType.java
rename to jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLOperation.java
index ff7d1eb9770..45d0a3a42a8 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/model/ExceptionType.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLOperation.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,21 +22,21 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-package com.sun.xml.internal.ws.model;
+
+package com.sun.tools.internal.ws.api.wsdl;
+
+import com.sun.codemodel.internal.JClass;
+
+import java.util.Map;
+
 /**
- * Type of java exception
+ * Abstracts wsdl:portType/wsdl:operation
  *
  * @author Vivek Pandey
  */
-public enum ExceptionType {
-    WSDLException(0), UserDefined(1);
-
-    ExceptionType(int exceptionType){
-        this.exceptionType = exceptionType;
-    }
-
-    public int value() {
-        return exceptionType;
-    }
-    private final int exceptionType;
+public interface TWSDLOperation extends TWSDLExtensible{
+    /**
+     * Gives a Map of fault name attribute value to the {@link JClass}
+     */
+    Map getFaults();
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLParserContext.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLParserContext.java
new file mode 100644
index 00000000000..6f6e3e00c7f
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLParserContext.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.tools.internal.ws.api.wsdl;
+
+import org.w3c.dom.Element;
+import org.xml.sax.Locator;
+
+/**
+ * Provides WSDL parsing context. It should be used by the WSDL extension handlers to register their namespaces so that
+ * it can be latter used by other extensions to resolve the namespaces.
+ *
+ * @author Vivek Pandey
+ */
+public interface TWSDLParserContext {
+
+    /**
+     * Pushes the parsing context
+     */
+    void push();
+
+    /**
+     * pops the parsing context
+     */
+    void pop();
+
+    /**
+     * Gives the namespace URI for a given prefix
+     *
+     * @param prefix non-null prefix
+     * @return null of the prefix is not found
+     */
+    String getNamespaceURI(String prefix);
+
+    /**
+     * Gives the prefixes in the current context
+     */
+    Iterable getPrefixes();
+
+    /**
+     * Gives default namespace
+     *
+     * @return null if there is no default namespace declaration found
+     */
+    String getDefaultNamespaceURI();
+
+    /**
+     * Registers naemespace declarations of a given {@link Element} found in the WSDL
+     *
+     * @param e {@link Element} whose namespace declarations need to be registered
+     */
+    void registerNamespaces(Element e);
+
+    /**
+     * gives the location information for the given Element.
+     */
+    Locator getLocation(Element e);
+
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/package-info.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/package-info.java
index 1889080b291..a3a514020ad 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/package-info.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,8 +24,8 @@
  */
 
 /**
- * 
    JAX-WS 2.0 Tools
    
- * This document describes the tools included with JAX-WS 2.0.
+ * 
    JAX-WS 2.0.1 Tools
    
+ * This document describes the tools included with JAX-WS 2.0.1.
  *
  * {@DotDiagram
      digraph G {
@@ -53,9 +53,8 @@
        "WsImport ANT Task" -> wsimport -> CompileTool;
 
        CompileTool -> APT -> WSAP -> WebServiceAP;
-       CompileTool -> Processor;
-       CompileTool -> Modeler;
-       CompileTool -> ProcessorActions;
+       CompileTool -> Processor -> Modeler;
+       Processor -> ProcessorActions;
        CompileTool -> WebServiceAP;
 
        Modeler -> WSDLModeler;
@@ -70,11 +69,11 @@
  *  
    {@link com.sun.tools.internal.ws.ant.Apt Apt}
  *  
    An ANT task to invoke APT.
 
- *  
    {@link com.sun.tools.internal.ws.ant.WsGen WsGen}
+ *  
    {@link com.sun.tools.internal.ws.ant.WsGen2 WsGen}
  *  
    
  *    An ANT task to invoke {@link com.sun.tools.internal.ws.WsGen WsGen}
 
- *  
    {@link com.sun.tools.internal.ws.ant.WsImport WsImport}
+ *  
    {@link com.sun.tools.internal.ws.ant.WsImport2 WsImport}
  *  
    
  *    An ANT task to invoke {@link com.sun.tools.internal.ws.WsImport WsImport}
  *
@@ -91,29 +90,17 @@
  *  
    Tool to process a compiled javax.jws.WebService annotated class and to generate the necessary classes to make
  *  it a Web service.
 
- *  
    {@link com.sun.tools.internal.ws.ant.WsImport WsImport}
+ *  
    {@link com.sun.tools.internal.ws.ant.WsImport2 WsImport}
  *  
    
  *    Tool to import a WSDL and to generate an SEI (a javax.jws.WebService) interface that can be either implemented
  *    on the server to build a web service, or can be used on the client to invoke the web service.
  *  
  * 
    Implementation Classes
    
  *  
-      
    {@link com.sun.tools.internal.ws.wscompile.CompileTool CompileTool}
- *    
     This is the main implementation class for both WsGen and WsImport.
- *
- *
- * 
    {@link com.sun.tools.internal.ws.processor.Processor Processor}
- *    
    This abstract class is used to process a particular {@link com.sun.tools.internal.ws.processor.config.Configuration
- *    Configuration} to build a {@link com.sun.tools.internal.ws.processor.model Model} and to run
- *   {@link com.sun.tools.internal.ws.processor.ProcessorAction ProcessorActions} on that model.
-
  *    
    {@link com.sun.tools.internal.ws.processor.model.Model Model}
  *    
    The model is used to represent the entire Web Service.  The JAX-WS ProcessorActions can process
  *    this Model to generate Java artifacts such as the service interface.
  *
-      
    {@link com.sun.tools.internal.ws.processor.ProcessorAction ProcessorActions}
- *    
    A ProcessorAction is used to perform some operation on a Model object such as
- *    generating a Java source file.
  *
  *    
    {@link com.sun.tools.internal.ws.processor.modeler.Modeler Modeler}
  *    
    A Modeler is used to create a Model of a Web Service from a particular Web
@@ -128,7 +115,7 @@
  *    javax.xml.ws.* annotations. This class is used either by the WsGen (CompileTool) tool or
  *    idirectly via the {@link com.sun.istack.internal.ws.WSAP WSAP} when invoked by APT.
  *
- *    
    {@link com.sun.istack.internal.ws.WSAP WSAP}
+ *    
    {@link com.sun.istack.internal.ws.AnnotationProcessorFactoryImpl WSAP}
  *    
    This is the entry point for the WebServiceAP when APT is invoked on a SEI
  *    annotated with the javax.jws.WebService annotation.
  *   
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/Processor.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/Processor.java
deleted file mode 100644
index 8b899c5f6eb..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/Processor.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.tools.internal.ws.processor;
-
-import com.sun.tools.internal.ws.processor.config.Configuration;
-import com.sun.tools.internal.ws.processor.config.ModelInfo;
-import com.sun.tools.internal.ws.processor.model.Model;
-import com.sun.tools.internal.ws.processor.util.ProcessorEnvironment;
-import com.sun.xml.internal.ws.util.exception.JAXWSExceptionBase;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-/**
- * This abstract class contains methods for getting a Modeler and creating a model
- * from that Modeler given a particular configuration. ProcessorActions can also
- * be registered and run with instances of this class.
- *
- * @author WS Development Team
- *
- */
-public class Processor {
-
-    public Processor(Configuration configuration, Properties options, Model model) {
-        this(configuration,options);
-        _model = model;
-    }
-
-    public Processor(Configuration configuration, Properties options) {
-        _configuration = configuration;
-        _options = options;
-
-        // find the value of the "print stack traces" property
-        _printStackTrace = Boolean.valueOf(_options.getProperty(ProcessorOptions.PRINT_STACK_TRACE_PROPERTY));
-        _env = _configuration.getEnvironment();
-    }
-
-    public void add(ProcessorAction action) {
-        _actions.add(action);
-    }
-
-    public Model getModel() {
-        return _model;
-    }
-
-    public void run() {
-        runModeler();
-        if (_model != null) {
-            runActions();
-        }
-    }
-
-    public void runModeler() {
-        try {
-            ModelInfo modelInfo = _configuration.getModelInfo();
-            if (modelInfo == null) {
-                throw new ProcessorException("processor.missing.model");
-            }
-
-            _model = modelInfo.buildModel(_options);
-
-        } catch (JAXWSExceptionBase e) {
-            if (_printStackTrace) {
-                _env.printStackTrace(e);
-            }
-            _env.error(e);
-        }
-    }
-
-    public void runActions() {
-        try {
-            if (_model == null) {
-                // avoid reporting yet another error here
-                return;
-            }
-
-            for (ProcessorAction action : _actions) {
-                action.perform(_model, _configuration, _options);
-            }
-        } catch (JAXWSExceptionBase e) {
-            if (_printStackTrace || _env.verbose()) {
-                _env.printStackTrace(e);
-            }
-            _env.error(e);
-        }
-    }
-
-    private final Properties _options;
-    private final Configuration _configuration;
-    private final List _actions = new ArrayList();
-    private Model _model;
-    private final boolean _printStackTrace;
-    private final ProcessorEnvironment _env;
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/ProcessorActionVersion.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/ProcessorActionVersion.java
deleted file mode 100644
index 54eb4cb6a65..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/ProcessorActionVersion.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package com.sun.tools.internal.ws.processor;
-
-/**
- * @author WS Development Team
- *
- * Typesafe enum class to hold the ProcessorActionVersion
- */
-public enum ProcessorActionVersion {
-    PRE_20("1.1.2"), VERSION_20("2.0");
-
-    ProcessorActionVersion(String version) {
-        this.version = version;
-    }
-
-    public String value() {
-        return version;
-    }
-
-    private final String version;
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/ProcessorConstants.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/ProcessorConstants.java
deleted file mode 100644
index b3345117a7d..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/ProcessorConstants.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.tools.internal.ws.processor;
-
-/**
- * Constants used by Model, Modelers, Config ProcessorActions
- *
- * @author WS Development Team
- */
-public class ProcessorConstants {
-    public final static String SOAP_VERSION_1_1 = "SOAP 1.1";
-    public final static String SOAP_VERSION_1_2 = "SOAP 1.2";
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/ProcessorException.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/ProcessorException.java
index 6f13aff45d9..fd998f244de 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/ProcessorException.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/ProcessorException.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 package com.sun.tools.internal.ws.processor;
 
 import com.sun.xml.internal.ws.util.exception.JAXWSExceptionBase;
-import com.sun.xml.internal.ws.util.localization.Localizable;
 
 /**
  * ProcessorException represents an exception that occurred while processing
@@ -42,11 +41,15 @@ public class ProcessorException extends JAXWSExceptionBase {
         super(key, args);
     }
 
+    public ProcessorException(String msg){
+        super(msg);
+    }
+
     public ProcessorException(Throwable throwable) {
         super(throwable);
     }
 
-    public String getResourceBundleName() {
+    public String getDefaultResourceBundleName() {
         return "com.sun.tools.internal.ws.resources.processor";
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/ProcessorOptions.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/ProcessorOptions.java
deleted file mode 100644
index de198cd375a..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/ProcessorOptions.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.tools.internal.ws.processor;
-
-/**
- * Property names used by ProcessorActions
- *
- * @author WS Development Team
- */
-public class ProcessorOptions {
-
-    public final static String SOURCE_DIRECTORY_PROPERTY = "sourceDirectory";
-    public final static String DESTINATION_DIRECTORY_PROPERTY =
-        "destinationDirectory";
-    public final static String NONCLASS_DESTINATION_DIRECTORY_PROPERTY =
-        "nonclassDestinationDirectory";
-    public final static String VALIDATE_WSDL_PROPERTY = "validationWSDL";
-    public final static String EXPLICIT_SERVICE_CONTEXT_PROPERTY =
-        "explicitServiceContext";
-    public final static String PRINT_STACK_TRACE_PROPERTY = "printStackTrace";
-    public final static String DONOT_OVERWRITE_CLASSES = "doNotOverWrite";
-    public final static String NO_DATA_BINDING_PROPERTY = "noDataBinding";
-    public final static String USE_WSI_BASIC_PROFILE = "useWSIBasicProfile";
-    public final static String STRICT_COMPLIANCE = "strictCompliance";
-    public final static String JAXWS_SOURCE_VERSION = "sourceVersion";
-    public final static String UNWRAP_DOC_LITERAL_WRAPPERS =
-        "unwrapDocLitWrappers";
-    public final static String BINDING_FILES = "bindingFiles";
-    public final static String EXTENSION = "extension";
-    public final static String PROTOCOL = "protocol";
-    public final static String TRANSPORT = "transport";
-    public final static String WSDL_LOCATION = "wsdllocation";
-    public final static String DEFAULT_PACKAGE = "defaultpackage";
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/config/ClassModelInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/config/ClassModelInfo.java
deleted file mode 100644
index eda6fa2cb43..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/config/ClassModelInfo.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.tools.internal.ws.processor.config;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-
-import com.sun.tools.internal.ws.processor.modeler.Modeler;
-import com.sun.tools.internal.ws.processor.ProcessorOptions;
-import com.sun.xml.internal.ws.util.VersionUtil;
-
-/**
- *
- * @author WS Development Team
- */
-public class ClassModelInfo extends ModelInfo {
-
-    public ClassModelInfo(String className) {
-        this.className = className;
-    }
-
-
-    public Modeler getModeler(Properties properties) {
-        return null;
-    }
-
-    public void setClassName(String className) {
-        this.className = className;
-    }
-
-    public String getClassName() {
-        return className;
-    }
-
-    private String className;
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/config/ModelInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/config/ModelInfo.java
deleted file mode 100644
index ca07bc57a7b..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/config/ModelInfo.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.tools.internal.ws.processor.config;
-
-import java.util.Properties;
-
-import com.sun.tools.internal.ws.processor.model.Model;
-import com.sun.tools.internal.ws.processor.modeler.Modeler;
-import com.sun.xml.internal.ws.util.xml.XmlUtil;
-import org.xml.sax.EntityResolver;
-
-/**
- * This class contiains information used by {@link com.sun.tools.internal.ws.processor.modeler.Modeler
- * Modelers} to build {@link com.sun.tools.internal.ws.processor.model.Model Models}.
- *
- * @author WS Development Team
- */
-public abstract class ModelInfo {
-
-    protected ModelInfo() {}
-
-    public Configuration getParent() {
-        return _parent;
-    }
-
-    public void setParent(Configuration c) {
-        _parent = c;
-    }
-
-    public String getName() {
-        return _name;
-    }
-
-    public void setName(String s) {
-        _name = s;
-    }
-
-    public Configuration getConfiguration() {
-        return _parent;
-    }
-
-    public HandlerChainInfo getClientHandlerChainInfo() {
-        return _clientHandlerChainInfo;
-    }
-
-    public void setClientHandlerChainInfo(HandlerChainInfo i) {
-        _clientHandlerChainInfo = i;
-    }
-
-    public HandlerChainInfo getServerHandlerChainInfo() {
-        return _serverHandlerChainInfo;
-    }
-
-    public void setServerHandlerChainInfo(HandlerChainInfo i) {
-        _serverHandlerChainInfo = i;
-    }
-
-    public String getJavaPackageName() {
-        return _javaPackageName;
-    }
-
-    public void setJavaPackageName(String s) {
-        _javaPackageName = s;
-    }
-
-    public Model buildModel(Properties options){
-        return getModeler(options).buildModel();
-    }
-
-    public EntityResolver getEntityResolver() {
-        return entityResolver;
-    }
-
-    public void setEntityResolver(EntityResolver entityResolver) {
-        this.entityResolver = entityResolver;
-    }
-
-    public String getDefaultJavaPackage() {
-        return _defaultJavaPackage;
-    }
-
-    public void setDefaultJavaPackage(String _defaultJavaPackage) {
-        this._defaultJavaPackage = _defaultJavaPackage;
-    }
-
-    protected abstract Modeler getModeler(Properties options);
-
-    private Configuration _parent;
-    private String _name;
-    private String _javaPackageName;
-    private String _defaultJavaPackage;
-    private HandlerChainInfo _clientHandlerChainInfo;
-    private HandlerChainInfo _serverHandlerChainInfo;
-    private EntityResolver entityResolver;
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/config/WSDLModelInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/config/WSDLModelInfo.java
deleted file mode 100644
index 12eab008ac9..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/config/WSDLModelInfo.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.tools.internal.ws.processor.config;
-
-
-import java.util.*;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
-
-import com.sun.tools.internal.ws.processor.modeler.Modeler;
-import com.sun.tools.internal.ws.util.JAXWSClassFactory;
-
-/**
- *
- * @author WS Development Team
- */
-public class WSDLModelInfo extends ModelInfo {
-
-    public WSDLModelInfo() {}
-
-    protected Modeler getModeler(Properties options) {
-        return JAXWSClassFactory.newInstance().createWSDLModeler(this, options);
-    }
-
-    public String getLocation() {
-        return _location;
-    }
-
-    public void setLocation(String s) {
-        _location = s;
-    }
-
-    public Map getJAXWSBindings(){
-        return _jaxwsBindings;
-    }
-
-    public void putJAXWSBindings(String systemId, Document binding){
-        _jaxwsBindings.put(systemId, binding);
-    }
-
-    public Set getJAXBBindings(){
-        return _jaxbBindings;
-    }
-
-    public void addJAXBBIndings(InputSource jaxbBinding){
-        _jaxbBindings.add(jaxbBinding);
-    }
-
-    public void setHandlerConfig(Element handlerConfig){
-        this.handlerConfig = handlerConfig;
-    }
-
-    public Element getHandlerConfig(){
-        return handlerConfig;
-    }
-
-    private Element handlerConfig;
-
-    private String _location;
-
-    //external jaxws:bindings elements
-    private Map _jaxwsBindings = new HashMap();
-
-    //we need an array of jaxb:binding elements, they are children of jaxws:bindings
-    //and could come from an external customization file or wsdl.
-    private Set _jaxbBindings = new HashSet();
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/config/parser/CustomizationParser.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/config/parser/CustomizationParser.java
deleted file mode 100644
index 72670bf2245..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/config/parser/CustomizationParser.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package com.sun.tools.internal.ws.processor.config.parser;
-
-import java.net.URL;
-import java.util.*;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
-import org.xml.sax.EntityResolver;
-
-import com.sun.tools.internal.ws.processor.ProcessorOptions;
-import com.sun.tools.internal.ws.processor.config.Configuration;
-import com.sun.tools.internal.ws.processor.config.WSDLModelInfo;
-import com.sun.tools.internal.ws.processor.util.ProcessorEnvironment;
-import com.sun.xml.internal.ws.streaming.XMLStreamReaderFactory;
-import com.sun.xml.internal.ws.streaming.XMLStreamReaderUtil;
-import com.sun.xml.internal.ws.util.JAXWSUtils;
-import com.sun.tools.internal.ws.wsdl.document.jaxws.JAXWSBindingsConstants;
-
-import javax.xml.stream.XMLStreamReader;
-
-/**
- * @author Vivek Pandey
- *
- */
-public class CustomizationParser extends InputParser {
-
-    /**
-     * @param entityResolver
-     * @param env
-     * @param options
-     */
-    public CustomizationParser(EntityResolver entityResolver, ProcessorEnvironment env, Properties options) {
-        super(env, options);
-        this.entityResolver = entityResolver;
-    }
-
-
-    /* (non-Javadoc)
-     * @see com.sun.xml.internal.ws.processor.config.parser.InputParser#parse(java.io.File[], java.lang.String)
-     */
-    protected Configuration parse(List inputFiles) throws Exception{
-        //File wsdlFile = inputFiles[0];
-        Configuration configuration = new Configuration(getEnv());
-        wsdlModelInfo = new WSDLModelInfo();
-        wsdlModelInfo.setLocation(inputFiles.get(0));
-        if(_options.get(ProcessorOptions.WSDL_LOCATION) == null)
-            _options.setProperty(ProcessorOptions.WSDL_LOCATION, inputFiles.get(0));
-
-        //modelInfoParser = (JAXWSBindingInfoParser)getModelInfoParsers().get(JAXWSBindingsConstants.JAXWS_BINDINGS);
-        modelInfoParser = new JAXWSBindingInfoParser(getEnv());
-
-        //get the jaxws bindingd file and add it to the modelInfo
-        Set bindingFiles = (Set)_options.get(ProcessorOptions.BINDING_FILES);
-        for(String bindingFile : bindingFiles){
-            addBinding(bindingFile);
-        }
-
-
-        for(InputSource jaxwsBinding : jaxwsBindings){
-            Document doc = modelInfoParser.parse(jaxwsBinding);
-            if(doc != null){
-                wsdlModelInfo.putJAXWSBindings(jaxwsBinding.getSystemId(), doc);
-            }
-        }
-
-        //copy jaxb binding sources in modelInfo
-        for(InputSource jaxbBinding : jaxbBindings){
-            wsdlModelInfo.addJAXBBIndings(jaxbBinding);
-        }
-
-        addHandlerChainInfo();
-        configuration.setModelInfo(wsdlModelInfo);
-        return configuration;
-    }
-
-    private void addBinding(String bindingLocation) throws Exception{
-        JAXWSUtils.checkAbsoluteness(bindingLocation);
-        InputSource is = null;
-        if(entityResolver != null){
-            is = entityResolver.resolveEntity(null, bindingLocation);
-        }
-        if(is == null)
-            is = new InputSource(bindingLocation);
-
-        XMLStreamReader reader =
-                XMLStreamReaderFactory.createFreshXMLStreamReader(is, true);
-        XMLStreamReaderUtil.nextElementContent(reader);
-        if(reader.getName().equals(JAXWSBindingsConstants.JAXWS_BINDINGS)){
-            jaxwsBindings.add(is);
-        }else if(reader.getName().equals(JAXWSBindingsConstants.JAXB_BINDINGS)){
-            jaxbBindings.add(is);
-        }else{
-            warn("configuration.notBindingFile");
-        }
-    }
-
-    private void addHandlerChainInfo() throws Exception{
-        //setup handler chain info
-        for(Map.Entry entry:wsdlModelInfo.getJAXWSBindings().entrySet()){
-            Element e = entry.getValue().getDocumentElement();
-            NodeList nl = e.getElementsByTagNameNS(
-                "http://java.sun.com/xml/ns/javaee", "handler-chains");
-            if(nl.getLength()== 0)
-                continue;
-            //take the first one, anyway its 1 handler-config per customization
-            Element hc = (Element)nl.item(0);
-            wsdlModelInfo.setHandlerConfig(hc);
-            return;
-        }
-    }
-
-    private WSDLModelInfo wsdlModelInfo;
-    private JAXWSBindingInfoParser modelInfoParser;
-    private Set jaxwsBindings = new HashSet();
-    private Set jaxbBindings = new HashSet();
-    private EntityResolver entityResolver;
-
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/config/parser/InputParser.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/config/parser/InputParser.java
deleted file mode 100644
index a2e2b08d154..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/config/parser/InputParser.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package com.sun.tools.internal.ws.processor.config.parser;
-
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.xml.namespace.QName;
-
-import org.xml.sax.InputSource;
-
-import com.sun.tools.internal.ws.processor.util.ProcessorEnvironment;
-import com.sun.tools.internal.ws.processor.config.Configuration;
-import com.sun.xml.internal.ws.util.localization.LocalizableMessageFactory;
-
-/**
- * @author Vivek Pandey
- *
- *
- */
-public abstract class InputParser{
-    protected LocalizableMessageFactory _messageFactory =
-        new LocalizableMessageFactory(
-            "com.sun.tools.internal.ws.resources.configuration");
-
-    public InputParser(ProcessorEnvironment env, Properties options) {
-        this._env = env;
-        this._options = options;
-        _modelInfoParsers = new HashMap();
-
-//        /*
-//         * Load modelinfo parsers from the plugins which want to extend
-//         * this functionality
-//         */
-//        Iterator i = ToolPluginFactory.getInstance().getExtensions(
-//            ToolPluginConstants.WSCOMPILE_PLUGIN,
-//            ToolPluginConstants.WSCOMPILE_MODEL_INFO_EXT_POINT);
-//        while(i != null && i.hasNext()) {
-//            ModelInfoPlugin plugin = (ModelInfoPlugin)i.next();
-//            _modelInfoParsers.put(plugin.getModelInfoName(),
-//                plugin.createModelInfoParser(env));
-//        }
-    }
-
-    protected Configuration parse(InputStream is) throws Exception{
-        //TODO: Not implemented exception
-        return null;
-    }
-
-    protected Configuration parse(InputSource is) throws Exception{
-        //TODO: Not implemented exception
-        return null;
-    }
-
-    protected Configuration parse(List inputSources) throws Exception{
-        //TODO: Not implemented exception
-        return null;
-    }
-
-    /**
-     * @return Returns the _env.
-     */
-    public  ProcessorEnvironment getEnv(){
-        return _env;
-    }
-
-    /**
-     * @param env The ProcessorEnvironment to set.
-     */
-    public void setEnv(ProcessorEnvironment env){
-        this._env = env;
-    }
-
-    protected void warn(String key) {
-        _env.warn(_messageFactory.getMessage(key));
-    }
-
-    protected void warn(String key, String arg) {
-        _env.warn(_messageFactory.getMessage(key, arg));
-    }
-
-    protected void warn(String key, Object[] args) {
-        _env.warn(_messageFactory.getMessage(key, args));
-    }
-
-    protected void info(String key) {
-        _env.info(_messageFactory.getMessage(key));
-    }
-
-    protected void info(String key, String arg) {
-        _env.info(_messageFactory.getMessage(key, arg));
-    }
-
-    protected ProcessorEnvironment _env;
-    protected Properties _options;
-    protected Map _modelInfoParsers;
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/config/parser/JAXWSBindingInfoParser.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/config/parser/JAXWSBindingInfoParser.java
deleted file mode 100644
index e4e560f8273..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/config/parser/JAXWSBindingInfoParser.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package com.sun.tools.internal.ws.processor.config.parser;
-
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-import com.sun.tools.internal.ws.processor.util.ProcessorEnvironment;
-import com.sun.tools.internal.ws.util.xml.NullEntityResolver;
-import com.sun.tools.internal.ws.wsdl.framework.ParseException;
-
-/**
- * @author Vivek Pandey
- *
- * External jaxws:bindings parser
- */
-public class JAXWSBindingInfoParser {
-
-    private ProcessorEnvironment env;
-
-    /**
-     * @param env
-     */
-    public JAXWSBindingInfoParser(ProcessorEnvironment env) {
-        this.env = env;
-    }
-
-    public Document parse(InputSource source) {
-        try {
-            DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
-            builderFactory.setNamespaceAware(true);
-            builderFactory.setValidating(false);
-            DocumentBuilder builder = builderFactory.newDocumentBuilder();
-            builder.setErrorHandler(new ErrorHandler() {
-                public void error(SAXParseException e)
-                    throws SAXParseException {
-                    throw e;
-                }
-
-                public void fatalError(SAXParseException e)
-                    throws SAXParseException {
-                    throw e;
-                }
-
-                public void warning(SAXParseException err)
-                    throws SAXParseException {
-                    // do nothing
-                }
-            });
-
-            builder.setEntityResolver(new NullEntityResolver());
-            return builder.parse(source);
-        } catch (ParserConfigurationException e) {
-            throw new ParseException("parsing.parserConfigException",e);
-        } catch (FactoryConfigurationError e) {
-            throw new ParseException("parsing.factoryConfigException",e);
-        }catch(SAXException e){
-            throw new ParseException("parsing.saxException",e);
-        }catch(IOException e){
-            throw new ParseException("parsing.saxException",e);
-        }
-    }
-
-    public final Set outerBindings = new HashSet();
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/config/parser/ParserUtil.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/config/parser/ParserUtil.java
deleted file mode 100644
index 84b18c8d4e2..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/config/parser/ParserUtil.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.tools.internal.ws.processor.config.parser;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamReader;
-
-import com.sun.tools.internal.ws.processor.config.ConfigurationException;
-import com.sun.xml.internal.ws.streaming.Attributes;
-import com.sun.xml.internal.ws.streaming.XMLReader;
-import com.sun.xml.internal.ws.util.xml.XmlUtil;
-
-/**
- *
- * @author WS Development Team
- */
-public class ParserUtil {
-    public static void failWithFullName(String key, String file, XMLReader reader) {
-        throw new ConfigurationException(key, new Object[] { file, Integer.toString(
-            reader.getLineNumber()), reader.getName().toString() });
-    }
-
-    public static void failWithFullName(String key, String file, XMLStreamReader reader) {
-        throw new ConfigurationException(key, new Object[] { file, Integer.toString(
-            reader.getLocation().getLineNumber()), reader.getName().toString() });
-    }
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/config/parser/Reader.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/config/parser/Reader.java
deleted file mode 100644
index cd9a100314b..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/config/parser/Reader.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package com.sun.tools.internal.ws.processor.config.parser;
-
-
-import java.net.URL;
-import java.util.List;
-import java.util.Properties;
-
-import com.sun.tools.internal.ws.processor.config.Configuration;
-import com.sun.tools.internal.ws.processor.util.ProcessorEnvironment;
-import com.sun.xml.internal.ws.util.JAXWSUtils;
-import com.sun.tools.internal.ws.wsdl.document.WSDLConstants;
-import com.sun.xml.internal.ws.streaming.XMLStreamReaderFactory;
-import com.sun.xml.internal.ws.streaming.XMLStreamReaderUtil;
-
-import javax.xml.stream.XMLStreamReader;
-
-import org.xml.sax.EntityResolver;
-
-/**
- * @author Vivek Pandey
- *
- * Main entry point from CompileTool
- */
-public class Reader {
-
-    /**
-     *
-     */
-    public Reader(ProcessorEnvironment env, Properties options) {
-        this._env = env;
-        this._options = options;
-    }
-
-    public Configuration parse(EntityResolver entityResolver, List inputSources)
-            throws Exception {
-        //reset the input type flags before parsing
-        isClassFile = false;
-
-        InputParser parser = null;
-        //now its just the first file. do we expect more than one input files?
-        validateInput(inputSources.get(0));
-
-        if(isClassFile){
-            parser = new ClassModelParser(_env, _options);
-        } else {
-            parser = new CustomizationParser(entityResolver, _env, _options);
-        }
-        return parser.parse(inputSources);
-    }
-
-    protected void validateInput(String file) throws Exception{
-        if(isClass(file)){
-            isClassFile = true;
-            return;
-        }
-
-//        JAXWSUtils.checkAbsoluteness(file);
-//        URL url = new URL(file);
-//
-//        XMLStreamReader reader =
-//                XMLStreamReaderFactory.createXMLStreamReader(url.openStream(), true);
-//
-//        XMLStreamReaderUtil.nextElementContent(reader);
-//        if(!reader.getName().equals(WSDLConstants.QNAME_DEFINITIONS)){
-//            //we are here, means invalid element
-//            ParserUtil.failWithFullName("configuration.invalidElement", file, reader);
-//        }
-    }
-
-    public boolean isClass(String className) {
-        try {
-            _env.getClassLoader().loadClass(className);
-        } catch (ClassNotFoundException e) {
-            return false;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return true;
-    }
-
-    private boolean isClassFile;
-
-    protected ProcessorEnvironment _env;
-
-    protected Properties _options;
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/CustomExceptionGenerator.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/CustomExceptionGenerator.java
index 4726a47a9de..a933faa0173 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/CustomExceptionGenerator.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/CustomExceptionGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,16 +25,28 @@
 
 package com.sun.tools.internal.ws.processor.generator;
 
-import com.sun.codemodel.internal.*;
-import com.sun.tools.internal.ws.processor.config.Configuration;
+import com.sun.codemodel.internal.ClassType;
+import com.sun.codemodel.internal.JAnnotationUse;
+import com.sun.codemodel.internal.JBlock;
+import com.sun.codemodel.internal.JClass;
+import com.sun.codemodel.internal.JClassAlreadyExistsException;
+import com.sun.codemodel.internal.JDefinedClass;
+import com.sun.codemodel.internal.JDocComment;
+import com.sun.codemodel.internal.JExpr;
+import com.sun.codemodel.internal.JFieldRef;
+import com.sun.codemodel.internal.JFieldVar;
+import com.sun.codemodel.internal.JMethod;
+import com.sun.codemodel.internal.JMod;
+import com.sun.codemodel.internal.JType;
+import com.sun.codemodel.internal.JVar;
 import com.sun.tools.internal.ws.processor.model.Fault;
 import com.sun.tools.internal.ws.processor.model.Model;
-import com.sun.xml.internal.ws.encoding.soap.SOAPVersion;
+import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
+import com.sun.tools.internal.ws.wscompile.WsimportOptions;
 
 import javax.xml.ws.WebFault;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Properties;
 
 /**
  *
@@ -43,39 +55,25 @@ import java.util.Properties;
 public class CustomExceptionGenerator extends GeneratorBase {
     private Map faults = new HashMap();
 
-    public CustomExceptionGenerator() {
+    public static void generate(Model model,
+        WsimportOptions options,
+        ErrorReceiver receiver){
+        CustomExceptionGenerator exceptionGen = new CustomExceptionGenerator(model, options, receiver);
+        exceptionGen.doGeneration();
     }
-
-    public GeneratorBase getGenerator(
+    private CustomExceptionGenerator(
         Model model,
-        Configuration config,
-        Properties properties) {
-        return new CustomExceptionGenerator(model, config, properties);
+        WsimportOptions options,
+        ErrorReceiver receiver) {
+        super(model, options, receiver);
     }
 
-    public GeneratorBase getGenerator(
-        Model model,
-        Configuration config,
-        Properties properties,
-        SOAPVersion ver) {
-        return new CustomExceptionGenerator(model, config, properties);
+    public GeneratorBase getGenerator(Model model, WsimportOptions options, ErrorReceiver receiver) {
+        return new CustomExceptionGenerator(model, options, receiver);
     }
 
-    protected CustomExceptionGenerator(
-        Model model,
-        Configuration config,
-        Properties properties) {
-        super(model, config, properties);
-    }
-
-    protected void preVisitModel(Model model) throws Exception {
-    }
-
-    protected void postVisitModel(Model model) throws Exception {
-        faults = null;
-    }
-
-    protected void preVisitFault(Fault fault) throws Exception {
+    @Override
+    public void visit(Fault fault) throws Exception {
         if (isRegistered(fault))
             return;
         registerFault(fault);
@@ -93,13 +91,13 @@ public class CustomExceptionGenerator extends GeneratorBase {
          try {
             write(fault);
             faults.put(fault.getJavaException().getName(), fault.getExceptionClass());
-        } catch (Exception e) {
+        } catch (JClassAlreadyExistsException e) {
             throw new GeneratorException("generator.nestedGeneratorError",e);
         }
     }
 
-    private void write(Fault fault) throws Exception{
-        String className = env.getNames().customExceptionClassName(fault);
+    private void write(Fault fault) throws JClassAlreadyExistsException {
+        String className = Names.customExceptionClassName(fault);
 
         JDefinedClass cls = cm._class(className, ClassType.CLASS);
         JDocComment comment = cls.javadoc();
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorBase.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorBase.java
index 49382cf407c..9cee479e62e 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorBase.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorBase.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,20 +25,12 @@
 
 package com.sun.tools.internal.ws.processor.generator;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.FileOutputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-
-import com.sun.tools.internal.ws.processor.ProcessorAction;
-import com.sun.tools.internal.ws.processor.ProcessorOptions;
-import com.sun.tools.internal.ws.processor.config.Configuration;
-import com.sun.tools.internal.ws.processor.config.WSDLModelInfo;
-import com.sun.tools.internal.ws.processor.model.AbstractType;
+import com.sun.codemodel.internal.ClassType;
+import com.sun.codemodel.internal.JAnnotationUse;
+import com.sun.codemodel.internal.JClassAlreadyExistsException;
+import com.sun.codemodel.internal.JCodeModel;
+import com.sun.codemodel.internal.JDefinedClass;
+import com.sun.tools.internal.ws.ToolVersion;
 import com.sun.tools.internal.ws.processor.model.Block;
 import com.sun.tools.internal.ws.processor.model.Fault;
 import com.sun.tools.internal.ws.processor.model.Model;
@@ -49,27 +41,25 @@ import com.sun.tools.internal.ws.processor.model.Port;
 import com.sun.tools.internal.ws.processor.model.Request;
 import com.sun.tools.internal.ws.processor.model.Response;
 import com.sun.tools.internal.ws.processor.model.Service;
-import com.sun.tools.internal.ws.processor.model.jaxb.JAXBType;
-import com.sun.tools.internal.ws.processor.model.jaxb.JAXBTypeVisitor;
-import com.sun.tools.internal.ws.processor.model.jaxb.RpcLitStructure;
-import com.sun.tools.internal.ws.processor.util.IndentingWriter;
-import com.sun.tools.internal.ws.processor.util.ProcessorEnvironment;
 import com.sun.tools.internal.ws.processor.util.DirectoryUtil;
-import com.sun.tools.internal.ws.processor.util.GeneratedFileInfo;
-import com.sun.tools.internal.ws.ToolVersion;
-import com.sun.xml.internal.ws.encoding.soap.SOAPVersion;
-import com.sun.xml.internal.ws.util.localization.Localizable;
-import com.sun.xml.internal.ws.util.localization.LocalizableMessageFactory;
+import com.sun.tools.internal.ws.processor.util.IndentingWriter;
+import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
+import com.sun.tools.internal.ws.wscompile.WsimportOptions;
 import com.sun.xml.internal.ws.util.xml.XmlUtil;
-import com.sun.codemodel.internal.*;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
 import javax.jws.HandlerChain;
-import javax.xml.transform.Transformer;
 import javax.xml.transform.OutputKeys;
-import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.Transformer;
 import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.OutputStreamWriter;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
 /**
  *
@@ -78,173 +68,53 @@ import javax.xml.transform.dom.DOMSource;
 public abstract class GeneratorBase
     implements
         GeneratorConstants,
-        ProcessorAction,
-        ModelVisitor,
-        JAXBTypeVisitor {
-    protected File sourceDir;
-    protected File destDir;
-    protected File nonclassDestDir;
-    protected ProcessorEnvironment env;
-    protected Model model;
-    protected Service service;
-    protected SOAPVersion curSOAPVersion;
-    protected String targetVersion;
+        ModelVisitor{
+    private File destDir;
+    private String targetVersion;
     protected boolean donotOverride;
-    protected String servicePackage;
     protected JCodeModel cm;
-    protected boolean printStackTrace;
-    protected String wsdlLocation;
-
-    private LocalizableMessageFactory messageFactory;
-
-    public GeneratorBase() {
-        sourceDir = null;
-        destDir = null;
-        nonclassDestDir = null;
-        env = null;
-        model = null;
-    }
-
-    public void perform(
-        Model model,
-        Configuration config,
-        Properties properties) {
-        GeneratorBase generator = getGenerator(model, config, properties);
-
-        generator.doGeneration();
-    }
-
-    public abstract GeneratorBase getGenerator(
-        Model model,
-        Configuration config,
-        Properties properties);
-    public abstract GeneratorBase getGenerator(
-        Model model,
-        Configuration config,
-        Properties properties,
-        SOAPVersion ver);
-
-    protected GeneratorBase(
-        Model model,
-        Configuration config,
-        Properties properties) {
+    protected final Model model;
+    protected final String wsdlLocation;
+    protected final ErrorReceiver receiver;
+    protected final WsimportOptions options;
 
+    protected GeneratorBase(Model model, WsimportOptions options, ErrorReceiver receiver){
         this.model = model;
-
-        if(model.getJAXBModel().getS2JJAXBModel() != null)
-            cm = model.getJAXBModel().getS2JJAXBModel().generateCode(null, new JAXBTypeGenerator.JAXBErrorListener());
-        else
-            cm = new JCodeModel();
-
-        this.env = (ProcessorEnvironment) config.getEnvironment();
-        String key = ProcessorOptions.DESTINATION_DIRECTORY_PROPERTY;
-        String dirPath = properties.getProperty(key);
-        this.destDir = new File(dirPath);
-        key = ProcessorOptions.SOURCE_DIRECTORY_PROPERTY;
-        String sourcePath = properties.getProperty(key);
-        this.sourceDir = new File(sourcePath);
-        key = ProcessorOptions.NONCLASS_DESTINATION_DIRECTORY_PROPERTY;
-        String nonclassDestPath = properties.getProperty(key);
-        this.nonclassDestDir = new File(nonclassDestPath);
-        if (nonclassDestDir == null)
-            nonclassDestDir = destDir;
-        messageFactory =
-            new LocalizableMessageFactory("com.sun.tools.internal.ws.resources.generator");
-        this.targetVersion =
-            properties.getProperty(ProcessorOptions.JAXWS_SOURCE_VERSION);
-        key = ProcessorOptions.DONOT_OVERWRITE_CLASSES;
-        this.donotOverride =
-            Boolean.valueOf(properties.getProperty(key)).booleanValue();
-        this.printStackTrace = Boolean.valueOf(properties.getProperty(ProcessorOptions.PRINT_STACK_TRACE_PROPERTY));
-        this.wsdlLocation = properties.getProperty(ProcessorOptions.WSDL_LOCATION);
+        this.options = options;
+        this.destDir = options.destDir;
+        this.receiver = receiver;
+        this.wsdlLocation = options.wsdlLocation;
+        this.targetVersion = options.target.getVersion();
+        this.cm = options.getCodeModel();
     }
 
     protected void doGeneration() {
         try {
             model.accept(this);
         } catch (Exception e) {
-            if (env.verbose())
-                e.printStackTrace();
-            throw new GeneratorException("generator.nestedGeneratorError",e);
+            receiver.error(e);
         }
     }
 
     public void visit(Model model) throws Exception {
-        preVisitModel(model);
-        visitModel(model);
-        postVisitModel(model);
-    }
-
-    protected void preVisitModel(Model model) throws Exception {
-    }
-
-    protected void visitModel(Model model) throws Exception {
-        env.getNames().resetPrefixFactory();
         for (Service service : model.getServices()) {
             service.accept(this);
         }
     }
 
-    protected void postVisitModel(Model model) throws Exception {
-    }
-
     public void visit(Service service) throws Exception {
-        preVisitService(service);
-        visitService(service);
-        postVisitService(service);
-    }
-
-    protected void preVisitService(Service service) throws Exception {
-        servicePackage = Names.getPackageName(service);
-    }
-
-    protected void visitService(Service service) throws Exception {
-        this.service = service;
-//        Iterator ports = service.getPorts();
         for (Port port : service.getPorts()) {
             port.accept(this);
         }
-        this.service = null;
-    }
-
-    protected void postVisitService(Service service) throws Exception {
-        Iterator extraTypes = model.getExtraTypes();
-        while (extraTypes.hasNext()) {
-            AbstractType type = (AbstractType) extraTypes.next();
-        }
-        servicePackage = null;
     }
 
     public void visit(Port port) throws Exception {
-        preVisitPort(port);
-        visitPort(port);
-        postVisitPort(port);
-    }
-
-    protected void preVisitPort(Port port) throws Exception {
-        curSOAPVersion = port.getSOAPVersion();
-    }
-
-    protected void visitPort(Port port) throws Exception {
         for (Operation operation : port.getOperations()) {
             operation.accept(this);
         }
     }
 
-    protected void postVisitPort(Port port) throws Exception {
-        curSOAPVersion = null;
-    }
-
     public void visit(Operation operation) throws Exception {
-        preVisitOperation(operation);
-        visitOperation(operation);
-        postVisitOperation(operation);
-    }
-
-    protected void preVisitOperation(Operation operation) throws Exception {
-    }
-
-    protected void visitOperation(Operation operation) throws Exception {
         operation.getRequest().accept(this);
         if (operation.getResponse() != null)
             operation.getResponse().accept(this);
@@ -258,161 +128,20 @@ public abstract class GeneratorBase
         }
     }
 
-    protected void postVisitOperation(Operation operation) throws Exception {
-    }
-
     public void visit(Parameter param) throws Exception {
-        preVisitParameter(param);
-        visitParameter(param);
-        postVisitParameter(param);
-    }
-
-    protected void preVisitParameter(Parameter param) throws Exception {
-    }
-
-    protected void visitParameter(Parameter param) throws Exception {
-    }
-
-    protected void postVisitParameter(Parameter param) throws Exception {
     }
 
     public void visit(Block block) throws Exception {
-        preVisitBlock(block);
-        visitBlock(block);
-        postVisitBlock(block);
-    }
-
-    protected void preVisitBlock(Block block) throws Exception {
-    }
-
-    protected void visitBlock(Block block) throws Exception {
-    }
-
-    protected void postVisitBlock(Block block) throws Exception {
     }
 
     public void visit(Response response) throws Exception {
-        preVisitResponse(response);
-        visitResponse(response);
-        postVisitResponse(response);
     }
 
-    protected void preVisitResponse(Response response) throws Exception {
-    }
-
-    protected void visitResponse(Response response) throws Exception {
-        Iterator iter = response.getParameters();
-        AbstractType type;
-        Block block;
-        while (iter.hasNext()) {
-            ((Parameter) iter.next()).accept(this);
-        }
-        iter = response.getBodyBlocks();
-        while (iter.hasNext()) {
-            block = (Block) iter.next();
-            type = block.getType();
-            if(type instanceof JAXBType)
-                ((JAXBType) type).accept(this);
-            else if(type instanceof RpcLitStructure)
-                ((RpcLitStructure) type).accept(this);
-
-            responseBodyBlock(block);
-        }
-        iter = response.getHeaderBlocks();
-        while (iter.hasNext()) {
-            block = (Block) iter.next();
-            type = block.getType();
-            if(type instanceof JAXBType)
-                ((JAXBType) type).accept(this);
-            responseHeaderBlock(block);
-        }
-
-        //attachment
-        iter = response.getAttachmentBlocks();
-        while (iter.hasNext()) {
-            block = (Block) iter.next();
-            type = block.getType();
-            if(type instanceof JAXBType)
-                ((JAXBType) type).accept(this);
-            responseAttachmentBlock(block);
-        }
-
-    }
-
-    protected void responseBodyBlock(Block block) throws Exception {
-    }
-
-    protected void responseHeaderBlock(Block block) throws Exception {
-    }
-
-    protected void responseAttachmentBlock(Block block) throws Exception {
-    }
-
-    protected void postVisitResponse(Response response) throws Exception {
-    }
 
     public void visit(Request request) throws Exception {
-        preVisitRequest(request);
-        visitRequest(request);
-        postVisitRequest(request);
-    }
-
-    protected void preVisitRequest(Request request) throws Exception {
-    }
-
-    protected void visitRequest(Request request) throws Exception {
-        Iterator iter = request.getParameters();
-        AbstractType type;
-        Block block;
-        while (iter.hasNext()) {
-            ((Parameter) iter.next()).accept(this);
-        }
-        iter = request.getBodyBlocks();
-        while (iter.hasNext()) {
-            block = (Block) iter.next();
-            type = block.getType();
-            if(type instanceof JAXBType)
-                ((JAXBType) type).accept(this);
-            else if(type instanceof RpcLitStructure)
-                ((RpcLitStructure) type).accept(this);
-            requestBodyBlock(block);
-        }
-        iter = request.getHeaderBlocks();
-        while (iter.hasNext()) {
-            block = (Block) iter.next();
-            type = block.getType();
-            if(type instanceof JAXBType)
-                ((JAXBType) type).accept(this);
-            requestHeaderBlock(block);
-        }
-    }
-
-    protected void requestBodyBlock(Block block) throws Exception {
-    }
-
-    protected void requestHeaderBlock(Block block) throws Exception {
-    }
-
-    protected void postVisitRequest(Request request) throws Exception {
     }
 
     public void visit(Fault fault) throws Exception {
-        preVisitFault(fault);
-        visitFault(fault);
-        postVisitFault(fault);
-    }
-
-    protected void preVisitFault(Fault fault) throws Exception {
-    }
-
-    protected void visitFault(Fault fault) throws Exception {
-    }
-
-    protected void postVisitFault(Fault fault) throws Exception {
-    }
-
-    protected void writeWarning(IndentingWriter p) throws IOException {
-        writeWarning(p, targetVersion);
     }
 
     public List getJAXWSClassComment(){
@@ -421,52 +150,14 @@ public abstract class GeneratorBase
 
     public static List getJAXWSClassComment(String targetVersion) {
         List comments = new ArrayList();
-        comments.add("This class was generated by the JAXWS SI.\n");
+        comments.add("This class was generated by the JAX-WS RI.\n");
         comments.add(ToolVersion.VERSION.BUILD_VERSION+"\n");
         comments.add("Generated source version: " + targetVersion);
         return comments;
     }
 
-    public static void writeWarning(IndentingWriter p,
-                                    String targetVersion) throws IOException {
-        /*
-         * Write boiler plate comment.
-         */
-        p.pln("// This class was generated by the JAX SI, do not edit.");
-        p.pln("// Contents subject to change without notice.");
-        p.pln("// " + ToolVersion.VERSION.BUILD_VERSION);
-        p.pln("// Generated source version: " + targetVersion);
-        p.pln();
-    }
-
-    public void writePackage(IndentingWriter p, String classNameStr)
-        throws IOException {
-
-        writePackage(p, classNameStr, targetVersion);
-    }
-
-    public static void writePackage(
-        IndentingWriter p,
-        String classNameStr,
-        String sourceVersion)
-        throws IOException {
-
-        writeWarning(p, sourceVersion);
-        writePackageOnly(p, classNameStr);
-    }
-
-    public static void writePackageOnly(IndentingWriter p, String classNameStr)
-        throws IOException {
-        int idx = classNameStr.lastIndexOf(".");
-        if (idx > 0) {
-            p.pln("package " + classNameStr.substring(0, idx) + ";");
-            p.pln();
-        }
-    }
-
-
     protected JDefinedClass getClass(String className, ClassType type) {
-        JDefinedClass cls = null;
+        JDefinedClass cls;
         try {
             cls = cm._class(className, type);
         } catch (JClassAlreadyExistsException e){
@@ -476,7 +167,7 @@ public abstract class GeneratorBase
     }
 
     protected void log(String msg) {
-        if (env.verbose()) {
+        if (options.verbose) {
             System.out.println(
                 "["
                     + Names.stripQualifier(this.getClass().getName())
@@ -486,101 +177,14 @@ public abstract class GeneratorBase
         }
     }
 
-    protected void warn(String key) {
-        env.warn(messageFactory.getMessage(key));
-    }
-
-    protected void warn(String key, String arg) {
-        env.warn(messageFactory.getMessage(key, arg));
-    }
-
-    protected void warn(String key, Object[] args) {
-        env.warn(messageFactory.getMessage(key, args));
-    }
-
-    protected void info(String key) {
-        env.info(messageFactory.getMessage(key));
-    }
-
-    protected void info(String key, String arg) {
-        env.info(messageFactory.getMessage(key, arg));
-    }
-
-    protected static void fail(String key) {
-        throw new GeneratorException(key);
-    }
-
-    protected static void fail(String key, String arg) {
-        throw new GeneratorException(key, arg);
-    }
-
-    protected static void fail(String key, String arg1, String arg2) {
-        throw new GeneratorException(key, new Object[] { arg1, arg2 });
-    }
-
-    protected static void fail(Localizable arg) {
-        throw new GeneratorException("generator.nestedGeneratorError", arg);
-    }
-
-    protected static void fail(Throwable arg) {
-        throw new GeneratorException(
-            "generator.nestedGeneratorError",
-            arg);
-    }
-
-    /* (non-Javadoc)
-     * @see com.sun.xml.internal.ws.processor.model.jaxb.JAXBTypeVisitor#visit(com.sun.xml.internal.ws.processor.model.jaxb.JAXBType)
-     */
-    public void visit(JAXBType type) throws Exception {
-        preVisitJAXBType(type);
-        visitJAXBType(type);
-        postVisitJAXBType(type);
-
-    }
-
-    /**
-     * @param type
-     */
-    protected void postVisitJAXBType(JAXBType type) {
-        // TODO Auto-generated method stub
-
-    }
-
-    /**
-     * @param type
-     */
-    protected void visitJAXBType(JAXBType type) {
-        // TODO Auto-generated method stub
-
-    }
-
-    /**
-     * @param type
-     */
-    protected void preVisitJAXBType(JAXBType type) {
-        // TODO Auto-generated method stub
-
-    }
-
-
-    /* (non-Javadoc)
-     * @see com.sun.xml.internal.ws.processor.model.jaxb.JAXBTypeVisitor#visit(com.sun.xml.internal.ws.processor.model.jaxb.RpcLitStructure)
-     */
-    public void visit(RpcLitStructure type) throws Exception {
-        // TODO Auto-generated method stub
-
-    }
-
-    protected void writeHandlerConfig(String className, JDefinedClass cls, WSDLModelInfo wsdlModelInfo) {
-        Element e = wsdlModelInfo.getHandlerConfig();
+    protected void writeHandlerConfig(String className, JDefinedClass cls, WsimportOptions options) {
+        Element e = options.getHandlerChainConfiguration();
         if(e == null)
             return;
         JAnnotationUse handlerChainAnn = cls.annotate(cm.ref(HandlerChain.class));
-        //String fullName = env.getNames().customJavaTypeClassName(port.getJavaInterface());
         NodeList nl = e.getElementsByTagNameNS(
             "http://java.sun.com/xml/ns/javaee", "handler-chain");
         if(nl.getLength() > 0){
-            Element hn = (Element)nl.item(0);
             String fName = getHandlerConfigFileName(className);
             handlerChainAnn.param("file", fName);
             generateHandlerChainFile(e, className);
@@ -595,14 +199,10 @@ public abstract class GeneratorBase
     private void generateHandlerChainFile(Element hChains, String name) {
         String hcName = getHandlerConfigFileName(name);
 
-        File packageDir = DirectoryUtil.getOutputDirectoryFor(name, destDir, env);
+        File packageDir = DirectoryUtil.getOutputDirectoryFor(name, destDir);
         File hcFile = new File(packageDir, hcName);
 
-        /* adding the file name and its type */
-        GeneratedFileInfo fi = new GeneratedFileInfo();
-        fi.setFile(hcFile);
-        fi.setType("HandlerConfig");
-        env.addGeneratedFile(fi);
+        options.addGeneratedFile(hcFile);
 
         try {
             IndentingWriter p =
@@ -617,6 +217,7 @@ public abstract class GeneratorBase
                 "2");
             it.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
             it.transform( new DOMSource(hChains), new StreamResult(p) );
+            p.close();
         } catch (Exception e) {
             throw new GeneratorException(
                     "generator.nestedGeneratorError",
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorConstants.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorConstants.java
index c8fcd512d53..0688b6b3a84 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorConstants.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorConstants.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,56 +31,12 @@ import com.sun.tools.internal.ws.processor.modeler.ModelerConstants;
  * @author WS Development Team
  */
 public interface GeneratorConstants extends ModelerConstants {
-
-    /*
-     * Constants used in the generators
-     */
-    public static final String FILE_TYPE_WSDL = "Wsdl";
-    public static final String FILE_TYPE_REMOTE_INTERFACE = "RemoteInterface";
-    public static final String FILE_TYPE_SERVICE = "Service";
-    public static final String FILE_TYPE_HANDLER_CONFIG = "HandlerConfig";
-    public static final String FILE_TYPE_SERVICE_IMPL = "ServiceImpl";
-    public static final String FILE_TYPE_EXCEPTION = "Exception";
-    public static final String FILE_TYPE_WRAPPER_BEAN = "WrapperBean";
-    public static final String FILE_TYPE_EXCEPTION_BEAN = "ExceptionBean";
-    /*
-     * Identifiers potentially useful for all Generators
-     */
-
-    public static final String ID_DELEGATE_BASE = "com.sun.xml.internal.ws.soap.internal.DelegateBase";
-
-
     public static final char DOTC = '.';
     public static final String SIG_INNERCLASS = "$";
-
-    public static final String UNDERSCORE = "_";
-    public static final String STUB_SUFFIX = "_Stub";
-
-    public static final String CLIENT_DELEGATE_SUFFIX = "_Delegate";
-    public static final String CLIENT_CONTACTINFOLIST_SUFFIX = "_ContactInfoList";
-
-    public static final String CLIENT_ENCODER_DECODER_SUFFIX = "_CED";
-    public static final String SERVER_ENCODER_DECODER_SUFFIX = "_SED";
-    public static final String TIE_SUFFIX = "_Tie";
-
-    public static final String PEPT_TIE_SUFFIX = "_PTie";
-    public static final String EPTFF_SUFFIX = "_EPTFF";
     public static final String JAVA_SRC_SUFFIX = ".java";
-    public static final String IMPL_SUFFIX = "_Impl";
-    public static final String ARRAY = "Array";
-    public static final String MEMBER_PREFIX = "my";
-
-    public static final String OPCODE_SUFFIX = "_OPCODE";
     public static final String QNAME_SUFFIX = "_QNAME";
-    public static final String TYPE_QNAME_SUFFIX = "_TYPE" + QNAME_SUFFIX;
-
     public static final String GET = "get";
     public static final String IS = "is";
-    public static final String SET = "set";
     public static final String RESPONSE = "Response";
-    public static final String NS_PREFIX = "ns";
-    public static final String SERVICE_SUFFIX = "_Service";
-    public static final String JAVA_PACKAGE_PREFIX = "java.";
-    public static final String JAVAX_PACKAGE_PREFIX = "javax.";
     public static final String FAULT_CLASS_MEMBER_NAME = "faultInfo";
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorException.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorException.java
index 12c50384766..36d6c6d148c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorException.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorException.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 package com.sun.tools.internal.ws.processor.generator;
 
 import com.sun.tools.internal.ws.processor.ProcessorException;
-import com.sun.xml.internal.ws.util.localization.Localizable;
 
 /**
  *
@@ -42,7 +41,7 @@ public class GeneratorException extends ProcessorException {
         super(throwable);
     }
 
-    public String getResourceBundleName() {
+    public String getDefaultResourceBundleName() {
         return "com.sun.tools.internal.ws.resources.generator";
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorUtil.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorUtil.java
index 6f552118dae..64dbe6f5953 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorUtil.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorUtil.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,17 +25,7 @@
 
 package com.sun.tools.internal.ws.processor.generator;
 
-import java.io.IOException;
-import java.util.Comparator;
-
-import javax.xml.namespace.QName;
-
-import com.sun.tools.internal.ws.processor.model.Block;
-import com.sun.tools.internal.ws.processor.model.Fault;
-import com.sun.tools.internal.ws.processor.model.Operation;
-import com.sun.tools.internal.ws.processor.model.java.JavaStructureType;
-import com.sun.tools.internal.ws.processor.util.IndentingWriter;
-import com.sun.tools.internal.ws.processor.util.ProcessorEnvironment;
+import com.sun.tools.internal.ws.wscompile.Options;
 
 
 /**
@@ -44,67 +34,19 @@ import com.sun.tools.internal.ws.processor.util.ProcessorEnvironment;
  */
 public class GeneratorUtil implements GeneratorConstants {
 
-    public static void writeNewQName(IndentingWriter p, QName name)
-        throws IOException {
-        p.p(
-            "new QName(\""
-                + name.getNamespaceURI()
-                + "\", \""
-                + name.getLocalPart()
-                + "\")");
-    }
-
-
-    public static void writeBlockQNameDeclaration(
-        IndentingWriter p,
-        Operation operation,
-        Block block,
-        Names names)
-        throws IOException {
-        String qname = names.getBlockQNameName(operation, block);
-        p.p("private static final QName ");
-        p.p(qname + " = ");
-        writeNewQName(p, block.getName());
-        p.pln(";");
-    }
-
-    public static void writeQNameDeclaration(
-        IndentingWriter p,
-        QName name,
-        Names names)
-        throws IOException {
-        String qname = names.getQNameName(name);
-        p.p("private static final QName ");
-        p.p(qname + " = ");
-        writeNewQName(p, name);
-        p.pln(";");
-    }
-
-    public static void writeQNameTypeDeclaration(
-        IndentingWriter p,
-        QName name,
-        Names names)
-        throws IOException {
-        String qname = names.getTypeQName(name);
-        p.p("private static final QName ");
-        p.p(qname + " = ");
-        writeNewQName(p, name);
-        p.pln(";");
-    }
-
     public static boolean classExists(
-        ProcessorEnvironment env,
+        Options options,
         String className) {
         try {
             // Takes care of inner classes.
-            getLoadableClassName(className, env.getClassLoader());
+            getLoadableClassName(className, options.getClassLoader());
             return true;
         } catch(ClassNotFoundException ce) {
+            return false;
         }
-        return false;
     }
 
-    public static String getLoadableClassName(
+    private static String getLoadableClassName(
         String className,
         ClassLoader classLoader)
         throws ClassNotFoundException {
@@ -122,62 +64,4 @@ public class GeneratorUtil implements GeneratorConstants {
         }
         return className;
     }
-
-    public static class FaultComparator implements Comparator {
-        private boolean sortName = false;
-        public FaultComparator() {
-        }
-        public FaultComparator(boolean sortName) {
-            this.sortName = sortName;
-        }
-
-        public int compare(Object o1, Object o2) {
-            if (sortName) {
-                QName name1 = ((Fault) o1).getBlock().getName();
-                QName name2 = ((Fault) o2).getBlock().getName();
-                // Faults that are processed by name first, then type
-                if (!name1.equals(name2)) {
-                    return name1.toString().compareTo(name2.toString());
-                }
-            }
-            JavaStructureType type1 = ((Fault) o1).getJavaException();
-            JavaStructureType type2 = ((Fault) o2).getJavaException();
-            int result = sort(type1, type2);
-            return result;
-        }
-
-        protected int sort(JavaStructureType type1, JavaStructureType type2) {
-            if (type1.getName().equals(type2.getName())) {
-                return 0;
-            }
-            JavaStructureType superType;
-            superType = type1.getSuperclass();
-            while (superType != null) {
-                if (superType.equals(type2)) {
-                    return -1;
-                }
-                superType = superType.getSuperclass();
-            }
-            superType = type2.getSuperclass();
-            while (superType != null) {
-                if (superType.equals(type1)) {
-                    return 1;
-                }
-                superType = superType.getSuperclass();
-            }
-            if (type1.getSubclasses() == null && type2.getSubclasses() != null)
-                return -1;
-            if (type1.getSubclasses() != null && type2.getSubclasses() == null)
-                return 1;
-            if (type1.getSuperclass() != null
-                && type2.getSuperclass() == null) {
-                return 1;
-            }
-            if (type1.getSuperclass() == null
-                && type2.getSuperclass() != null) {
-                return -1;
-            }
-            return type1.getName().compareTo(type2.getName());
-        }
-    }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/JAXBTypeGenerator.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/JAXBTypeGenerator.java
deleted file mode 100644
index a4c201bfa08..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/JAXBTypeGenerator.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package com.sun.tools.internal.ws.processor.generator;
-
-import java.util.Properties;
-
-import org.xml.sax.SAXParseException;
-
-import com.sun.codemodel.internal.CodeWriter;
-import com.sun.codemodel.internal.JCodeModel;
-import com.sun.codemodel.internal.writer.ProgressCodeWriter;
-//import com.sun.tools.internal.xjc.addon.Augmenter;
-import com.sun.tools.internal.xjc.api.ErrorListener;
-import com.sun.tools.internal.xjc.api.JAXBModel;
-import com.sun.tools.internal.xjc.api.S2JJAXBModel;
-import com.sun.tools.internal.ws.processor.config.Configuration;
-import com.sun.tools.internal.ws.processor.model.Model;
-import com.sun.tools.internal.ws.processor.model.jaxb.JAXBType;
-import com.sun.tools.internal.ws.processor.model.jaxb.RpcLitStructure;
-import com.sun.tools.internal.ws.processor.modeler.wsdl.ConsoleErrorReporter;
-import com.sun.tools.internal.ws.processor.ProcessorOptions;
-import com.sun.xml.internal.ws.encoding.soap.SOAPVersion;
-import com.sun.tools.internal.ws.wscompile.WSCodeWriter;
-
-/**
- * @author Vivek Pandey
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class JAXBTypeGenerator extends GeneratorBase {
-
-    /**
-     * @author Vivek Pandey
-     *
-     * To change the template for this generated type comment go to
-     * Window>Preferences>Java>Code Generation>Code and Comments
-     */
-    public static class JAXBErrorListener implements ErrorListener {
-
-        /**
-         *
-         */
-        public JAXBErrorListener() {
-            super();
-        }
-
-        /* (non-Javadoc)
-         * @see org.xml.sax.ErrorHandler#error(org.xml.sax.SAXParseException)
-         */
-        public void error(SAXParseException arg0) {
-            // TODO Auto-generated method stub
-
-        }
-
-        /* (non-Javadoc)
-         * @see org.xml.sax.ErrorHandler#fatalError(org.xml.sax.SAXParseException)
-         */
-        public void fatalError(SAXParseException arg0) {
-            // TODO Auto-generated method stub
-
-        }
-
-        /* (non-Javadoc)
-         * @see org.xml.sax.ErrorHandler#warning(org.xml.sax.SAXParseException)
-         */
-        public void warning(SAXParseException arg0) {
-            // TODO Auto-generated method stub
-
-        }
-
-        /* (non-Javadoc)
-         * @see com.sun.tools.internal.xjc.api.ErrorListener#info(org.xml.sax.SAXParseException)
-         */
-        public void info(SAXParseException arg0) {
-            // TODO Auto-generated method stub
-
-        }
-
-    }
-    /**
-     *
-     */
-    public JAXBTypeGenerator() {
-        super();
-        // TODO Auto-generated constructor stub
-    }
-    /**
-     * @param model
-     * @param config
-     * @param properties
-     */
-    public JAXBTypeGenerator(Model model, Configuration config,
-            Properties properties) {
-        super(model, config, properties);
-    }
-    /* (non-Javadoc)
-     * @see GeneratorBase#getGenerator(com.sun.xml.internal.ws.processor.model.Model, com.sun.xml.internal.ws.processor.config.Configuration, java.util.Properties)
-     */
-    public GeneratorBase getGenerator(Model model, Configuration config,
-            Properties properties) {
-        return new JAXBTypeGenerator(model, config, properties);
-    }
-    /* (non-Javadoc)
-     * @see cGeneratorBase#getGenerator(com.sun.xml.internal.ws.processor.model.Model, com.sun.xml.internal.ws.processor.config.Configuration, java.util.Properties, com.sun.xml.internal.ws.soap.SOAPVersion)
-     */
-    public GeneratorBase getGenerator(Model model, Configuration config,
-            Properties properties, SOAPVersion ver) {
-        return new JAXBTypeGenerator(model, config, properties);
-    }
-
-    /* (non-Javadoc)
-     * @see JAXBTypeVisitor#visit(JAXBType)
-     */
-    public void visit(JAXBType type) throws Exception {
-        //this is a raw type, probably from rpclit
-        if(type.getJaxbModel() == null)
-            return;
-        S2JJAXBModel model = type.getJaxbModel().getS2JJAXBModel();
-        if (model != null)
-            generateJAXBClasses(model);
-    }
-
-
-    /* (non-Javadoc)
-     * @see JAXBTypeVisitor#visit(com.sun.xml.internal.ws.processor.model.jaxb.RpcLitStructure)
-     */
-    public void visit(RpcLitStructure type) throws Exception {
-        S2JJAXBModel model = type.getJaxbModel().getS2JJAXBModel();
-        generateJAXBClasses(model);
-    }
-
-    private static boolean doneGeneration = true;
-    private void generateJAXBClasses(S2JJAXBModel model) throws Exception{
-        if(doneGeneration)
-            return;
-        JCodeModel cm = null;
-
-        // get the list of jaxb source files
-        CodeWriter cw = new WSCodeWriter(sourceDir,env);
-
-        if(env.verbose())
-            cw = new ProgressCodeWriter(cw, System.out); // TODO this should not be System.out, should be
-                                                         // something from ProcessorEnvironment
-        //TODO:set package level javadoc in JPackage
-        cm = model.generateCode(null, new ConsoleErrorReporter(env, printStackTrace));
-        cm.build(cw);
-        doneGeneration = true;
-    }
-
-
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/DivImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/JavaGeneratorExtensionFacade.java
similarity index 59%
rename from jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/DivImpl.java
rename to jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/JavaGeneratorExtensionFacade.java
index 2b68817a30c..2936437caf8 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/DivImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/JavaGeneratorExtensionFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,26 +23,26 @@
  * have any questions.
  */
 
-package com.sun.tools.internal.txw2.builder.relaxng;
+package com.sun.tools.internal.ws.processor.generator;
 
-import com.sun.tools.internal.txw2.model.Grammar;
-import com.sun.tools.internal.txw2.model.Leaf;
-import org.kohsuke.rngom.ast.builder.Div;
-import org.kohsuke.rngom.ast.builder.Scope;
-import org.kohsuke.rngom.ast.om.ParsedElementAnnotation;
-import org.kohsuke.rngom.ast.util.LocatorImpl;
+import com.sun.codemodel.internal.JMethod;
+import com.sun.tools.internal.ws.api.TJavaGeneratorExtension;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLOperation;
 
 /**
- * @author Kohsuke Kawaguchi
+ * @author Arun Gupta
  */
-class DivImpl
-    extends GrammarSectionImpl
-    implements Div {
+public final class JavaGeneratorExtensionFacade extends TJavaGeneratorExtension {
+    private final TJavaGeneratorExtension[] extensions;
 
-    DivImpl(Scope parent, Grammar grammar) {
-        super(parent,grammar);
+    JavaGeneratorExtensionFacade(TJavaGeneratorExtension... extensions) {
+        assert extensions != null;
+        this.extensions = extensions;
     }
 
-    public void endDiv(LocatorImpl locator, AnnotationsImpl annotations) {
+    public void writeMethodAnnotations(TWSDLOperation wsdlOperation, JMethod jMethod) {
+        for (TJavaGeneratorExtension e : extensions) {
+            e.writeMethodAnnotations(wsdlOperation, jMethod);
+        }
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/Names.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/Names.java
index a768205db37..0d77a452853 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/Names.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/Names.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,20 +25,18 @@
 
 package com.sun.tools.internal.ws.processor.generator;
 
-import com.sun.tools.internal.ws.processor.model.*;
+import com.sun.tools.internal.ws.processor.model.Fault;
+import com.sun.tools.internal.ws.processor.model.ModelProperties;
+import com.sun.tools.internal.ws.processor.model.Port;
+import com.sun.tools.internal.ws.processor.model.Service;
 import com.sun.tools.internal.ws.processor.model.java.JavaInterface;
 import com.sun.tools.internal.ws.processor.model.java.JavaStructureMember;
-import com.sun.tools.internal.ws.processor.model.jaxb.JAXBProperty;
-import com.sun.tools.internal.ws.processor.util.DirectoryUtil;
-import com.sun.tools.internal.ws.processor.util.ProcessorEnvironment;
 import com.sun.tools.internal.ws.util.ClassNameInfo;
-import com.sun.xml.internal.ws.streaming.PrefixFactory;
-import com.sun.xml.internal.ws.streaming.PrefixFactoryImpl;
 import com.sun.xml.internal.ws.util.StringUtils;
-import com.sun.xml.internal.bind.api.JAXBRIContext;
+import com.sun.istack.internal.Nullable;
+import com.sun.istack.internal.NotNull;
 
 import javax.xml.namespace.QName;
-import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -50,45 +48,6 @@ import java.util.Map;
  */
 public class Names implements GeneratorConstants{
 
-    public Names() {
-    }
-
-    public String stubFor(Port port, String infix) {
-        String result =
-            (String) port.getProperty(ModelProperties.PROPERTY_STUB_CLASS_NAME);
-        if (result == null) {
-            result =
-                makeDerivedClassName(
-                    port.getJavaInterface(),
-                    STUB_SUFFIX,
-                    infix);
-        }
-        return result;
-    }
-
-    public String tieFor(Port port, String infix) {
-        String result =
-            (String) port.getProperty(ModelProperties.PROPERTY_TIE_CLASS_NAME);
-        if (result == null) {
-            result =
-                makeDerivedClassName(
-                    port.getJavaInterface(),
-                    TIE_SUFFIX,
-                    infix);
-        }
-        return result;
-    }
-
-    public String makeDerivedClassName(
-        JavaInterface javaInterface,
-        String suffix,
-        String infix) {
-
-        String name =
-            ClassNameInfo.replaceInnerClassSym(javaInterface.getRealName());
-        return name + (infix == null ? "" : UNDERSCORE + infix) + suffix;
-    }
-
     public static String getPortName(Port port) {
         String javaPortName =
             (String) port.getProperty(ModelProperties.PROPERTY_JAVA_PORT_NAME);
@@ -107,10 +66,6 @@ public class Names implements GeneratorConstants{
         }
     }
 
-    public static String stripQualifier(Class classObj) {
-        String name = classObj.getName();
-        return stripQualifier(name);
-    }
 
     public static String stripQualifier(String name) {
         return ClassNameInfo.getName(name);
@@ -121,147 +76,37 @@ public class Names implements GeneratorConstants{
         return packageName != null ? packageName : "";
     }
 
-    public static String getUnqualifiedClassName(String className) {
-        return ClassNameInfo.getName(className).replace('$', '.');
+
+    public static String customJavaTypeClassName(JavaInterface intf) {
+        return intf.getName();
     }
 
-    /**
-     * Return the File object that should be used as the source file
-     * for the given Java class, using the supplied destination
-     * directory for the top of the package hierarchy.
-     */
-    public File sourceFileForClass(
-        String className,
-        String outputClassName,
-        File destDir,
-        ProcessorEnvironment env)
-        throws GeneratorException {
-        File packageDir =
-            DirectoryUtil.getOutputDirectoryFor(className, destDir, env);
-        String outputName = stripQualifier(outputClassName);
-
-        String outputFileName = outputName + JAVA_SRC_SUFFIX;
-        return new File(packageDir, outputFileName);
+    public static String customExceptionClassName(Fault fault) {
+        return fault.getJavaException().getName();
     }
 
-    public static String getPackageName(Service service) {
-        String portPackage =
-            getPackageName(service.getJavaInterface().getName());
-        return portPackage;
-    }
-
-    public String customJavaTypeClassName(JavaInterface intf) {
-        String intName = intf.getName();
-        return intName;
-    }
-
-    public String customExceptionClassName(Fault fault) {
-        String typeName = fault.getJavaException().getName();
-        return typeName;
-    }
-
-    public String getExceptionClassMemberName(){
+    public static String getExceptionClassMemberName(){
         return FAULT_CLASS_MEMBER_NAME;
     }
 
-    public String getQNameName(QName name) {
-        String qname =
-            getPrefix(name) + UNDERSCORE + name.getLocalPart() + QNAME_SUFFIX;
-        return validInternalJavaIdentifier(qname);
-    }
-
-    public String getBlockQNameName(Operation operation, Block block) {
-        QName blockName = block.getName();
-        String qname = getPrefix(blockName);
-        if (operation != null)
-            qname += UNDERSCORE + operation.getUniqueName();
-        qname += UNDERSCORE + blockName.getLocalPart() + QNAME_SUFFIX;
-        return validInternalJavaIdentifier(qname);
-    }
-
-    public String getTypeQName(QName name) {
-        String qname =
-            getPrefix(name)
-                + UNDERSCORE
-                + name.getLocalPart()
-                + TYPE_QNAME_SUFFIX;
-        return validInternalJavaIdentifier(qname);
-    }
-
-    /* (non-Javadoc)
-     * @see Names#validJavaClassName(String)
-     */
-    public String validJavaClassName(String name) {
-        return JAXBRIContext.mangleNameToClassName(name);
-    }
-
-    /* (non-Javadoc)
-     * @see Names#validJavaMemberName(String)
-     */
-    public String validJavaMemberName(String name) {
-        return JAXBRIContext.mangleNameToVariableName(name);
-    }
-
-    public String validInternalJavaIdentifier(String name) {
-        // return a valid java identifier without dropping characters (i.e. do not apply
-        // the mapping of XML names to Java identifiers in the spec); it's only meant
-        // to be used to generate internal identifiers (e.g. variable names in generated code)
-
-        StringBuffer sb = new StringBuffer();
-        for (int i = 0; i < name.length(); ++i) {
-            char ch = name.charAt(i);
-            if (i == 0) {
-                if (Character.isJavaIdentifierStart(ch)) {
-                    sb.append(ch);
-                } else {
-                    sb.append("_$");
-                    sb.append(Integer.toHexString((int) ch));
-                    sb.append("$");
-                }
-            } else {
-                if (Character.isJavaIdentifierPart(ch)) {
-                    sb.append(ch);
-                } else {
-                    sb.append("$");
-                    sb.append(Integer.toHexString((int) ch));
-                    sb.append("$");
-                }
-            }
-        }
-
-        String id = sb.toString();
-
-        String tmp = (String) reservedWords.get(id);
-        if (tmp != null)
-            id = tmp;
-        return id;
-    }
-
-    public String validExternalJavaIdentifier(String name) {
-        return validInternalJavaIdentifier(name).replace('$', '_');
-    }
-
-    public String validJavaName(String name) {
-        name = wordBreakString(name);
-        name = removeWhiteSpace(name);
-
-        String tmp = (String) reservedWords.get(name);
-        if (tmp != null)
-            name = tmp;
-        return name;
-    }
-
-    public boolean isJavaReservedWord(String name) {
+    public static boolean isJavaReservedWord(String name) {
         return reservedWords.get(name) != null;
     }
 
+    /**
+     * See if its a java keyword name, if so then mangle the name
+     */
+    public static @NotNull String getJavaReserverVarialbeName(@NotNull String name){
+        return (reservedWords.get(name) == null)?name:reservedWords.get(name);
+    }
+
     /* here we check on wether return values datatype is
        boolean. If its boolean, instead of a get method
        its set a is to comply with JavaBeans
        Pattern spec */
-    public String getJavaMemberReadMethod(JavaStructureMember member) {
-        String return_value = null;
-        if ((member.getType().getRealName()) == "boolean") {
+    public static String getJavaMemberReadMethod(JavaStructureMember member) {
+        String return_value;
+        if (member.getType().getRealName().equals("boolean")) {
             return_value = IS + StringUtils.capitalize(member.getName());
         } else {
             return_value = GET + StringUtils.capitalize(member.getName());
@@ -269,104 +114,14 @@ public class Names implements GeneratorConstants{
         return (return_value);
     }
 
-    public String getJavaMemberWriteMethod(JavaStructureMember member) {
-        return SET + StringUtils.capitalize(member.getName());
-    }
-
     public static String getResponseName(String messageName) {
         return messageName + RESPONSE;
     }
 
-
-    public String getJavaReadMethod(JAXBProperty prop){
-        if(prop.getType().getName().equals("boolean"))
-            return IS + StringUtils.capitalize(prop.getName());
-        return getJavaReadMethod(prop.getName());
-    }
-
-    public String getJavaWriteMethod(JAXBProperty prop){
-        return getJavaWriteMethod(prop.getName());
-    }
-
-    public String getJavaReadMethod(String prop){
-        return GET + StringUtils.capitalize(prop);
-    }
-
-    public String getJavaWriteMethod(String prop){
-        return SET + StringUtils.capitalize(prop);
-    }
-
-    public String removeWhiteSpace(String str) {
-        String tmp = removeCharacter(' ', str);
-        return tmp;
-    }
-
-    public String wordBreakString(String str) {
-        StringBuffer buf = new StringBuffer(str);
-        char ch;
-        for (int i = 0; i < buf.length(); i++) {
-            ch = buf.charAt(i);
-            if (Character.isDigit(ch)) {
-                if (i + 1 < buf.length()
-                    && !Character.isDigit(buf.charAt(i + 1))) {
-                    buf.insert(1 + i++, ' ');
-                }
-            } else if (Character.isSpaceChar(ch) || ch == '_') {
-                continue;
-            } else if (!Character.isJavaIdentifierPart(ch)) {
-                buf.setCharAt(i, ' ');
-            } else if (!Character.isLetter(ch)) {
-                buf.setCharAt(i, ' ');
-            }
-        }
-        return buf.toString();
-    }
-
-    public String removeCharacter(int ch, String str) {
-        String tmp;
-        int idx = str.indexOf(ch);
-        while (idx >= 0) {
-            str =
-                str.substring(0, idx)
-                    + StringUtils.capitalize(str.substring(idx + 1).trim());
-            idx = str.indexOf(' ');
-        }
-
-        return str;
-    }
-
-    public String getPrefix(QName name) {
-        return getPrefix(name.getNamespaceURI());
-    }
-
-    public String getPrefix(String uri) {
-        return prefixFactory.getPrefix(uri);
-    }
-
-    public void resetPrefixFactory() {
-        prefixFactory = new PrefixFactoryImpl(NS_PREFIX);
-    }
-
-    public void setSerializerNameInfix(String serNameInfix) {
-        if (serNameInfix != null && serNameInfix.length() > 0)
-            serializerNameInfix = UNDERSCORE + serNameInfix;
-    }
-
-    public String getSerializerNameInfix() {
-        // Fix for bug 4811625 and 4778136, undoing what setter does (remove beginning underscore)
-        String str = serializerNameInfix;
-        if ((serializerNameInfix != null)
-            && (serializerNameInfix.charAt(0) == '_'))
-            str = serializerNameInfix.substring(1);
-        return str;
-    }
-
-    protected String serializerNameInfix = null;
-    protected PrefixFactory prefixFactory = new PrefixFactoryImpl(NS_PREFIX);
-    protected static Map reservedWords;
+    private static final Map reservedWords;
 
     static {
-        reservedWords = new HashMap();
+        reservedWords = new HashMap();
         reservedWords.put("abstract", "_abstract");
         reservedWords.put("assert", "_assert");
         reservedWords.put("boolean", "_boolean");
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/SeiGenerator.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/SeiGenerator.java
index 542f1614e5b..79334ed1ce1 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/SeiGenerator.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/SeiGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,87 +26,58 @@
 package com.sun.tools.internal.ws.processor.generator;
 
 import com.sun.codemodel.internal.*;
-import com.sun.codemodel.internal.writer.ProgressCodeWriter;
-import com.sun.tools.internal.ws.processor.ProcessorAction;
-import com.sun.tools.internal.ws.processor.config.Configuration;
-import com.sun.tools.internal.ws.processor.config.WSDLModelInfo;
+import com.sun.tools.internal.ws.api.TJavaGeneratorExtension;
 import com.sun.tools.internal.ws.processor.model.*;
 import com.sun.tools.internal.ws.processor.model.java.JavaInterface;
 import com.sun.tools.internal.ws.processor.model.java.JavaMethod;
 import com.sun.tools.internal.ws.processor.model.java.JavaParameter;
 import com.sun.tools.internal.ws.processor.model.jaxb.JAXBType;
 import com.sun.tools.internal.ws.processor.model.jaxb.JAXBTypeAndAnnotation;
-import com.sun.tools.internal.ws.processor.util.DirectoryUtil;
-import com.sun.tools.internal.ws.processor.util.GeneratedFileInfo;
-import com.sun.tools.internal.ws.processor.util.IndentingWriter;
-import com.sun.tools.internal.ws.wscompile.WSCodeWriter;
+import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
+import com.sun.tools.internal.ws.wscompile.Options;
+import com.sun.tools.internal.ws.wscompile.WsimportOptions;
 import com.sun.tools.internal.ws.wsdl.document.soap.SOAPStyle;
-import com.sun.tools.internal.ws.wsdl.document.PortType;
-import com.sun.tools.internal.xjc.api.TypeAndAnnotation;
-import com.sun.xml.internal.ws.encoding.soap.SOAPVersion;
-import com.sun.xml.internal.ws.util.xml.XmlUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
 
-import javax.jws.HandlerChain;
 import javax.jws.WebMethod;
 import javax.jws.WebParam;
 import javax.jws.WebService;
 import javax.jws.soap.SOAPBinding;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.ws.Holder;
+import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.namespace.QName;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
+import javax.xml.ws.Holder;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Properties;
-import java.util.Iterator;
 
-public class SeiGenerator extends GeneratorBase implements ProcessorAction {
-    private WSDLModelInfo wsdlModelInfo;
+public class SeiGenerator extends GeneratorBase{
     private String serviceNS;
+    private TJavaGeneratorExtension extension;
+    private List extensionHandlers;
 
-    public SeiGenerator() {
+    public static void generate(Model model, WsimportOptions options, ErrorReceiver receiver, TJavaGeneratorExtension... extensions){
+        SeiGenerator seiGenerator = new SeiGenerator(model, options, receiver, extensions);
+        seiGenerator.doGeneration();
     }
 
-    protected void doGeneration() {
-        try {
-            model.accept(this);
-        } catch (Exception e) {
-            if (env.verbose())
-                e.printStackTrace();
-            throw new GeneratorException(
-                "generator.nestedGeneratorError",
-                e);
-        }
+    private SeiGenerator(Model model, WsimportOptions options, ErrorReceiver receiver, TJavaGeneratorExtension... extensions) {
+        super(model, options, receiver);
+        extensionHandlers = new ArrayList();
+
+        // register handlers for default extensions
+        //spec does not require generation of these annotations
+        // and we can infer from wsdl anyway, so lets disable it
+        //register(new W3CAddressingJavaGeneratorExtension());
+
+        for (TJavaGeneratorExtension j : extensions)
+            register(j);
+
+        this.extension = new JavaGeneratorExtensionFacade(extensionHandlers.toArray(new TJavaGeneratorExtension[0]));
     }
 
-    public GeneratorBase getGenerator(Model model, Configuration config, Properties properties) {
-        return new SeiGenerator(model, config, properties);
-    }
-
-    public SeiGenerator(Model model, Configuration config, Properties properties) {
-        super(model, config, properties);
-        this.model = model;
-        this.wsdlModelInfo = (WSDLModelInfo)config.getModelInfo();
-    }
-
-    public GeneratorBase getGenerator(Model model, Configuration config, Properties properties, SOAPVersion ver) {
-        return new SeiGenerator(model, config, properties);
-    }
-
-
-    private void write(Service service, Port port) throws Exception{
+    private void write(Port port) {
         JavaInterface intf = port.getJavaInterface();
-        String className = env.getNames().customJavaTypeClassName(intf);
+        String className = Names.customJavaTypeClassName(intf);
 
-        if (donotOverride && GeneratorUtil.classExists(env, className)) {
+        if (donotOverride && GeneratorUtil.classExists(options, className)) {
             log("Class " + className + " exists. Not overriding.");
             return;
         }
@@ -137,20 +108,24 @@ public class SeiGenerator extends GeneratorBase implements ProcessorAction {
 
         //@WebService
         JAnnotationUse webServiceAnn = cls.annotate(cm.ref(WebService.class));
-        writeWebServiceAnnotation(service, port, webServiceAnn);
+        writeWebServiceAnnotation(port, webServiceAnn);
 
         //@HandlerChain
-        writeHandlerConfig(env.getNames().customJavaTypeClassName(port.getJavaInterface()), cls, wsdlModelInfo);
+        writeHandlerConfig(Names.customJavaTypeClassName(port.getJavaInterface()), cls, options);
 
         //@SOAPBinding
         writeSOAPBinding(port, cls);
 
+        //@XmlSeeAlso
+        if(options.target.isLaterThan(Options.Target.V2_1))
+            writeXmlSeeAlso(cls);
+
         for (Operation operation: port.getOperations()) {
             JavaMethod method = operation.getJavaMethod();
 
             //@WebMethod
-            JMethod m = null;
-            JDocComment methodDoc = null;
+            JMethod m;
+            JDocComment methodDoc;
             String methodJavaDoc = operation.getJavaDoc();
             if(method.getReturnType().getName().equals("void")){
                 m = cls.method(JMod.PUBLIC, void.class, method.getName());
@@ -169,7 +144,7 @@ public class SeiGenerator extends GeneratorBase implements ProcessorAction {
             writeWebMethod(operation, m);
             JClass holder = cm.ref(Holder.class);
             for (JavaParameter parameter: method.getParametersList()) {
-                JVar var = null;
+                JVar var;
                 JAXBTypeAndAnnotation paramType = parameter.getType().getType();
                 if (parameter.isHolder()) {
                     var = m.param(holder.narrow(paramType.getType().boxify()), parameter.getName());
@@ -183,21 +158,38 @@ public class SeiGenerator extends GeneratorBase implements ProcessorAction {
                 JAnnotationUse paramAnn = var.annotate(cm.ref(WebParam.class));
                 writeWebParam(operation, parameter, paramAnn);
             }
+            com.sun.tools.internal.ws.wsdl.document.Operation wsdlOp = operation.getWSDLPortTypeOperation();
             for(Fault fault:operation.getFaultsSet()){
                 m._throws(fault.getExceptionClass());
                 methodDoc.addThrows(fault.getExceptionClass());
+                wsdlOp.putFault(fault.getWsdlFaultName(), fault.getExceptionClass());
+            }
+
+            //It should be the last thing to invoke after JMethod is built completely
+            extension.writeMethodAnnotations(wsdlOp, m);
+        }
+    }
+
+    private void writeXmlSeeAlso(JDefinedClass cls) {
+        if (model.getJAXBModel().getS2JJAXBModel() != null) {
+            List objectFactories = model.getJAXBModel().getS2JJAXBModel().getAllObjectFactories();
+
+            //if there are no object facotires, dont generate @XmlSeeAlso
+            if(objectFactories.size() == 0)
+                return;
+
+            JAnnotationUse xmlSeeAlso = cls.annotate(cm.ref(XmlSeeAlso.class));
+            JAnnotationArrayMember paramArray = xmlSeeAlso.paramArray("value");
+            for (JClass of : objectFactories) {
+                paramArray = paramArray.param(of);
             }
         }
-        CodeWriter cw = new WSCodeWriter(sourceDir,env);
 
-        if(env.verbose())
-            cw = new ProgressCodeWriter(cw, System.out);
-        cm.build(cw);
     }
 
     private void writeWebMethod(Operation operation, JMethod m) {
         Response response = operation.getResponse();
-        JAnnotationUse webMethodAnn = m.annotate(cm.ref(WebMethod.class));;
+        JAnnotationUse webMethodAnn = m.annotate(cm.ref(WebMethod.class));
         String operationName = (operation instanceof AsyncOperation)?
                 ((AsyncOperation)operation).getNormalOperation().getName().getLocalPart():
                 operation.getName().getLocalPart();
@@ -214,7 +206,7 @@ public class SeiGenerator extends GeneratorBase implements ProcessorAction {
             m.annotate(javax.jws.Oneway.class);
         }else if (!operation.getJavaMethod().getReturnType().getName().equals("void") &&
                  operation.getResponse().getParametersList().size() > 0){
-            Block block = null;
+            Block block;
             String resultName = null;
             String nsURI = null;
             if (operation.getResponse().getBodyBlocks().hasNext()) {
@@ -245,11 +237,9 @@ public class SeiGenerator extends GeneratorBase implements ProcessorAction {
                         JAnnotationUse wr = null;
 
                         if(!resultName.equals("return")){
-                            if(wr == null)
-                                wr = m.annotate(javax.jws.WebResult.class);
+                            wr = m.annotate(javax.jws.WebResult.class);
                             wr.param("name", resultName);
                         }
-                        //if (operation.getStyle().equals(SOAPStyle.DOCUMENT) && !(nsURI.equals(serviceNS))) {
                         if((nsURI != null) && (!nsURI.equals(serviceNS) || (isDocStyle && operation.isWrapped()))){
                             if(wr == null)
                                 wr = m.annotate(javax.jws.WebResult.class);
@@ -298,18 +288,6 @@ public class SeiGenerator extends GeneratorBase implements ProcessorAction {
         }
     }
 
-    //TODO: JAXB should expose the annotations so that it can be added to JAnnotationUse
-    protected void writeJAXBTypeAnnotations(JAnnotationUse annUse, Parameter param) throws IOException{
-        List annotations = param.getAnnotations();
-        if(annotations == null)
-            return;
-
-        for(String annotation:param.getAnnotations()){
-            //p.pln(annotation);
-            //annUse.
-        }
-    }
-
     private boolean isMessageParam(Parameter param, Message message) {
         Block block = param.getBlock();
 
@@ -357,7 +335,7 @@ public class SeiGenerator extends GeneratorBase implements ProcessorAction {
         Response res = operation.getResponse();
 
         boolean header = isHeaderParam(param, req) ||
-            (res != null ? isHeaderParam(param, res) : false);
+            (res != null && isHeaderParam(param, res));
 
         String name;
         boolean isWrapped = operation.isWrapped();
@@ -374,9 +352,9 @@ public class SeiGenerator extends GeneratorBase implements ProcessorAction {
         if (isDocStyle) {
             ns = param.getBlock().getName().getNamespaceURI(); // its bare nsuri
             if(isWrapped){
-                ns = ((JAXBType)param.getType()).getName().getNamespaceURI();
+                ns = param.getType().getName().getNamespaceURI();
             }
-        }else if(!isDocStyle && header){
+        }else if(header){
             ns = param.getBlock().getName().getNamespaceURI();
         }
 
@@ -390,7 +368,7 @@ public class SeiGenerator extends GeneratorBase implements ProcessorAction {
         if (param.isINOUT()){
             paramAnno.param("mode", javax.jws.WebParam.Mode.INOUT);
         }else if ((res != null) && (isMessageParam(param, res) || isHeaderParam(param, res) || isAttachmentParam(param, res) ||
-                isUnboundParam(param,res))){
+                isUnboundParam(param,res) || param.isOUT())){
             paramAnno.param("mode", javax.jws.WebParam.Mode.OUT);
         }
 
@@ -399,14 +377,13 @@ public class SeiGenerator extends GeneratorBase implements ProcessorAction {
             paramAnno.param("partName", javaParameter.getParameter().getName());
     }
 
-    boolean isDocStyle = true;
-    boolean sameParamStyle = true;
+    private boolean isDocStyle = true;
+    private boolean sameParamStyle = true;
     private void writeSOAPBinding(Port port, JDefinedClass cls) {
         JAnnotationUse soapBindingAnn = null;
-        isDocStyle = port.getStyle() != null ? port.getStyle().equals(SOAPStyle.DOCUMENT) : true;
+        isDocStyle = port.getStyle() == null || port.getStyle().equals(SOAPStyle.DOCUMENT);
         if(!isDocStyle){
-            if(soapBindingAnn == null)
-                soapBindingAnn = cls.annotate(SOAPBinding.class);
+            soapBindingAnn = cls.annotate(SOAPBinding.class);
             soapBindingAnn.param("style", SOAPBinding.Style.RPC);
             port.setWrapped(true);
         }
@@ -433,7 +410,7 @@ public class SeiGenerator extends GeneratorBase implements ProcessorAction {
         }
     }
 
-    private void writeWebServiceAnnotation(Service service, Port port, JAnnotationUse wsa) {
+    private void writeWebServiceAnnotation(Port port, JAnnotationUse wsa) {
         QName name = (QName) port.getProperty(ModelProperties.PROPERTY_WSDL_PORT_TYPE_NAME);
         wsa.param("name", name.getLocalPart());
         wsa.param("targetNamespace", name.getNamespaceURI());
@@ -451,7 +428,7 @@ public class SeiGenerator extends GeneratorBase implements ProcessorAction {
     public void visit(Service service) throws Exception {
         String jd = model.getJavaDoc();
         if(jd != null){
-            JPackage pkg = cm._package(wsdlModelInfo.getJavaPackageName());
+            JPackage pkg = cm._package(options.defaultPackage);
             pkg.javadoc().add(jd);
         }
 
@@ -467,11 +444,15 @@ public class SeiGenerator extends GeneratorBase implements ProcessorAction {
 
 
         try {
-            write(service, port);
+            write(port);
         } catch (Exception e) {
             throw new GeneratorException(
                 "generator.nestedGeneratorError",
                 e);
         }
     }
+
+    private void register(TJavaGeneratorExtension h) {
+        extensionHandlers.add(h);
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/ServiceGenerator.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/ServiceGenerator.java
index 1e2eadbc59a..2cea1189011 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/ServiceGenerator.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/ServiceGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,97 +25,51 @@
 
 package com.sun.tools.internal.ws.processor.generator;
 
-import com.sun.codemodel.internal.JClassAlreadyExistsException;
-import com.sun.codemodel.internal.ClassType;
-import com.sun.codemodel.internal.CodeWriter;
-import com.sun.codemodel.internal.JAnnotationUse;
-import com.sun.codemodel.internal.JClass;
-import com.sun.codemodel.internal.JCommentPart;
-import com.sun.codemodel.internal.JDefinedClass;
-import com.sun.codemodel.internal.JDocComment;
-import com.sun.codemodel.internal.JExpression;
-import com.sun.codemodel.internal.JFieldVar;
-import com.sun.codemodel.internal.JMethod;
-import com.sun.codemodel.internal.JMod;
-import com.sun.codemodel.internal.JType;
 import com.sun.codemodel.internal.*;
-import com.sun.codemodel.internal.writer.ProgressCodeWriter;
-import java.util.Properties;
-
-import com.sun.tools.internal.xjc.api.XJC;
-import com.sun.tools.internal.ws.processor.ProcessorAction;
-import com.sun.tools.internal.ws.processor.config.Configuration;
-import com.sun.tools.internal.ws.processor.config.WSDLModelInfo;
 import com.sun.tools.internal.ws.processor.model.Model;
 import com.sun.tools.internal.ws.processor.model.Port;
 import com.sun.tools.internal.ws.processor.model.Service;
 import com.sun.tools.internal.ws.processor.model.java.JavaInterface;
-import com.sun.tools.internal.ws.wscompile.WSCodeWriter;
-import com.sun.xml.internal.ws.encoding.soap.SOAPVersion;
-import com.sun.xml.internal.ws.util.JAXWSUtils;
-import com.sun.xml.internal.ws.util.StringUtils;
+import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
+import com.sun.tools.internal.ws.wscompile.Options;
+import com.sun.tools.internal.ws.wscompile.WsimportOptions;
+import com.sun.tools.internal.ws.resources.GeneratorMessages;
 import com.sun.xml.internal.bind.api.JAXBRIContext;
+import com.sun.xml.internal.ws.util.JAXWSUtils;
 
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.net.MalformedURLException;
+import javax.xml.namespace.QName;
 import javax.xml.ws.WebEndpoint;
 import javax.xml.ws.WebServiceClient;
-import javax.xml.namespace.QName;
+import javax.xml.ws.WebServiceFeature;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
 
 
 /**
  *
  * @author WS Development Team
  */
-public class ServiceGenerator extends GeneratorBase implements ProcessorAction {
-    private String serviceNS;
-    private WSDLModelInfo wsdlModelInfo;
+public class ServiceGenerator extends GeneratorBase{
 
-    public ServiceGenerator() {
-        super();
+    public static void generate(Model model, WsimportOptions options, ErrorReceiver receiver){
+        ServiceGenerator serviceGenerator = new ServiceGenerator(model, options, receiver);
+        serviceGenerator.doGeneration();
     }
-
-    private ServiceGenerator(
-        Model model,
-        Configuration config,
-        Properties properties) {
-        super(model, config, properties);
-        this.wsdlModelInfo = (WSDLModelInfo)config.getModelInfo();
-    }
-
-    public GeneratorBase getGenerator(
-        Model model,
-        Configuration config,
-        Properties properties) {
-        return new ServiceGenerator(model, config, properties);
-    }
-
-    public GeneratorBase getGenerator(
-        Model model,
-        Configuration config,
-        Properties properties,
-        SOAPVersion ver) {
-        return new ServiceGenerator(model, config, properties);
-    }
-
-    /**
-     * Generates an expression that evaluates to "new QName(...)"
-     */
-    private JInvocation createQName(QName name) {
-        return JExpr._new(cm.ref(QName.class)).arg(name.getNamespaceURI()).arg(name.getLocalPart());
+    private ServiceGenerator(Model model, WsimportOptions options, ErrorReceiver receiver) {
+        super(model, options, receiver);
     }
 
     private JInvocation createURL(URL url) {
         return JExpr._new(cm.ref(URL.class)).arg(url.toExternalForm());
     }
 
-    protected void visitService(Service service) {
+    @Override
+    public void visit(Service service) {
         try {
-            JavaInterface intf = (JavaInterface) service.getJavaInterface();
-            String className = env.getNames().customJavaTypeClassName(intf);
-            if (donotOverride && GeneratorUtil.classExists(env, className)) {
+            JavaInterface intf = service.getJavaInterface();
+            String className = Names.customJavaTypeClassName(intf);
+            if (donotOverride && GeneratorUtil.classExists(options, className)) {
                 log("Class " + className + " exists. Not overriding.");
                 return;
             }
@@ -168,46 +122,70 @@ public class ServiceGenerator extends GeneratorBase implements ProcessorAction {
             writeWebServiceClientAnnotation(service, webServiceClientAnn);
 
             //@HandlerChain
-            writeHandlerConfig(env.getNames().customJavaTypeClassName(service.getJavaInterface()), cls, wsdlModelInfo);
+            writeHandlerConfig(Names.customJavaTypeClassName(service.getJavaInterface()), cls, options);
 
             for (Port port: service.getPorts()) {
                 if (port.isProvider()) {
                     continue;  // No getXYZPort() for porvider based endpoint
                 }
-                //@WebEndpoint
-                JMethod m = null;
-                JDocComment methodDoc = null;
-                JType retType = getClass(port.getJavaInterface().getName(), ClassType.INTERFACE);
-                m = cls.method(JMod.PUBLIC, retType, port.getPortGetter());
-                methodDoc = m.javadoc();
-                if(port.getJavaDoc() != null)
-                    methodDoc.add(port.getJavaDoc());
-                JCommentPart ret = methodDoc.addReturn();
-                ret.add("returns "+retType.name());
-                JBlock body = m.body();
-                StringBuffer statement = new StringBuffer("return (");
-                statement.append(retType.name());
-                statement.append(")super.getPort(new QName(\""+port.getName().getNamespaceURI()+"\", \""+ port.getName().getLocalPart()+"\"), ");
-                statement.append(retType.name());
-                statement.append(".class);");
-                body.directStatement(statement.toString());
-                writeWebEndpoint(port, m);
+
+                //write getXyzPort()
+                writeDefaultGetPort(port, cls);
+
+                //write getXyzPort(WebServicesFeature...)
+                if(options.target.isLaterThan(Options.Target.V2_1))
+                    writeGetPort(port, cls);
             }
-            CodeWriter cw = new WSCodeWriter(sourceDir,env);
-
-            if(env.verbose())
-                cw = new ProgressCodeWriter(cw, System.out);
-            cm.build(cw);
-
         } catch (IOException e) {
-            throw new GeneratorException(
-                "generator.nestedGeneratorError",
-                e);
+            receiver.error(e);
         }
     }
 
+    private void writeGetPort(Port port, JDefinedClass cls) {
+        JType retType = getClass(port.getJavaInterface().getName(), ClassType.INTERFACE);
+        JMethod m = cls.method(JMod.PUBLIC, retType, port.getPortGetter());
+        JDocComment methodDoc = m.javadoc();
+        if(port.getJavaDoc() != null)
+            methodDoc.add(port.getJavaDoc());
+        JCommentPart ret = methodDoc.addReturn();
+        JCommentPart paramDoc = methodDoc.addParam("features");
+        paramDoc.append("A list of ");
+        paramDoc.append("{@link "+WebServiceFeature.class.getName()+"}");
+        paramDoc.append("to configure on the proxy.  Supported features not in the features parameter will have their default values.");
+        ret.add("returns "+retType.name());
+        m.varParam(WebServiceFeature.class, "features");
+        JBlock body = m.body();
+        StringBuffer statement = new StringBuffer("return (");
+        statement.append(retType.name());
+        statement.append(")super.getPort(new QName(\"").append(port.getName().getNamespaceURI()).append("\", \"").append(port.getName().getLocalPart()).append("\"), ");
+        statement.append(retType.name());
+        statement.append(".class, features);");
+        body.directStatement(statement.toString());
+        writeWebEndpoint(port, m);
+    }
+
+    private void writeDefaultGetPort(Port port, JDefinedClass cls) {
+        JType retType = getClass(port.getJavaInterface().getName(), ClassType.INTERFACE);
+        String portGetter = port.getPortGetter();
+        JMethod m = cls.method(JMod.PUBLIC, retType, portGetter);
+        JDocComment methodDoc = m.javadoc();
+        if(port.getJavaDoc() != null)
+            methodDoc.add(port.getJavaDoc());
+        JCommentPart ret = methodDoc.addReturn();
+        ret.add("returns "+retType.name());
+        JBlock body = m.body();
+        StringBuffer statement = new StringBuffer("return (");
+        statement.append(retType.name());
+        statement.append(")super.getPort(new QName(\"").append(port.getName().getNamespaceURI()).append("\", \"").append(port.getName().getLocalPart()).append("\"), ");
+        statement.append(retType.name());
+        statement.append(".class);");
+        body.directStatement(statement.toString());
+        writeWebEndpoint(port, m);
+    }
+
+
     protected JDefinedClass getClass(String className, ClassType type) {
-        JDefinedClass cls = null;
+        JDefinedClass cls;
         try {
             cls = cm._class(className, type);
         } catch (JClassAlreadyExistsException e){
@@ -218,7 +196,7 @@ public class ServiceGenerator extends GeneratorBase implements ProcessorAction {
 
     private void writeWebServiceClientAnnotation(Service service, JAnnotationUse wsa) {
         String serviceName = service.getName().getLocalPart();
-        serviceNS = service.getName().getNamespaceURI();
+        String serviceNS= service.getName().getNamespaceURI();
         wsa.param("name", serviceName);
         wsa.param("targetNamespace", serviceNS);
         wsa.param("wsdlLocation", wsdlLocation);
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/SimpleToBoxedUtil.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/SimpleToBoxedUtil.java
deleted file mode 100644
index 20ba880de2b..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/SimpleToBoxedUtil.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.tools.internal.ws.processor.generator;
-
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- *
- * @author WS Development Team
- */
-public final class SimpleToBoxedUtil {
-
-    public static String getBoxedExpressionOfType(String s, String c) {
-        if (isPrimitive(c)) {
-            StringBuffer sb = new StringBuffer();
-            sb.append("new ");
-            sb.append(getBoxedClassName(c));
-            sb.append('(');
-            sb.append(s);
-            sb.append(')');
-            return sb.toString();
-        } else
-            return s;
-    }
-
-    public static String getUnboxedExpressionOfType(String s, String c) {
-        if (isPrimitive(c)) {
-            StringBuffer sb = new StringBuffer();
-            sb.append('(');
-            sb.append(s);
-            sb.append(").");
-            sb.append(c);
-            sb.append("Value()");
-            return sb.toString();
-        } else
-            return s;
-    }
-
-    public static String convertExpressionFromTypeToType(
-        String s,
-        String from,
-        String to)
-        throws Exception {
-        if (from.equals(to))
-            return s;
-        else {
-            if (!isPrimitive(to) && isPrimitive(from))
-                return getBoxedExpressionOfType(s, from);
-            else if (isPrimitive(to) && isPrimitive(from))
-                return getUnboxedExpressionOfType(s, to);
-            else
-                return s;
-        }
-    }
-
-    public static String getBoxedClassName(String className) {
-        if (isPrimitive(className)) {
-            StringBuffer sb = new StringBuffer();
-            sb.append("java.lang.");
-            if (className.equals(int.class.getName()))
-                sb.append("Integer");
-            else if (className.equals(char.class.getName()))
-                sb.append("Character");
-            else {
-                sb.append(Character.toUpperCase(className.charAt(0)));
-                sb.append(className.substring(1));
-            }
-            return sb.toString();
-        } else
-            return className;
-    }
-
-    public static boolean isPrimitive(String className) {
-        return primitiveSet.contains(className);
-    }
-
-    static Set primitiveSet = null;
-
-    static {
-        primitiveSet = new HashSet();
-        primitiveSet.add("boolean");
-        primitiveSet.add("byte");
-        primitiveSet.add("double");
-        primitiveSet.add("float");
-        primitiveSet.add("int");
-        primitiveSet.add("long");
-        primitiveSet.add("short");
-    }
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/W3CAddressingJavaGeneratorExtension.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/W3CAddressingJavaGeneratorExtension.java
new file mode 100644
index 00000000000..dbc10ddbf8e
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/W3CAddressingJavaGeneratorExtension.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+/*
+ * $Id: W3CAddressingJavaGeneratorExtension.java,v 1.1.2.4 2006/10/31 19:57:28 vivekp Exp $
+ */
+
+package com.sun.tools.internal.ws.processor.generator;
+
+import com.sun.codemodel.internal.JAnnotationArrayMember;
+import com.sun.codemodel.internal.JAnnotationUse;
+import com.sun.codemodel.internal.JClass;
+import com.sun.codemodel.internal.JMethod;
+import com.sun.tools.internal.ws.api.TJavaGeneratorExtension;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLOperation;
+import com.sun.tools.internal.ws.wsdl.document.Fault;
+import com.sun.tools.internal.ws.wsdl.document.Operation;
+
+import javax.xml.ws.Action;
+import javax.xml.ws.FaultAction;
+import java.util.Map;
+
+/**
+ * @author Arun Gupta
+ */
+public class W3CAddressingJavaGeneratorExtension extends TJavaGeneratorExtension {
+    @Override
+    public void writeMethodAnnotations(TWSDLOperation two, JMethod jMethod) {
+        JAnnotationUse actionAnn = null;
+
+        if (!(two instanceof Operation))
+            return;
+
+        Operation o = ((Operation)two);
+
+        // explicit input action
+        if (o.getInput().getAction() != null && !o.getInput().getAction().equals("")) {
+            // explicitly specified
+            actionAnn = jMethod.annotate(Action.class);
+            actionAnn.param("input", o.getInput().getAction());
+        }
+
+        // explicit output action
+        if (o.getOutput() != null && o.getOutput().getAction() != null && !o.getOutput().getAction().equals("")) {
+            // explicitly specified
+            if (actionAnn == null)
+                actionAnn = jMethod.annotate(Action.class);
+
+            actionAnn.param("output", o.getOutput().getAction());
+        }
+
+        // explicit fault action
+        if (o.getFaults() != null && o.getFaults().size() > 0) {
+            Map map = o.getFaults();
+            JAnnotationArrayMember jam = null;
+
+            for (Fault f : o.faults()) {
+                if (f.getAction() == null)
+                    continue;
+
+                if (f.getAction().equals(""))
+                    continue;
+
+                if (actionAnn == null) {
+                    actionAnn = jMethod.annotate(Action.class);
+                }
+                if (jam == null) {
+                    jam = actionAnn.paramArray("fault");
+                }
+                final JAnnotationUse faAnn = jam.annotate(FaultAction.class);
+                faAnn.param("className", map.get(f.getName()));
+                faAnn.param("value", f.getAction());
+            }
+        }
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/AbstractType.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/AbstractType.java
index 56aadfb0375..b84bbe0a46f 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/AbstractType.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/AbstractType.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,15 +25,14 @@
 
 package com.sun.tools.internal.ws.processor.model;
 
+import com.sun.tools.internal.ws.processor.model.java.JavaType;
+
+import javax.xml.namespace.QName;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import javax.xml.namespace.QName;
-
-import com.sun.tools.internal.ws.processor.model.java.JavaType;
-import com.sun.xml.internal.ws.util.NullIterator;
-
 /**
  *
  * @author WS Development Team
@@ -123,7 +122,7 @@ public abstract class AbstractType {
 
     public Iterator getProperties() {
         if (properties == null) {
-            return NullIterator.getInstance();
+            return Collections.emptyList().iterator();
         } else {
             return properties.keySet().iterator();
         }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/AsyncOperation.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/AsyncOperation.java
index 282c3eadb9d..9aa2642241a 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/AsyncOperation.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/AsyncOperation.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,14 +24,14 @@
  */
 package com.sun.tools.internal.ws.processor.model;
 
-import javax.xml.namespace.QName;
-
-import com.sun.tools.internal.ws.processor.model.jaxb.JAXBType;
-import com.sun.tools.internal.ws.processor.model.jaxb.JAXBTypeAndAnnotation;
-import com.sun.tools.internal.ws.processor.model.java.JavaType;
-import com.sun.tools.internal.ws.processor.model.java.JavaSimpleType;
 import com.sun.codemodel.internal.JClass;
 import com.sun.codemodel.internal.JCodeModel;
+import com.sun.tools.internal.ws.processor.model.java.JavaSimpleType;
+import com.sun.tools.internal.ws.processor.model.java.JavaType;
+import com.sun.tools.internal.ws.processor.model.jaxb.JAXBTypeAndAnnotation;
+import com.sun.tools.internal.ws.wsdl.framework.Entity;
+
+import javax.xml.namespace.QName;
 
 
 /**
@@ -44,24 +44,24 @@ public class AsyncOperation extends Operation {
     /**
      *
      */
-    public AsyncOperation() {
-        super();
+    public AsyncOperation(Entity entity) {
+        super(entity);
         // TODO Auto-generated constructor stub
     }
 
     /**
      * @param operation
      */
-    public AsyncOperation(Operation operation) {
-        super(operation);
+    public AsyncOperation(Operation operation, Entity entity) {
+        super(operation, entity);
         this.operation = operation;
     }
 
     /**
      * @param name
      */
-    public AsyncOperation(QName name) {
-        super(name);
+    public AsyncOperation(QName name, Entity entity) {
+        super(name, entity);
         // TODO Auto-generated constructor stub
     }
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/AsyncOperationType.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/AsyncOperationType.java
index 28758996eaa..786281d1fd8 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/AsyncOperationType.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/AsyncOperationType.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,7 @@ package com.sun.tools.internal.ws.processor.model;
 /**
  * @author Vivek Pandey
  *
- * Async Operation type
+ * Async WSDLOperation type
  */
 public final class AsyncOperationType {
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Block.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Block.java
index 57328539229..690eb5d3b34 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Block.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Block.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,10 @@
  */
 package com.sun.tools.internal.ws.processor.model;
 
+
+import com.sun.tools.internal.ws.wsdl.framework.Entity;
+import com.sun.tools.internal.ws.wsdl.document.*;
+
 import javax.xml.namespace.QName;
 
 /**
@@ -37,13 +41,8 @@ public class Block extends ModelObject {
     public static final int HEADER = 2;
     public static final int ATTACHMENT = 3;
 
-    public Block() {}
-
-    public Block(QName name) {
-        this.name = name;
-    }
-
-    public Block(QName name, AbstractType type) {
+    public Block(QName name, AbstractType type, Entity entity) {
+        super(entity);
         this.name = name;
         this.type = type;
     }
@@ -52,10 +51,6 @@ public class Block extends ModelObject {
         return name;
     }
 
-    public void setName(QName n) {
-        name = n;
-    }
-
     public AbstractType getType() {
         return type;
     }
@@ -76,16 +71,7 @@ public class Block extends ModelObject {
         visitor.visit(this);
     }
 
-    private QName name;
+    private final QName name;
     private AbstractType type;
     private int location;
-
-    /**
-     * @return true if the block is unbound
-     */
-    public boolean isUnbound() {
-        if(location == UNBOUND)
-            return true;
-        return false;
-    }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/ExtendedModelVisitor.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/ExtendedModelVisitor.java
index 4897843131c..e2d63deadd0 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/ExtendedModelVisitor.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/ExtendedModelVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Fault.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Fault.java
index 4b62705dc38..e5c1f091800 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Fault.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Fault.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,26 +24,29 @@
  */
 package com.sun.tools.internal.ws.processor.model;
 
+import com.sun.codemodel.internal.JClass;
+import com.sun.tools.internal.ws.processor.generator.GeneratorUtil;
+import com.sun.tools.internal.ws.processor.model.java.JavaException;
+import com.sun.tools.internal.ws.wsdl.framework.Entity;
+
+import javax.xml.namespace.QName;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.TreeSet;
 
-import javax.xml.namespace.QName;
-
-import com.sun.tools.internal.ws.processor.generator.GeneratorUtil;
-import com.sun.tools.internal.ws.processor.model.java.JavaException;
-import com.sun.codemodel.internal.JClass;
-
 /**
  *
  * @author WS Development Team
  */
 public class Fault extends ModelObject {
 
-    public Fault() {}
+    public Fault(Entity entity) {
+        super(entity);
+    }
 
-    public Fault(String name) {
+    public Fault(String name, Entity entity) {
+        super(entity);
         this.name = name;
         parentFault = null;
     }
@@ -80,26 +83,6 @@ public class Fault extends ModelObject {
         return parentFault;
     }
 
-    public void setParentFault(Fault parentFault) {
-        if (this.parentFault != null &&
-            parentFault != null &&
-            !this.parentFault.equals(parentFault)) {
-
-            throw new ModelException("model.parent.fault.already.set",
-                new Object[] {
-                    getName(),
-                    this.parentFault.getName(),
-                    parentFault.getName()
-            });
-        }
-        this.parentFault = parentFault;
-    }
-
-    public void addSubfault(Fault fault) {
-        subfaults.add(fault);
-        fault.setParentFault(this);
-    }
-
     public Iterator getSubfaults() {
         if (subfaults.size() == 0) {
             return null;
@@ -107,12 +90,6 @@ public class Fault extends ModelObject {
         return subfaults.iterator();
     }
 
-    public Iterator getSortedSubfaults() {
-        Set sortedFaults = new TreeSet(new GeneratorUtil.FaultComparator());
-        sortedFaults.addAll(subfaults);
-        return sortedFaults.iterator();
-    }
-
     /* serialization */
     public Set getSubfaultsSet() {
         return subfaults;
@@ -187,4 +164,14 @@ public class Fault extends ModelObject {
     private QName elementName = null;
     private String javaMemberName = null;
     private JClass exceptionClass;
+
+    public String getWsdlFaultName() {
+        return wsdlFaultName;
+    }
+
+    public void setWsdlFaultName(String wsdlFaultName) {
+        this.wsdlFaultName = wsdlFaultName;
+    }
+
+    private String wsdlFaultName;
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/HeaderFault.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/HeaderFault.java
index bf9ad8f0b4d..397c96439c4 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/HeaderFault.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/HeaderFault.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,14 +24,18 @@
  */
 package com.sun.tools.internal.ws.processor.model;
 
+import com.sun.tools.internal.ws.wsdl.framework.Entity;
+
 import javax.xml.namespace.QName;
 
 public class HeaderFault extends Fault {
 
-    public HeaderFault() {}
+    public HeaderFault(Entity entity) {
+        super(entity);
+    }
 
-    public HeaderFault(String name) {
-        super(name);
+    public HeaderFault(String name, Entity entity) {
+        super(name, entity);
     }
 
     public QName getMessage() {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Message.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Message.java
index ed807ca7f8b..117aeb35580 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Message.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Message.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,26 +25,28 @@
 
 package com.sun.tools.internal.ws.processor.model;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import com.sun.tools.internal.ws.wsdl.framework.Entity;
+import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
+import com.sun.tools.internal.ws.wscompile.AbortException;
+import com.sun.tools.internal.ws.resources.ModelMessages;
 
 import javax.xml.namespace.QName;
+import java.util.*;
 
 /**
  *
  * @author WS Development Team
  */
 public abstract class Message extends ModelObject {
+    protected Message(com.sun.tools.internal.ws.wsdl.document.Message entity, ErrorReceiver receiver) {
+        super(entity);
+        setErrorReceiver(receiver);
+    }
 
     public void addBodyBlock(Block b) {
         if (_bodyBlocks.containsKey(b.getName())) {
-            throw new ModelException("model.uniqueness");
+            errorReceiver.error(getEntity().getLocator(), ModelMessages.MODEL_PART_NOT_UNIQUE(((com.sun.tools.internal.ws.wsdl.document.Message)getEntity()).getName(), b.getName()));
+            throw new AbortException();
         }
         _bodyBlocks.put(b.getName(), b);
         b.setLocation(Block.BODY);
@@ -85,7 +87,8 @@ public abstract class Message extends ModelObject {
 
     public void addHeaderBlock(Block b) {
         if (_headerBlocks.containsKey(b.getName())) {
-            throw new ModelException("model.uniqueness");
+            errorReceiver.error(getEntity().getLocator(), ModelMessages.MODEL_PART_NOT_UNIQUE(((com.sun.tools.internal.ws.wsdl.document.Message)getEntity()).getName(), b.getName()));
+            throw new AbortException();
         }
         _headerBlocks.put(b.getName(), b);
         b.setLocation(Block.HEADER);
@@ -116,7 +119,8 @@ public abstract class Message extends ModelObject {
     /** attachment block */
     public void addAttachmentBlock(Block b) {
         if (_attachmentBlocks.containsKey(b.getName())) {
-            throw new ModelException("model.uniqueness");
+            errorReceiver.error(getEntity().getLocator(), ModelMessages.MODEL_PART_NOT_UNIQUE(((com.sun.tools.internal.ws.wsdl.document.Message)getEntity()).getName(), b.getName()));
+            throw new AbortException();
         }
         _attachmentBlocks.put(b.getName(), b);
         b.setLocation(Block.ATTACHMENT);
@@ -169,7 +173,8 @@ public abstract class Message extends ModelObject {
 
     public void addParameter(Parameter p) {
         if (_parametersByName.containsKey(p.getName())) {
-            throw new ModelException("model.uniqueness");
+            errorReceiver.error(getEntity().getLocator(), ModelMessages.MODEL_PARAMETER_NOTUNIQUE(p.getName(), p.getName()));
+            throw new AbortException();
         }
         _parameters.add(p);
         _parametersByName.put(p.getName(), p);
@@ -179,7 +184,7 @@ public abstract class Message extends ModelObject {
         if (_parametersByName.size() != _parameters.size()) {
             initializeParametersByName();
         }
-        return (Parameter) _parametersByName.get(name);
+        return _parametersByName.get(name);
     }
 
     public Iterator getParameters() {
@@ -203,8 +208,8 @@ public abstract class Message extends ModelObject {
                 Parameter param = (Parameter) iter.next();
                 if (param.getName() != null &&
                     _parametersByName.containsKey(param.getName())) {
-
-                    throw new ModelException("model.uniqueness");
+                    errorReceiver.error(getEntity().getLocator(), ModelMessages.MODEL_PARAMETER_NOTUNIQUE(param.getName(), param.getName()));
+                    throw new AbortException();
                 }
                 _parametersByName.put(param.getName(), param);
             }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Model.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Model.java
index 59ae490000c..ef68703b50a 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Model.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Model.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,18 +25,11 @@
 
 package com.sun.tools.internal.ws.processor.model;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.EnumSet;
-import javax.xml.namespace.QName;
-
 import com.sun.tools.internal.ws.processor.model.jaxb.JAXBModel;
-import com.sun.tools.internal.ws.processor.ProcessorActionVersion;
+import com.sun.tools.internal.ws.wsdl.framework.Entity;
+
+import javax.xml.namespace.QName;
+import java.util.*;
 
 /**
  * The model is used to represent the entire Web Service.  The JAX-WS ProcessorActions can process
@@ -46,10 +39,12 @@ import com.sun.tools.internal.ws.processor.ProcessorActionVersion;
  */
 public class Model extends ModelObject {
 
-    public Model() {
+    public Model(Entity entity) {
+        super(entity);
     }
 
-    public Model(QName name) {
+    public Model(QName name, Entity entity) {
+        super(entity);
         this.name = name;
     }
 
@@ -145,31 +140,6 @@ public class Model extends ModelObject {
         source = string;
     }
 
-    public ProcessorActionVersion getProcessorActionVersion(){
-        return processorActionVersion;
-    }
-
-    public void setProcessorActionVersion(ProcessorActionVersion version){
-        this.processorActionVersion = version;
-    }
-
-    public void setProcessorActionVersion(String version){
-        for(ProcessorActionVersion paVersion : EnumSet.allOf(ProcessorActionVersion.class)){
-            switch(paVersion){
-                case PRE_20:
-                    if(version.equals(ProcessorActionVersion.PRE_20.toString()))
-                        processorActionVersion = ProcessorActionVersion.PRE_20;
-                    break;
-                case VERSION_20:
-                    if(version.equals(ProcessorActionVersion.VERSION_20.toString()))
-                        processorActionVersion = ProcessorActionVersion.VERSION_20;
-                    break;
-                default:
-                    throw new ModelException("model.invalid.processorActionVersion", new Object[]{version});
-            }
-        }
-    }
-
     public void setJAXBModel(JAXBModel jaxBModel) {
         this.jaxBModel = jaxBModel;
     }
@@ -185,5 +155,4 @@ public class Model extends ModelObject {
     private Set extraTypes = new HashSet();
     private String source;
     private JAXBModel jaxBModel = null;
-    private ProcessorActionVersion processorActionVersion = ProcessorActionVersion.VERSION_20;
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/ModelException.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/ModelException.java
index 11b49a7b687..4b14db94f98 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/ModelException.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/ModelException.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,7 @@ public class ModelException extends ProcessorException {
         super("model.nestedModelError", arg);
     }
 
-    public String getResourceBundleName() {
+    public String getDefaultResourceBundleName() {
         return "com.sun.tools.internal.ws.resources.model";
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/ModelObject.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/ModelObject.java
index c0c47ea78c4..1f2faebfe93 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/ModelObject.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/ModelObject.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,20 +25,38 @@
 
 package com.sun.tools.internal.ws.processor.model;
 
+import com.sun.tools.internal.ws.wsdl.framework.Entity;
+import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
+
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import com.sun.xml.internal.ws.util.NullIterator;
+import org.xml.sax.Locator;
 
 /**
  *
  * @author WS Development Team
  */
 public abstract class ModelObject {
-
     public abstract void accept(ModelVisitor visitor) throws Exception;
 
+    private final Entity entity;
+    protected ErrorReceiver errorReceiver;
+
+    protected ModelObject(Entity entity) {
+        this.entity = entity;
+    }
+
+    public void setErrorReceiver(ErrorReceiver errorReceiver) {
+        this.errorReceiver = errorReceiver;
+    }
+
+    public Entity getEntity() {
+        return entity;
+    }
+
     public Object getProperty(String key) {
         if (_properties == null) {
             return null;
@@ -66,18 +84,20 @@ public abstract class ModelObject {
 
     public Iterator getProperties() {
         if (_properties == null) {
-            return NullIterator.getInstance();
+            return Collections.emptyList().iterator();
         } else {
             return _properties.keySet().iterator();
         }
     }
 
-    /* serialization */
+    public Locator getLocator(){
+        return entity.getLocator();
+    }
+
     public Map getPropertiesMap() {
         return _properties;
     }
 
-    /* serialization */
     public void setPropertiesMap(Map m) {
         _properties = m;
     }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/ModelProperties.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/ModelProperties.java
index abea8d62b63..9885f4bc8c8 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/ModelProperties.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/ModelProperties.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/ModelVisitor.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/ModelVisitor.java
index b28755e7a1a..448cb66a681 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/ModelVisitor.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/ModelVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Operation.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Operation.java
index 6b482eee026..48c0453aeab 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Operation.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Operation.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@ package com.sun.tools.internal.ws.processor.model;
 import com.sun.tools.internal.ws.processor.model.java.JavaMethod;
 import com.sun.tools.internal.ws.wsdl.document.soap.SOAPStyle;
 import com.sun.tools.internal.ws.wsdl.document.soap.SOAPUse;
+import com.sun.tools.internal.ws.wsdl.framework.Entity;
 import com.sun.xml.internal.bind.api.JAXBRIContext;
 
 import javax.xml.namespace.QName;
@@ -41,15 +42,18 @@ import java.util.Set;
  */
 public class Operation extends ModelObject {
 
-    public Operation() {}
+    public Operation(Entity entity) {
+        super(entity);
+    }
 
-    public Operation(Operation operation){
-        this(operation._name);
+    public Operation(Operation operation, Entity entity){
+        this(operation._name, entity);
         this._style = operation._style;
         this._use = operation._use;
         this.customizedName = operation.customizedName;
     }
-    public Operation(QName name) {
+    public Operation(QName name, Entity entity) {
+        super(entity);
         _name = name;
         _uniqueName = name.getLocalPart();
         _faultNames = new HashSet();
@@ -226,6 +230,16 @@ public class Operation extends ModelObject {
         return JAXBRIContext.mangleNameToVariableName(_name.getLocalPart());
     }
 
+    public com.sun.tools.internal.ws.wsdl.document.Operation getWSDLPortTypeOperation(){
+        return wsdlOperation;
+    }
+
+    public void setWSDLPortTypeOperation(com.sun.tools.internal.ws.wsdl.document.Operation wsdlOperation){
+        this.wsdlOperation = wsdlOperation;
+    }
+
+
+
     private String customizedName;
     private boolean _isWrapped = true;
     private QName _name;
@@ -238,5 +252,6 @@ public class Operation extends ModelObject {
     private SOAPUse _use = SOAPUse.LITERAL;
     private Set _faultNames;
     private Set _faults;
+    private com.sun.tools.internal.ws.wsdl.document.Operation wsdlOperation;
 
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Parameter.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Parameter.java
index 4f220acd774..1299de46d96 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Parameter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Parameter.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,37 @@
 
 package com.sun.tools.internal.ws.processor.model;
 
+import com.sun.tools.internal.ws.processor.model.java.JavaParameter;
+import com.sun.tools.internal.ws.wsdl.framework.Entity;
+import com.sun.tools.internal.ws.wsdl.document.MessagePart;
+
+import javax.jws.WebParam.Mode;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.sun.tools.internal.ws.processor.model.java.JavaParameter;
-import com.sun.xml.internal.ws.model.Mode;
-
 /**
  *
  * @author WS Development Team
  */
 public class Parameter extends ModelObject {
+    private final String entityName;
 
-    public Parameter() {}
-
-    public Parameter(String name) {
+    public Parameter(String name, Entity entity) {
+        super(entity);
         this.name = name;
+        if(entity instanceof com.sun.tools.internal.ws.wsdl.document.Message){
+            this.entityName = ((com.sun.tools.internal.ws.wsdl.document.Message)entity).getName();
+        }else if(entity instanceof MessagePart){
+            this.entityName = ((MessagePart)entity).getName();
+        }else{
+            this.entityName = name;
+        }
+
+    }
+
+
+    public String getEntityName() {
+        return entityName;
     }
 
     public String getName() {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Port.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Port.java
index a5680b67227..419d4d16777 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Port.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Port.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,29 +25,27 @@
 
 package com.sun.tools.internal.ws.processor.model;
 
+import com.sun.tools.internal.ws.processor.model.java.JavaInterface;
+import com.sun.tools.internal.ws.wsdl.document.soap.SOAPStyle;
+import com.sun.tools.internal.ws.wsdl.framework.Entity;
+
+import javax.xml.namespace.QName;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.xml.namespace.QName;
-
-import com.sun.tools.internal.ws.processor.config.HandlerChainInfo;
-import com.sun.tools.internal.ws.processor.model.java.JavaInterface;
-import com.sun.tools.internal.ws.wsdl.document.soap.SOAPUse;
-import com.sun.xml.internal.ws.encoding.soap.SOAPVersion;
-import com.sun.tools.internal.ws.wsdl.document.soap.SOAPStyle;
-import com.sun.tools.internal.ws.wsdl.document.soap.SOAPUse;
-
 /**
- *
  * @author WS Development Team
  */
 public class Port extends ModelObject {
 
-    public Port() {}
+    public Port(Entity entity) {
+        super(entity);
+    }
 
-    public Port(QName name) {
+    public Port(QName name, Entity entity) {
+        super(entity);
         _name = name;
     }
 
@@ -68,15 +66,15 @@ public class Port extends ModelObject {
         if (operationsByName.size() != _operations.size()) {
             initializeOperationsByName();
         }
-        return (Operation)operationsByName.get(name);
+        return operationsByName.get(name);
     }
 
     private void initializeOperationsByName() {
-        operationsByName = new HashMap();
+        operationsByName = new HashMap();
         if (_operations != null) {
             for (Operation operation : _operations) {
                 if (operation.getUniqueName() != null &&
-                    operationsByName.containsKey(operation.getUniqueName())) {
+                        operationsByName.containsKey(operation.getUniqueName())) {
 
                     throw new ModelException("model.uniqueness");
                 }
@@ -111,36 +109,6 @@ public class Port extends ModelObject {
         _address = s;
     }
 
-    public HandlerChainInfo getClientHandlerChainInfo() {
-        if (_clientHandlerChainInfo == null) {
-            _clientHandlerChainInfo  = new HandlerChainInfo();
-        }
-        return _clientHandlerChainInfo;
-    }
-
-    public void setClientHandlerChainInfo(HandlerChainInfo i) {
-        _clientHandlerChainInfo = i;
-    }
-
-    public HandlerChainInfo getServerHandlerChainInfo() {
-        if (_serverHandlerChainInfo == null) {
-            _serverHandlerChainInfo  = new HandlerChainInfo();
-        }
-        return _serverHandlerChainInfo;
-    }
-
-    public void setServerHandlerChainInfo(HandlerChainInfo i) {
-        _serverHandlerChainInfo = i;
-    }
-
-    public SOAPVersion getSOAPVersion() {
-        return _soapVersion;
-    }
-
-    public void setSOAPVersion(SOAPVersion soapVersion) {
-        _soapVersion = soapVersion;
-    }
-
     public String getServiceImplName() {
         return _serviceImplName;
     }
@@ -165,16 +133,17 @@ public class Port extends ModelObject {
     }
 
     /**
-    * XYZ_Service.getABC() method name
-    * @return Returns the portGetterName.
-    */
+     * XYZ_Service.getABC() method name
+     *
+     * @return Returns the portGetterName.
+     */
     public String getPortGetter() {
         return portGetter;
     }
 
     /**
-    * @param portGetterName The portGetterName to set.
-    */
+     * @param portGetterName The portGetterName to set.
+     */
     public void setPortGetter(String portGetterName) {
         this.portGetter = portGetterName;
     }
@@ -200,12 +169,9 @@ public class Port extends ModelObject {
 
     private String portGetter;
     private QName _name;
-    private List _operations = new ArrayList();
+    private List _operations = new ArrayList();
     private JavaInterface _javaInterface;
     private String _address;
     private String _serviceImplName;
-    private Map operationsByName = new HashMap();
-    private HandlerChainInfo _clientHandlerChainInfo;
-    private HandlerChainInfo _serverHandlerChainInfo;
-    private SOAPVersion _soapVersion = SOAPVersion.SOAP_11;
+    private Map operationsByName = new HashMap();
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Request.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Request.java
index 172704d5753..1c50dee5baa 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Request.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Request.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,13 +25,18 @@
 
 package com.sun.tools.internal.ws.processor.model;
 
+import com.sun.tools.internal.ws.wsdl.framework.Entity;
+import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
+
 /**
  *
  * @author WS Development Team
  */
 public class Request extends Message {
 
-    public Request() {}
+    public Request(com.sun.tools.internal.ws.wsdl.document.Message entity, ErrorReceiver receiver) {
+        super(entity, receiver);
+    }
 
     public void accept(ModelVisitor visitor) throws Exception {
         visitor.visit(this);
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Response.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Response.java
index a5199b3e127..19349c0ae5b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Response.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Response.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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.tools.internal.ws.processor.model;
 
+import com.sun.tools.internal.ws.wsdl.framework.Entity;
+import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
+
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -35,7 +38,9 @@ import java.util.Map;
  */
 public class Response extends Message {
 
-    public Response() {}
+    public Response(com.sun.tools.internal.ws.wsdl.document.Message entity, ErrorReceiver receiver) {
+        super(entity, receiver);
+    }
 
     public void addFaultBlock(Block b) {
         if (_faultBlocks.containsKey(b.getName())) {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Service.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Service.java
index d3678ce83bc..4f2c06263cb 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Service.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Service.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,14 +26,10 @@
 package com.sun.tools.internal.ws.processor.model;
 
 import com.sun.tools.internal.ws.processor.model.java.JavaInterface;
+import com.sun.tools.internal.ws.wsdl.framework.Entity;
 
 import javax.xml.namespace.QName;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  *
@@ -41,9 +37,12 @@ import java.util.Map;
  */
 public class Service extends ModelObject {
 
-    public Service() {}
+    public Service(Entity entity) {
+        super(entity);
+    }
 
-    public Service(QName name, JavaInterface javaInterface) {
+    public Service(QName name, JavaInterface javaInterface, Entity entity) {
+        super(entity);
         this.name = name;
         this.javaInterface = javaInterface;
     }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/exporter/ExternalObject.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/exporter/ExternalObject.java
index 224c60d9b3b..281ba6470f3 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/exporter/ExternalObject.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/exporter/ExternalObject.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaArrayType.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaArrayType.java
index 7d8cbd28370..1c172f57933 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaArrayType.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaArrayType.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaException.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaException.java
index 019aedc3818..343d47bd237 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaException.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaException.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaInterface.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaInterface.java
index 9bf221f5459..11f98f8c190 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaInterface.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaInterface.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,14 +25,13 @@
 
 package com.sun.tools.internal.ws.processor.model.java;
 
+import com.sun.tools.internal.ws.processor.model.ModelException;
+import com.sun.tools.internal.ws.util.ClassNameInfo;
+
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import com.sun.tools.internal.ws.util.ClassNameInfo;
-
-import com.sun.tools.internal.ws.processor.model.ModelException;
-
 /**
  *
  * @author WS Development Team
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaMethod.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaMethod.java
index 6999e5c71f7..e0797fdbe30 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaMethod.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaMethod.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,34 +25,35 @@
 
 package com.sun.tools.internal.ws.processor.model.java;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+import com.sun.tools.internal.ws.resources.ModelMessages;
+import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
+import com.sun.tools.internal.ws.processor.model.Parameter;
 
-import com.sun.tools.internal.ws.processor.model.ModelException;
-import com.sun.codemodel.internal.JClass;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Iterator;
 
 /**
- *
  * @author WS Development Team
  */
 public class JavaMethod {
 
-    public JavaMethod() {}
+    private final ErrorReceiver errorReceiver;
+    private final String name;
+    private final List parameters = new ArrayList();
+    private final List exceptions = new ArrayList();
+    private JavaType returnType;
 
-    public JavaMethod(String name) {
+    public JavaMethod(String name, ErrorReceiver receiver) {
         this.name = name;
         this.returnType = null;
+        this.errorReceiver = receiver;
     }
 
     public String getName() {
         return name;
     }
 
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public JavaType getReturnType() {
         return returnType;
     }
@@ -61,109 +62,48 @@ public class JavaMethod {
         this.returnType = returnType;
     }
 
-    public boolean hasParameter(String paramName) {
-        for (int i=0; i getParameters() {
-        return parameters.iterator();
+    public void addParameter(JavaParameter param) {
+        // verify that this member does not already exist
+        if (hasParameter(param.getName())) {
+            errorReceiver.error(param.getParameter().getLocator(), ModelMessages.MODEL_PARAMETER_NOTUNIQUE(param.getName(), param.getParameter().getEntityName()));
+            Parameter duplicParam = getParameter(param.getName());
+            errorReceiver.error(duplicParam.getLocator(), ModelMessages.MODEL_PARAMETER_NOTUNIQUE(param.getName(), duplicParam.getEntityName()));
+            return;
+        }
+        parameters.add(param);
     }
 
-    public int getParameterCount() {
-        return parameters.size();
-    }
-
-    /* serialization */
     public List getParametersList() {
         return parameters;
     }
 
-    /* serialization */
-    public void setParametersList(List l) {
-        parameters = l;
-    }
-
-    public boolean hasException(String exception) {
-        return exceptions.contains(exception);
-    }
-
     public void addException(String exception) {
-
         // verify that this exception does not already exist
-        if (hasException(exception)) {
-            throw new ModelException("model.uniqueness");
+        if (!exceptions.contains(exception)) {
+            exceptions.add(exception);
         }
-        exceptions.add(exception);
     }
 
-    public Iterator getExceptions() {
+    /** TODO: NB uses it, remove it once we expose it thru some API **/
+    public Iterator getExceptions() {
         return exceptions.iterator();
     }
-
-    /* serialization */
-    public List getExceptionsList() {
-        return exceptions;
-    }
-
-    /* serialization */
-    public void setExceptionsList(List l) {
-        exceptions = l;
-    }
-
-    public String getDeclaringClass() {
-        return declaringClass;
-    }
-    public void setDeclaringClass(String declaringClass) {
-        this.declaringClass = declaringClass;
-    }
-
-    // TODO fix model importer/exporter to handle this
-    public boolean getThrowsRemoteException() {
-        return throwsRemoteException;
-    }
-    public void setThrowsRemoteException(boolean throwsRemoteException) {
-        this.throwsRemoteException = throwsRemoteException;
-    }
-
-    public void addExceptionClass(JClass ex){
-        exceptionClasses.add(ex);
-    }
-
-    public List getExceptionClasses(){
-        return exceptionClasses;
-    }
-
-    private String name;
-    private List parameters = new ArrayList();
-    private List exceptions = new ArrayList();
-    private List exceptionClasses = new ArrayList();
-
-    private JavaType returnType;
-    private String declaringClass;
-    private boolean throwsRemoteException = true;
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaParameter.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaParameter.java
index e341b823a8e..cebe5366808 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaParameter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaParameter.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaSimpleType.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaSimpleType.java
index 678a23477d9..720691400ca 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaSimpleType.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaSimpleType.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,8 +25,6 @@
 
 package com.sun.tools.internal.ws.processor.model.java;
 
-import com.sun.codemodel.internal.JType;
-import com.sun.tools.internal.xjc.api.TypeAndAnnotation;
 import com.sun.tools.internal.ws.processor.model.jaxb.JAXBTypeAndAnnotation;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureMember.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureMember.java
index c0b08d31f3b..f2c92ded4b2 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureMember.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureMember.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureType.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureType.java
index 907a5269132..c2df0d563e9 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureType.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureType.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,16 +25,10 @@
 
 package com.sun.tools.internal.ws.processor.model.java;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import com.sun.tools.internal.ws.processor.model.ModelException;
 
+import java.util.*;
+
 /**
  *
  * @author WS Development Team
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaType.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaType.java
index 87220881bbc..89721ea49d1 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaType.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaType.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,8 +25,6 @@
 
 package com.sun.tools.internal.ws.processor.model.java;
 
-import com.sun.codemodel.internal.JType;
-import com.sun.tools.internal.xjc.api.TypeAndAnnotation;
 import com.sun.tools.internal.ws.processor.model.jaxb.JAXBTypeAndAnnotation;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBElementMember.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBElementMember.java
index ef242ebe8a0..6a93252a902 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBElementMember.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBElementMember.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,9 +24,10 @@
  */
 package com.sun.tools.internal.ws.processor.model.jaxb;
 
+import com.sun.tools.internal.ws.processor.model.java.JavaStructureMember;
+
 import javax.xml.namespace.QName;
 
-import com.sun.tools.internal.ws.processor.model.java.JavaStructureMember;
 /**
  * @author Kathy Walsh, Vivek Pandey
  *
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBMapping.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBMapping.java
index 6964389396f..17e7d2e27e6 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBMapping.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBMapping.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,15 +24,13 @@
  */
 package com.sun.tools.internal.ws.processor.model.jaxb;
 
-import java.util.List;
-import java.util.ArrayList;
-
-import javax.xml.namespace.QName;
-
 import com.sun.tools.internal.xjc.api.Mapping;
 import com.sun.tools.internal.xjc.api.Property;
 import com.sun.tools.internal.xjc.api.TypeAndAnnotation;
-import com.sun.codemodel.internal.JType;
+
+import javax.xml.namespace.QName;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author Kohsuke Kawaguchi, Vivek Pandey
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBModel.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBModel.java
index 6fb25cfefa4..0a16d495925 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBModel.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBModel.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,18 +24,12 @@
  */
 package com.sun.tools.internal.ws.processor.model.jaxb;
 
-import com.sun.tools.internal.xjc.api.*;
+import com.sun.tools.internal.xjc.api.J2SJAXBModel;
+import com.sun.tools.internal.xjc.api.Mapping;
+import com.sun.tools.internal.xjc.api.S2JJAXBModel;
 
 import javax.xml.namespace.QName;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import com.sun.codemodel.internal.JType;
+import java.util.*;
 
 /**
  * Root of the JAXB Model.
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBProperty.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBProperty.java
index 7e7a7c34282..3fe9ed77aed 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBProperty.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBProperty.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,11 +24,10 @@
  */
 package com.sun.tools.internal.ws.processor.model.jaxb;
 
-import javax.xml.namespace.QName;
-
 import com.sun.tools.internal.xjc.api.Property;
 
-import com.sun.codemodel.internal.JType;
+import javax.xml.namespace.QName;
+
 /**
  * @author Kohsuke Kawaguchi
  */
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBStructuredType.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBStructuredType.java
index bd5940bddb7..a9dbdf32fbe 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBStructuredType.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBStructuredType.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,19 +24,12 @@
  */
 package com.sun.tools.internal.ws.processor.model.jaxb;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-
 import com.sun.tools.internal.ws.processor.model.ModelException;
 import com.sun.tools.internal.ws.processor.model.java.JavaStructureType;
 
+import javax.xml.namespace.QName;
+import java.util.*;
+
 /**
  * Top-level binding between JAXB generated Java type
  * and XML Schema element declaration.
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBType.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBType.java
index ad3462807d8..665ce7ad3d5 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBType.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBType.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,6 @@ package com.sun.tools.internal.ws.processor.model.jaxb;
 
 import com.sun.tools.internal.ws.processor.model.AbstractType;
 import com.sun.tools.internal.ws.processor.model.java.JavaType;
-import com.sun.tools.internal.xjc.api.TypeAndAnnotation;
-import com.sun.codemodel.internal.JType;
 
 import javax.xml.namespace.QName;
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeAndAnnotation.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeAndAnnotation.java
index cfa340cb5d2..07be64ed56a 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeAndAnnotation.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeAndAnnotation.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,9 +24,9 @@
  */
 package com.sun.tools.internal.ws.processor.model.jaxb;
 
-import com.sun.tools.internal.xjc.api.TypeAndAnnotation;
-import com.sun.codemodel.internal.JType;
 import com.sun.codemodel.internal.JAnnotatable;
+import com.sun.codemodel.internal.JType;
+import com.sun.tools.internal.xjc.api.TypeAndAnnotation;
 
 /**
  * Holds JAXB JType and TypeAndAnnotation. This provides abstration over
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeVisitor.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeVisitor.java
index 94fba8bc641..e1926580680 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeVisitor.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitMember.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitMember.java
index 0e4d6fbd832..70fb9188582 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitMember.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitMember.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,10 +24,10 @@
  */
 package com.sun.tools.internal.ws.processor.model.jaxb;
 
-import javax.xml.namespace.QName;
-
 import com.sun.tools.internal.ws.processor.model.AbstractType;
 
+import javax.xml.namespace.QName;
+
 /**
  * @author Vivek Pandey
  *
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitStructure.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitStructure.java
index 17d58c719c7..095eb682837 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitStructure.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitStructure.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,12 +24,11 @@
  */
 package com.sun.tools.internal.ws.processor.model.jaxb;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.sun.tools.internal.ws.processor.model.AbstractType;
 
 import javax.xml.namespace.QName;
-
-import com.sun.tools.internal.ws.processor.model.AbstractType;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author Vivek Pandey
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/Util.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/Util.java
index 5fb77a7dd8b..c96e2c42b15 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/Util.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/Util.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/JavaSimpleTypeCreator.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/JavaSimpleTypeCreator.java
index 44243e7bfb0..71df3cc5ae0 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/JavaSimpleTypeCreator.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/JavaSimpleTypeCreator.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,12 +25,11 @@
 
 package com.sun.tools.internal.ws.processor.modeler;
 
+import com.sun.tools.internal.ws.processor.model.java.JavaSimpleType;
+
 import java.util.HashMap;
 import java.util.Map;
 
-import com.sun.tools.internal.ws.processor.model.java.JavaSimpleType;
-import com.sun.xml.internal.ws.util.VersionUtil;
-
 /**
  *
  * @author WS Development Team
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/Modeler.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/Modeler.java
index 88091d0631e..539de36abc3 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/Modeler.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/Modeler.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/ModelerConstants.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/ModelerConstants.java
index 1362f84c091..ec280f47053 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/ModelerConstants.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/ModelerConstants.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/ModelerException.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/ModelerException.java
index 2f853499d72..b0953aa5762 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/ModelerException.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/ModelerException.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,7 @@ public class ModelerException extends ProcessorException {
         super("modeler.nestedModelError", arg);
     }
 
-    public String getResourceBundleName() {
+    public String getDefaultResourceBundleName() {
         return "com.sun.tools.internal.ws.resources.modeler";
     }
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/AnnotationProcessorContext.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/AnnotationProcessorContext.java
index eaeb8145f8f..c6c3750c6d7 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/AnnotationProcessorContext.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/AnnotationProcessorContext.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,28 +24,18 @@
  */
 package com.sun.tools.internal.ws.processor.modeler.annotation;
 
-import com.sun.mirror.apt.AnnotationProcessorEnvironment;
 import com.sun.mirror.declaration.MethodDeclaration;
 import com.sun.mirror.declaration.ParameterDeclaration;
 import com.sun.mirror.declaration.TypeDeclaration;
-import com.sun.mirror.type.TypeMirror;
 import com.sun.tools.internal.ws.processor.model.Model;
 import com.sun.tools.internal.ws.processor.model.Operation;
 import com.sun.tools.internal.ws.processor.model.Port;
 import com.sun.tools.internal.ws.processor.model.Service;
-import com.sun.tools.internal.ws.processor.model.jaxb.JAXBModel;
 import com.sun.tools.internal.ws.wsdl.document.soap.SOAPUse;
 
-import com.sun.tools.internal.xjc.api.Reference;
-
-import javax.xml.namespace.QName;
-
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
-import com.sun.tools.internal.ws.processor.modeler.annotation.*;
 
 
 /**
@@ -85,14 +75,6 @@ public class AnnotationProcessorContext {
         return seiContextMap.values();
     }
 
-    public boolean allEncoded() {
-        for (SEIContext seiContext : seiContextMap.values()) {
-            if (!isEncoded(seiContext.getModel()))
-                return false;
-        }
-        return true;
-    }
-
     public int getRound() {
         return round;
     }
@@ -128,23 +110,15 @@ public class AnnotationProcessorContext {
         private Map resOperationWrapperMap;
         private Map exceptionBeanMap;
 
-        private Model model;
-        private Map schemaReferences;
-        private Map schemaElements;
-
-        private boolean modelCompiled = false;
         private String seiName;
         private String seiImplName;
         private boolean implementsSEI = false;
-        private JAXBModel jaxBModel;
         private String namespaceURI = null;
 
         public SEIContext(String seiName) {
             reqOperationWrapperMap = new HashMap();
             resOperationWrapperMap = new HashMap();
             exceptionBeanMap = new HashMap();
-            schemaReferences = new HashMap();
-            schemaElements = new HashMap();
             this.seiName = seiName;
         }
 
@@ -164,20 +138,6 @@ public class AnnotationProcessorContext {
             return namespaceURI;
         }
 
-        public void setJAXBModel(JAXBModel model) {
-            this.jaxBModel = model;
-            if (this.model != null)
-                this.model.setJAXBModel(model);
-        }
-
-        public JAXBModel getJAXBModel() {
-            return jaxBModel;
-        }
-
-        public String getSEIName() {
-            return seiName;
-        }
-
         public String getSEIImplName() {
             return seiImplName;
         }
@@ -209,35 +169,6 @@ public class AnnotationProcessorContext {
             return buf.toString();
         }
 
-        public void setModel(Model model) {
-            this.model = model;
-            model.setJAXBModel(jaxBModel);
-        }
-
-        public Model getModel() {
-            return model;
-        }
-
-        public boolean getModelCompiled() {
-            return modelCompiled;
-        }
-
-        public void setModelCompiled(boolean compiled) {
-            modelCompiled = compiled;
-        }
-
-        public Collection getSchemaReferences(ModelBuilder builder) {
-            return schemaReferences.values();
-        }
-
-        public Map getSchemaElementMap(ModelBuilder builder) {
-            return schemaElements;
-        }
-
-        public Collection getSchemaReferences() {
-            return schemaReferences.values();
-        }
-
         public void clearExceptionMap() {
             exceptionBeanMap.clear();
         }
@@ -249,51 +180,5 @@ public class AnnotationProcessorContext {
         public FaultInfo getExceptionBeanName(String exception) {
             return exceptionBeanMap.get(exception);
         }
-
-        public Reference addReference(MethodDeclaration method) {
-            Reference ref = schemaReferences.get(method);
-            if (ref == null)
-                ref = new Reference(method);
-            addReference(method, ref);
-            return ref;
-        }
-
-        public Reference addReference(ParameterDeclaration param) {
-            Reference ref = schemaReferences.get(param);
-            if (ref == null)
-                ref = new Reference(param);
-            addReference(param, ref);
-            return ref;
-        }
-
-        public Reference addReference(TypeMirror type, ParameterDeclaration param) {
-            Reference ref = schemaReferences.get(param);
-            if (ref == null)
-                ref = new Reference(type, param);
-            addReference(param, ref);
-            return ref;
-        }
-
-        public Reference addReference(TypeDeclaration type, AnnotationProcessorEnvironment apEnv) {
-            Reference ref = schemaReferences.get(type);
-            if (ref == null)
-                ref = new Reference(type, apEnv);
-            addReference(type, ref);
-            return ref;
-        }
-
-        private void addReference(Object key, Reference reference) {
-            schemaReferences.put(key, reference);
-        }
-
-        public Reference getReference(Object key) {
-            return schemaReferences.get(key);
-        }
-
-        public void addSchemaElement(QName elemName, Reference reference) {
-            if (elemName == null)
-                throw new RuntimeException();
-            schemaElements.put(elemName, reference);
-        }
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/FaultInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/FaultInfo.java
index e14c6472b54..bad0e695e81 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/FaultInfo.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/FaultInfo.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@ package com.sun.tools.internal.ws.processor.modeler.annotation;
 import javax.xml.namespace.QName;
 import java.util.ArrayList;
 import java.util.List;
-import com.sun.tools.internal.ws.processor.modeler.annotation.*;
 
 /**
  *
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/MakeSafeTypeVisitor.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/MakeSafeTypeVisitor.java
index 1666e5029dc..5651dd2ab23 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/MakeSafeTypeVisitor.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/MakeSafeTypeVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,28 +25,13 @@
 
 package com.sun.tools.internal.ws.processor.modeler.annotation;
 
-import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-
-
 import com.sun.istack.internal.tools.APTTypeVisitor;
-
+import com.sun.mirror.apt.AnnotationProcessorEnvironment;
 import com.sun.mirror.declaration.TypeDeclaration;
-import com.sun.mirror.type.ArrayType;
-import com.sun.mirror.type.ClassType;
-import com.sun.mirror.type.DeclaredType;
-import com.sun.mirror.type.InterfaceType;
-import com.sun.mirror.type.PrimitiveType;
-import com.sun.mirror.type.ReferenceType;
-import com.sun.mirror.type.TypeMirror;
-import com.sun.mirror.type.TypeVariable;
-import com.sun.mirror.type.VoidType;
-import com.sun.mirror.type.WildcardType;
+import com.sun.mirror.type.*;
 import com.sun.mirror.util.Types;
 
-import java.lang.reflect.Array;
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
 
 /**
  *
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/MemberInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/MemberInfo.java
index e3aa05eca1b..ea4f7d3cd54 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/MemberInfo.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/MemberInfo.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,30 +24,38 @@
  */
 package com.sun.tools.internal.ws.processor.modeler.annotation;
 
-import javax.xml.namespace.QName;
-
+import com.sun.istack.internal.NotNull;
+import com.sun.mirror.declaration.Declaration;
 import com.sun.mirror.type.TypeMirror;
 
+import javax.xml.namespace.QName;
+import java.lang.annotation.Annotation;
+
 /**
  *
  * @author  WS Development Team
  */
-public class MemberInfo implements Comparable {
-    int paramIndex;
-    TypeMirror paramType;
-    String paramName;
-    QName elementName;
+public final class MemberInfo implements Comparable {
+    private final TypeMirror paramType;
+    private final String paramName;
+    private final QName elementName;
+    private final Annotation[] jaxbAnnotations;
+    /**
+     * Use this to look up annotations on this parameter/return type.
+     */
+    private final Declaration decl;
 
-    public MemberInfo(int paramIndex, TypeMirror paramType, String paramName,
-        QName elementName) {
-        this.paramIndex = paramIndex;
+    public MemberInfo(TypeMirror paramType, String paramName, QName elementName, @NotNull Declaration decl, Annotation... jaxbAnnotations) {
         this.paramType = paramType;
         this.paramName = paramName;
         this.elementName = elementName;
+        this.decl = decl;
+        this.jaxbAnnotations = jaxbAnnotations;
     }
 
-    public int getParamIndex() {
-        return paramIndex;
+
+    public Annotation[] getJaxbAnnotations() {
+        return jaxbAnnotations;
     }
 
     public TypeMirror getParamType() {
@@ -62,6 +70,10 @@ public class MemberInfo implements Comparable {
         return elementName;
     }
 
+    public @NotNull Declaration getDecl() {
+        return decl;
+    }
+
     public int compareTo(MemberInfo member) {
         return paramName.compareTo(member.paramName);
     }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/ModelBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/ModelBuilder.java
index 13b26c56759..ef0f522b738 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/ModelBuilder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/ModelBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,24 +24,17 @@
  */
 package com.sun.tools.internal.ws.processor.modeler.annotation;
 
-import java.io.File;
-
+import com.sun.mirror.apt.AnnotationProcessorEnvironment;
+import com.sun.mirror.declaration.TypeDeclaration;
+import com.sun.mirror.type.TypeMirror;
+import com.sun.mirror.util.SourcePosition;
 import com.sun.tools.internal.ws.processor.model.Port;
 import com.sun.tools.internal.ws.processor.model.Service;
 import com.sun.tools.internal.ws.processor.modeler.ModelerException;
-import com.sun.tools.internal.ws.processor.util.ProcessorEnvironment;
+import com.sun.tools.internal.ws.wscompile.WsgenOptions;
 import com.sun.xml.internal.ws.util.localization.Localizable;
 
-import java.net.URL;
-import java.util.Properties;
-
-import com.sun.mirror.apt.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-import javax.xml.namespace.QName;
-import com.sun.tools.internal.ws.processor.modeler.annotation.*;
+import java.io.File;
 
 /**
  *
@@ -49,7 +42,6 @@ import com.sun.tools.internal.ws.processor.modeler.annotation.*;
  */
 public interface ModelBuilder {
     public AnnotationProcessorEnvironment getAPEnv();
-    public void createModel(TypeDeclaration d, QName modelName, String targetNamespace, String modelerClassName);
     public void setService(Service service);
     public void setPort(Port port);
     public String getOperationName(String methodName);
@@ -62,14 +54,11 @@ public interface ModelBuilder {
     public void setWrapperGenerated(boolean wrapperGenerated);
     public TypeDeclaration getTypeDeclaration(String typeName);
     public String getSourceVersion();
-    public ProcessorEnvironment getProcessorEnvironment();
+    public WsgenOptions getOptions();
     public File getSourceDir();
     public String getXMLName(String javaName);
-    public void onError(String key);
-    public void onError(String key, Object[] args) throws ModelerException;
-    public void onError(SourcePosition srcPos, String key, Object[] args) throws ModelerException;
-    public void onError(Localizable msg) throws ModelerException;
-    public void onWarning(Localizable msg);
-    public void onInfo(Localizable msg);
     public void log(String msg);
+
+    public void onError(String s);
+    public void onError(SourcePosition pos, Localizable msg) throws ModelerException;
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeModeler.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeModeler.java
index 959acba35ea..6cad883d8fd 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeModeler.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeModeler.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,20 +24,13 @@
  */
 package com.sun.tools.internal.ws.processor.modeler.annotation;
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import com.sun.mirror.apt.*;
+import com.sun.mirror.apt.AnnotationProcessorEnvironment;
 import com.sun.mirror.declaration.*;
 import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-import com.sun.tools.internal.ws.processor.modeler.annotation.*;
 import com.sun.xml.internal.ws.util.StringUtils;
 
+import java.util.*;
+
 
 /**
  *
@@ -46,39 +39,11 @@ import com.sun.xml.internal.ws.util.StringUtils;
 public class TypeModeler implements WebServiceConstants {
 
     public static TypeDeclaration getDeclaration(TypeMirror typeMirror) {
-        TypeDeclaration retDecl = null;
         if (typeMirror instanceof DeclaredType)
             return ((DeclaredType)typeMirror).getDeclaration();
         return null;
     }
 
-    public static TypeDeclaration getTypeDeclaration(TypeMirror type) {
-        TypeDeclaration typeDecl = null;
-        if (type instanceof ClassType)
-            typeDecl = ((ClassType)type).getDeclaration();
-        else
-            typeDecl = ((InterfaceType)type).getDeclaration();
-        return typeDecl;
-    }
-
-    public static Collection getSuperinterfaces(TypeMirror type) {
-        Collection interfaces = null;
-        if (type instanceof ClassType)
-            interfaces = ((ClassType)type).getSuperinterfaces();
-        else
-            interfaces = ((InterfaceType)type).getSuperinterfaces();
-        return interfaces;
-    }
-
-    public static Collection getSuperinterfaces(TypeDeclaration type) {
-        Collection interfaces = null;
-        if (type instanceof ClassDeclaration)
-            interfaces = ((ClassDeclaration)type).getSuperinterfaces();
-        else
-            interfaces = ((InterfaceDeclaration)type).getSuperinterfaces();
-        return interfaces;
-    }
-
     public static TypeDeclaration getDeclaringClassMethod(
         TypeMirror theClass,
         String methodName,
@@ -99,7 +64,7 @@ public class TypeModeler implements WebServiceConstants {
                 retClass = getDeclaringClassMethod(superClass, methodName, args);
         }
         if (retClass == null) {
-            for (InterfaceType interfaceType : getSuperinterfaces(theClass))
+            for (InterfaceType interfaceType : theClass.getSuperinterfaces())
                 retClass =
                     getDeclaringClassMethod(interfaceType, methodName, args);
         }
@@ -143,8 +108,8 @@ public class TypeModeler implements WebServiceConstants {
 
     public static TypeMirror getHolderValueType(
         TypeMirror type,
-        TypeDeclaration defHolder,
-        AnnotationProcessorEnvironment env) {
+        TypeDeclaration defHolder
+    ) {
 
         TypeDeclaration typeDecl = getDeclaration(type);
         if (typeDecl == null)
@@ -216,21 +181,21 @@ public class TypeModeler implements WebServiceConstants {
         return false;
     }
 
-    public static Map getExceptionProperties(TypeMirror type) {
+    public static Map getExceptionProperties(TypeMirror type) {
         return getExceptionProperties(getDeclaration(type));
     }
 
-    public static Map getExceptionProperties(TypeDeclaration type) {
-        Map members = new HashMap();
+    public static Map getExceptionProperties(TypeDeclaration type) {
+        Map members = new HashMap();
         collectExceptionProperties(type, members);
         return members;
     }
 
-    public static void collectExceptionProperties(TypeMirror type, Map members) {
+    public static void collectExceptionProperties(TypeMirror type, Map members) {
         collectExceptionProperties(getDeclaration(type), members);
     }
 
-    public static void collectExceptionProperties(TypeDeclaration type, Map members) {
+    public static void collectExceptionProperties(TypeDeclaration type, Map members) {
 //        System.out.println("type: "+type.toString());
         Collection methods;
         methods = type.getMethods();
@@ -256,13 +221,13 @@ public class TypeModeler implements WebServiceConstants {
                            ((PrimitiveType)resultType).getKind() == PrimitiveType.Kind.BOOLEAN)) {
                     // Simple getter
 //                    System.out.println("exception property: "+ StringUtils.decapitalize(name.substring(3)));
-                members.put(StringUtils.decapitalize(name.substring(3)), resultType);
+                members.put(StringUtils.decapitalize(name.substring(3)), method);
             } else if (resultType instanceof PrimitiveType &&
                            ((PrimitiveType)resultType).getKind() == PrimitiveType.Kind.BOOLEAN &&
                            name.startsWith(IS_PREFIX)) {
                     // Boolean getter
 //                    System.out.println("exception property: "+ StringUtils.decapitalize(name.substring(2)));
-                    members.put(StringUtils.decapitalize(name.substring(2)), resultType);
+                    members.put(StringUtils.decapitalize(name.substring(2)), method);
                 }
             }
         }
@@ -270,7 +235,7 @@ public class TypeModeler implements WebServiceConstants {
         if (type instanceof ClassDeclaration && ((ClassDeclaration)type).getSuperclass() != null)  {
             collectExceptionProperties(((ClassDeclaration)type).getSuperclass(), members);
         }
-        for (InterfaceType intfType : getSuperinterfaces(type)) {
+        for (InterfaceType intfType : type.getSuperinterfaces()) {
             collectExceptionProperties(intfType, members);
         }
     }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMoniker.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMoniker.java
index 41934cbb6ed..4a75f2d8133 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMoniker.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMoniker.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,9 +24,8 @@
  */
 package com.sun.tools.internal.ws.processor.modeler.annotation;
 
-import com.sun.mirror.type.TypeMirror;
 import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-import com.sun.tools.internal.ws.processor.modeler.annotation.*;
+import com.sun.mirror.type.TypeMirror;
 
 /**
  *
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMonikerFactory.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMonikerFactory.java
index c4dba54ba74..aa93759870b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMonikerFactory.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMonikerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,14 +25,15 @@
 package com.sun.tools.internal.ws.processor.modeler.annotation;
 
 
-import com.sun.mirror.declaration.TypeDeclaration;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.Types;
 import com.sun.mirror.apt.AnnotationProcessorEnvironment;
+import com.sun.mirror.declaration.TypeDeclaration;
+import com.sun.mirror.type.ArrayType;
+import com.sun.mirror.type.DeclaredType;
+import com.sun.mirror.type.PrimitiveType;
+import com.sun.mirror.type.TypeMirror;
 
-import java.util.Collection;
 import java.util.ArrayList;
-import com.sun.tools.internal.ws.processor.modeler.annotation.*;
+import java.util.Collection;
 
 /**
  *
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceAP.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceAP.java
index db23b74437a..9e2e1d0c7f9 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceAP.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceAP.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,70 +27,49 @@ package com.sun.tools.internal.ws.processor.modeler.annotation;
 import com.sun.mirror.apt.AnnotationProcessor;
 import com.sun.mirror.apt.AnnotationProcessorEnvironment;
 import com.sun.mirror.apt.Messager;
-import com.sun.mirror.declaration.ClassDeclaration;
-import com.sun.mirror.declaration.InterfaceDeclaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-import com.sun.mirror.declaration.TypeDeclaration;
-import com.sun.mirror.declaration.TypeParameterDeclaration;
+import com.sun.mirror.declaration.*;
 import com.sun.mirror.type.ClassType;
 import com.sun.mirror.type.InterfaceType;
 import com.sun.mirror.type.TypeMirror;
 import com.sun.mirror.util.SourcePosition;
-import com.sun.tools.internal.ws.processor.ProcessorNotificationListener;
-import com.sun.tools.internal.ws.processor.ProcessorOptions;
+import com.sun.tools.internal.ws.ToolVersion;
 import com.sun.tools.internal.ws.processor.generator.GeneratorUtil;
 import com.sun.tools.internal.ws.processor.generator.Names;
-import com.sun.tools.internal.ws.processor.model.Model;
-import com.sun.tools.internal.ws.processor.model.ModelProperties;
 import com.sun.tools.internal.ws.processor.model.Operation;
 import com.sun.tools.internal.ws.processor.model.Port;
 import com.sun.tools.internal.ws.processor.model.Service;
-import com.sun.tools.internal.ws.processor.model.jaxb.JAXBModel;
 import com.sun.tools.internal.ws.processor.modeler.ModelerException;
-import com.sun.tools.internal.ws.processor.modeler.annotation.AnnotationProcessorContext.SEIContext;
-import com.sun.tools.internal.ws.processor.util.ClientProcessorEnvironment;
-import com.sun.tools.internal.ws.processor.util.ProcessorEnvironment;
-import com.sun.tools.internal.ws.util.ToolBase;
-import com.sun.tools.internal.ws.ToolVersion;
-import com.sun.tools.internal.xjc.api.JavaCompiler;
-import com.sun.tools.internal.xjc.api.Reference;
-import com.sun.tools.internal.xjc.api.XJC;
+import com.sun.tools.internal.ws.processor.modeler.wsdl.ConsoleErrorReporter;
+import com.sun.tools.internal.ws.resources.WebserviceapMessages;
+import com.sun.tools.internal.ws.wscompile.*;
 import com.sun.xml.internal.ws.util.localization.Localizable;
-import com.sun.xml.internal.ws.util.localization.LocalizableMessage;
+import com.sun.xml.internal.ws.util.localization.Localizer;
+import org.xml.sax.SAXParseException;
 
 import javax.jws.WebService;
-import javax.xml.namespace.QName;
 import javax.xml.ws.WebServiceProvider;
-
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.util.Collection;
+import java.io.PrintStream;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Properties;
 import java.util.Set;
 
 
-
 /**
  * WebServiceAP is a APT AnnotationProcessor for processing javax.jws.* and
  * javax.xml.ws.* annotations. This class is used either by the WsGen (CompileTool) tool or
- *    idirectly via the {@link com.sun.istack.internal.ws.WSAP WSAP} when invoked by APT.
+ *    idirectly via the {@link com.sun.istack.internal.ws.AnnotationProcessorFactoryImpl} when invoked by APT.
  *
  * @author WS Development Team
  */
-public class WebServiceAP extends ToolBase implements AnnotationProcessor, ModelBuilder, WebServiceConstants,
-    ProcessorNotificationListener {
+public class WebServiceAP implements AnnotationProcessor, ModelBuilder, WebServiceConstants{
 
     protected AnnotationProcessorEnvironment apEnv;
-    protected ProcessorEnvironment env;
 
     private File sourceDir;
 
-    // the model being build
-    private Model model;
-
     private TypeDeclaration remoteDecl;
     private TypeDeclaration remoteExceptionDecl;
     private TypeDeclaration exceptionDecl;
@@ -100,13 +79,14 @@ public class WebServiceAP extends ToolBase implements AnnotationProcessor, Model
     protected AnnotationProcessorContext context;
     private Set processedTypeDecls = new HashSet();
     protected Messager messager;
-    private ByteArrayOutputStream output;
-    private ToolBase tool;
     private boolean doNotOverWrite = false;
-    private boolean wrapperGenerated = false;
+    private WsgenOptions options;
+    private ErrorReceiver receiver;
+    private PrintStream out;
+
     /*
-     * Is this invocation from APT or JavaC?
-     */
+    * Is this invocation from APT or JavaC?
+    */
     private boolean isAPTInvocation = false;
 
 
@@ -117,17 +97,14 @@ public class WebServiceAP extends ToolBase implements AnnotationProcessor, Model
        return true;
     }
 
-    public WebServiceAP(ToolBase tool, ProcessorEnvironment env, Properties options,  AnnotationProcessorContext context) {
-        super(System.out, "WebServiceAP");
+
+    public WebServiceAP(WsgenOptions options, AnnotationProcessorContext context, ErrorReceiver receiver, PrintStream out) {
+        this.options = options;
+        this.sourceDir = (options != null)?options.sourceDir:null;
+        this.doNotOverWrite = (options != null) && options.doNotOverWrite;
+        this.receiver = receiver;
+        this.out = out;
         this.context = context;
-        this.tool = tool;
-        this.env = env;
-        if (options != null) {
-            sourceDir = new File(options.getProperty(ProcessorOptions.SOURCE_DIRECTORY_PROPERTY));
-            String key = ProcessorOptions.DONOT_OVERWRITE_CLASSES;
-            this.doNotOverWrite =
-                Boolean.valueOf(options.getProperty(key));
-        }
     }
 
     public void init(AnnotationProcessorEnvironment apEnv) {
@@ -136,10 +113,62 @@ public class WebServiceAP extends ToolBase implements AnnotationProcessor, Model
         remoteExceptionDecl = this.apEnv.getTypeDeclaration(REMOTE_EXCEPTION_CLASSNAME);
         exceptionDecl = this.apEnv.getTypeDeclaration(EXCEPTION_CLASSNAME);
         defHolderDecl = this.apEnv.getTypeDeclaration(HOLDER_CLASSNAME);
+        if (options == null) {
+            options = new WsgenOptions();
+            out = new PrintStream(new ByteArrayOutputStream());
+            class Listener extends WsimportListener {
+                ConsoleErrorReporter cer = new ConsoleErrorReporter(out);
 
-        if (env == null) {
+                @Override
+                public void generatedFile(String fileName) {
+                    message(fileName);
+                }
+
+                @Override
+                public void message(String msg) {
+                    out.println(msg);
+                }
+
+                @Override
+                public void error(SAXParseException exception) {
+                    cer.error(exception);
+                }
+
+                @Override
+                public void fatalError(SAXParseException exception) {
+                    cer.fatalError(exception);
+                }
+
+                @Override
+                public void warning(SAXParseException exception) {
+                    cer.warning(exception);
+                }
+
+                @Override
+                public void info(SAXParseException exception) {
+                    cer.info(exception);
+                }
+            }
+
+            final Listener listener = new Listener();
+            receiver = new ErrorReceiverFilter(new Listener()) {
+                public void info(SAXParseException exception) {
+                    if (options.verbose)
+                        super.info(exception);
+                }
+
+                public void warning(SAXParseException exception) {
+                    if (!options.quiet)
+                        super.warning(exception);
+                }
+
+                @Override
+                public void pollAbort() throws AbortException {
+                    if (listener.isCanceled())
+                        throw new AbortException();
+                }
+            };
             Map apOptions = apEnv.getOptions();
-            output = new ByteArrayOutputStream();
             String classDir = apOptions.get("-d");
             if (classDir == null)
                 classDir = ".";
@@ -152,53 +181,41 @@ public class WebServiceAP extends ToolBase implements AnnotationProcessor, Model
                     File.pathSeparator +
                     cp + File.pathSeparator +
                     System.getProperty("java.class.path");
-            env = new ClientProcessorEnvironment(output, cpath, this);
-            ((ClientProcessorEnvironment) env).setNames(new Names());
+            options.classpath = cpath;
             boolean setVerbose = false;
             for (String key : apOptions.keySet()) {
                 if (key.equals("-verbose"))
-                    setVerbose=true;
-            }
-            if (setVerbose) {
-                env.setFlags(ProcessorEnvironment.F_VERBOSE);
+                    setVerbose = true;
             }
+            options.verbose = setVerbose;
             messager = apEnv.getMessager();
             isAPTInvocation = true;
         }
-        env.setFiler(apEnv.getFiler());
+        options.filer = apEnv.getFiler();
+//        env.setFiler(apEnv.getFiler());
     }
 
     public AnnotationProcessorEnvironment getAPEnv() {
         return apEnv;
     }
 
-    public ProcessorEnvironment getEnvironment() {
-        return env;
-    }
-
-    public ProcessorEnvironment getProcessorEnvironment() {
-        return env;
+    public WsgenOptions getOptions() {
+        return options;
     }
 
     public File getSourceDir() {
         return sourceDir;
     }
 
-    public void onError(String key) {
-        onError(new LocalizableMessage(getResourceBundleName(), key));
+    public void onError(String message) {
+        if (messager != null) {
+            messager.printError(message);
+        } else {
+            throw new ModelerException(message);
+        }
     }
 
-    public void onError(String key, Object[] args) throws ModelerException {
-        onError(null, key, args);
-    }
-
-    public void onError(SourcePosition pos, String key, Object[] args) throws ModelerException {
-        onError(pos, new LocalizableMessage(getResourceBundleName(), key, args));
-    }
-
-    public void onError(Localizable msg) throws ModelerException {
-        onError(null, msg);
-    }
+    private final static Localizer localizer = new Localizer();
 
     public void onError(SourcePosition pos, Localizable msg) throws ModelerException {
         if (messager != null) {
@@ -208,54 +225,35 @@ public class WebServiceAP extends ToolBase implements AnnotationProcessor, Model
         }
     }
 
-    public void onWarning(String key) {
-        onWarning(new LocalizableMessage(getResourceBundleName(), key));
-    }
 
-    public void onWarning(Localizable msg) {
-        String message = localizer.localize(getMessage("webserviceap.warning", localizer.localize(msg)));
+    public void onWarning(String message) {
         if (messager != null) {
             messager.printWarning(message);
         } else {
             report(message);
         }
     }
-    public void onInfo(Localizable msg) {
+    public void onInfo(String message) {
         if (messager != null) {
-            String message = localizer.localize(msg);
             messager.printNotice(message);
         } else {
-            String message = localizer.localize(getMessage("webserviceap.info", localizer.localize(msg)));
             report(message);
         }
     }
 
+    protected void report(String msg) {
+        PrintStream outstream =
+                out instanceof PrintStream
+                        ? out
+                        : new PrintStream(out, true);
+        outstream.println(msg);
+        outstream.flush();
+    }
+
     public void process() {
         if (context.getRound() == 1) {
             buildModel();
         }
-        if (!wrapperGenerated  || // the wrappers already exist
-            context.getRound() == 2 ||
-            context.allEncoded()) {
-            if ((context.getRound() == 2 || !wrapperGenerated) && !context.isModelCompleted()) {
-                completeModel();
-                context.setModelCompleted(true);
-            }
-            try {
-                for (SEIContext seiContext : context.getSEIContexts()) {
-                    if (!seiContext.getModelCompiled()) {
-                        runProcessorActions(seiContext.getModel());
-                        seiContext.setModelCompiled(true);
-                    }
-                }
-            } catch(Exception e) {
-                e.printStackTrace();
-            } finally {
-                if (messager != null && output != null && output.size() > 0) {
-                    messager.printNotice(output.toString());
-                }
-            }
-        }
         context.incrementRound();
     }
 
@@ -271,40 +269,8 @@ public class WebServiceAP extends ToolBase implements AnnotationProcessor, Model
         processedTypeDecls.clear();
     }
 
-    protected void runProcessorActions(Model model) throws Exception {
-        if (tool != null)
-            tool.runProcessorActions();
-    }
-
-
-    protected String getGenericErrorMessage() {
-        return "webserviceap.error";
-    }
-
-    protected String getResourceBundleName() {
-        return "com.sun.tools.internal.ws.resources.webserviceap";
-    }
-
-    public void createModel(TypeDeclaration d, QName modelName, String targetNamespace,
-        String modelerClassName){
-
-        SEIContext seiContext = context.getSEIContext(d);
-        if (seiContext.getModel() != null) {
-            onError("webserviceap.model.already.exists");
-            return;
-        }
-        log("creating model: " + modelName);
-        model = new Model(modelName);
-        model.setTargetNamespaceURI(targetNamespace);
-        model.setProperty(
-            ModelProperties.PROPERTY_MODELER_NAME,
-            modelerClassName);
-        seiContext.setModel(model);
-    }
-
     public void setService(Service service) {
         this.service = service;
-        model.addService(service);
     }
 
     public void setPort(Port port) {
@@ -317,7 +283,6 @@ public class WebServiceAP extends ToolBase implements AnnotationProcessor, Model
     }
 
     public void setWrapperGenerated(boolean wrapperGenerated) {
-        this.wrapperGenerated = wrapperGenerated;
     }
 
     public TypeDeclaration getTypeDeclaration(String typeName) {
@@ -330,7 +295,7 @@ public class WebServiceAP extends ToolBase implements AnnotationProcessor, Model
 
     private void buildModel() {
         WebService webService;
-        WebServiceProvider webServiceProvider = null;
+        WebServiceProvider webServiceProvider;
         WebServiceVisitor wrapperGenerator = createWrapperGenerator();
         boolean processedEndpoint = false;
         for (TypeDeclaration typedecl: apEnv.getTypeDeclarations()) {
@@ -340,8 +305,7 @@ public class WebServiceAP extends ToolBase implements AnnotationProcessor, Model
             webService = typedecl.getAnnotation(WebService.class);
             if (webServiceProvider != null) {
                 if (webService != null) {
-                    onError("webserviceap.webservice.and.webserviceprovider",
-                            new Object[] {typedecl.getQualifiedName()});
+                    onError(WebserviceapMessages.WEBSERVICEAP_WEBSERVICE_AND_WEBSERVICEPROVIDER(typedecl.getQualifiedName()));
                 }
                 processedEndpoint = true;
             }
@@ -352,9 +316,9 @@ public class WebServiceAP extends ToolBase implements AnnotationProcessor, Model
         }
         if (!processedEndpoint) {
             if (isAPTInvocation)
-                onWarning("webserviceap.no.webservice.endpoint.found");
+                onWarning(WebserviceapMessages.WEBSERVICEAP_NO_WEBSERVICE_ENDPOINT_FOUND());
             else
-                onError("webserviceap.no.webservice.endpoint.found");
+                onError(WebserviceapMessages.WEBSERVICEAP_NO_WEBSERVICE_ENDPOINT_FOUND());
         }
     }
 
@@ -362,48 +326,11 @@ public class WebServiceAP extends ToolBase implements AnnotationProcessor, Model
         return new WebServiceWrapperGenerator(this, context);
     }
 
-    protected WebServiceVisitor createReferenceCollector() {
-        return new WebServiceReferenceCollector(this, context);
-    }
-
     protected boolean shouldProcessWebService(WebService webService) {
         return webService != null;
     }
 
 
-    private void completeModel() {
-        clearProcessed();
-        JavaCompiler javaC = XJC.createJavaCompiler();
-        JAXBModel jaxBModel;
-        WebServiceVisitor referenceCollector = createReferenceCollector();
-        for (SEIContext seiContext : context.getSEIContexts()) {
-            log("completing model for endpoint: "+seiContext.getSEIImplName());
-            TypeDeclaration decl = apEnv.getTypeDeclaration(seiContext.getSEIImplName());
-            if (decl == null)
-                onError("webserviceap.could.not.find.typedecl",
-                         new Object[] {seiContext.getSEIImplName(), context.getRound()});
-            decl.accept(referenceCollector);
-        }
-        clearProcessed();
-        for (SEIContext seiContext : context.getSEIContexts()) {
-            TypeDeclaration decl = apEnv.getTypeDeclaration(seiContext.getSEIName());
-            Collection schemaMirrors = seiContext.getSchemaReferences(this);
-
-//            System.out.println("schemaMirrors count: " + schemaMirrors.size());
-//            for (Reference reference : schemaMirrors) {System.out.println("reference: "+reference.type);}
-//        System.out.println("schemaElementMap count: "+ seiContext.getSchemaElementMap(this).entrySet().size());
-//            for (Map.Entry entry : seiContext.getSchemaElementMap(this).entrySet()) {
-//               System.out.println("name: " + entry.getKey()+" value: "+entry.getValue().type);
-//            }
-
-//            System.out.println("setting default namespaceURI: "+seiContext.getNamespaceURI());
-            jaxBModel = new JAXBModel(javaC.bind(schemaMirrors, seiContext.getSchemaElementMap(this),
-                seiContext.getNamespaceURI(), apEnv));
-//            for (JAXBMapping map : jaxBModel.getMappings()) {System.out.println("map.getClazz: "+map.getClazz());}
-            seiContext.setJAXBModel(jaxBModel);
-        }
-    }
-
     public boolean isException(TypeDeclaration typeDecl) {
         return isSubtype(typeDecl, exceptionDecl);
     }
@@ -468,15 +395,15 @@ public class WebServiceAP extends ToolBase implements AnnotationProcessor, Model
 
 
     public TypeMirror getHolderValueType(TypeMirror type) {
-        return TypeModeler.getHolderValueType(type, defHolderDecl, apEnv);
+        return TypeModeler.getHolderValueType(type, defHolderDecl);
     }
 
     public boolean canOverWriteClass(String className) {
-        return !((doNotOverWrite && GeneratorUtil.classExists(env, className)));
+        return !((doNotOverWrite && GeneratorUtil.classExists(options, className)));
     }
 
     public void log(String msg) {
-        if (env != null && env.verbose()) {
+        if (options != null && options.verbose) {
             String message = "[" + msg + "]";
             if (messager != null) {
                 messager.printNotice(message);
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceConstants.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceConstants.java
index 9ff20b7372e..94ffafb7855 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceConstants.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceConstants.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,7 +25,6 @@
 package com.sun.tools.internal.ws.processor.modeler.annotation;
 
 
-import javax.xml.ws.Holder;
 /**
  *
  * @author  dkohlert
@@ -54,7 +53,7 @@ public interface WebServiceConstants { //extends RmiConstants {
     public static final char SIGC_UNDERSCORE  = '_';
 
     public static final String DOT = ".";
-    public static final String PORT = "Port";
+    public static final String PORT = "WSDLPort";
     public static final String BINDING = "Binding";
     public static final String RESPONSE = "Response";
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceReferenceCollector.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceReferenceCollector.java
deleted file mode 100644
index 5d53ce3ef9e..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceReferenceCollector.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package com.sun.tools.internal.ws.processor.modeler.annotation;
-
-import com.sun.mirror.apt.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-
-import com.sun.tools.internal.xjc.api.*;
-
-import javax.jws.*;
-
-/**
- *
- * @author  WS Development Team
- */
-public class WebServiceReferenceCollector extends WebServiceVisitor {
-
-    public WebServiceReferenceCollector(ModelBuilder builder, AnnotationProcessorContext context) {
-        super(builder, context);
-    }
-
-
-    protected void processWebService(WebService webService, TypeDeclaration d) {
-    }
-
-    protected void processMethod(MethodDeclaration method, WebMethod webMethod) {
-        boolean isOneway = method.getAnnotation(Oneway.class) != null;
-        boolean generatedWrapper = false;
-        builder.log("WebServiceReferenceCollector - method: "+method);
-        collectTypes(method, webMethod, seiContext.getReqOperationWrapper(method) != null);
-        if (seiContext.getReqOperationWrapper(method) != null) {
-            AnnotationProcessorEnvironment apEnv = builder.getAPEnv();
-            TypeDeclaration typeDecl;
-            typeDecl = builder.getTypeDeclaration(seiContext.getReqOperationWrapper(method).getWrapperName());
-            seiContext.addReference(typeDecl, apEnv);
-            if (!isOneway) {
-                typeDecl = builder.getTypeDeclaration(seiContext.getResOperationWrapper(method).getWrapperName());
-                seiContext.addReference(typeDecl, apEnv);
-            }
-        }
-        collectExceptionBeans(method);
-    }
-
-    private void collectTypes(MethodDeclaration method, WebMethod webMethod, boolean isDocLitWrapped) {
-        addSchemaElements(method, isDocLitWrapped);
-    }
-
-
-    private void collectExceptionBeans(MethodDeclaration method) {
-        AnnotationProcessorEnvironment apEnv = builder.getAPEnv();
-        for (ReferenceType thrownType : method.getThrownTypes()) {
-            FaultInfo faultInfo = seiContext.getExceptionBeanName(thrownType.toString());
-            if (faultInfo != null) {
-                if (!faultInfo.isWSDLException()) {
-                    seiContext.addReference(builder.getTypeDeclaration(faultInfo.getBeanName()), apEnv);
-                } else {
-                    TypeMirror bean = faultInfo.beanTypeMoniker.create(apEnv);
-                    Reference ref = seiContext.addReference(((DeclaredType)bean).getDeclaration(), apEnv);
-                    seiContext.addSchemaElement(faultInfo.getElementName(), ref);
-                }
-            }
-        }
-    }
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java
index 6c78b15bdff..9efa0064d4c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,63 +25,28 @@
 package com.sun.tools.internal.ws.processor.modeler.annotation;
 
 
-import com.sun.mirror.declaration.ClassDeclaration;
-import com.sun.mirror.declaration.ConstructorDeclaration;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.FieldDeclaration;
-import com.sun.mirror.declaration.InterfaceDeclaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-import com.sun.mirror.declaration.Modifier;
-import com.sun.mirror.declaration.PackageDeclaration;
-import com.sun.mirror.declaration.ParameterDeclaration;
-import com.sun.mirror.declaration.TypeDeclaration;
-import com.sun.mirror.type.ClassType;
-import com.sun.mirror.type.DeclaredType;
-import com.sun.mirror.type.InterfaceType;
-import com.sun.mirror.type.ReferenceType;
-import com.sun.mirror.type.TypeMirror;
-import com.sun.mirror.type.VoidType;
-import com.sun.mirror.util.DeclarationVisitor;
+import com.sun.mirror.declaration.*;
+import com.sun.mirror.type.*;
 import com.sun.mirror.util.SimpleDeclarationVisitor;
 import com.sun.mirror.util.SourcePosition;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.Stack;
-import java.util.StringTokenizer;
-
-import com.sun.xml.internal.ws.modeler.RuntimeModeler;
-import com.sun.tools.internal.ws.processor.model.Parameter;
 import com.sun.tools.internal.ws.processor.model.Port;
-import com.sun.tools.internal.ws.processor.model.Service;
-import com.sun.tools.internal.ws.processor.model.java.JavaInterface;
-import com.sun.tools.internal.ws.processor.model.java.JavaSimpleType;
-import com.sun.tools.internal.ws.processor.model.java.JavaType;
 import com.sun.tools.internal.ws.processor.modeler.JavaSimpleTypeCreator;
 import com.sun.tools.internal.ws.processor.modeler.annotation.AnnotationProcessorContext.SEIContext;
+import com.sun.tools.internal.ws.resources.WebserviceapMessages;
 import com.sun.tools.internal.ws.util.ClassNameInfo;
 import com.sun.tools.internal.ws.wsdl.document.soap.SOAPStyle;
 import com.sun.tools.internal.ws.wsdl.document.soap.SOAPUse;
+import com.sun.xml.internal.ws.developer.Stateful;
+import com.sun.xml.internal.ws.model.RuntimeModeler;
+import com.sun.xml.internal.ws.util.localization.Localizable;
 
-import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-
-import javax.jws.HandlerChain;
-import javax.jws.Oneway;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
+import javax.jws.*;
 import javax.jws.soap.SOAPBinding;
 import javax.jws.soap.SOAPBinding.ParameterStyle;
-import javax.xml.namespace.QName;
-
-import com.sun.tools.internal.xjc.api.Reference;
-import com.sun.tools.internal.ws.processor.modeler.annotation.AnnotationProcessorContext;
-import com.sun.tools.internal.ws.processor.modeler.annotation.ModelBuilder;
-import com.sun.tools.internal.ws.processor.modeler.annotation.WebServiceConstants;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.Stack;
 
 /**
  *
@@ -125,15 +90,14 @@ public abstract class WebServiceVisitor extends SimpleDeclarationVisitor impleme
     }
 
     public void visitInterfaceDeclaration(InterfaceDeclaration d) {
-        WebService webService = (WebService)d.getAnnotation(WebService.class);
+        WebService webService = d.getAnnotation(WebService.class);
         if (!shouldProcessWebService(webService, d))
             return;
         if (builder.checkAndSetProcessed(d))
             return;
         typeDecl = d;
         if (endpointInterfaceName != null && !endpointInterfaceName.equals(d.getQualifiedName())) {
-            builder.onError(d.getPosition(), "webserviceap.endpointinterfaces.do.not.match", new Object[]
-            {endpointInterfaceName, d.getQualifiedName()});
+            builder.onError(d.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_ENDPOINTINTERFACES_DO_NOT_MATCH(endpointInterfaceName, d.getQualifiedName()));
         }
         verifySEIAnnotations(webService, d);
         endpointInterfaceName = d.getQualifiedName();
@@ -158,7 +122,7 @@ public abstract class WebServiceVisitor extends SimpleDeclarationVisitor impleme
             SourcePosition pos = pos = d.getPosition();
             checkForInvalidImplAnnotation(d, SOAPBinding.class);
             if (webService.name().length() > 0)
-                annotationError(pos, ANNOTATION_ELEMENT_ERROR,"name");
+                annotationError(pos, WebserviceapMessages.localizableWEBSERVICEAP_ENDPOINTINTEFACE_PLUS_ELEMENT("name"));
             endpointReferencesInterface = true;
             verifyImplAnnotations(d);
             inspectEndpointInterface(endpointInterfaceName, d);
@@ -175,16 +139,13 @@ public abstract class WebServiceVisitor extends SimpleDeclarationVisitor impleme
 
     protected void verifySEIAnnotations(WebService webService, InterfaceDeclaration d) {
         if (webService.endpointInterface().length() > 0) {
-            builder.onError(d.getPosition(), "webservicefactory.endpointinterface.on.interface",
-                    new Object[] {d.getQualifiedName(), webService.endpointInterface()});
+            builder.onError(d.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_ENDPOINTINTERFACE_ON_INTERFACE(d.getQualifiedName(), webService.endpointInterface()));
         }
         if (webService.serviceName().length() > 0) {
-            builder.onError(d.getPosition(), "webserviceap.invalid.sei.annotation.element",
-                    new Object[] {"serviceName", d.getQualifiedName()});
+            builder.onError(d.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT("serviceName", d.getQualifiedName()));
         }
         if (webService.portName().length() > 0) {
-            builder.onError(d.getPosition(), "webserviceap.invalid.sei.annotation.element",
-                    new Object[] {"portName", d.getQualifiedName()});
+            builder.onError(d.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT("portName", d.getQualifiedName()));
         }
     }
 
@@ -203,8 +164,7 @@ public abstract class WebServiceVisitor extends SimpleDeclarationVisitor impleme
         Object annotation = d.getAnnotation(annotationClass);
         if (annotation != null) {
             SourcePosition pos = d.getPosition();
-            annotationError(pos, "webserviceap.invalid.sei.annotation",
-                    new Object[] {annotationClass.getName(), d.getQualifiedName()});
+            annotationError(pos, WebserviceapMessages.localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION(annotationClass.getName(), d.getQualifiedName()));
         }
     }
 
@@ -212,21 +172,17 @@ public abstract class WebServiceVisitor extends SimpleDeclarationVisitor impleme
         Object annotation = d.getAnnotation(annotationClass);
         if (annotation != null) {
             SourcePosition pos = d.getPosition();
-            annotationError(pos, "webserviceap.endpointinteface.plus.annotation",
-                    annotationClass.getName());
+            annotationError(pos, WebserviceapMessages.localizableWEBSERVICEAP_ENDPOINTINTEFACE_PLUS_ANNOTATION(annotationClass.getName()));
         }
     }
 
-    protected void annotationError(SourcePosition pos, String key, String element) {
-        annotationError(pos, key, new Object[] {element});
-    }
-
-    protected void annotationError(SourcePosition pos, String key, Object[] args) {
-        builder.onError(pos, key, args);
+    protected void annotationError(SourcePosition pos, Localizable message) {
+        builder.onError(pos, message);
     }
 
 
     protected void preProcessWebService(WebService webService, TypeDeclaration d) {
+        processedMethods = new HashSet();
         seiContext = context.getSEIContext(d);
         String targetNamespace = null;
         if (webService != null)
@@ -234,8 +190,7 @@ public abstract class WebServiceVisitor extends SimpleDeclarationVisitor impleme
         if (targetNamespace == null || targetNamespace.length() == 0) {
             String packageName = d.getPackage().getQualifiedName();
             if (packageName == null || packageName.length() == 0) {
-                builder.onError(d.getPosition(), "webserviceap.no.package.class.must.have.targetnamespace",
-                        new Object[] {d.getQualifiedName()});
+                builder.onError(d.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_NO_PACKAGE_CLASS_MUST_HAVE_TARGETNAMESPACE(d.getQualifiedName()));
             }
             targetNamespace = getNamespace(d.getPackage());
         }
@@ -284,15 +239,13 @@ public abstract class WebServiceVisitor extends SimpleDeclarationVisitor impleme
         if (!sameStyle(soapBinding.style(), soapStyle)) {
             changed = true;
             if (pushedSOAPBinding)
-                builder.onError(bindingDecl.getPosition(), "webserviceap.mixed.binding.style",
-                        new Object[] {classDecl.getQualifiedName()});
+                builder.onError(bindingDecl.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_MIXED_BINDING_STYLE(classDecl.getQualifiedName()));
         }
         if (soapBinding.style().equals(SOAPBinding.Style.RPC)) {
             soapStyle = SOAPStyle.RPC;
             wrapped = true;
             if (soapBinding.parameterStyle().equals(ParameterStyle.BARE)) {
-                builder.onError(bindingDecl.getPosition(), "webserviceap.rpc.literal.must.not.be.bare",
-                        new Object[] {classDecl.getQualifiedName()});
+                builder.onError(bindingDecl.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_RPC_LITERAL_MUST_NOT_BE_BARE(classDecl.getQualifiedName()));
             }
 
         } else {
@@ -303,8 +256,10 @@ public abstract class WebServiceVisitor extends SimpleDeclarationVisitor impleme
             }
         }
         if (soapBinding.use().equals(SOAPBinding.Use.ENCODED)) {
-            builder.onError(bindingDecl.getPosition(), "webserviceap.rpc.encoded.not.supported",
-                    new Object[] {classDecl.getQualifiedName()});
+            String style = "rpc";
+            if(soapBinding.style().equals(SOAPBinding.Style.DOCUMENT))
+                style = "document";
+            builder.onError(bindingDecl.getPosition(), WebserviceapMessages.localizableWEBSERVICE_ENCODED_NOT_SUPPORTED(classDecl.getQualifiedName(), style));
         }
         if (changed || soapBindingStack.empty()) {
             soapBindingStack.push(soapBinding);
@@ -341,8 +296,7 @@ public abstract class WebServiceVisitor extends SimpleDeclarationVisitor impleme
     protected boolean shouldProcessWebService(WebService webService, InterfaceDeclaration intf) {
         hasWebMethods = false;
         if (webService == null)
-            builder.onError(intf.getPosition(), "webserviceap.endpointinterface.has.no.webservice.annotation",
-                    new Object[] {intf.getQualifiedName()});
+            builder.onError(intf.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_ENDPOINTINTERFACE_HAS_NO_WEBSERVICE_ANNOTATION(intf.getQualifiedName()));
         if (isLegalSEI(intf))
             return true;
         return false;
@@ -377,11 +331,9 @@ public abstract class WebServiceVisitor extends SimpleDeclarationVisitor impleme
             if (webMethod != null) {
                 if (webMethod.exclude()) {
                     if (webMethod.operationName().length() > 0)
-                        builder.onError(method.getPosition(), "webserviceap.invalid.webmethod.element.with.exclude",
-                                new Object[] {"operationName", d.getQualifiedName(), method.toString()});
+                        builder.onError(method.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_INVALID_WEBMETHOD_ELEMENT_WITH_EXCLUDE("operationName", d.getQualifiedName(), method.toString()));
                                 if (webMethod.action().length() > 0)
-                                    builder.onError(method.getPosition(), "webserviceap.invalid.webmethod.element.with.exclude",
-                                            new Object[] {"action", d.getQualifiedName(), method.toString()});
+                                    builder.onError(method.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_INVALID_WEBMETHOD_ELEMENT_WITH_EXCLUDE("action", d.getQualifiedName(), method.toString()));
                 } else {
                     return true;
                 }
@@ -394,7 +346,7 @@ public abstract class WebServiceVisitor extends SimpleDeclarationVisitor impleme
         builder.log("ProcessedMethods Interface: "+d);
         hasWebMethods = false;
         for (MethodDeclaration methodDecl : d.getMethods()) {
-            methodDecl.accept((DeclarationVisitor)this);
+            methodDecl.accept(this);
         }
         for (InterfaceType superType : d.getSuperinterfaces())
             processMethods(superType.getDeclaration());
@@ -408,7 +360,7 @@ public abstract class WebServiceVisitor extends SimpleDeclarationVisitor impleme
         if (d.getAnnotation(WebService.class) != null) {
             // Super classes must have @WebService annotations to pick up their methods
             for (MethodDeclaration methodDecl : d.getMethods()) {
-                methodDecl.accept((DeclarationVisitor)this);
+                methodDecl.accept(this);
             }
         }
         if (d.getSuperclass() != null) {
@@ -432,16 +384,15 @@ public abstract class WebServiceVisitor extends SimpleDeclarationVisitor impleme
             intTypeDecl = (InterfaceDeclaration)builder.getTypeDeclaration(endpointInterfaceName);
         }
         if (intTypeDecl == null)
-            builder.onError("webserviceap.endpointinterface.class.not.found",
-                    new Object[] {endpointInterfaceName});
-                    return intTypeDecl;
+            builder.onError(WebserviceapMessages.WEBSERVICEAP_ENDPOINTINTERFACE_CLASS_NOT_FOUND(endpointInterfaceName));
+        return intTypeDecl;
     }
 
 
     private void inspectEndpointInterface(String endpointInterfaceName, ClassDeclaration d) {
         TypeDeclaration intTypeDecl = getEndpointInterfaceDecl(endpointInterfaceName, d);
         if (intTypeDecl != null)
-            intTypeDecl.accept((DeclarationVisitor)this);
+            intTypeDecl.accept(this);
     }
 
     public void visitMethodDeclaration(MethodDeclaration method) {
@@ -507,26 +458,25 @@ public abstract class WebServiceVisitor extends SimpleDeclarationVisitor impleme
 
 
     protected boolean isLegalImplementation(WebService webService, ClassDeclaration classDecl) {
+
+        boolean isStateful = isStateful(classDecl);
+
         Collection modifiers = classDecl.getModifiers();
         if (!modifiers.contains(Modifier.PUBLIC)){
-            builder.onError(classDecl.getPosition(), "webserviceap.webservice.class.not.public",
-                    new Object[] {classDecl.getQualifiedName()});
+            builder.onError(classDecl.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_WEBSERVICE_CLASS_NOT_PUBLIC(classDecl.getQualifiedName()));
                     return false;
         }
-        if (modifiers.contains(Modifier.FINAL)) {
-            builder.onError(classDecl.getPosition(), "webserviceap.webservice.class.is.final",
-                    new Object[] {classDecl.getQualifiedName()});
-                    return false;
+        if (modifiers.contains(Modifier.FINAL) && !isStateful) {
+            builder.onError(classDecl.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_FINAL(classDecl.getQualifiedName()));
+            return false;
         }
-        if (modifiers.contains(Modifier.ABSTRACT)) {
-            builder.onError(classDecl.getPosition(), "webserviceap.webservice.class.is.abstract",
-                    new Object[] {classDecl.getQualifiedName()});
-                    return false;
+        if (modifiers.contains(Modifier.ABSTRACT) && !isStateful) {
+            builder.onError(classDecl.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_ABSTRACT(classDecl.getQualifiedName()));
+            return false;
         }
-        if (classDecl.getDeclaringType() != null && !modifiers.contains(Modifier.STATIC)) {
-            builder.onError(classDecl.getPosition(), "webserviceap.webservice.class.is.innerclass.not.static",
-                    new Object[] {classDecl.getQualifiedName()});
-                    return false;
+        if (classDecl.getDeclaringType() != null && !modifiers.contains(Modifier.STATIC) && !isStateful) {
+            builder.onError(classDecl.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_INNERCLASS_NOT_STATIC(classDecl.getQualifiedName()));
+            return false;
         }
         boolean hasDefaultConstructor = false;
         for (ConstructorDeclaration constructor : classDecl.getConstructors()) {
@@ -536,10 +486,9 @@ public abstract class WebServiceVisitor extends SimpleDeclarationVisitor impleme
                 break;
             }
         }
-        if (!hasDefaultConstructor) {
-            builder.onError(classDecl.getPosition(), "webserviceap.webservice.no.default.constructor",
-                    new Object[] {classDecl.getQualifiedName()});
-                    return false;
+        if (!hasDefaultConstructor && !isStateful) {
+            builder.onError(classDecl.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_WEBSERVICE_NO_DEFAULT_CONSTRUCTOR(classDecl.getQualifiedName()));
+            return false;
         }
         if (webService.endpointInterface().length() == 0) {
             if (!methodsAreLegal(classDecl))
@@ -553,6 +502,10 @@ public abstract class WebServiceVisitor extends SimpleDeclarationVisitor impleme
         return true;
     }
 
+    private boolean isStateful(ClassDeclaration classDecl) {
+        return classDecl.getAnnotation(Stateful.class)!=null;
+    }
+
     protected boolean classImplementsSEI(ClassDeclaration classDecl,
             InterfaceDeclaration intfDecl) {
         for (InterfaceType interfaceType : classDecl.getSuperinterfaces()) {
@@ -569,10 +522,8 @@ public abstract class WebServiceVisitor extends SimpleDeclarationVisitor impleme
                 }
             }
             if (!implementsMethod) {
-                builder.onError(method.getPosition(), "webserviceap.method.not.implemented",
-                        new Object[] {intfDecl.getSimpleName(), classDecl.getSimpleName(),
-                                method});
-                                return false;
+                builder.onError(method.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_METHOD_NOT_IMPLEMENTED(intfDecl.getSimpleName(), classDecl.getSimpleName(), method));
+                return false;
             }
         }
         return true;
@@ -596,13 +547,11 @@ public abstract class WebServiceVisitor extends SimpleDeclarationVisitor impleme
     }
 
     protected boolean isLegalSEI(InterfaceDeclaration intf) {
-        for (FieldDeclaration field : intf.getFields()) {
+        for (FieldDeclaration field : intf.getFields())
             if (field.getConstantValue() != null) {
-                builder.onError("webserviceap.sei.cannot.contain.constant.values",
-                        new Object[] {intf.getQualifiedName(), field.getSimpleName()});
-                        return false;
+                builder.onError(WebserviceapMessages.WEBSERVICEAP_SEI_CANNOT_CONTAIN_CONSTANT_VALUES(intf.getQualifiedName(), field.getSimpleName()));
+                return false;
             }
-        }
         if (!methodsAreLegal(intf))
             return false;
         return true;
@@ -628,7 +577,8 @@ public abstract class WebServiceVisitor extends SimpleDeclarationVisitor impleme
                 return false;
         }
         ClassType superClass = classDecl.getSuperclass();
-        if (superClass != null && !methodsAreLegal(superClass.getDeclaration())) {
+
+        if (!superClass.getDeclaration().getQualifiedName().equals(JAVA_LANG_OBJECT) && superClass != null && !methodsAreLegal(superClass.getDeclaration())) {
             return false;
         }
         return true;
@@ -636,19 +586,25 @@ public abstract class WebServiceVisitor extends SimpleDeclarationVisitor impleme
 
 
     protected boolean isLegalMethod(MethodDeclaration method, TypeDeclaration typeDecl) {
-        if (hasWebMethods && method.getAnnotation(WebMethod.class) == null)
+        WebMethod webMethod = method.getAnnotation(WebMethod.class);
+        //SEI cannot have methods with @WebMethod(exclude=true)
+        if (typeDecl instanceof InterfaceDeclaration && webMethod != null && webMethod.exclude())
+            builder.onError(method.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT_EXCLUDE("exclude=true", typeDecl.getQualifiedName(), method.toString()));
+
+        if (hasWebMethods && (webMethod == null))
             return true;
+        if (!hasWebMethods && (webMethod !=null) && webMethod.exclude()) {
+            return true;
+        }
         if (typeDecl instanceof ClassDeclaration && method.getModifiers().contains(Modifier.ABSTRACT)) {
-            builder.onError(method.getPosition(), "webserviceap.webservice.method.is.abstract",
-                    new Object[] {typeDecl.getQualifiedName(), method.getSimpleName()});
-                    return false;
+            builder.onError(method.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_WEBSERVICE_METHOD_IS_ABSTRACT(typeDecl.getQualifiedName(), method.getSimpleName()));
+            return false;
         }
 
         if (!isLegalType(method.getReturnType())) {
-            builder.onError(method.getPosition(), "webserviceap.method.return.type.cannot.implement.remote",
-                    new Object[] {typeDecl.getQualifiedName(),
-                            method.getSimpleName(),
-                            method.getReturnType()});
+            builder.onError(method.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_METHOD_RETURN_TYPE_CANNOT_IMPLEMENT_REMOTE(typeDecl.getQualifiedName(),
+                method.getSimpleName(),
+                method.getReturnType()));
         }
         boolean isOneway = method.getAnnotation(Oneway.class) != null;
         if (isOneway && !isValidOnewayMethod(method, typeDecl))
@@ -658,8 +614,7 @@ public abstract class WebServiceVisitor extends SimpleDeclarationVisitor impleme
         SOAPBinding soapBinding = method.getAnnotation(SOAPBinding.class);
         if (soapBinding != null) {
             if (soapBinding.style().equals(SOAPBinding.Style.RPC)) {
-                builder.onError(method.getPosition(),"webserviceap.rpc.soapbinding.not.allowed.on.method",
-                        new Object[] {typeDecl.getQualifiedName(), method.toString()});
+                builder.onError(method.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_RPC_SOAPBINDING_NOT_ALLOWED_ON_METHOD(typeDecl.getQualifiedName(), method.toString()));
             }
         }
 
@@ -675,27 +630,19 @@ public abstract class WebServiceVisitor extends SimpleDeclarationVisitor impleme
             int inParams = getModeParameterCount(method, WebParam.Mode.IN);
             int outParams = getModeParameterCount(method, WebParam.Mode.OUT);
             if (inParams != 1) {
-                builder.onError(method.getPosition(),
-                        "webserviceap.doc.bare.and.no.one.in",
-                        new Object[] {typeDecl.getQualifiedName(), method.toString()});
+                builder.onError(method.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_DOC_BARE_AND_NO_ONE_IN(typeDecl.getQualifiedName(), method.toString()));
             }
             if (method.getReturnType() instanceof VoidType) {
                 if (outParam == null && !isOneway) {
-                    builder.onError(method.getPosition(),
-                            "webserviceap.doc.bare.no.out",
-                            new Object[] {typeDecl.getQualifiedName(), method.toString()});
+                    builder.onError(method.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_DOC_BARE_NO_OUT(typeDecl.getQualifiedName(), method.toString()));
                 }
                 if (outParams != 1) {
                     if (!isOneway && outParams != 0)
-                        builder.onError(method.getPosition(),
-                                "webserviceap.doc.bare.no.return.and.no.out",
-                                new Object[] {typeDecl.getQualifiedName(), method.toString()});
+                        builder.onError(method.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_DOC_BARE_NO_RETURN_AND_NO_OUT(typeDecl.getQualifiedName(), method.toString()));
                 }
             } else {
                 if (outParams > 0) {
-                    builder.onError(outParam.getPosition(),
-                            "webserviceap.doc.bare.return.and.out",
-                            new Object[] {typeDecl.getQualifiedName(), method.toString()});
+                    builder.onError(outParam.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_DOC_BARE_RETURN_AND_OUT(typeDecl.getQualifiedName(), method.toString()));
                 }
             }
         }
@@ -707,12 +654,11 @@ public abstract class WebServiceVisitor extends SimpleDeclarationVisitor impleme
             TypeDeclaration typeDecl,
             int paramIndex) {
         if (!isLegalType(param.getType())) {
-            builder.onError(param.getPosition(), "webserviceap.method.parameter.types.cannot.implement.remote",
-                    new Object[] {typeDecl.getQualifiedName(),
-                            method.getSimpleName(),
-                            param.getSimpleName(),
-                            param.getType().toString()});
-                            return false;
+            builder.onError(param.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_METHOD_PARAMETER_TYPES_CANNOT_IMPLEMENT_REMOTE(typeDecl.getQualifiedName(),
+                method.getSimpleName(),
+                param.getSimpleName(),
+                param.getType().toString()));
+            return false;
         }
         TypeMirror holderType;
         holderType = builder.getHolderValueType(param.getType());
@@ -722,14 +668,14 @@ public abstract class WebServiceVisitor extends SimpleDeclarationVisitor impleme
             mode = webParam.mode();
 
         if (holderType != null) {
-            if (mode != null &&  mode.equals(WebParam.Mode.IN))
-                builder.onError(param.getPosition(), "webserviceap.holder.parameters.must.not.be.in.only",
-                        new Object[] {typeDecl.getQualifiedName(), method.toString(), paramIndex});
-        } else if (mode != null && !mode.equals(WebParam.Mode.IN)) {
-            builder.onError(param.getPosition(), "webserviceap.non.in.parameters.must.be.holder",
-                    new Object[] {typeDecl.getQualifiedName(), method.toString(), paramIndex});
+            if (mode != null &&  mode==WebParam.Mode.IN)
+                builder.onError(param.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_HOLDER_PARAMETERS_MUST_NOT_BE_IN_ONLY(typeDecl.getQualifiedName(), method.toString(), paramIndex));
+        } else if (mode != null && mode!=WebParam.Mode.IN) {
+            builder.onError(param.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_NON_IN_PARAMETERS_MUST_BE_HOLDER(typeDecl.getQualifiedName(), method.toString(), paramIndex));
         }
 
+
+
         return true;
     }
 
@@ -741,23 +687,18 @@ public abstract class WebServiceVisitor extends SimpleDeclarationVisitor impleme
         boolean valid = true;
         if (!(method.getReturnType() instanceof VoidType)) {
             // this is an error, cannot be Oneway and have a return type
-            builder.onError(method.getPosition(), "webserviceap.oneway.operation.cannot.have.return.type",
-                    new Object[] {typeDecl.getQualifiedName(), method.toString()});
+            builder.onError(method.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_ONEWAY_OPERATION_CANNOT_HAVE_RETURN_TYPE(typeDecl.getQualifiedName(), method.toString()));
             valid = false;
         }
         ParameterDeclaration outParam = getOutParameter(method);
         if (outParam != null) {
-            builder.onError(outParam.getPosition(),
-                    "webserviceap.oneway.and.out",
-                    new Object[] {typeDecl.getQualifiedName(), method.toString()});
+            builder.onError(outParam.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_ONEWAY_AND_OUT(typeDecl.getQualifiedName(), method.toString()));
             valid = false;
         }
         if (!isDocLitWrapped() && soapStyle.equals(SOAPStyle.DOCUMENT)) {
             int inCnt = getModeParameterCount(method, WebParam.Mode.IN);
             if (inCnt != 1) {
-                builder.onError(method.getPosition(),
-                        "webserviceap.oneway.and.not.one.in",
-                        new Object[] {typeDecl.getQualifiedName(), method.toString()});
+                builder.onError(method.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_ONEWAY_AND_NOT_ONE_IN(typeDecl.getQualifiedName(), method.toString()));
                 valid = false;
             }
         }
@@ -765,8 +706,7 @@ public abstract class WebServiceVisitor extends SimpleDeclarationVisitor impleme
         for (ReferenceType thrownType : method.getThrownTypes()) {
             exDecl = ((ClassType)thrownType).getDeclaration();
             if (!builder.isRemoteException(exDecl)) {
-                builder.onError(method.getPosition(), "webserviceap.oneway.operation.cannot.declare.exceptions",
-                        new Object[] {typeDecl.getQualifiedName(), method.toString(), exDecl.getQualifiedName()});
+                builder.onError(method.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_ONEWAY_OPERATION_CANNOT_DECLARE_EXCEPTIONS(typeDecl.getQualifiedName(), method.toString(), exDecl.getQualifiedName()));
                 valid = false;
             }
         }
@@ -795,13 +735,10 @@ public abstract class WebServiceVisitor extends SimpleDeclarationVisitor impleme
     protected boolean isEquivalentModes(WebParam.Mode mode1, WebParam.Mode mode2) {
         if (mode1.equals(mode2))
             return true;
-        assert(mode1.equals(WebParam.Mode.IN) ||
-                mode1.equals(WebParam.Mode.OUT));
-        if (mode1.equals(WebParam.Mode.IN) &&
-                !(mode2.equals(WebParam.Mode.OUT)))
+        assert mode1==WebParam.Mode.IN || mode1==WebParam.Mode.OUT;
+        if (mode1==WebParam.Mode.IN && mode2!=WebParam.Mode.OUT)
             return true;
-        if (mode1.equals(WebParam.Mode.OUT) &&
-                !(mode2.equals(WebParam.Mode.IN)))
+        if (mode1==WebParam.Mode.OUT && mode2!=WebParam.Mode.IN)
             return true;
         return false;
     }
@@ -816,78 +753,11 @@ public abstract class WebServiceVisitor extends SimpleDeclarationVisitor impleme
         return !builder.isRemote(((DeclaredType)type).getDeclaration());
     }
 
-    public void addSchemaElements(MethodDeclaration method, boolean isDocLitWrapped) {
-        addReturnSchemaElement(method, isDocLitWrapped);
-        boolean hasInParam = false;
-        for (ParameterDeclaration param : method.getParameters()) {
-            hasInParam |= addParamSchemaElement(param, method, isDocLitWrapped);
-        }
-        if (!hasInParam && soapStyle.equals(SOAPStyle.DOCUMENT) && !isDocLitWrapped) {
-            QName paramQName = new QName(wsdlNamespace, method.getSimpleName());
-            seiContext.addSchemaElement(paramQName, null);
-        }
-    }
-
-    public void addReturnSchemaElement(MethodDeclaration method, boolean isDocLitWrapped) {
-        TypeMirror returnType = method.getReturnType();
-        WebResult webResult = method.getAnnotation(WebResult.class);
-        String responseName = builder.getResponseName(method.getSimpleName());
-        String responseNamespace = wsdlNamespace;
-        boolean isResultHeader = false;
-        if (webResult != null) {
-            responseName = webResult.name().length() > 0 ? webResult.name() : responseName;
-            responseNamespace = webResult.targetNamespace().length() > 0 ? webResult.targetNamespace() : responseNamespace;
-            isResultHeader = webResult.header();
-        }
-        QName typeName = new QName(responseNamespace, responseName);
-        if (!(returnType instanceof VoidType) &&
-                (!isDocLitWrapped || isResultHeader)) {
-            Reference ref = seiContext.addReference(method);
-            if (!soapStyle.equals(SOAPStyle.RPC))
-                seiContext.addSchemaElement(typeName, ref);
-        }
-    }
-
-    public boolean addParamSchemaElement(ParameterDeclaration param, MethodDeclaration method, boolean isDocLitWrappped) {
-        boolean isInParam = false;
-        WebParam webParam = param.getAnnotation(WebParam.class);
-        String paramName = param.getSimpleName();
-        String paramNamespace = wsdlNamespace;
-        TypeMirror paramType = param.getType();
-        TypeMirror holderType = builder.getHolderValueType(paramType);
-        boolean isHeader = false;
-        if (soapStyle.equals(SOAPStyle.DOCUMENT) && !wrapped) {
-            paramName = method.getSimpleName();
-        }
-        if (webParam != null) {
-            paramName = webParam.name() != null && webParam.name().length() > 0 ? webParam.name() : paramName;
-            isHeader = webParam.header();
-            paramNamespace = webParam.targetNamespace().length() > 0 ? webParam.targetNamespace() : paramNamespace;
-        }
-        if (holderType != null) {
-            paramType = holderType;
-        }
-        if (isHeader || soapStyle.equals(SOAPStyle.DOCUMENT)) {
-            if (isHeader || !isDocLitWrappped) {
-                QName paramQName = new QName(paramNamespace, paramName);
-                Reference ref = seiContext.addReference(paramType, param);
-                seiContext.addSchemaElement(paramQName, ref);
-            }
-        } else
-            seiContext.addReference(paramType, param);
-        if (!isHeader && (holderType == null ||
-                (webParam == null || !webParam.mode().equals(WebParam.Mode.OUT)))) {
-            isInParam = true;
-        }
-        return isInParam;
-    }
-
     protected ParameterDeclaration getOutParameter(MethodDeclaration method) {
         WebParam webParam;
         for (ParameterDeclaration param : method.getParameters()) {
-            webParam = (WebParam)param.getAnnotation(WebParam.class);
-            if (webParam != null &&
-                    !webParam.mode().equals(WebParam.Mode.IN)) {
+            webParam = param.getAnnotation(WebParam.class);
+            if (webParam != null && webParam.mode()!=WebParam.Mode.IN) {
                 return param;
             }
         }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java
index dffd689bf81..5ffd4dd2d4c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,71 +22,39 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.ws.processor.modeler.annotation;
 
 import static com.sun.codemodel.internal.ClassType.CLASS;
-import com.sun.codemodel.internal.CodeWriter;
-import com.sun.codemodel.internal.JAnnotationArrayMember;
-import com.sun.codemodel.internal.JAnnotationUse;
-import com.sun.codemodel.internal.JBlock;
-import com.sun.codemodel.internal.JCodeModel;
-import com.sun.codemodel.internal.JCommentPart;
-import com.sun.codemodel.internal.JDefinedClass;
-import com.sun.codemodel.internal.JDocComment;
-import com.sun.codemodel.internal.JExpr;
-import com.sun.codemodel.internal.JFieldVar;
-import com.sun.codemodel.internal.JMethod;
-import com.sun.codemodel.internal.JMod;
-import com.sun.codemodel.internal.JType;
-import com.sun.codemodel.internal.JVar;
+import com.sun.codemodel.internal.*;
 import com.sun.codemodel.internal.writer.ProgressCodeWriter;
-import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-import com.sun.mirror.declaration.ClassDeclaration;
-import com.sun.mirror.declaration.FieldDeclaration;
-import com.sun.mirror.declaration.InterfaceDeclaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-import com.sun.mirror.declaration.ParameterDeclaration;
-import com.sun.mirror.declaration.TypeDeclaration;
-
+import com.sun.mirror.declaration.*;
 import com.sun.mirror.type.ClassType;
-import com.sun.mirror.type.ReferenceType;
-import com.sun.mirror.type.TypeMirror;
-import com.sun.mirror.type.VoidType;
-
+import com.sun.mirror.type.*;
 import com.sun.tools.internal.ws.processor.generator.GeneratorBase;
+import com.sun.tools.internal.ws.processor.generator.GeneratorConstants;
+import com.sun.tools.internal.ws.processor.generator.Names;
 import com.sun.tools.internal.ws.processor.modeler.ModelerException;
-import com.sun.tools.internal.ws.processor.util.ProcessorEnvironment;
+import com.sun.tools.internal.ws.processor.util.DirectoryUtil;
+import com.sun.tools.internal.ws.resources.WebserviceapMessages;
 import com.sun.tools.internal.ws.util.ClassNameInfo;
 import com.sun.tools.internal.ws.wscompile.FilerCodeWriter;
+import com.sun.tools.internal.ws.wscompile.WsgenOptions;
 import com.sun.tools.internal.ws.wsdl.document.soap.SOAPStyle;
-import com.sun.tools.internal.ws.ToolVersion;
 import com.sun.xml.internal.ws.util.StringUtils;
+import com.sun.xml.internal.bind.api.JAXBRIContext;
+import com.sun.xml.internal.bind.api.impl.NameConverter;
 
-import javax.jws.Oneway;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
+import javax.jws.*;
+import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import javax.xml.namespace.QName;
 import javax.xml.ws.RequestWrapper;
 import javax.xml.ws.ResponseWrapper;
 import javax.xml.ws.WebFault;
 import java.io.File;
 import java.io.IOException;
-import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
+import java.util.*;
+import java.lang.annotation.Annotation;
 
 
 /**
@@ -126,11 +94,10 @@ public class WebServiceWrapperGenerator extends WebServiceVisitor {
         if (cm != null) {
             File sourceDir = builder.getSourceDir();
             assert(sourceDir != null);
-            ProcessorEnvironment env = builder.getProcessorEnvironment();
+            WsgenOptions options = builder.getOptions();
             try {
-                CodeWriter cw = new FilerCodeWriter(sourceDir, env);
-
-                if(env.verbose())
+                CodeWriter cw = new FilerCodeWriter(sourceDir, options);
+                if(options.verbose)
                     cw = new ProgressCodeWriter(cw, System.out);
                 cm.build(cw);
             } catch (IOException e) {
@@ -158,17 +125,12 @@ public class WebServiceWrapperGenerator extends WebServiceVisitor {
         if (packageName.length() == 0)
             beanPackage = JAXWS_PACKAGE_PD;
         boolean beanGenerated = false;
-        try {
-            for (ReferenceType thrownType : method.getThrownTypes()) {
-                ClassDeclaration typeDecl = ((ClassType)thrownType).getDeclaration();
-                if (typeDecl == null)
-                    builder.onError("webserviceap.could.not.find.typedecl",
-                         new Object[] {thrownType.toString(), context.getRound()});
-                boolean tmp = generateExceptionBean(typeDecl, beanPackage);
-                beanGenerated = beanGenerated || tmp;
-            }
-        } catch (Exception e) {
-            throw new ModelerException("modeler.nestedGeneratorError",e);
+        for (ReferenceType thrownType : method.getThrownTypes()) {
+            ClassDeclaration typeDecl = ((ClassType)thrownType).getDeclaration();
+            if (typeDecl == null)
+                builder.onError(WebserviceapMessages.WEBSERVICEAP_COULD_NOT_FIND_TYPEDECL(thrownType.toString(), context.getRound()));
+            boolean tmp = generateExceptionBean(typeDecl, beanPackage);
+            beanGenerated = beanGenerated || tmp;
         }
         return beanGenerated;
     }
@@ -176,10 +138,10 @@ public class WebServiceWrapperGenerator extends WebServiceVisitor {
     private boolean duplicateName(String name) {
         for (String str : wrapperNames) {
             if (str.equalsIgnoreCase(name))
-                return true;
+        return true;
         }
         wrapperNames.add(name);
-        return false;
+    return false;
     }
 
     private boolean generateWrappers(MethodDeclaration method, WebMethod webMethod) {
@@ -207,13 +169,17 @@ public class WebServiceWrapperGenerator extends WebServiceVisitor {
                 reqNamespace = reqWrapper.targetNamespace();
         }
         builder.log("requestWrapper: "+requestClassName);
+///// fix for wsgen CR 6442344
+        File file = new File(DirectoryUtil.getOutputDirectoryFor(requestClassName, builder.getSourceDir()),
+                             Names.stripQualifier(requestClassName) + GeneratorConstants.JAVA_SRC_SUFFIX);
+        builder.getOptions().addGeneratedFile(file);
+//////////
         boolean canOverwriteRequest = builder.canOverWriteClass(requestClassName);
         if (!canOverwriteRequest) {
             builder.log("Class " + requestClassName + " exists. Not overwriting.");
         }
         if (duplicateName(requestClassName) && canOverwriteRequest) {
-            builder.onError("webserviceap.method.request.wrapper.bean.name.not.unique",
-                             new Object[] {typeDecl.getQualifiedName(), method.toString()});
+            builder.onError(WebserviceapMessages.WEBSERVICEAP_METHOD_REQUEST_WRAPPER_BEAN_NAME_NOT_UNIQUE(typeDecl.getQualifiedName(), method.toString()));
         }
 
         String responseClassName = null;
@@ -234,9 +200,11 @@ public class WebServiceWrapperGenerator extends WebServiceVisitor {
                 builder.log("Class " + responseClassName + " exists. Not overwriting.");
             }
             if (duplicateName(responseClassName) && canOverwriteResponse) {
-                builder.onError("webserviceap.method.response.wrapper.bean.name.not.unique",
-                                 new Object[] {typeDecl.getQualifiedName(), method.toString()});
+                builder.onError(WebserviceapMessages.WEBSERVICEAP_METHOD_RESPONSE_WRAPPER_BEAN_NAME_NOT_UNIQUE(typeDecl.getQualifiedName(), method.toString()));
             }
+            file = new File(DirectoryUtil.getOutputDirectoryFor(responseClassName, builder.getSourceDir()),
+                                 Names.stripQualifier(responseClassName) + GeneratorConstants.JAVA_SRC_SUFFIX);
+            builder.getOptions().addGeneratedFile(file);
         }
         ArrayList reqMembers = new ArrayList();
         ArrayList resMembers = new ArrayList();
@@ -252,8 +220,6 @@ public class WebServiceWrapperGenerator extends WebServiceVisitor {
             seiContext.setResWrapperOperation(method, resWrapperInfo);
         try {
             if (!canOverwriteRequest && !canOverwriteResponse) {
-//                getWrapperMembers(reqWrapperInfo);
-//                getWrapperMembers(resWrapperInfo);
                 return false;
             }
 
@@ -271,7 +237,7 @@ public class WebServiceWrapperGenerator extends WebServiceVisitor {
             writeXmlElementDeclaration(reqCls, reqName,reqNamespace);
             writeXmlElementDeclaration(resCls, resName, resNamespace);
 
-            collectMembers(method, operationName, typeNamespace, reqMembers, resMembers);
+            collectMembers(method, reqMembers, resMembers);
 
             // XmlType
             writeXmlTypeDeclaration(reqCls, reqName, reqNamespace, reqMembers);
@@ -280,56 +246,31 @@ public class WebServiceWrapperGenerator extends WebServiceVisitor {
             // class members
             writeMembers(reqCls, reqMembers);
             writeMembers(resCls, resMembers);
+
         } catch (Exception e) {
             throw new ModelerException("modeler.nestedGeneratorError",e);
         }
         return true;
     }
 
-/*    private void getWrapperMembers(WrapperInfo wrapperInfo) throws Exception {
-        if (wrapperInfo == null)
-            return;
-        TypeDeclaration type = builder.getTypeDeclaration(wrapperInfo.getWrapperName());
-        Collection fields = type.getFields();
-        ArrayList members = new ArrayList();
-        MemberInfo member;
-        int i=0;
-        for (FieldDeclaration field : fields) {
-            XmlElement xmlElement = field.getAnnotation(XmlElement.class);
-            String fieldName = field.getSimpleName();
-//            String typeName = field.getType().toString();
-            String elementName = xmlElement != null ? xmlElement.name() : fieldName;
-            String namespace =  xmlElement != null ? xmlElement.namespace() : "";
+    private void collectMembers(MethodDeclaration method,
+                                ArrayList requestMembers,
+                                ArrayList responseMembers) {
 
-            String idxStr = fieldName.substring(3);
-            int index = Integer.parseInt(idxStr);
-            member = new MemberInfo(index, field.getType(),
-                                    field.getSimpleName(),
-                                    new QName(namespace, elementName));
-            int j=0;
-            while (j requestMembers,
-                               ArrayList responseMembers) {
-
-        AnnotationProcessorEnvironment apEnv = builder.getAPEnv();
         WebResult webResult = method.getAnnotation(WebResult.class);
+        List jaxbRespAnnotations = collectJAXBAnnotations(method);
         String responseElementName = RETURN;
+        String responseName = RETURN_VALUE;
         String responseNamespace = wrapped ? EMTPY_NAMESPACE_ID : typeNamespace;
         boolean isResultHeader = false;
         if (webResult != null) {
             if (webResult.name().length() > 0) {
                 responseElementName = webResult.name();
+                responseName = JAXBRIContext.mangleNameToVariableName(webResult.name());
+
+                //We wont have to do this if JAXBRIContext.mangleNameToVariableName() takes
+                //care of mangling java identifiers
+                responseName = Names.getJavaReserverVarialbeName(responseName);
             }
             responseNamespace = webResult.targetNamespace().length() > 1 ?
                 webResult.targetNamespace() :
@@ -341,27 +282,23 @@ public class WebServiceWrapperGenerator extends WebServiceVisitor {
         WebParam webParam;
         TypeMirror paramType;
         String paramName;
+
         String paramNamespace;
         TypeMirror holderType;
         int paramIndex = -1;
-//        System.out.println("method: "+method.toString());
-//        System.out.println("returnType: "+ method.getReturnType());
-
-//        TypeMirror typeMirror = apEnv.getTypeUtils().getErasure(method.getReturnType());
         TypeMirror typeMirror = getSafeType(method.getReturnType());
-        String retType = typeMirror.toString();
+
         if (!(method.getReturnType() instanceof VoidType) && !isResultHeader) {
-            responseMembers.add(new MemberInfo(-1, typeMirror, RETURN_VALUE,
-                new QName(responseNamespace, responseElementName)));
+            responseMembers.add(new MemberInfo(typeMirror, responseName,
+                new QName(responseNamespace, responseElementName), method, jaxbRespAnnotations.toArray(new Annotation[jaxbRespAnnotations.size()])));
         }
 
         for (ParameterDeclaration param : method.getParameters()) {
+            List jaxbAnnotation = collectJAXBAnnotations(param);
             WebParam.Mode mode = null;
             paramIndex++;
-//            System.out.println("param.getType(): "+param.getType());
             holderType = builder.getHolderValueType(param.getType());
             webParam = param.getAnnotation(WebParam.class);
-//            typeMirror = apEnv.getTypeUtils().getErasure(param.getType());
             typeMirror =  getSafeType(param.getType());
             paramType = typeMirror;
             paramNamespace = wrapped ? EMTPY_NAMESPACE_ID : typeNamespace;
@@ -379,8 +316,14 @@ public class WebServiceWrapperGenerator extends WebServiceVisitor {
                 if (webParam.targetNamespace().length() > 0)
                     paramNamespace = webParam.targetNamespace();
             }
-            MemberInfo memInfo = new MemberInfo(paramIndex, paramType, paramName,
-                new QName(paramNamespace, paramName));
+
+            String propertyName = JAXBRIContext.mangleNameToVariableName(paramName);
+            //We wont have to do this if JAXBRIContext.mangleNameToVariableName() takes
+            //care of mangling java identifiers
+            propertyName = Names.getJavaReserverVarialbeName(propertyName);
+
+            MemberInfo memInfo = new MemberInfo(paramType, propertyName,
+                new QName(paramNamespace, paramName), param, jaxbAnnotation.toArray(new Annotation[jaxbAnnotation.size()]));
             if (holderType != null) {
                 if (mode == null || mode.equals(WebParam.Mode.INOUT)) {
                     requestMembers.add(memInfo);
@@ -392,25 +335,59 @@ public class WebServiceWrapperGenerator extends WebServiceVisitor {
         }
     }
 
-    private TypeMirror getSafeType(TypeMirror type) {
-//        System.out.println("type: "+type+" type.getClass(): "+type.getClass());
-        TypeMirror retType = makeSafeVisitor.apply(type, builder.getAPEnv().getTypeUtils());
-//        System.out.println("retType: "+retType+" retType.getClass(): "+retType.getClass());
-        return retType;
+    private List collectJAXBAnnotations(ParameterDeclaration param) {
+        List jaxbAnnotation = new ArrayList();
+        Annotation ann = param.getAnnotation(XmlAttachmentRef.class);
+        if(ann != null)
+            jaxbAnnotation.add(ann);
+
+        ann = param.getAnnotation(XmlMimeType.class);
+        if(ann != null)
+            jaxbAnnotation.add(ann);
+
+        ann = param.getAnnotation(XmlJavaTypeAdapter.class);
+        if(ann != null)
+            jaxbAnnotation.add(ann);
+
+        ann = param.getAnnotation(XmlList.class);
+        if(ann != null)
+            jaxbAnnotation.add(ann);
+        return jaxbAnnotation;
     }
 
-    private JType getType(TypeMirror typeMirror) throws IOException {
+    private List collectJAXBAnnotations(MethodDeclaration method) {
+        List jaxbAnnotation = new ArrayList();
+        Annotation ann = method.getAnnotation(XmlAttachmentRef.class);
+        if(ann != null)
+            jaxbAnnotation.add(ann);
+
+        ann = method.getAnnotation(XmlMimeType.class);
+        if(ann != null)
+            jaxbAnnotation.add(ann);
+
+        ann = method.getAnnotation(XmlJavaTypeAdapter.class);
+        if(ann != null)
+            jaxbAnnotation.add(ann);
+
+        ann = method.getAnnotation(XmlList.class);
+        if(ann != null)
+            jaxbAnnotation.add(ann);
+        return jaxbAnnotation;
+    }
+
+    private TypeMirror getSafeType(TypeMirror type) {
+        return makeSafeVisitor.apply(type, builder.getAPEnv().getTypeUtils());
+    }
+
+    private JType getType(TypeMirror typeMirror) {
         String type = typeMirror.toString();
-        JType jType = null;
         try {
 //            System.out.println("typeName: "+typeName);
-            jType = cm.parseType(type);
+            return cm.parseType(type);
 //            System.out.println("type: "+type);
-            return jType;
         } catch (ClassNotFoundException e) {
-            jType = cm.ref(type);
+            return cm.ref(type);
         }
-        return jType;
     }
 
     private ArrayList sortMembers(ArrayList members) {
@@ -423,7 +400,7 @@ public class WebServiceWrapperGenerator extends WebServiceVisitor {
         return sortedMembers;
     }
 
-    private void writeMembers(JDefinedClass cls, ArrayList members) throws IOException {
+    private void writeMembers(JDefinedClass cls, ArrayList members) {
         if (cls == null)
             return;
         for (MemberInfo memInfo : members) {
@@ -435,19 +412,54 @@ public class WebServiceWrapperGenerator extends WebServiceVisitor {
                     JAnnotationUse xmlElementAnn = field.annotate(XmlElement.class);
                     xmlElementAnn.param("name", elementName.getLocalPart());
                     xmlElementAnn.param("namespace", elementName.getNamespaceURI());
+                    if(memInfo.getParamType() instanceof ArrayType){
+                        xmlElementAnn.param("nillable", true);
+                    }
                 } else {
-                    JAnnotationUse xmlValueAnnn = field.annotate(XmlValue.class);
+                    field.annotate(XmlValue.class);
                 }
+                annotateParameterWithJAXBAnnotations(field, memInfo.getJaxbAnnotations());
+            }
+
+            // copy adapter if needed
+            XmlJavaTypeAdapter xjta = memInfo.getDecl().getAnnotation(XmlJavaTypeAdapter.class);
+            if(xjta!=null) {
+                JAnnotationUse xjtaA = field.annotate(XmlJavaTypeAdapter.class);
+                try {
+                    xjta.value();
+                    throw new AssertionError();
+                } catch (MirroredTypeException e) {
+                    xjtaA.param("value",getType(e.getTypeMirror()));
+                }
+                // XmlJavaTypeAdapter.type() is for package only. No need to copy.
             }
         }
         for (MemberInfo memInfo : members) {
-            writeMember(cls, memInfo.getParamIndex(), memInfo.getParamType(),
-                        memInfo.getParamName(), memInfo.getElementName());
+            writeMember(cls, memInfo.getParamType(),
+                        memInfo.getParamName());
+        }
+    }
+
+    private void annotateParameterWithJAXBAnnotations(JFieldVar field, Annotation[] jaxbAnnotations) {
+        for(Annotation ann : jaxbAnnotations){
+            if(ann instanceof XmlMimeType){
+                JAnnotationUse jaxbAnn = field.annotate(XmlMimeType.class);
+                jaxbAnn.param("value", ((XmlMimeType)ann).value());
+            }else if(ann instanceof XmlJavaTypeAdapter){
+                JAnnotationUse jaxbAnn = field.annotate(XmlJavaTypeAdapter.class);
+                XmlJavaTypeAdapter ja = (XmlJavaTypeAdapter) ann;
+                jaxbAnn.param("value", ja.value());
+                jaxbAnn.param("type", ja.type());
+            }else if(ann instanceof XmlAttachmentRef){
+                field.annotate(XmlAttachmentRef.class);
+            }else if(ann instanceof XmlList){
+                field.annotate(XmlList.class);
+            }
         }
     }
 
     protected JDefinedClass getCMClass(String className, com.sun.codemodel.internal.ClassType type) {
-        JDefinedClass cls = null;
+        JDefinedClass cls;
         try {
             cls = cm._class(className, type);
         } catch (com.sun.codemodel.internal.JClassAlreadyExistsException e){
@@ -456,10 +468,10 @@ public class WebServiceWrapperGenerator extends WebServiceVisitor {
         return cls;
     }
 
-    private boolean generateExceptionBean(ClassDeclaration thrownDecl, String beanPackage) throws IOException {
+    private boolean generateExceptionBean(ClassDeclaration thrownDecl, String beanPackage) {
         if (builder.isRemoteException(thrownDecl))
             return false;
-        AnnotationProcessorEnvironment apEnv = builder.getAPEnv();
+
         String exceptionName = ClassNameInfo.getName(thrownDecl.getQualifiedName());
         if (processedExceptions.contains(exceptionName))
             return false;
@@ -467,14 +479,16 @@ public class WebServiceWrapperGenerator extends WebServiceVisitor {
         WebFault webFault = thrownDecl.getAnnotation(WebFault.class);
         String className = beanPackage+ exceptionName + BEAN;
 
-        Map propertyToTypeMap;
-        propertyToTypeMap = TypeModeler.getExceptionProperties(thrownDecl);
+        TreeMap propertyToTypeMap = new TreeMap();
+
+        TypeModeler.collectExceptionProperties(thrownDecl,propertyToTypeMap);
+
         boolean isWSDLException = isWSDLException(propertyToTypeMap, thrownDecl);
         String namespace = typeNamespace;
         String name = exceptionName;
         FaultInfo faultInfo;
         if (isWSDLException) {
-            TypeMirror beanType =  getSafeType(propertyToTypeMap.get(FAULT_INFO));
+            TypeMirror beanType =  getSafeType(propertyToTypeMap.get(FAULT_INFO).getReturnType());
             faultInfo = new FaultInfo(TypeMonikerFactory.getTypeMoniker(beanType), true);
             namespace = webFault.targetNamespace().length()>0 ?
                                webFault.targetNamespace() : namespace;
@@ -497,19 +511,14 @@ public class WebServiceWrapperGenerator extends WebServiceVisitor {
         faultInfo = new FaultInfo(className, false);
 
         if (duplicateName(className)) {
-            builder.onError("webserviceap.method.exception.bean.name.not.unique",
-                             new Object[] {typeDecl.getQualifiedName(), thrownDecl.getQualifiedName()});
+            builder.onError(WebserviceapMessages.WEBSERVICEAP_METHOD_EXCEPTION_BEAN_NAME_NOT_UNIQUE(typeDecl.getQualifiedName(), thrownDecl.getQualifiedName()));
         }
 
         ArrayList members = new ArrayList();
-        MemberInfo member;
-        String typeString;
-        TypeMirror erasureType;
-        TreeSet keys = new TreeSet(propertyToTypeMap.keySet());
-        for (String key : keys) {
-            TypeMirror type = propertyToTypeMap.get(key);
-            erasureType =  getSafeType(type);
-            member = new MemberInfo(-10, erasureType, key, null);
+        for (String key : propertyToTypeMap.keySet()) {
+            MethodDeclaration method = propertyToTypeMap.get(key);
+            TypeMirror erasureType =  getSafeType(method.getReturnType());
+            MemberInfo member = new MemberInfo(erasureType, key, null, method);
             members.add(member);
         }
         faultInfo.setMembers(members);
@@ -542,17 +551,14 @@ public class WebServiceWrapperGenerator extends WebServiceVisitor {
         return true;
     }
 
-    protected boolean isWSDLException(Mapmap, ClassDeclaration thrownDecl) {
+    protected boolean isWSDLException(Map map, ClassDeclaration thrownDecl) {
         WebFault webFault = thrownDecl.getAnnotation(WebFault.class);
         if (webFault == null)
             return false;
-        if (map.size() != 2 || map.get(FAULT_INFO) == null)
-            return false;
-        return true;
+        return !(map.size() != 2 || map.get(FAULT_INFO) == null);
     }
 
-    private void writeXmlElementDeclaration(JDefinedClass cls, String elementName, String namespaceUri)
-        throws IOException {
+    private void writeXmlElementDeclaration(JDefinedClass cls, String elementName, String namespaceUri) {
 
        if (cls == null)
             return;
@@ -566,7 +572,7 @@ public class WebServiceWrapperGenerator extends WebServiceVisitor {
     }
 
     private void writeXmlTypeDeclaration(JDefinedClass cls, String typeName, String namespaceUri,
-                                         ArrayList members) throws IOException {
+                                         ArrayList members) {
         if (cls == null)
             return;
         JAnnotationUse xmlTypeAnn = cls.annotate(cm.ref(XmlType.class));
@@ -580,24 +586,23 @@ public class WebServiceWrapperGenerator extends WebServiceVisitor {
         }
     }
 
-    private void writeMember(JDefinedClass cls, int paramIndex, TypeMirror paramType,
-        String paramName, QName elementName) throws IOException {
+    private void writeMember(JDefinedClass cls, TypeMirror paramType,
+                             String paramName) {
 
         if (cls == null)
             return;
-        String capPropName = StringUtils.capitalize(paramName);
+
+        String accessorName =JAXBRIContext.mangleNameToPropertyName(paramName);
         String getterPrefix = paramType.equals("boolean") || paramType.equals("java.lang.Boolean") ? "is" : "get";
-        JMethod m = null;
-        JDocComment methodDoc = null;
         JType propType = getType(paramType);
-        m = cls.method(JMod.PUBLIC, propType, getterPrefix+capPropName);
-        methodDoc = m.javadoc();
+        JMethod m = cls.method(JMod.PUBLIC, propType, getterPrefix+ accessorName);
+        JDocComment methodDoc = m.javadoc();
         JCommentPart ret = methodDoc.addReturn();
         ret.add("returns "+propType.name());
         JBlock body = m.body();
         body._return( JExpr._this().ref(paramName) );
 
-        m = cls.method(JMod.PUBLIC, cm.VOID, "set"+capPropName);
+        m = cls.method(JMod.PUBLIC, cm.VOID, "set"+accessorName);
         JVar param = m.param(propType, paramName);
         methodDoc = m.javadoc();
         JCommentPart part = methodDoc.addParam(paramName);
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WrapperInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WrapperInfo.java
index 43ce925a7c5..635f53b4d3e 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WrapperInfo.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WrapperInfo.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,10 +24,8 @@
  */
 package com.sun.tools.internal.ws.processor.modeler.annotation;
 
-import javax.xml.namespace.QName;
 import java.util.ArrayList;
 import java.util.List;
-import com.sun.tools.internal.ws.processor.modeler.annotation.*;
 
 /**
  *
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/AccessorElement.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/AccessorElement.java
index 19eb4e20a82..aef8f22fbd7 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/AccessorElement.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/AccessorElement.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ClassNameAllocatorImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ClassNameAllocatorImpl.java
index f3ab1e2f569..4f6c6ceaa28 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ClassNameAllocatorImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ClassNameAllocatorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,13 +24,11 @@
  */
 package com.sun.tools.internal.ws.processor.modeler.wsdl;
 
-import com.sun.tools.internal.xjc.api.ClassNameAllocator;
 import com.sun.tools.internal.ws.processor.util.ClassNameCollector;
+import com.sun.tools.internal.xjc.api.ClassNameAllocator;
 
-import java.util.Set;
 import java.util.HashSet;
-import java.util.Map;
-import java.util.HashMap;
+import java.util.Set;
 
 /**
  * @author Vivek Pandey
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ConsoleErrorReporter.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ConsoleErrorReporter.java
index 240a6e9cd0e..a94a0e2ea0c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ConsoleErrorReporter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ConsoleErrorReporter.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,61 +25,47 @@
 
 package com.sun.tools.internal.ws.processor.modeler.wsdl;
 
-import com.sun.tools.internal.xjc.api.ErrorListener;
-import com.sun.tools.internal.ws.processor.util.ProcessorEnvironment;
-import com.sun.xml.internal.ws.util.localization.LocalizableMessageFactory;
+import com.sun.tools.internal.ws.resources.WscompileMessages;
+import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
 import org.xml.sax.SAXParseException;
 
-import java.util.ResourceBundle;
-import java.text.MessageFormat;
+import java.io.OutputStream;
+import java.io.PrintStream;
 
-public class ConsoleErrorReporter implements ErrorListener{
+public class ConsoleErrorReporter extends ErrorReceiver {
 
-    private LocalizableMessageFactory messageFactory;
-    private ProcessorEnvironment env;
-    private boolean printStackTrace;
     private boolean hasError;
+    private PrintStream output;
+    private boolean debug;
 
-    public ConsoleErrorReporter(ProcessorEnvironment env, boolean printStackTrace) {
-        this.env = env;
-        this.printStackTrace = printStackTrace;
-        messageFactory =
-            new LocalizableMessageFactory("com.sun.tools.internal.ws.resources.model");
+    public ConsoleErrorReporter(PrintStream stream) {
+        this.output = stream;
+    }
+
+    public ConsoleErrorReporter(OutputStream outputStream) {
+        this.output = new PrintStream(outputStream);
     }
 
     public boolean hasError() {
         return hasError;
     }
 
-    // will be null unless set in #error or #fatalError
-    //TODO: remove it after error handling is straightened
-    private Exception e;
-    Exception getException(){
-        return e;
-    }
-
     public void error(SAXParseException e) {
-        hasError = true;
-        this.e = e;
-        if(printStackTrace)
+        if(debug)
             e.printStackTrace();
-        env.error(messageFactory.getMessage("model.saxparser.exception",
-                new Object[]{e.getMessage(), getLocationString(e)}));
+        hasError = true;
+        print(WscompileMessages.WSIMPORT_ERROR_MESSAGE(e.getMessage()), e);
     }
 
     public void fatalError(SAXParseException e) {
-        hasError = true;
-        this.e = e;
-        if(printStackTrace)
+        if(debug)
             e.printStackTrace();
-
-        env.error(messageFactory.getMessage("model.saxparser.exception",
-                new Object[]{e.getMessage(), getLocationString(e)}));
+        hasError = true;
+        print(WscompileMessages.WSIMPORT_ERROR_MESSAGE(e.getMessage()), e);
     }
 
     public void warning(SAXParseException e) {
-        env.warn(messageFactory.getMessage("model.saxparser.exception",
-                new Object[]{e.getMessage(), getLocationString(e)}));
+        print(WscompileMessages.WSIMPORT_WARNING_MESSAGE(e.getMessage()), e);
     }
 
     /**
@@ -87,37 +73,17 @@ public class ConsoleErrorReporter implements ErrorListener{
      * can be safely ignored.
      */
     public void info(SAXParseException e) {
-        env.info(messageFactory.getMessage("model.saxparser.exception",
-                new Object[]{e.getMessage(), getLocationString(e)}));
+        print(WscompileMessages.WSIMPORT_INFO_MESSAGE(e.getMessage()), e);
     }
 
-     /**
-    * Returns the human readable string representation of the
-    * {@link org.xml.sax.Locator} part of the specified
-    * {@link SAXParseException}.
-    *
-    * @return  non-null valid object.
-    */
-    protected final String getLocationString( SAXParseException e ) {
-      if(e.getLineNumber()!=-1 || e.getSystemId()!=null) {
-          int line = e.getLineNumber();
-          return format("ConsoleErrorReporter.LineXOfY", line==-1?"?":Integer.toString( line ),
-              getShortName( e.getSystemId() ) );
-      } else {
-          return format("ConsoleErrorReporter.UnknownLocation");
-      }
+    private void print(String message, SAXParseException e) {
+        output.println(message);
+        output.println(getLocationString(e));
+        output.println();
     }
 
-    /** Computes a short name of a given URL for display. */
-    private String getShortName( String url ) {
-        if(url==null)
-            return format("ConsoleErrorReporter.UnknownLocation");
-        return url;
-    }
-
-    private String format( String property, Object... args ) {
-        String text = ResourceBundle.getBundle("com.sun.tools.internal.ws.resources.model").getString(property);
-        return MessageFormat.format(text,args);
+    public void enableDebugging(){
+        this.debug = true;
     }
 
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/JAXBModelBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/JAXBModelBuilder.java
index b85e02169d1..880d63d0e23 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/JAXBModelBuilder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/JAXBModelBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,53 +24,45 @@
  */
 package com.sun.tools.internal.ws.processor.modeler.wsdl;
 
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXParseException;
-
-import com.sun.tools.internal.xjc.api.ErrorListener;
-import com.sun.tools.internal.xjc.api.SchemaCompiler;
-import com.sun.tools.internal.xjc.api.XJC;
-import com.sun.tools.internal.xjc.api.TypeAndAnnotation;
-import com.sun.tools.internal.ws.processor.ProcessorOptions;
-import com.sun.tools.internal.ws.processor.config.ModelInfo;
-import com.sun.tools.internal.ws.processor.config.WSDLModelInfo;
 import com.sun.tools.internal.ws.processor.model.ModelException;
 import com.sun.tools.internal.ws.processor.model.java.JavaSimpleType;
 import com.sun.tools.internal.ws.processor.model.java.JavaType;
 import com.sun.tools.internal.ws.processor.model.jaxb.JAXBMapping;
 import com.sun.tools.internal.ws.processor.model.jaxb.JAXBModel;
 import com.sun.tools.internal.ws.processor.model.jaxb.JAXBType;
-import com.sun.tools.internal.ws.processor.modeler.JavaSimpleTypeCreator;
 import com.sun.tools.internal.ws.processor.util.ClassNameCollector;
-import com.sun.tools.internal.ws.processor.util.ProcessorEnvironment;
-import com.sun.xml.internal.ws.util.JAXWSUtils;
-import com.sun.xml.internal.ws.util.localization.LocalizableMessageFactory;
+import com.sun.tools.internal.ws.wscompile.AbortException;
+import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
+import com.sun.tools.internal.ws.wscompile.WsimportOptions;
+import com.sun.tools.internal.ws.wsdl.parser.DOMForestScanner;
+import com.sun.tools.internal.ws.wsdl.parser.MetadataFinder;
+import com.sun.tools.internal.xjc.api.S2JJAXBModel;
+import com.sun.tools.internal.xjc.api.SchemaCompiler;
+import com.sun.tools.internal.xjc.api.TypeAndAnnotation;
+import org.w3c.dom.Element;
+import org.xml.sax.InputSource;
+import org.xml.sax.helpers.LocatorImpl;
+
+import javax.xml.namespace.QName;
 
 /**
- * @author Kathy Walsh, Vivek Pandey
+ * @author  Vivek Pandey
  *
  * Uses JAXB XJC apis to build JAXBModel and resolves xml to java type mapping from JAXBModel
  */
 public class JAXBModelBuilder {
-    public JAXBModelBuilder(ModelInfo modelInfo,
-                            Properties options, ClassNameCollector classNameCollector, List elements) {
-        _messageFactory =
-            new LocalizableMessageFactory("com.sun.tools.internal.ws.resources.model");
-        _modelInfo = modelInfo;
-        _env = (ProcessorEnvironment) modelInfo.getParent().getEnvironment();
-        _classNameAllocator = new ClassNameAllocatorImpl(classNameCollector);
 
-        printstacktrace = Boolean.valueOf(options.getProperty(ProcessorOptions.PRINT_STACK_TRACE_PROPERTY));
-        consoleErrorReporter = new ConsoleErrorReporter(_env, false);
-        internalBuildJAXBModel(elements);
+    private final ErrorReceiver errReceiver;
+    private final WsimportOptions options;
+    private final MetadataFinder forest;
+
+    public JAXBModelBuilder(WsimportOptions options, ClassNameCollector classNameCollector, MetadataFinder finder, ErrorReceiver errReceiver) {
+        this._classNameAllocator = new ClassNameAllocatorImpl(classNameCollector);
+        this.errReceiver = errReceiver;
+        this.options = options;
+        this.forest = finder;
+
+        internalBuildJAXBModel();
     }
 
     /**
@@ -80,22 +72,26 @@ public class JAXBModelBuilder {
      * @see com.sun.tools.internal.ws.processor.modeler.Modeler#buildModel()
      */
 
-    private void internalBuildJAXBModel(List elements){
+    private void internalBuildJAXBModel(){
         try {
-            schemaCompiler = XJC.createSchemaCompiler();
+            schemaCompiler =  options.getSchemaCompiler();
+            schemaCompiler.resetSchema();
+            schemaCompiler.setEntityResolver(options.entityResolver);
             schemaCompiler.setClassNameAllocator(_classNameAllocator);
-            schemaCompiler.setErrorListener(consoleErrorReporter);
-            schemaCompiler.setEntityResolver(_modelInfo.getEntityResolver());
+            schemaCompiler.setErrorListener(errReceiver);
             int schemaElementCount = 1;
-            for(Iterator iter = elements.iterator(); iter.hasNext();){
-                Element schemaElement = (Element)iter.next();
-                String location = schemaElement.getOwnerDocument().getDocumentURI();
-                String systemId = new String(location + "#types?schema"+schemaElementCount++);
-                schemaCompiler.parseSchema(systemId,schemaElement);
+
+            for (Element element : forest.getInlinedSchemaElement()) {
+                String location = element.getOwnerDocument().getDocumentURI();
+                String systemId = location + "#types?schema" + schemaElementCount++;
+                if(forest.isMexMetadata)
+                    schemaCompiler.parseSchema(systemId,element);
+                else
+                    new DOMForestScanner(forest).scan(element,schemaCompiler.getParserHandler(systemId));
             }
 
             //feed external jaxb:bindings file
-            Set externalBindings = ((WSDLModelInfo)_modelInfo).getJAXBBindings();
+            InputSource[] externalBindings = options.getSchemaBindings();
             if(externalBindings != null){
                 for(InputSource jaxbBinding : externalBindings){
                     schemaCompiler.parseSchema(jaxbBinding);
@@ -109,27 +105,25 @@ public class JAXBModelBuilder {
     public JAXBType  getJAXBType(QName qname){
         JAXBMapping mapping = jaxbModel.get(qname);
         if (mapping == null){
-            fail("model.schema.elementNotFound", new Object[]{qname});
+            return null;
         }
-
         JavaType javaType = new JavaSimpleType(mapping.getType());
-        JAXBType type =  new JAXBType(qname, javaType, mapping, jaxbModel);
-        return type;
+        return new JAXBType(qname, javaType, mapping, jaxbModel);
     }
 
     public TypeAndAnnotation getElementTypeAndAnn(QName qname){
         JAXBMapping mapping = jaxbModel.get(qname);
         if (mapping == null){
-            fail("model.schema.elementNotFound", new Object[]{qname});
+            return null;
         }
         return mapping.getType().getTypeAnn();
     }
 
     protected void bind(){
-        com.sun.tools.internal.xjc.api.JAXBModel rawJaxbModel = schemaCompiler.bind();
-        if(consoleErrorReporter.hasError()){
-            throw new ModelException(consoleErrorReporter.getException());
-        }
+        S2JJAXBModel rawJaxbModel = schemaCompiler.bind();
+        if(rawJaxbModel == null)
+            throw new AbortException();
+        options.setCodeModel(rawJaxbModel.generateCode(null, errReceiver));
         jaxbModel = new JAXBModel(rawJaxbModel);
         jaxbModel.setGeneratedClassNames(_classNameAllocator.getJaxbGeneratedClasses());
     }
@@ -138,32 +132,13 @@ public class JAXBModelBuilder {
         return schemaCompiler;
     }
 
-    protected void fail(String key, Object[] arg) {
-        throw new ModelException(key, arg);
-    }
-
-    protected void error(String key, Object[] args){
-        _env.error(_messageFactory.getMessage(key, args));
-    }
-
-    protected void warn(String key, Object[] args) {
-        _env.warn(_messageFactory.getMessage(key, args));
-    }
-
-    protected void inform(String key, Object[] args) {
-        _env.info(_messageFactory.getMessage(key, args));
-    }
-
     public JAXBModel getJAXBModel(){
         return jaxbModel;
     }
 
     private JAXBModel jaxbModel;
     private SchemaCompiler schemaCompiler;
-    private final LocalizableMessageFactory _messageFactory;
-    private final ModelInfo _modelInfo;
-    private final ProcessorEnvironment _env;
-    private final boolean printstacktrace;
     private final ClassNameAllocatorImpl _classNameAllocator;
-    private final ConsoleErrorReporter consoleErrorReporter;
+    protected static final LocatorImpl NULL_LOCATOR = new LocatorImpl();
+
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/MimeHelper.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/MimeHelper.java
index 80a17dcb847..bd661005e53 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/MimeHelper.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/MimeHelper.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,11 +24,11 @@
  */
 package com.sun.tools.internal.ws.processor.modeler.wsdl;
 
+import com.sun.tools.internal.ws.processor.modeler.JavaSimpleTypeCreator;
+
 import java.util.HashMap;
 import java.util.Map;
 
-import com.sun.tools.internal.ws.processor.modeler.JavaSimpleTypeCreator;
-
 /**
  * @author Vivek Pandey
  *
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/ModelerUtils.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ModelerUtils.java
similarity index 93%
rename from jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/ModelerUtils.java
rename to jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ModelerUtils.java
index 4fd476c5b8d..729dfb04790 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/ModelerUtils.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ModelerUtils.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,16 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-package com.sun.tools.internal.ws.processor.modeler;
+package com.sun.tools.internal.ws.processor.modeler.wsdl;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import com.sun.tools.internal.xjc.api.S2JJAXBModel;
-import com.sun.tools.internal.xjc.api.TypeAndAnnotation;
 import com.sun.tools.internal.ws.processor.model.AbstractType;
 import com.sun.tools.internal.ws.processor.model.Block;
 import com.sun.tools.internal.ws.processor.model.ModelProperties;
@@ -41,17 +33,27 @@ import com.sun.tools.internal.ws.processor.model.java.JavaStructureMember;
 import com.sun.tools.internal.ws.processor.model.java.JavaStructureType;
 import com.sun.tools.internal.ws.processor.model.java.JavaType;
 import com.sun.tools.internal.ws.processor.model.jaxb.*;
+import com.sun.tools.internal.ws.resources.ModelerMessages;
 import com.sun.tools.internal.ws.util.ClassNameInfo;
+import com.sun.tools.internal.ws.wscompile.AbortException;
+import com.sun.tools.internal.ws.wscompile.ErrorReceiverFilter;
 import com.sun.tools.internal.ws.wsdl.document.Message;
 import com.sun.tools.internal.ws.wsdl.document.MessagePart;
+import com.sun.tools.internal.xjc.api.S2JJAXBModel;
+import com.sun.tools.internal.xjc.api.TypeAndAnnotation;
+
+import javax.xml.namespace.QName;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
 /**
- * Utilities to be used by modelers such as WSDLModeler and Rmimodeler
+ * Utilities to be used by WSDLModeler
  *
  * @author Vivek Pandey
  *
  */
-public class ModelerUtils {
+class ModelerUtils {
 
     /**
      * This method should be called incase of wrapper style operations. This is
@@ -126,7 +128,7 @@ public class ModelerUtils {
         return parameter;
     }
 
-    public static List createRpcLitParameters(Message message, Block block, S2JJAXBModel jaxbModel){
+    public static List createRpcLitParameters(Message message, Block block, S2JJAXBModel jaxbModel, ErrorReceiverFilter errReceiver){
         RpcLitStructure rpcStruct = (RpcLitStructure)block.getType();
 
         List parameters = new ArrayList();
@@ -137,8 +139,9 @@ public class ModelerUtils {
             TypeAndAnnotation typeAndAnn = jaxbModel.getJavaType(name);
             if(typeAndAnn == null){
                 String msgQName = "{"+message.getDefining().getTargetNamespaceURI()+"}"+message.getName();
-                throw new ModelerException("wsdlmodeler.rpclit.unkownschematype", name.toString(),
-                        part.getName(), msgQName);
+                errReceiver.error(part.getLocator(), ModelerMessages.WSDLMODELER_RPCLIT_UNKOWNSCHEMATYPE(name.toString(),
+                        part.getName(), msgQName));
+                throw new AbortException();
             }
             String type = typeAndAnn.getTypeClass().fullName();
             type = ClassNameInfo.getGenericClass(type);
@@ -164,7 +167,7 @@ public class ModelerUtils {
      */
     public static Parameter createParameter(String partName, AbstractType jaxbType,
             Block block) {
-        Parameter parameter = new Parameter(partName);
+        Parameter parameter = new Parameter(partName, block.getEntity());
         parameter.setProperty(ModelProperties.PROPERTY_PARAM_MESSAGE_PART_NAME,
                 partName);
         parameter.setEmbedded(false);
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java
index 33ab8c24f36..d095c7ef20b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,70 +24,102 @@
  */
 package com.sun.tools.internal.ws.processor.modeler.wsdl;
 
-import static com.sun.tools.internal.ws.processor.modeler.wsdl.WSDLModelerBase.*;
-import com.sun.tools.internal.ws.processor.config.ModelInfo;
-import com.sun.tools.internal.ws.processor.modeler.wsdl.WSDLModelerBase.ProcessSOAPOperationInfo;
+import com.sun.tools.internal.ws.processor.generator.Names;
+import static com.sun.tools.internal.ws.processor.modeler.wsdl.WSDLModelerBase.getExtensionOfType;
+import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
+import com.sun.tools.internal.ws.wscompile.WsimportOptions;
+import com.sun.tools.internal.ws.wsdl.document.*;
+import com.sun.tools.internal.ws.wsdl.document.jaxws.JAXWSBinding;
 import com.sun.tools.internal.ws.wsdl.document.schema.SchemaKinds;
-import com.sun.tools.internal.ws.wsdl.framework.Extensible;
-import com.sun.tools.internal.ws.wsdl.framework.NoSuchEntityException;
-
+import com.sun.tools.internal.ws.wsdl.document.soap.SOAP12Binding;
+import com.sun.tools.internal.ws.wsdl.document.soap.SOAPBinding;
 import org.xml.sax.InputSource;
 
 import javax.xml.namespace.QName;
+import java.io.ByteArrayInputStream;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import com.sun.tools.internal.ws.wsdl.document.MessagePart;
-import com.sun.tools.internal.ws.wsdl.document.Operation;
-import com.sun.tools.internal.ws.wsdl.document.Kinds;
-import com.sun.tools.internal.ws.wsdl.document.Message;
-import com.sun.tools.internal.ws.wsdl.document.PortType;
-import com.sun.tools.internal.ws.wsdl.document.Port;
-import com.sun.tools.internal.ws.wsdl.document.Service;
-import com.sun.tools.internal.ws.wsdl.document.WSDLDocument;
-import com.sun.tools.internal.ws.wsdl.document.Binding;
-import com.sun.tools.internal.ws.wsdl.document.BindingOperation;
-import com.sun.tools.internal.ws.wsdl.document.jaxws.JAXWSBinding;
-import com.sun.tools.internal.ws.wsdl.document.soap.*;
-
+import java.util.*;
 
 
 /**
- * @author Vivek Pandey
- *
  * Builds all possible pseudo schemas for async operation ResponseBean to feed to XJC.
+ *
+ * @author Vivek Pandey
  */
 public class PseudoSchemaBuilder {
 
     private final StringWriter buf = new StringWriter();
     private final WSDLDocument wsdlDocument;
-    private final ModelInfo modelInfo;
     private WSDLModeler wsdlModeler;
     private final List schemas = new ArrayList();
     private final HashMap bindingNameToPortMap = new HashMap();
+    private static final String w3ceprSchemaBinding = "\n" +
+            "  \n" +
+            "  \n" +
+            "    \n" +
+            "    \n" +
+            "      \n" +
+            "    \n" +
+            "    \n" +
+            "      \n" +
+            "    \n" +
+            "  \n" +
+            "";
 
-    public static List build(WSDLModeler wsdlModeler, ModelInfo modelInfo) {
-        PseudoSchemaBuilder b = new PseudoSchemaBuilder(wsdlModeler.document, modelInfo);
+    private static final String memberSubmissionEPR = "\n" +
+            "  \n" +
+            "  \n" +
+            "    \n" +
+            "    \n" +
+            "      \n" +
+            "    \n" +
+            "    \n" +
+            "      \n" +
+            "    \n" +
+            "  \n" +
+            "";
+
+    private final static String sysId = "http://dummy.pseudo-schema#schema";
+
+    private WsimportOptions options;
+    public static List build(WSDLModeler wsdlModeler, WsimportOptions options, ErrorReceiver errReceiver) {
+        PseudoSchemaBuilder b = new PseudoSchemaBuilder(wsdlModeler.document);
         b.wsdlModeler = wsdlModeler;
-        JAXBModelBuilder analyzer = wsdlModeler.getJAXBModelBuilder();
+        b.options = options;
         b.build();
-        for(int i = 0; i < b.schemas.size(); i++){
+        int i;
+        for(i = 0; i < b.schemas.size(); i++){
             InputSource is = b.schemas.get(i);
-            is.setSystemId("http://dummy.pseudo-schema#schema"+(i+1));
+            is.setSystemId(sysId+(i + 1));
         }
+        //add w3c EPR binding
+        if(!(options.noAddressingBbinding && options.isExtensionMode())){
+            InputSource is = new InputSource(new ByteArrayInputStream(w3ceprSchemaBinding.getBytes()));
+            is.setSystemId(sysId+(++i +1));
+            b.schemas.add(is);
+        }
+
+
+        //TODO: uncomment after JAXB fixes the issue related to passing multiples of such bindings
+        //add member submission EPR binding
+//        InputSource is1 = new InputSource(new ByteArrayInputStream(memberSubmissionEPR.getBytes()));
+//        is1.setSystemId(sysId+(++i + 1));
+//        b.schemas.add(is1);
+
         return b.schemas;
     }
 
-    private PseudoSchemaBuilder(WSDLDocument _wsdl, ModelInfo _modelInfo) {
+
+    private PseudoSchemaBuilder(WSDLDocument _wsdl) {
         this.wsdlDocument = _wsdl;
-        this.modelInfo = _modelInfo;
     }
 
     private void build() {
@@ -128,9 +160,6 @@ public class PseudoSchemaBuilder {
 
         for(Iterator itr=binding.operations(); itr.hasNext();){
             BindingOperation bindingOperation = (BindingOperation)itr.next();
-            SOAPOperation soapOperation =
-            (SOAPOperation)getExtensionOfType(bindingOperation,
-                SOAPOperation.class);
 
             // get only the bounded operations
             Set boundedOps = portType.getOperationsNamed(bindingOperation.getName());
@@ -139,8 +168,6 @@ public class PseudoSchemaBuilder {
             Operation operation = (Operation)boundedOps.iterator().next();
 
             // No pseudo schema required for doc/lit
-            SOAPStyle bindingStyle = soapBinding.getStyle();
-            SOAPStyle operationStyle = (soapOperation != null) ? soapOperation.getStyle() : bindingStyle;
             if(wsdlModeler.isAsync(portType, operation)){
                 buildAsync(portType, operation, bindingOperation);
             }
@@ -162,7 +189,7 @@ public class PseudoSchemaBuilder {
         if(outputMessage != null){
             List allParts = new ArrayList(outputMessage.getParts());
             if(allParts.size() > 1)
-                build(getOperationName(portType, operationName, bindingOperation.getOutput()), allParts);
+                build(getOperationName(operationName), allParts);
         }
 
     }
@@ -171,7 +198,7 @@ public class PseudoSchemaBuilder {
         JAXWSBinding jaxwsCustomization = (JAXWSBinding)getExtensionOfType(operation, JAXWSBinding.class);
         String operationName = (jaxwsCustomization != null)?((jaxwsCustomization.getMethodName() != null)?jaxwsCustomization.getMethodName().getName():null):null;
         if(operationName != null){
-            if(wsdlModeler.getEnvironment().getNames().isJavaReservedWord(operationName)){
+            if(Names.isJavaReservedWord(operationName)){
                 return null;
             }
 
@@ -199,12 +226,9 @@ public class PseudoSchemaBuilder {
                 "           xmlns:jaxb=''http://java.sun.com/xml/ns/jaxb''" +
                 "           xmlns:xjc=''http://java.sun.com/xml/ns/jaxb/xjc''" +
                 "           jaxb:extensionBindingPrefixes=''xjc''" +
-                "           jaxb:version=''1.0''");
-        if((elementName != null) && elementName.getNamespaceURI().length() > 0){
-            print("           targetNamespace=''{0}''>", elementName.getNamespaceURI());
-        }else{
-            print("           >");
-        }
+                "           jaxb:version=''1.0''" +
+                "           targetNamespace=''{0}''>",
+                elementName.getNamespaceURI());
 
         writeImports(elementName, allParts);
 
@@ -243,14 +267,14 @@ public class PseudoSchemaBuilder {
 
         // reset the StringWriter, so that next operation element could be written
         if(buf.toString().length() > 0){
-//            System.out.println("Response bean Schema for operation========> "+ elementName+"\n\n"+buf);
+            //System.out.println("Response bean Schema for operation========> "+ elementName+"\n\n"+buf);
             InputSource is = new InputSource(new StringReader(buf.toString()));
             schemas.add(is);
             buf.getBuffer().setLength(0);
         }
     }
 
-    private QName getOperationName(PortType portType, String operationName, Extensible binding){
+    private QName getOperationName(String operationName){
         if(operationName == null)
             return null;
 //        String namespaceURI = wsdlDocument.getDefinitions().getTargetNamespaceURI()+"?"+portType.getName()+"?" + operationName;
@@ -275,6 +299,4 @@ public class PseudoSchemaBuilder {
         buf.write('\n');
     }
 
-    private static final Set nspaceToPackageSchema = new HashSet();
-    private static int  schemaCounter;
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java
index 1070438c3ca..15ea18e597a 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,96 +24,46 @@
  */
 package com.sun.tools.internal.ws.processor.modeler.wsdl;
 
-import com.sun.codemodel.internal.JCodeModel;
 import com.sun.codemodel.internal.JType;
-import com.sun.tools.internal.ws.processor.ProcessorOptions;
-import com.sun.tools.internal.ws.processor.config.WSDLModelInfo;
-import com.sun.tools.internal.ws.processor.generator.GeneratorConstants;
-import com.sun.tools.internal.ws.processor.model.AsyncOperation;
-import com.sun.tools.internal.ws.processor.model.AsyncOperationType;
-import com.sun.tools.internal.ws.processor.model.Block;
+import com.sun.istack.internal.SAXParseException2;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtensible;
+import com.sun.tools.internal.ws.processor.generator.Names;
+import com.sun.tools.internal.ws.processor.model.*;
 import com.sun.tools.internal.ws.processor.model.Fault;
-import com.sun.tools.internal.ws.processor.model.Model;
-import com.sun.tools.internal.ws.processor.model.ModelException;
-import com.sun.tools.internal.ws.processor.model.ModelObject;
-import com.sun.tools.internal.ws.processor.model.ModelProperties;
 import com.sun.tools.internal.ws.processor.model.Operation;
-import com.sun.tools.internal.ws.processor.model.Parameter;
 import com.sun.tools.internal.ws.processor.model.Port;
-import com.sun.tools.internal.ws.processor.model.Request;
-import com.sun.tools.internal.ws.processor.model.Response;
 import com.sun.tools.internal.ws.processor.model.Service;
-import com.sun.tools.internal.ws.processor.model.java.JavaException;
-import com.sun.tools.internal.ws.processor.model.java.JavaInterface;
-import com.sun.tools.internal.ws.processor.model.java.JavaMethod;
-import com.sun.tools.internal.ws.processor.model.java.JavaParameter;
-import com.sun.tools.internal.ws.processor.model.java.JavaSimpleType;
-import com.sun.tools.internal.ws.processor.model.java.JavaStructureMember;
-import com.sun.tools.internal.ws.processor.model.java.JavaType;
-import com.sun.tools.internal.ws.processor.model.jaxb.JAXBElementMember;
-import com.sun.tools.internal.ws.processor.model.jaxb.JAXBProperty;
-import com.sun.tools.internal.ws.processor.model.jaxb.JAXBStructuredType;
-import com.sun.tools.internal.ws.processor.model.jaxb.JAXBType;
-import com.sun.tools.internal.ws.processor.model.jaxb.JAXBTypeAndAnnotation;
-import com.sun.tools.internal.ws.processor.model.jaxb.RpcLitMember;
-import com.sun.tools.internal.ws.processor.model.jaxb.RpcLitStructure;
+import com.sun.tools.internal.ws.processor.model.java.*;
+import com.sun.tools.internal.ws.processor.model.jaxb.*;
 import com.sun.tools.internal.ws.processor.modeler.JavaSimpleTypeCreator;
-import com.sun.tools.internal.ws.processor.modeler.ModelerException;
-import com.sun.tools.internal.ws.processor.modeler.ModelerUtils;
 import com.sun.tools.internal.ws.processor.util.ClassNameCollector;
-import com.sun.tools.internal.ws.processor.util.ProcessorEnvironment;
-import com.sun.tools.internal.ws.wsdl.document.Binding;
-import com.sun.tools.internal.ws.wsdl.document.BindingFault;
-import com.sun.tools.internal.ws.wsdl.document.BindingOperation;
-import com.sun.tools.internal.ws.wsdl.document.Documentation;
-import com.sun.tools.internal.ws.wsdl.document.Kinds;
+import com.sun.tools.internal.ws.resources.ModelerMessages;
+import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
+import com.sun.tools.internal.ws.wscompile.WsimportOptions;
+import com.sun.tools.internal.ws.wsdl.document.*;
 import com.sun.tools.internal.ws.wsdl.document.Message;
-import com.sun.tools.internal.ws.wsdl.document.MessagePart;
-import com.sun.tools.internal.ws.wsdl.document.OperationStyle;
-import com.sun.tools.internal.ws.wsdl.document.PortType;
-import com.sun.tools.internal.ws.wsdl.document.WSDLConstants;
-import com.sun.tools.internal.ws.wsdl.document.WSDLDocument;
 import com.sun.tools.internal.ws.wsdl.document.jaxws.CustomName;
 import com.sun.tools.internal.ws.wsdl.document.jaxws.JAXWSBinding;
 import com.sun.tools.internal.ws.wsdl.document.mime.MIMEContent;
 import com.sun.tools.internal.ws.wsdl.document.schema.SchemaKinds;
-import com.sun.tools.internal.ws.wsdl.document.soap.SOAP12Binding;
-import com.sun.tools.internal.ws.wsdl.document.soap.SOAP12Constants;
-import com.sun.tools.internal.ws.wsdl.document.soap.SOAPAddress;
-import com.sun.tools.internal.ws.wsdl.document.soap.SOAPBinding;
-import com.sun.tools.internal.ws.wsdl.document.soap.SOAPBody;
-import com.sun.tools.internal.ws.wsdl.document.soap.SOAPConstants;
-import com.sun.tools.internal.ws.wsdl.document.soap.SOAPFault;
-import com.sun.tools.internal.ws.wsdl.document.soap.SOAPHeader;
-import com.sun.tools.internal.ws.wsdl.document.soap.SOAPOperation;
-import com.sun.tools.internal.ws.wsdl.document.soap.SOAPStyle;
-import com.sun.tools.internal.ws.wsdl.document.soap.SOAPUse;
-import com.sun.tools.internal.ws.wsdl.framework.Entity;
-import com.sun.tools.internal.ws.wsdl.framework.Extensible;
-import com.sun.tools.internal.ws.wsdl.framework.NoSuchEntityException;
-import com.sun.tools.internal.ws.wsdl.framework.ParseException;
-import com.sun.tools.internal.ws.wsdl.framework.ParserListener;
-import com.sun.tools.internal.ws.wsdl.framework.ValidationException;
-import com.sun.tools.internal.ws.wsdl.parser.SOAPEntityReferenceValidator;
+import com.sun.tools.internal.ws.wsdl.document.soap.*;
+import com.sun.tools.internal.ws.wsdl.framework.*;
 import com.sun.tools.internal.ws.wsdl.parser.WSDLParser;
 import com.sun.tools.internal.xjc.api.S2JJAXBModel;
 import com.sun.tools.internal.xjc.api.TypeAndAnnotation;
 import com.sun.tools.internal.xjc.api.XJC;
 import com.sun.xml.internal.bind.api.JAXBRIContext;
-import com.sun.xml.internal.ws.model.Mode;
 import com.sun.xml.internal.ws.util.xml.XmlUtil;
 import org.xml.sax.InputSource;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.helpers.LocatorImpl;
 
+import javax.jws.WebParam.Mode;
 import javax.xml.namespace.QName;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.StringTokenizer;
+import java.util.*;
+import java.io.IOException;
 
 
 /**
@@ -127,111 +77,111 @@ public class WSDLModeler extends WSDLModelerBase {
     private final Map uniqueBodyBlocks = new HashMap();
     private final QName VOID_BODYBLOCK = new QName("");
     private ClassNameCollector classNameCollector;
-    private boolean extensions = false;
-    protected enum StyleAndUse  {RPC_LITERAL, DOC_LITERAL};
-    private ModelerUtils modelerUtils;
-    private JAXBModelBuilder jaxbModelBuilder;
+    private final String explicitDefaultPackage;
 
-    /**
-     * @param modelInfo
-     * @param options
-     */
-    public WSDLModeler(WSDLModelInfo modelInfo, Properties options) {
-        super(modelInfo, options);
-        classNameCollector = new ClassNameCollector();
+    public WSDLModeler(WsimportOptions options, ErrorReceiver receiver) {
+        super(options, receiver);
+        this.classNameCollector = new ClassNameCollector();
+        this.explicitDefaultPackage = options.defaultPackage;
     }
 
+
+    protected enum StyleAndUse {
+        RPC_LITERAL, DOC_LITERAL
+    }
+
+    private JAXBModelBuilder jaxbModelBuilder;
+
     public Model buildModel() {
         try {
 
-            parser = new WSDLParser(_modelInfo);
+            parser = new WSDLParser(options, errReceiver);
             parser.addParserListener(new ParserListener() {
-                public void ignoringExtension(QName name, QName parent) {
+                public void ignoringExtension(Entity entity, QName name, QName parent) {
                     if (parent.equals(WSDLConstants.QNAME_TYPES)) {
                         // check for a schema element with the wrong namespace URI
                         if (name.getLocalPart().equals("schema")
-                            && !name.getNamespaceURI().equals("")) {
-                            warn(
-                                "wsdlmodeler.warning.ignoringUnrecognizedSchemaExtension",
-                                name.getNamespaceURI());
+                                && !name.getNamespaceURI().equals("")) {
+                            warning(entity, ModelerMessages.WSDLMODELER_WARNING_IGNORING_UNRECOGNIZED_SCHEMA_EXTENSION(name.getNamespaceURI()));
                         }
                     }
+
                 }
+
                 public void doneParsingEntity(QName element, Entity entity) {
                 }
             });
-            hSet = parser.getUse();
 
-            extensions = Boolean.valueOf(_options.getProperty(ProcessorOptions.EXTENSION));
+            document = parser.parse();
+            if (document == null || document.getDefinitions() == null)
+                return null;
 
-            useWSIBasicProfile = !extensions;
-            document =
-                parser.parse();
             document.validateLocally();
-
-            boolean validateWSDL =
-                Boolean
-                    .valueOf(
-                        _options.getProperty(
-                            ProcessorOptions.VALIDATE_WSDL_PROPERTY))
-                    .booleanValue();
-            if (validateWSDL) {
-                document.validate(new SOAPEntityReferenceValidator());
-            }
-
+            forest = parser.getDOMForest();
 
             Model model = internalBuildModel(document);
+            if(model == null || errReceiver.hadError())
+                return null;
             //ClassNameCollector classNameCollector = new ClassNameCollector();
             classNameCollector.process(model);
             if (classNameCollector.getConflictingClassNames().isEmpty()) {
+                if(errReceiver.hadError())
+                    return null;
                 return model;
             }
             // do another pass, this time with conflict resolution enabled
             model = internalBuildModel(document);
+
             classNameCollector.process(model);
             if (classNameCollector.getConflictingClassNames().isEmpty()) {
                 // we're done
+                if(errReceiver.hadError())
+                    return null;
                 return model;
             }
             // give up
             StringBuffer conflictList = new StringBuffer();
             boolean first = true;
             for (Iterator iter =
-                classNameCollector.getConflictingClassNames().iterator();
-                iter.hasNext();
-                ) {
+                    classNameCollector.getConflictingClassNames().iterator();
+                 iter.hasNext();
+                    ) {
                 if (!first) {
                     conflictList.append(", ");
                 } else {
                     first = false;
                 }
-                conflictList.append((String)iter.next());
+                conflictList.append((String) iter.next());
             }
-            throw new ModelerException(
-                "wsdlmodeler.unsolvableNamingConflicts",
-                conflictList.toString());
-
+            error(document.getDefinitions(), ModelerMessages.WSDLMODELER_UNSOLVABLE_NAMING_CONFLICTS(conflictList.toString()));
         } catch (ModelException e) {
-            throw new ModelerException((Exception)e);
+            reportError(document.getDefinitions(), e.getMessage(), e);
         } catch (ParseException e) {
-            throw new ModelerException((Exception)e);
+            errReceiver.error(e);
         } catch (ValidationException e) {
-            throw new ModelerException((Exception)e);
+            errReceiver.error(e.getMessage(), e);
+        } catch (SAXException e) {
+            errReceiver.error(e);
+        } catch (IOException e) {
+            errReceiver.error(e);
         }
+        //should never reach here
+        return null;
     }
 
     private Model internalBuildModel(WSDLDocument document) {
+        numPasses++;
 
         //build the jaxbModel to be used latter
-        buildJAXBModel(document, _modelInfo, classNameCollector);
+        buildJAXBModel(document);
 
         QName modelName =
-            new QName(
-                document.getDefinitions().getTargetNamespaceURI(),
-                document.getDefinitions().getName() == null
-                    ? "model"
-                    : document.getDefinitions().getName());
-        Model model = new Model(modelName);
+                new QName(
+                        document.getDefinitions().getTargetNamespaceURI(),
+                        document.getDefinitions().getName() == null
+                                ? "model"
+                                : document.getDefinitions().getName());
+        Model model = new Model(modelName, document.getDefinitions());
         model.setJAXBModel(getJAXBModelBuilder().getJAXBModel());
 
         // This fails with the changed classname (WSDLModeler to WSDLModeler11 etc.)
@@ -239,37 +189,36 @@ public class WSDLModeler extends WSDLModelerBase {
         // modeler class name to the same one being checked in WSDLGenerator.
 
         model.setProperty(
-            ModelProperties.PROPERTY_MODELER_NAME,
-            ModelProperties.WSDL_MODELER_NAME);
+                ModelProperties.PROPERTY_MODELER_NAME,
+                ModelProperties.WSDL_MODELER_NAME);
 
         _javaTypes = new JavaSimpleTypeCreator();
-        _javaExceptions = new HashMap();
-        _bindingNameToPortMap = new HashMap();
+        _javaExceptions = new HashMap();
+        _bindingNameToPortMap = new HashMap();
 
         // grab target namespace
         model.setTargetNamespaceURI(document.getDefinitions().getTargetNamespaceURI());
 
         setDocumentationIfPresent(model,
-            document.getDefinitions().getDocumentation());
+                document.getDefinitions().getDocumentation());
 
         boolean hasServices = document.getDefinitions().services().hasNext();
         if (hasServices) {
             for (Iterator iter = document.getDefinitions().services();
-                iter.hasNext();
-                ) {
-                processService((com.sun.tools.internal.ws.wsdl.document.Service)iter.next(),
-                                model, document);
+                 iter.hasNext();
+                    ) {
+                processService((com.sun.tools.internal.ws.wsdl.document.Service) iter.next(),
+                        model, document);
                 hasServices = true;
             }
         } else {
             // emit a warning if there are no service definitions
-            warn("wsdlmodeler.warning.noServiceDefinitionsFound");
+            warning(model.getEntity(), ModelerMessages.WSDLMODELER_WARNING_NO_SERVICE_DEFINITIONS_FOUND());
         }
 
         return model;
     }
 
-
     /* (non-Javadoc)
      * @see WSDLModelerBase#processService(Service, Model, WSDLDocument)
      */
@@ -281,71 +230,75 @@ public class WSDLModeler extends WSDLModelerBase {
             serviceInterface += "_Service";
         }
         Service service =
-            new Service(
-                serviceQName,
-                new JavaInterface(serviceInterface, serviceInterface + "Impl"));
+                new Service(
+                        serviceQName,
+                        new JavaInterface(serviceInterface, serviceInterface + "Impl"), wsdlService);
 
         setDocumentationIfPresent(service, wsdlService.getDocumentation());
         boolean hasPorts = false;
         for (Iterator iter = wsdlService.ports(); iter.hasNext();) {
             boolean processed =
-                processPort(
-                    (com.sun.tools.internal.ws.wsdl.document.Port)iter.next(),
-                    service,
-                    document);
+                    processPort(
+                            (com.sun.tools.internal.ws.wsdl.document.Port) iter.next(),
+                            service,
+                            document);
             hasPorts = hasPorts || processed;
         }
         if (!hasPorts) {
             // emit a warning if there are no ports
-            warn("wsdlmodeler.warning.noPortsInService", wsdlService.getName());
-        }else{
+            warning(wsdlService, ModelerMessages.WSDLMODELER_WARNING_NO_PORTS_IN_SERVICE(wsdlService.getName()));
+        } else {
             model.addService(service);
         }
     }
 
     /* (non-Javadoc)
-     * @see WSDLModelerBase#processPort(Port, Service, WSDLDocument)
+     * @see WSDLModelerBase#processPort(WSDLPort, Service, WSDLDocument)
      */
     protected boolean processPort(com.sun.tools.internal.ws.wsdl.document.Port wsdlPort,
-            Service service, WSDLDocument document) {
+                                  Service service, WSDLDocument document) {
         try {
 
             //clear the  unique block map
             uniqueBodyBlocks.clear();
 
             QName portQName = getQNameOf(wsdlPort);
-            Port port = new Port(portQName);
+            Port port = new Port(portQName, wsdlPort);
 
             setDocumentationIfPresent(port, wsdlPort.getDocumentation());
 
             SOAPAddress soapAddress =
-                (SOAPAddress)getExtensionOfType(wsdlPort, SOAPAddress.class);
+                    (SOAPAddress) getExtensionOfType(wsdlPort, SOAPAddress.class);
             if (soapAddress == null) {
-                // not a SOAP port, ignore it
-                warn("wsdlmodeler.warning.ignoringNonSOAPPort.noAddress", wsdlPort.getName());
-                return false;
+                if(options.isExtensionMode()){
+                    warning(wsdlPort, ModelerMessages.WSDLMODELER_WARNING_NO_SOAP_ADDRESS(wsdlPort.getName()));
+                }else{
+                    // not a SOAP port, ignore it
+                    warning(wsdlPort, ModelerMessages.WSDLMODELER_WARNING_IGNORING_NON_SOAP_PORT_NO_ADDRESS(wsdlPort.getName()));
+                    return false;
+                }
             }
-
-            port.setAddress(soapAddress.getLocation());
+            if(soapAddress != null)
+                port.setAddress(soapAddress.getLocation());
             Binding binding = wsdlPort.resolveBinding(document);
             QName bindingName = getQNameOf(binding);
             PortType portType = binding.resolvePortType(document);
 
             port.setProperty(
-                ModelProperties.PROPERTY_WSDL_PORT_NAME,
-                getQNameOf(wsdlPort));
+                    ModelProperties.PROPERTY_WSDL_PORT_NAME,
+                    getQNameOf(wsdlPort));
             port.setProperty(
-                ModelProperties.PROPERTY_WSDL_PORT_TYPE_NAME,
-                getQNameOf(portType));
+                    ModelProperties.PROPERTY_WSDL_PORT_TYPE_NAME,
+                    getQNameOf(portType));
             port.setProperty(
-                ModelProperties.PROPERTY_WSDL_BINDING_NAME,
-                bindingName);
+                    ModelProperties.PROPERTY_WSDL_BINDING_NAME,
+                    bindingName);
 
             boolean isProvider = isProvider(wsdlPort);
             if (_bindingNameToPortMap.containsKey(bindingName) && !isProvider) {
                 // this binding has been processed before
                 Port existingPort =
-                    _bindingNameToPortMap.get(bindingName);
+                        _bindingNameToPortMap.get(bindingName);
                 port.setOperations(existingPort.getOperations());
                 port.setJavaInterface(existingPort.getJavaInterface());
                 port.setStyle(existingPort.getStyle());
@@ -353,59 +306,62 @@ public class WSDLModeler extends WSDLModelerBase {
             } else {
                 // find out the SOAP binding extension, if any
                 SOAPBinding soapBinding =
-                    (SOAPBinding)getExtensionOfType(binding, SOAPBinding.class);
+                        (SOAPBinding) getExtensionOfType(binding, SOAPBinding.class);
 
                 if (soapBinding == null) {
                     soapBinding =
-                            (SOAPBinding)getExtensionOfType(binding, SOAP12Binding.class);
+                            (SOAPBinding) getExtensionOfType(binding, SOAP12Binding.class);
                     if (soapBinding == null) {
-                        // cannot deal with non-SOAP ports
-                        warn(
-                            "wsdlmodeler.warning.ignoringNonSOAPPort",
-                            wsdlPort.getName());
-                        return false;
-                    }
-                    // we can only do soap1.2 if extensions are on
-                    if (extensions) {
-                        warn("wsdlmodeler.warning.port.SOAPBinding12", wsdlPort.getName());
-                    } else {
-                        warn("wsdlmodeler.warning.ignoringSOAPBinding12",
-                                wsdlPort.getName());
-                        return false;
+                        if(!options.isExtensionMode()){
+                            // cannot deal with non-SOAP ports
+                            warning(wsdlPort, ModelerMessages.WSDLMODELER_WARNING_IGNORING_NON_SOAP_PORT(wsdlPort.getName()));
+                            return false;
+                        }else{
+                            warning(wsdlPort, ModelerMessages.WSDLMODELER_WARNING_NON_SOAP_PORT(wsdlPort.getName()));
+                        }
+                    }else{
+                        // we can only do soap1.2 if extensions are on
+                        if (options.isExtensionMode()) {
+                            warning(wsdlPort, ModelerMessages.WSDLMODELER_WARNING_PORT_SOAP_BINDING_12(wsdlPort.getName()));
+                        } else {
+                            warning(wsdlPort, ModelerMessages.WSDLMODELER_WARNING_IGNORING_SOAP_BINDING_12(wsdlPort.getName()));
+                            return false;
+                        }
                     }
                 }
 
-                if (soapBinding.getTransport() == null
-                    || (!soapBinding.getTransport().equals(
+                if (soapBinding != null  && (soapBinding.getTransport() == null
+                        || (!soapBinding.getTransport().equals(
                         SOAPConstants.URI_SOAP_TRANSPORT_HTTP) && !soapBinding.getTransport().equals(
-                        SOAP12Constants.URI_SOAP_TRANSPORT_HTTP))) {
-                    // cannot deal with non-HTTP ports
-                    warn(
-                        "wsdlmodeler.warning.ignoringSOAPBinding.nonHTTPTransport",
-                        wsdlPort.getName());
-                    return false;
+                        SOAP12Constants.URI_SOAP_TRANSPORT_HTTP)))) {
+                    warning(wsdlPort, ModelerMessages.WSDLMODELER_WARNING_IGNORING_SOAP_BINDING_NON_HTTP_TRANSPORT(wsdlPort.getName()));
+                    if (!options.isExtensionMode()) {
+                        // cannot deal with non-HTTP ports
+                        return false;
+                    }
                 }
 
                 /**
                  * validate wsdl:binding uniqueness in style, e.g. rpclit or doclit
                  * ref: WSI BP 1.1 R 2705
                  */
-                if(!validateWSDLBindingStyle(binding)){
-                    if(extensions){
-                        warn("wsdlmodeler.warning.port.SOAPBinding.mixedStyle", wsdlPort.getName());
-                    }else{
-                        fail("wsdlmodeler.warning.ignoringSOAPBinding.mixedStyle",
-                                wsdlPort.getName());
-                        return false;
+                if (soapBinding != null && !validateWSDLBindingStyle(binding)) {
+                    if (options.isExtensionMode()) {
+                        warning(wsdlPort, ModelerMessages.WSDLMODELER_WARNING_PORT_SOAP_BINDING_MIXED_STYLE(wsdlPort.getName()));
+                    } else {
+                        error(wsdlPort, ModelerMessages.WSDLMODELER_WARNING_IGNORING_SOAP_BINDING_MIXED_STYLE(wsdlPort.getName()));
                     }
                 }
 
-                port.setStyle(soapBinding.getStyle());
+                if(soapBinding != null){
+                    port.setStyle(soapBinding.getStyle());
+                }
+
                 boolean hasOverloadedOperations = false;
                 Set operationNames = new HashSet();
                 for (Iterator iter = portType.operations(); iter.hasNext();) {
                     com.sun.tools.internal.ws.wsdl.document.Operation operation =
-                        (com.sun.tools.internal.ws.wsdl.document.Operation)iter.next();
+                            (com.sun.tools.internal.ws.wsdl.document.Operation) iter.next();
 
                     if (operationNames.contains(operation.getName())) {
                         hasOverloadedOperations = true;
@@ -414,20 +370,16 @@ public class WSDLModeler extends WSDLModelerBase {
                     operationNames.add(operation.getName());
 
                     for (Iterator itr = binding.operations();
-                        iter.hasNext();
-                        ) {
+                         iter.hasNext();
+                            ) {
                         BindingOperation bindingOperation =
-                            (BindingOperation)itr.next();
+                                (BindingOperation) itr.next();
                         if (operation
-                            .getName()
-                            .equals(bindingOperation.getName())) {
+                                .getName()
+                                .equals(bindingOperation.getName())) {
                             break;
                         } else if (!itr.hasNext()) {
-                            throw new ModelerException(
-                                "wsdlmodeler.invalid.bindingOperation.notFound",
-                                new Object[] {
-                                    operation.getName(),
-                                    binding.getName()});
+                            error(bindingOperation, ModelerMessages.WSDLMODELER_INVALID_BINDING_OPERATION_NOT_FOUND(operation.getName(), bindingOperation.getName()));
                         }
                     }
                 }
@@ -436,65 +388,49 @@ public class WSDLModeler extends WSDLModelerBase {
                 boolean hasOperations = false;
                 for (Iterator iter = binding.operations(); iter.hasNext();) {
                     BindingOperation bindingOperation =
-                        (BindingOperation)iter.next();
+                            (BindingOperation) iter.next();
 
                     com.sun.tools.internal.ws.wsdl.document.Operation portTypeOperation =
-                        null;
+                            null;
                     Set operations =
-                        portType.getOperationsNamed(bindingOperation.getName());
+                            portType.getOperationsNamed(bindingOperation.getName());
                     if (operations.size() == 0) {
                         // the WSDL document is invalid
-                        throw new ModelerException(
-                            "wsdlmodeler.invalid.bindingOperation.notInPortType",
-                            new Object[] {
-                                bindingOperation.getName(),
-                                binding.getName()});
+                        error(bindingOperation, ModelerMessages.WSDLMODELER_INVALID_BINDING_OPERATION_NOT_IN_PORT_TYPE(bindingOperation.getName(), binding.getName()));
                     } else if (operations.size() == 1) {
                         portTypeOperation =
-                            (com.sun.tools.internal.ws.wsdl.document.Operation)operations
-                                .iterator()
-                                .next();
+                                (com.sun.tools.internal.ws.wsdl.document.Operation) operations
+                                        .iterator()
+                                        .next();
                     } else {
                         boolean found = false;
                         String expectedInputName =
-                            bindingOperation.getInput().getName();
+                                bindingOperation.getInput().getName();
                         String expectedOutputName =
-                            bindingOperation.getOutput().getName();
+                                bindingOperation.getOutput().getName();
 
-                        for (Iterator iter2 = operations.iterator();iter2.hasNext();) {
+                        for (Iterator iter2 = operations.iterator(); iter2.hasNext();) {
                             com.sun.tools.internal.ws.wsdl.document.Operation candidateOperation =
-                                (com.sun.tools.internal.ws.wsdl.document.Operation)iter2
-                                    .next();
+                                    (com.sun.tools.internal.ws.wsdl.document.Operation) iter2
+                                            .next();
 
                             if (expectedInputName == null) {
                                 // the WSDL document is invalid
-                                throw new ModelerException(
-                                    "wsdlmodeler.invalid.bindingOperation.missingInputName",
-                                    new Object[] {
-                                        bindingOperation.getName(),
-                                        binding.getName()});
+                                error(bindingOperation, ModelerMessages.WSDLMODELER_INVALID_BINDING_OPERATION_MISSING_INPUT_NAME(bindingOperation.getName()));
                             }
                             if (expectedOutputName == null) {
                                 // the WSDL document is invalid
-                                throw new ModelerException(
-                                    "wsdlmodeler.invalid.bindingOperation.missingOutputName",
-                                    new Object[] {
-                                        bindingOperation.getName(),
-                                        binding.getName()});
+                                error(bindingOperation, ModelerMessages.WSDLMODELER_INVALID_BINDING_OPERATION_MISSING_OUTPUT_NAME(bindingOperation.getName()));
                             }
                             if (expectedInputName
-                                .equals(candidateOperation.getInput().getName())
-                                && expectedOutputName.equals(
+                                    .equals(candidateOperation.getInput().getName())
+                                    && expectedOutputName.equals(
                                     candidateOperation
-                                        .getOutput()
-                                        .getName())) {
+                                            .getOutput()
+                                            .getName())) {
                                 if (found) {
                                     // the WSDL document is invalid
-                                    throw new ModelerException(
-                                        "wsdlmodeler.invalid.bindingOperation.multipleMatchingOperations",
-                                        new Object[] {
-                                            bindingOperation.getName(),
-                                            binding.getName()});
+                                    error(bindingOperation, ModelerMessages.WSDLMODELER_INVALID_BINDING_OPERATION_MULTIPLE_MATCHING_OPERATIONS(bindingOperation.getName(), bindingOperation.getName()));
                                 }
                                 // got it!
                                 found = true;
@@ -503,26 +439,28 @@ public class WSDLModeler extends WSDLModelerBase {
                         }
                         if (!found) {
                             // the WSDL document is invalid
-                            throw new ModelerException(
-                                "wsdlmodeler.invalid.bindingOperation.notFound",
-                                new Object[] {
-                                    bindingOperation.getName(),
-                                    binding.getName()});
+                            error(bindingOperation, ModelerMessages.WSDLMODELER_INVALID_BINDING_OPERATION_NOT_FOUND(bindingOperation.getName(), binding.getName()));
                         }
                     }
-                    if(!isProvider){
+                    if (!isProvider) {
                         this.info =
-                            new ProcessSOAPOperationInfo(
-                                port,
-                                wsdlPort,
-                                portTypeOperation,
-                                bindingOperation,
-                                soapBinding,
-                                document,
-                                hasOverloadedOperations,
-                                headers);
+                                new ProcessSOAPOperationInfo(
+                                        port,
+                                        wsdlPort,
+                                        portTypeOperation,
+                                        bindingOperation,
+                                        soapBinding,
+                                        document,
+                                        hasOverloadedOperations,
+                                        headers);
 
-                        Operation operation = processSOAPOperation();
+
+                        Operation operation;
+                        if(soapBinding != null)
+                            operation = processSOAPOperation();
+                        else{
+                            operation = processNonSOAPOperation();
+                        }
                         if (operation != null) {
                             port.addOperation(operation);
                             hasOperations = true;
@@ -531,23 +469,16 @@ public class WSDLModeler extends WSDLModelerBase {
                 }
                 if (!isProvider && !hasOperations) {
                     // emit a warning if there are no operations, except when its a provider port
-                    warn("wsdlmodeler.warning.noOperationsInPort",
-                        wsdlPort.getName());
+                    warning(wsdlPort, ModelerMessages.WSDLMODELER_WARNING_NO_OPERATIONS_IN_PORT(wsdlPort.getName()));
                     return false;
                 }
                 createJavaInterfaceForPort(port, isProvider);
                 PortType pt = binding.resolvePortType(document);
-                String jd = (pt.getDocumentation() != null)?pt.getDocumentation().getContent():null;
+                String jd = (pt.getDocumentation() != null) ? pt.getDocumentation().getContent() : null;
                 port.getJavaInterface().setJavaDoc(jd);
                 _bindingNameToPortMap.put(bindingName, port);
             }
 
-            // now deal with the configured handlers
-            port.setClientHandlerChainInfo(
-                _modelInfo.getClientHandlerChainInfo());
-            port.setServerHandlerChainInfo(
-                _modelInfo.getServerHandlerChainInfo());
-
             service.addPort(port);
             applyPortMethodCustomization(port, wsdlPort);
             applyWrapperStyleCustomization(port, binding.resolvePortType(document));
@@ -555,43 +486,169 @@ public class WSDLModeler extends WSDLModelerBase {
             return true;
 
         } catch (NoSuchEntityException e) {
-            warn(e);
+            warning(document.getDefinitions(), e.getMessage());
             // should not happen
             return false;
         }
     }
 
+    /**
+     * Returns an operation purely from abstract operation
+     */
+    private Operation processNonSOAPOperation() {
+        Operation operation =
+                new Operation(new QName(null, info.bindingOperation.getName()), info.bindingOperation);
+
+        setDocumentationIfPresent(
+                operation,
+                info.portTypeOperation.getDocumentation());
+
+        if (info.portTypeOperation.getStyle()
+                != OperationStyle.REQUEST_RESPONSE
+                && info.portTypeOperation.getStyle() != OperationStyle.ONE_WAY) {
+            if (options.isExtensionMode()) {
+                warning(info.portTypeOperation, ModelerMessages.WSDLMODELER_WARNING_IGNORING_OPERATION_NOT_SUPPORTED_STYLE(info.portTypeOperation.getName()));
+                return null;
+            } else {
+                error(info.portTypeOperation, ModelerMessages.WSDLMODELER_INVALID_OPERATION_NOT_SUPPORTED_STYLE(info.portTypeOperation.getName(),
+                        info.port.resolveBinding(document).resolvePortType(document).getName()));
+            }
+        }
+
+        boolean isRequestResponse = info.portTypeOperation.getStyle() == OperationStyle.REQUEST_RESPONSE;
+        Message inputMessage = getInputMessage();
+        Request request = new Request(inputMessage, errReceiver);
+        request.setErrorReceiver(errReceiver);
+        info.operation = operation;
+        info.operation.setWSDLPortTypeOperation(info.portTypeOperation);
+
+        Response response = null;
+
+        Message outputMessage = null;
+        if (isRequestResponse) {
+            outputMessage = getOutputMessage();
+            response = new Response(outputMessage, errReceiver);
+        }else{
+            response = new Response(null, errReceiver);
+        }
+
+        //set the style based on heuristic that message has either all parts defined
+        // using type(RPC) or element(DOCUMENT)
+        setNonSoapStyle(inputMessage, outputMessage);
+
+        // Process parameterOrder and get the parameterList
+        List parameterList = getParameterOrder();
+
+        List params = null;
+        boolean unwrappable = isUnwrappable();
+        info.operation.setWrapped(unwrappable);
+            params = getDoclitParameters(request, response, parameterList);
+        if (!validateParameterName(params)) {
+            return null;
+        }
+
+        // create a definitive list of parameters to match what we'd like to get
+        // in the java interface (which is generated much later), parameterOrder
+        List definitiveParameterList = new ArrayList();
+        for (Parameter param : params) {
+            if (param.isReturn()) {
+                info.operation.setProperty(WSDL_RESULT_PARAMETER, param);
+                response.addParameter(param);
+                continue;
+            }
+            if (param.isIN()) {
+                request.addParameter(param);
+            } else if (param.isOUT()) {
+                response.addParameter(param);
+            } else if (param.isINOUT()) {
+                request.addParameter(param);
+                response.addParameter(param);
+            }
+            definitiveParameterList.add(param);
+        }
+
+        info.operation.setRequest(request);
+
+        if (isRequestResponse) {
+            info.operation.setResponse(response);
+        }
+
+        // faults with duplicate names
+        Set duplicateNames = getDuplicateFaultNames();
+
+        // handle soap:fault
+        handleLiteralSOAPFault(response, duplicateNames);
+        info.operation.setProperty(
+                WSDL_PARAMETER_ORDER,
+                definitiveParameterList);
+
+        Binding binding = info.port.resolveBinding(document);
+        PortType portType = binding.resolvePortType(document);
+        if (isAsync(portType, info.portTypeOperation)) {
+            warning(portType, "Can not generate Async methods for non-soap binding!");
+        }
+        return info.operation;
+    }
+
+    /**
+     * This method is added to fix one of the use case for j2ee se folks, so that we determine
+     * for non_soap wsdl what could be the style - rpc or document based on parts in the message.
+     *
+     * We assume that the message parts could have either all of them with type attribute (RPC)
+     * or element (DOCUMENT)
+     *
+     * Shall this check if parts are mixed and throw error message?
+     */
+    private void setNonSoapStyle(Message inputMessage, Message outputMessage) {
+        SOAPStyle style = SOAPStyle.DOCUMENT;
+        for(MessagePart part:inputMessage.getParts()){
+            if(part.getDescriptorKind() == SchemaKinds.XSD_TYPE)
+                style = SOAPStyle.RPC;
+            else
+                style = SOAPStyle.DOCUMENT;
+        }
+
+        //check the outputMessage parts
+        if(outputMessage != null){
+            for(MessagePart part:outputMessage.getParts()){
+                if(part.getDescriptorKind() == SchemaKinds.XSD_TYPE)
+                    style = SOAPStyle.RPC;
+                else
+                    style = SOAPStyle.DOCUMENT;
+            }
+        }
+        info.modelPort.setStyle(style);
+    }
+
     /* (non-Javadoc)
      * @see WSDLModelerBase#processSOAPOperation()
      */
     protected Operation processSOAPOperation() {
         Operation operation =
-            new Operation(new QName(null, info.bindingOperation.getName()));
+                new Operation(new QName(null, info.bindingOperation.getName()), info.bindingOperation);
 
         setDocumentationIfPresent(
-            operation,
-            info.portTypeOperation.getDocumentation());
+                operation,
+                info.portTypeOperation.getDocumentation());
 
         if (info.portTypeOperation.getStyle()
-            != OperationStyle.REQUEST_RESPONSE
-            && info.portTypeOperation.getStyle() != OperationStyle.ONE_WAY) {
-            if(extensions){
-                warn(
-                    "wsdlmodeler.warning.ignoringOperation.notSupportedStyle",
-                    info.portTypeOperation.getName());
+                != OperationStyle.REQUEST_RESPONSE
+                && info.portTypeOperation.getStyle() != OperationStyle.ONE_WAY) {
+            if (options.isExtensionMode()) {
+                warning(info.portTypeOperation, ModelerMessages.WSDLMODELER_WARNING_IGNORING_OPERATION_NOT_SUPPORTED_STYLE(info.portTypeOperation.getName()));
                 return null;
+            } else {
+                error(info.portTypeOperation, ModelerMessages.WSDLMODELER_INVALID_OPERATION_NOT_SUPPORTED_STYLE(info.portTypeOperation.getName(),
+                        info.port.resolveBinding(document).resolvePortType(document).getName()));
             }
-            fail("wsdlmodeler.invalid.operation.notSupportedStyle",
-                    new Object[]{info.portTypeOperation.getName(),
-                    info.port.resolveBinding(document).resolvePortType(document).getName()});
         }
 
         SOAPStyle soapStyle = info.soapBinding.getStyle();
 
         // find out the SOAP operation extension, if any
         SOAPOperation soapOperation =
-            (SOAPOperation)getExtensionOfType(info.bindingOperation,
-                SOAPOperation.class);
+                (SOAPOperation) getExtensionOfType(info.bindingOperation,
+                        SOAPOperation.class);
 
         if (soapOperation != null) {
             if (soapOperation.getStyle() != null) {
@@ -605,7 +662,7 @@ public class WSDLModeler extends WSDLModelerBase {
         operation.setStyle(soapStyle);
 
         String uniqueOperationName =
-            getUniqueName(info.portTypeOperation, info.hasOverloadedOperations);
+                getUniqueName(info.portTypeOperation, info.hasOverloadedOperations);
         if (info.hasOverloadedOperations) {
             operation.setUniqueName(uniqueOperationName);
         }
@@ -617,14 +674,12 @@ public class WSDLModeler extends WSDLModelerBase {
         SOAPBody soapRequestBody = getSOAPRequestBody();
         if (soapRequestBody == null) {
             // the WSDL document is invalid
-            throw new ModelerException(
-                "wsdlmodeler.invalid.bindingOperation.inputMissingSoapBody",
-                new Object[] { info.bindingOperation.getName()});
+            error(info.bindingOperation, ModelerMessages.WSDLMODELER_INVALID_BINDING_OPERATION_INPUT_MISSING_SOAP_BODY(info.bindingOperation.getName()));
         }
 
         if (soapStyle == SOAPStyle.RPC) {
             if (soapRequestBody.isEncoded()) {
-                throw new ModelerException("wsdlmodeler20.rpcenc.not.supported");
+                error(soapRequestBody, ModelerMessages.WSDLMODELER_20_RPCENC_NOT_SUPPORTED());
             }
             return processLiteralSOAPOperation(StyleAndUse.RPC_LITERAL);
         }
@@ -632,55 +687,61 @@ public class WSDLModeler extends WSDLModelerBase {
         return processLiteralSOAPOperation(StyleAndUse.DOC_LITERAL);
     }
 
-    protected Operation processLiteralSOAPOperation(StyleAndUse styleAndUse){
+    protected Operation processLiteralSOAPOperation(StyleAndUse styleAndUse) {
         //returns false if the operation name is not acceptable
-        if(!applyOperationNameCustomization())
+        if (!applyOperationNameCustomization())
             return null;
 
         boolean isRequestResponse = info.portTypeOperation.getStyle() == OperationStyle.REQUEST_RESPONSE;
-        Request request = new Request();
-        Response response = new Response();
+        Message inputMessage = getInputMessage();
+        Request request = new Request(inputMessage, errReceiver);
+        request.setErrorReceiver(errReceiver);
         info.operation.setUse(SOAPUse.LITERAL);
+        info.operation.setWSDLPortTypeOperation(info.portTypeOperation);
         SOAPBody soapRequestBody = getSOAPRequestBody();
-        if((StyleAndUse.DOC_LITERAL == styleAndUse) && (soapRequestBody.getNamespace() != null)){
-            warn("wsdlmodeler.warning.r2716", new Object[]{"soapbind:body", info.bindingOperation.getName()});
+        if ((StyleAndUse.DOC_LITERAL == styleAndUse) && (soapRequestBody.getNamespace() != null)) {
+            warning(soapRequestBody, ModelerMessages.WSDLMODELER_WARNING_R_2716("soapbind:body", info.bindingOperation.getName()));
         }
 
-        Message inputMessage = getInputMessage();
+
+        Response response = null;
 
         SOAPBody soapResponseBody = null;
         Message outputMessage = null;
         if (isRequestResponse) {
             soapResponseBody = getSOAPResponseBody();
             if (isOperationDocumentLiteral(styleAndUse) && (soapResponseBody.getNamespace() != null)) {
-                warn("wsdlmodeler.warning.r2716", new Object[]{"soapbind:body", info.bindingOperation.getName()});
+                warning(soapResponseBody, ModelerMessages.WSDLMODELER_WARNING_R_2716("soapbind:body", info.bindingOperation.getName()));
             }
             outputMessage = getOutputMessage();
+            response = new Response(outputMessage, errReceiver);
+        }else{
+            response = new Response(null, errReceiver);
         }
 
         //ignore operation if there are more than one root part
-        if(!validateMimeParts(getMimeParts(info.bindingOperation.getInput())) ||
+        if (!validateMimeParts(getMimeParts(info.bindingOperation.getInput())) ||
                 !validateMimeParts(getMimeParts(info.bindingOperation.getOutput())))
             return null;
 
 
-        if(!validateBodyParts(info.bindingOperation)){
+        if (!validateBodyParts(info.bindingOperation)) {
             // BP 1.1
             // R2204   A document-literal binding in a DESCRIPTION MUST refer, in each of its soapbind:body element(s),
             // only to wsdl:part element(s) that have been defined using the element attribute.
 
             // R2203   An rpc-literal binding in a DESCRIPTION MUST refer, in its soapbind:body element(s),
             // only to wsdNl:part element(s) that have been defined using the type attribute.
-            if(isOperationDocumentLiteral(styleAndUse))
-                if(extensions)
-                    warn("wsdlmodeler.warning.ignoringOperation.cannotHandleTypeMessagePart", info.portTypeOperation.getName());
+            if (isOperationDocumentLiteral(styleAndUse))
+                if (options.isExtensionMode())
+                    warning(info.portTypeOperation, ModelerMessages.WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_TYPE_MESSAGE_PART(info.portTypeOperation.getName()));
                 else
-                    fail("wsdlmodeler.invalid.doclitoperation", info.portTypeOperation.getName());
-            else if(isOperationRpcLiteral(styleAndUse)) {
-                if(extensions)
-                    warn("wsdlmodeler.warning.ignoringOperation.cannotHandleElementMessagePart", info.portTypeOperation.getName());
+                    error(info.portTypeOperation, ModelerMessages.WSDLMODELER_INVALID_DOCLITOPERATION(info.portTypeOperation.getName()));
+            else if (isOperationRpcLiteral(styleAndUse)) {
+                if (options.isExtensionMode())
+                    warning(info.portTypeOperation, ModelerMessages.WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_ELEMENT_MESSAGE_PART(info.portTypeOperation.getName()));
                 else
-                    fail("wsdlmodeler.invalid.rpclitoperation", info.portTypeOperation.getName());
+                    error(info.portTypeOperation, ModelerMessages.WSDLMODELER_INVALID_RPCLITOPERATION(info.portTypeOperation.getName()));
             }
             return null;
         }
@@ -689,22 +750,22 @@ public class WSDLModeler extends WSDLModelerBase {
         List parameterList = getParameterOrder();
 
         //binding is invalid in the wsdl, ignore the operation.
-        if(!setMessagePartsBinding(styleAndUse))
+        if (!setMessagePartsBinding(styleAndUse))
             return null;
 
         List params = null;
         boolean unwrappable = isUnwrappable();
         info.operation.setWrapped(unwrappable);
-        if(isOperationDocumentLiteral(styleAndUse)){
+        if (isOperationDocumentLiteral(styleAndUse)) {
             params = getDoclitParameters(request, response, parameterList);
-        }else if(isOperationRpcLiteral(styleAndUse)){
+        } else if (isOperationRpcLiteral(styleAndUse)) {
             String operationName = info.bindingOperation.getName();
             Block reqBlock = null;
             if (inputMessage != null) {
                 QName name = new QName(getRequestNamespaceURI(soapRequestBody), operationName);
                 RpcLitStructure rpcStruct = new RpcLitStructure(name, getJAXBModelBuilder().getJAXBModel());
                 rpcStruct.setJavaType(new JavaSimpleType("com.sun.xml.internal.ws.encoding.jaxb.RpcLitPayload", null));
-                reqBlock = new Block(name, rpcStruct);
+                reqBlock = new Block(name, rpcStruct, inputMessage);
                 request.addBodyBlock(reqBlock);
             }
 
@@ -713,31 +774,31 @@ public class WSDLModeler extends WSDLModelerBase {
                 QName name = new QName(getResponseNamespaceURI(soapResponseBody), operationName + "Response");
                 RpcLitStructure rpcStruct = new RpcLitStructure(name, getJAXBModelBuilder().getJAXBModel());
                 rpcStruct.setJavaType(new JavaSimpleType("com.sun.xml.internal.ws.encoding.jaxb.RpcLitPayload", null));
-                resBlock = new Block(name, rpcStruct);
+                resBlock = new Block(name, rpcStruct, outputMessage);
                 response.addBodyBlock(resBlock);
             }
             params = getRpcLitParameters(request, response, reqBlock, resBlock, parameterList);
         }
 
 
-        if(!validateParameterName(params)) {
+        if (!validateParameterName(params)) {
             return null;
         }
 
         // create a definitive list of parameters to match what we'd like to get
         // in the java interface (which is generated much later), parameterOrder
         List definitiveParameterList = new ArrayList();
-        for (Parameter param: params) {
-            if(param.isReturn()){
+        for (Parameter param : params) {
+            if (param.isReturn()) {
                 info.operation.setProperty(WSDL_RESULT_PARAMETER, param);
                 response.addParameter(param);
                 continue;
             }
-            if(param.isIN()){
+            if (param.isIN()) {
                 request.addParameter(param);
-            }else if(param.isOUT()){
+            } else if (param.isOUT()) {
                 response.addParameter(param);
-            }else if(param.isINOUT()){
+            } else if (param.isINOUT()) {
                 request.addParameter(param);
                 response.addParameter(param);
             }
@@ -754,17 +815,17 @@ public class WSDLModeler extends WSDLModelerBase {
         QName body = VOID_BODYBLOCK;
         QName opName = null;
 
-        if(bb.hasNext()){
+        if (bb.hasNext()) {
             body = bb.next().getName();
             opName = uniqueBodyBlocks.get(body);
-        }else{
+        } else {
             //there is no body block
             body = VOID_BODYBLOCK;
             opName = uniqueBodyBlocks.get(VOID_BODYBLOCK);
         }
-        if(opName != null){
-            fail("wsdlmodeler.nonUnique.body", new Object[]{info.port.getName(), info.operation.getName(), opName, body});
-        }else{
+        if (opName != null) {
+            error(info.port, ModelerMessages.WSDLMODELER_NON_UNIQUE_BODY(info.port.getName(), info.operation.getName(), opName, body));
+        } else {
             uniqueBodyBlocks.put(body, info.operation.getName());
         }
 
@@ -780,98 +841,71 @@ public class WSDLModeler extends WSDLModelerBase {
         //set Async property
         Binding binding = info.port.resolveBinding(document);
         PortType portType = binding.resolvePortType(document);
-        if(isAsync(portType, info.portTypeOperation)){
+        if (isAsync(portType, info.portTypeOperation)) {
             addAsyncOperations(info.operation, styleAndUse);
         }
 
         return info.operation;
     }
 
-    /**
-     *
-     * @param params
-     * @return
-     */
     private boolean validateParameterName(List params) {
+        if (options.isExtensionMode())
+            return true;
+
         Message msg = getInputMessage();
-        for(Parameter param : params){
-            if(param.isOUT())
+        for (Parameter param : params) {
+            if (param.isOUT())
                 continue;
-            if(param.getCustomName() != null){
-                if(getEnvironment().getNames().isJavaReservedWord(param.getCustomName())){
-                    if(extensions)
-                        warn("wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.customName",
-                                new Object[]{info.operation.getName(), param.getCustomName()});
-                    else
-                        fail("wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.customName",
-                                new Object[]{info.operation.getName(), param.getCustomName()});
+            if (param.getCustomName() != null) {
+                if (Names.isJavaReservedWord(param.getCustomName())) {
+                    error(param.getEntity(), ModelerMessages.WSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOM_NAME(info.operation.getName(), param.getCustomName()));
                     return false;
                 }
                 return true;
             }
             //process doclit wrapper style
-            if(param.isEmbedded() && !(param.getBlock().getType() instanceof RpcLitStructure)){
-                if(getEnvironment().getNames().isJavaReservedWord(param.getName())){
-                    if(extensions)
-                        warn("wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.wrapperStyle", new Object[]{info.operation.getName(), param.getName(), param.getBlock().getName()});
-                    else
-                        fail("wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.wrapperStyle", new Object[]{info.operation.getName(), param.getName(), param.getBlock().getName()});
+            if (param.isEmbedded() && !(param.getBlock().getType() instanceof RpcLitStructure)) {
+                if (Names.isJavaReservedWord(param.getName())) {
+                    error(param.getEntity(), ModelerMessages.WSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_WRAPPER_STYLE(info.operation.getName(), param.getName(), param.getBlock().getName()));
                     return false;
                 }
-            }else{
+            } else {
                 //non-wrapper style and rpclit
-                if(getEnvironment().getNames().isJavaReservedWord(param.getName())){
-                    if(extensions)
-                        warn("wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.nonWrapperStyle", new Object[]{info.operation.getName(), msg.getName(), param.getName()});
-                    else
-                        fail("wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.nonWrapperStyle", new Object[]{info.operation.getName(), msg.getName(), param.getName()});
+                if (Names.isJavaReservedWord(param.getName())) {
+                    error(param.getEntity(), ModelerMessages.WSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_NON_WRAPPER_STYLE(info.operation.getName(), msg.getName(), param.getName()));
                     return false;
                 }
             }
         }
 
         boolean isRequestResponse = info.portTypeOperation.getStyle() == OperationStyle.REQUEST_RESPONSE;
-        if(isRequestResponse){
+        if (isRequestResponse) {
             msg = getOutputMessage();
-            for(Parameter param : params){
-                if(param.isIN())
+            for (Parameter param : params) {
+                if (param.isIN())
                     continue;
-                if(param.getCustomName() != null){
-                    if(getEnvironment().getNames().isJavaReservedWord(param.getCustomName())){
-                        if(extensions)
-                            warn("wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.customName",
-                                    new Object[]{info.operation.getName(), param.getCustomName()});
-                        else
-                            fail("wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.customName",
-                                    new Object[]{info.operation.getName(), param.getCustomName()});
+                if (param.getCustomName() != null) {
+                    if (Names.isJavaReservedWord(param.getCustomName())) {
+                        error(param.getEntity(), ModelerMessages.WSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOM_NAME(info.operation.getName(), param.getCustomName()));
                         return false;
                     }
                     return true;
                 }
                 //process doclit wrapper style
-                if(param.isEmbedded() && !(param.getBlock().getType() instanceof RpcLitStructure)){
-                    if(param.isReturn())
+                if (param.isEmbedded() && !(param.getBlock().getType() instanceof RpcLitStructure)) {
+                    if (param.isReturn())
                         continue;
-                    if(!param.getName().equals("return") && getEnvironment().getNames().isJavaReservedWord(param.getName())){
-                        if(extensions)
-                            warn("wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.wrapperStyle",
-                                    new Object[]{info.operation.getName(), param.getName(), param.getBlock().getName()});
-                        else
-                            fail("wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.wrapperStyle",
-                                    new Object[]{info.operation.getName(), param.getName(), param.getBlock().getName()});
+                    if (!param.getName().equals("return") && Names.isJavaReservedWord(param.getName())) {
+                        error(param.getEntity(), ModelerMessages.WSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_WRAPPER_STYLE(info.operation.getName(), param.getName(), param.getBlock().getName()));
                         return false;
                     }
-                }else{
-                    if(param.isReturn())
+                } else {
+                    if (param.isReturn())
                         continue;
 
                     //non-wrapper style and rpclit
-                    if(getEnvironment().getNames().isJavaReservedWord(param.getName())){
-                        if(extensions)
-                            warn("wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.nonWrapperStyle", new Object[]{info.operation.getName(), msg.getName(), param.getName()});
-                        else
-                            fail("wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.nonWrapperStyle",
-                                    new Object[]{info.operation.getName(), msg.getName(), param.getName()});
+                    if (Names.isJavaReservedWord(param.getName())) {
+                        error(param.getEntity(), ModelerMessages.WSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_NON_WRAPPER_STYLE(info.operation.getName(), msg.getName(), param.getName()));
                         return false;
                     }
                 }
@@ -881,62 +915,56 @@ public class WSDLModeler extends WSDLModelerBase {
         return true;
     }
 
-    /**
-     * @return
-     */
     private boolean enableMimeContent() {
         //first we look at binding operation
-        JAXWSBinding jaxwsCustomization = (JAXWSBinding)getExtensionOfType(info.bindingOperation, JAXWSBinding.class);
-        Boolean mimeContentMapping = (jaxwsCustomization != null)?jaxwsCustomization.isEnableMimeContentMapping():null;
-        if(mimeContentMapping != null)
+        JAXWSBinding jaxwsCustomization = (JAXWSBinding) getExtensionOfType(info.bindingOperation, JAXWSBinding.class);
+        Boolean mimeContentMapping = (jaxwsCustomization != null) ? jaxwsCustomization.isEnableMimeContentMapping() : null;
+        if (mimeContentMapping != null)
             return mimeContentMapping;
 
         //then in wsdl:binding
         Binding binding = info.port.resolveBinding(info.document);
-        jaxwsCustomization = (JAXWSBinding)getExtensionOfType(binding, JAXWSBinding.class);
-        mimeContentMapping = (jaxwsCustomization != null)?jaxwsCustomization.isEnableMimeContentMapping():null;
-        if(mimeContentMapping != null)
+        jaxwsCustomization = (JAXWSBinding) getExtensionOfType(binding, JAXWSBinding.class);
+        mimeContentMapping = (jaxwsCustomization != null) ? jaxwsCustomization.isEnableMimeContentMapping() : null;
+        if (mimeContentMapping != null)
             return mimeContentMapping;
 
         //at last look in wsdl:definitions
-        jaxwsCustomization = (JAXWSBinding)getExtensionOfType(info.document.getDefinitions(), JAXWSBinding.class);
-        mimeContentMapping = (jaxwsCustomization != null)?jaxwsCustomization.isEnableMimeContentMapping():null;
-        if(mimeContentMapping != null)
+        jaxwsCustomization = (JAXWSBinding) getExtensionOfType(info.document.getDefinitions(), JAXWSBinding.class);
+        mimeContentMapping = (jaxwsCustomization != null) ? jaxwsCustomization.isEnableMimeContentMapping() : null;
+        if (mimeContentMapping != null)
             return mimeContentMapping;
         return false;
     }
 
-    /**
-     *
-     */
     private boolean applyOperationNameCustomization() {
-        JAXWSBinding jaxwsCustomization = (JAXWSBinding)getExtensionOfType(info.portTypeOperation, JAXWSBinding.class);
-        String operationName = (jaxwsCustomization != null)?((jaxwsCustomization.getMethodName() != null)?jaxwsCustomization.getMethodName().getName():null):null;
-        if(operationName != null){
-            if(getEnvironment().getNames().isJavaReservedWord(operationName)){
-                if(extensions)
-                    warn("wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.customizedOperationName", new Object[]{info.operation.getName(), operationName});
+        JAXWSBinding jaxwsCustomization = (JAXWSBinding) getExtensionOfType(info.portTypeOperation, JAXWSBinding.class);
+        String operationName = (jaxwsCustomization != null) ? ((jaxwsCustomization.getMethodName() != null) ? jaxwsCustomization.getMethodName().getName() : null) : null;
+        if (operationName != null) {
+            if (Names.isJavaReservedWord(operationName)) {
+                if (options.isExtensionMode())
+                    warning(info.portTypeOperation, ModelerMessages.WSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOMIZED_OPERATION_NAME(info.operation.getName(), operationName));
                 else
-                    fail("wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.customizedOperationName", new Object[]{info.operation.getName(), operationName});
+                    error(info.portTypeOperation, ModelerMessages.WSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOMIZED_OPERATION_NAME(info.operation.getName(), operationName));
                 return false;
             }
 
             info.operation.setCustomizedName(operationName);
         }
 
-        if(getEnvironment().getNames().isJavaReservedWord(info.operation.getJavaMethodName())){
-            if(extensions)
-                warn("wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.operationName", new Object[]{info.operation.getName()});
+        if (Names.isJavaReservedWord(info.operation.getJavaMethodName())) {
+            if (options.isExtensionMode())
+                warning(info.portTypeOperation, ModelerMessages.WSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_OPERATION_NAME(info.operation.getName()));
             else
-                fail("wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.operationName", new Object[]{info.operation.getName()});
+                error(info.portTypeOperation, ModelerMessages.WSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_OPERATION_NAME(info.operation.getName()));
             return false;
         }
         return true;
     }
 
-    protected String getAsyncOperationName(Operation operation){
+    protected String getAsyncOperationName(Operation operation) {
         String name = operation.getCustomizedName();
-        if(name == null)
+        if (name == null)
             name = operation.getUniqueName();
         return name;
     }
@@ -946,41 +974,32 @@ public class WSDLModeler extends WSDLModelerBase {
      */
     private void addAsyncOperations(Operation syncOperation, StyleAndUse styleAndUse) {
         Operation operation = createAsyncOperation(syncOperation, styleAndUse, AsyncOperationType.POLLING);
-        if(operation != null)
+        if (operation != null)
             info.modelPort.addOperation(operation);
 
         operation = createAsyncOperation(syncOperation, styleAndUse, AsyncOperationType.CALLBACK);
-        if(operation != null)
+        if (operation != null)
             info.modelPort.addOperation(operation);
     }
 
-    /**
-     *
-     * @param syncOperation
-     * @param styleAndUse
-     * @param asyncType
-     * @return
-     */
     private Operation createAsyncOperation(Operation syncOperation, StyleAndUse styleAndUse, AsyncOperationType asyncType) {
         boolean isRequestResponse = info.portTypeOperation.getStyle() == OperationStyle.REQUEST_RESPONSE;
-        if(!isRequestResponse)
+        if (!isRequestResponse)
             return null;
-        Request request = new Request();
-        Response response = new Response();
 
         //create async operations
-        AsyncOperation operation = new AsyncOperation(info.operation);
+        AsyncOperation operation = new AsyncOperation(info.operation, info.bindingOperation);
 
         //creation the async operation name: operationName+Async or customized name
         //operation.setName(new QName(operation.getName().getNamespaceURI(), getAsyncOperationName(info.portTypeOperation, operation)));
-        if(asyncType.equals(AsyncOperationType.CALLBACK))
-            operation.setUniqueName(info.operation.getUniqueName()+"_async_callback");
-        else if(asyncType.equals(AsyncOperationType.POLLING))
-            operation.setUniqueName(info.operation.getUniqueName()+"_async_polling");
+        if (asyncType.equals(AsyncOperationType.CALLBACK))
+            operation.setUniqueName(info.operation.getUniqueName() + "_async_callback");
+        else if (asyncType.equals(AsyncOperationType.POLLING))
+            operation.setUniqueName(info.operation.getUniqueName() + "_async_polling");
 
         setDocumentationIfPresent(
-            operation,
-            info.portTypeOperation.getDocumentation());
+                operation,
+                info.portTypeOperation.getDocumentation());
 
         operation.setAsyncType(asyncType);
         operation.setSOAPAction(info.operation.getSOAPAction());
@@ -989,32 +1008,35 @@ public class WSDLModeler extends WSDLModelerBase {
         SOAPBody soapRequestBody = getSOAPRequestBody();
 
         Message inputMessage = getInputMessage();
+        Request request = new Request(inputMessage, errReceiver);
+        Response response = new Response(null, errReceiver);
 
         SOAPBody soapResponseBody = null;
         Message outputMessage = null;
         if (isRequestResponse) {
             soapResponseBody = getSOAPResponseBody();
             outputMessage = getOutputMessage();
+            response = new Response(outputMessage, errReceiver);
         }
 
         // Process parameterOrder and get the parameterList
         java.util.List parameterList = getAsynParameterOrder();
 
         List inParameters = null;
-        if(isOperationDocumentLiteral(styleAndUse)){
+        if (isOperationDocumentLiteral(styleAndUse)) {
             inParameters = getRequestParameters(request, parameterList);
             // outParameters = getResponseParameters(response);
             // re-create parameterList with unwrapped parameters
-            if(unwrappable){
+            if (unwrappable) {
                 List unwrappedParameterList = new ArrayList();
-                if(inputMessage != null){
+                if (inputMessage != null) {
                     Iterator parts = inputMessage.parts();
-                    if(parts.hasNext()){
+                    if (parts.hasNext()) {
                         MessagePart part = parts.next();
-                        JAXBType jaxbType = getJAXBType(part.getDescriptor());
+                        JAXBType jaxbType = getJAXBType(part);
                         List memberList = jaxbType.getWrapperChildren();
                         Iterator props = memberList.iterator();
-                        while(props.hasNext()){
+                        while (props.hasNext()) {
                             JAXBProperty prop = props.next();
                             unwrappedParameterList.add(prop.getElementName().getLocalPart());
                         }
@@ -1024,14 +1046,14 @@ public class WSDLModeler extends WSDLModelerBase {
                 parameterList.clear();
                 parameterList.addAll(unwrappedParameterList);
             }
-        }else if(isOperationRpcLiteral(styleAndUse)){
+        } else if (isOperationRpcLiteral(styleAndUse)) {
             String operationName = info.bindingOperation.getName();
             Block reqBlock = null;
             if (inputMessage != null) {
                 QName name = new QName(getRequestNamespaceURI(soapRequestBody), operationName);
                 RpcLitStructure rpcStruct = new RpcLitStructure(name, getJAXBModelBuilder().getJAXBModel());
                 rpcStruct.setJavaType(new JavaSimpleType("com.sun.xml.internal.ws.encoding.jaxb.RpcLitPayload", null));
-                reqBlock = new Block(name, rpcStruct);
+                reqBlock = new Block(name, rpcStruct, inputMessage);
                 request.addBodyBlock(reqBlock);
             }
             inParameters = createRpcLitRequestParameters(request, parameterList, reqBlock);
@@ -1042,17 +1064,17 @@ public class WSDLModeler extends WSDLModelerBase {
         //copy the response blocks from the sync operation
         Iterator blocks = info.operation.getResponse().getBodyBlocks();
 
-        while(blocks.hasNext()){
+        while (blocks.hasNext()) {
             response.addBodyBlock(blocks.next());
         }
 
         blocks = info.operation.getResponse().getHeaderBlocks();
-        while(blocks.hasNext()){
+        while (blocks.hasNext()) {
             response.addHeaderBlock(blocks.next());
         }
 
         blocks = info.operation.getResponse().getAttachmentBlocks();
-        while(blocks.hasNext()){
+        while (blocks.hasNext()) {
             response.addAttachmentBlock(blocks.next());
         }
 
@@ -1061,37 +1083,40 @@ public class WSDLModeler extends WSDLModelerBase {
         // handle headers
         int numOfOutMsgParts = outputParts.size();
 
-        if(isRequestResponse){
-            if(numOfOutMsgParts == 1){
+        if (isRequestResponse) {
+            if (numOfOutMsgParts == 1) {
                 MessagePart part = outputParts.get(0);
-                if(isOperationDocumentLiteral(styleAndUse)){
-                    JAXBType type = getJAXBType(part.getDescriptor());
+                if (isOperationDocumentLiteral(styleAndUse)) {
+                    JAXBType type = getJAXBType(part);
                     operation.setResponseBean(type);
-                }else if(isOperationRpcLiteral(styleAndUse)){
+                } else if (isOperationRpcLiteral(styleAndUse)) {
                     String operationName = info.bindingOperation.getName();
                     Block resBlock = null;
                     if (isRequestResponse && outputMessage != null) {
                         resBlock = info.operation.getResponse().getBodyBlocksMap().get(new QName(getResponseNamespaceURI(soapResponseBody),
                                 operationName + "Response"));
                     }
-                    RpcLitStructure resBean = (resBlock == null) ? null : (RpcLitStructure)resBlock.getType();
+                    RpcLitStructure resBean = (resBlock == null) ? null : (RpcLitStructure) resBlock.getType();
                     List members = resBean.getRpcLitMembers();
 
                     operation.setResponseBean(members.get(0));
                 }
-            }else{
+            } else {
                 //create response bean
                 String nspace = "";
-                QName responseBeanName = new QName(nspace,getAsyncOperationName(info.operation) +"Response");
-                JAXBType responseBeanType = getJAXBType(responseBeanName);
+                QName responseBeanName = new QName(nspace, getAsyncOperationName(info.operation) + "Response");
+                JAXBType responseBeanType = jaxbModelBuilder.getJAXBType(responseBeanName);
+                if(responseBeanType == null){
+                    error(info.operation.getEntity(), ModelerMessages.WSDLMODELER_RESPONSEBEAN_NOTFOUND(info.operation.getName()));
+                }
                 operation.setResponseBean(responseBeanType);
             }
         }
-        QName respBeanName = new QName(soapResponseBody.getNamespace(),getAsyncOperationName(info.operation)+"Response");
-        Block block = new Block(respBeanName, operation.getResponseBeanType());
+        QName respBeanName = new QName(soapResponseBody.getNamespace(), getAsyncOperationName(info.operation) + "Response");
+        Block block = new Block(respBeanName, operation.getResponseBeanType(), outputMessage);
         JavaType respJavaType = operation.getResponseBeanJavaType();
         JAXBType respType = new JAXBType(respBeanName, respJavaType);
-        Parameter respParam = ModelerUtils.createParameter(info.operation.getName()+"Response", respType, block);
+        Parameter respParam = ModelerUtils.createParameter(info.operation.getName() + "Response", respType, block);
         respParam.setParameterIndex(-1);
         response.addParameter(respParam);
         operation.setProperty(WSDL_RESULT_PARAMETER, respParam.getName());
@@ -1099,15 +1124,15 @@ public class WSDLModeler extends WSDLModelerBase {
 
         List definitiveParameterList = new ArrayList();
         int parameterOrderPosition = 0;
-        for (String name: parameterList) {
+        for (String name : parameterList) {
             Parameter inParameter = null;
 
             inParameter = ModelerUtils.getParameter(name, inParameters);
-            if(inParameter == null){
-                if(extensions)
-                    warn("wsdlmodeler.warning.ignoringOperation.partNotFound", new Object[]{info.operation.getName().getLocalPart(), name});
+            if (inParameter == null) {
+                if (options.isExtensionMode())
+                    warning(info.operation.getEntity(), ModelerMessages.WSDLMODELER_WARNING_IGNORING_OPERATION_PART_NOT_FOUND(info.operation.getName().getLocalPart(), name));
                 else
-                    fail("wsdlmodeler.error.partNotFound", new Object[]{info.operation.getName().getLocalPart(), name});
+                    error(info.operation.getEntity(), ModelerMessages.WSDLMODELER_ERROR_PART_NOT_FOUND(info.operation.getName().getLocalPart(), name));
                 return null;
             }
             request.addParameter(inParameter);
@@ -1121,7 +1146,7 @@ public class WSDLModeler extends WSDLModelerBase {
         }
 
         //  add callback handlerb Parameter to request
-        if(operation.getAsyncType().equals(AsyncOperationType.CALLBACK)){
+        if (operation.getAsyncType().equals(AsyncOperationType.CALLBACK)) {
             JavaType cbJavaType = operation.getCallBackType();
             JAXBType callbackType = new JAXBType(respBeanName, cbJavaType);
             Parameter cbParam = ModelerUtils.createParameter("asyncHandler", callbackType, block);
@@ -1133,52 +1158,52 @@ public class WSDLModeler extends WSDLModelerBase {
         return operation;
     }
 
-    protected boolean isAsync(com.sun.tools.internal.ws.wsdl.document.PortType portType, com.sun.tools.internal.ws.wsdl.document.Operation wsdlOperation){
+    protected boolean isAsync(com.sun.tools.internal.ws.wsdl.document.PortType portType, com.sun.tools.internal.ws.wsdl.document.Operation wsdlOperation) {
         //First look into wsdl:operation
-        JAXWSBinding jaxwsCustomization = (JAXWSBinding)getExtensionOfType(wsdlOperation, JAXWSBinding.class);
-        Boolean isAsync = (jaxwsCustomization != null)?jaxwsCustomization.isEnableAsyncMapping():null;
+        JAXWSBinding jaxwsCustomization = (JAXWSBinding) getExtensionOfType(wsdlOperation, JAXWSBinding.class);
+        Boolean isAsync = (jaxwsCustomization != null) ? jaxwsCustomization.isEnableAsyncMapping() : null;
 
-        if(isAsync != null)
+        if (isAsync != null)
             return isAsync;
 
         // then into wsdl:portType
         QName portTypeName = new QName(portType.getDefining().getTargetNamespaceURI(), portType.getName());
-        if(portTypeName != null){
-            jaxwsCustomization = (JAXWSBinding)getExtensionOfType(portType, JAXWSBinding.class);
-            isAsync = (jaxwsCustomization != null)?jaxwsCustomization.isEnableAsyncMapping():null;
-            if(isAsync != null)
+        if (portTypeName != null) {
+            jaxwsCustomization = (JAXWSBinding) getExtensionOfType(portType, JAXWSBinding.class);
+            isAsync = (jaxwsCustomization != null) ? jaxwsCustomization.isEnableAsyncMapping() : null;
+            if (isAsync != null)
                 return isAsync;
         }
 
         //then wsdl:definitions
-        jaxwsCustomization = (JAXWSBinding)getExtensionOfType(document.getDefinitions(), JAXWSBinding.class);
-        isAsync = (jaxwsCustomization != null)?jaxwsCustomization.isEnableAsyncMapping():null;
-        if(isAsync != null)
+        jaxwsCustomization = (JAXWSBinding) getExtensionOfType(document.getDefinitions(), JAXWSBinding.class);
+        isAsync = (jaxwsCustomization != null) ? jaxwsCustomization.isEnableAsyncMapping() : null;
+        if (isAsync != null)
             return isAsync;
         return false;
     }
 
-    protected void handleLiteralSOAPHeaders(Request request, Response response, Iterator headerParts, Set duplicateNames, List definitiveParameterList, boolean processRequest) {
+    protected void handleLiteralSOAPHeaders(Request request, Response response, Iterator headerParts, Set duplicateNames, List definitiveParameterList, boolean processRequest) {
         QName headerName = null;
         Block headerBlock = null;
         JAXBType jaxbType = null;
         int parameterOrderPosition = definitiveParameterList.size();
-        while(headerParts.hasNext()){
-            MessagePart part = (MessagePart)headerParts.next();
+        while (headerParts.hasNext()) {
+            MessagePart part = (MessagePart) headerParts.next();
             headerName = part.getDescriptor();
-            jaxbType = getJAXBType(headerName);
-            headerBlock = new Block(headerName, jaxbType);
-            Extensible ext;
-            if(processRequest){
+            jaxbType = getJAXBType(part);
+            headerBlock = new Block(headerName, jaxbType, part);
+            TWSDLExtensible ext;
+            if (processRequest) {
                 ext = info.bindingOperation.getInput();
-            }else{
+            } else {
                 ext = info.bindingOperation.getOutput();
             }
             Message headerMessage = getHeaderMessage(part, ext);
 
-            if(processRequest){
+            if (processRequest) {
                 request.addHeaderBlock(headerBlock);
-            }else{
+            } else {
                 response.addHeaderBlock(headerBlock);
             }
 
@@ -1192,7 +1217,7 @@ public class WSDLModeler extends WSDLModelerBase {
                 if (definitiveParameterList != null) {
                     for (Iterator iterInParams = definitiveParameterList.iterator(); iterInParams.hasNext();) {
                         String inParamName =
-                            (String)iterInParams.next();
+                                (String) iterInParams.next();
                         if (inParamName.equals(parameter.getName())) {
                             Parameter inParam = request.getParameterByName(inParamName);
                             parameter.setLinkedParameter(inParam);
@@ -1212,142 +1237,127 @@ public class WSDLModeler extends WSDLModelerBase {
 
     }
 
-    protected void handleLiteralSOAPFault(Response response, Set duplicateNames){
-        for (Iterator iter = info.bindingOperation.faults(); iter.hasNext();){
-            BindingFault bindingFault = (BindingFault)iter.next();
+    protected void handleLiteralSOAPFault(Response response, Set duplicateNames) {
+        for (BindingFault bindingFault : info.bindingOperation.faults()) {
             com.sun.tools.internal.ws.wsdl.document.Fault portTypeFault = null;
-            for(Iterator iter2 = info.portTypeOperation.faults(); iter2.hasNext();){
-                com.sun.tools.internal.ws.wsdl.document.Fault aFault =
-                    (com.sun.tools.internal.ws.wsdl.document.Fault)iter2.next();
-                if(aFault.getName().equals(bindingFault.getName())){
-                    if(portTypeFault != null){
+            for (com.sun.tools.internal.ws.wsdl.document.Fault aFault : info.portTypeOperation.faults()) {
+                if (aFault.getName().equals(bindingFault.getName())) {
+                    if (portTypeFault != null) {
                         // the WSDL document is invalid, a wsld:fault in a wsdl:operation of a portType can be bound only once
-                        throw new ModelerException("wsdlmodeler.invalid.bindingFault.notUnique",
-                                new Object[]{bindingFault.getName(), info.bindingOperation.getName()});
+                        error(portTypeFault, ModelerMessages.WSDLMODELER_INVALID_BINDING_FAULT_NOT_UNIQUE(bindingFault.getName(), info.bindingOperation.getName()));
                     }
                     portTypeFault = aFault;
                 }
             }
 
             // The WSDL document is invalid, the wsdl:fault in abstract operation is does not have any binding
-            if(portTypeFault == null){
-                throw new ModelerException("wsdlmodeler.invalid.bindingFault.notFound",
-                        new Object[] {bindingFault.getName(), info.bindingOperation.getName()});
+            if (portTypeFault == null) {
+                error(bindingFault, ModelerMessages.WSDLMODELER_INVALID_BINDING_FAULT_NOT_FOUND(bindingFault.getName(), info.bindingOperation.getName()));
 
             }
 
             // wsdl:fault message name is used to create the java exception name later on
             String faultName = getFaultClassName(portTypeFault);
-            Fault fault = new Fault(faultName);
+            Fault fault = new Fault(faultName, portTypeFault);
+            fault.setWsdlFaultName(portTypeFault.getName());
             setDocumentationIfPresent(fault, portTypeFault.getDocumentation());
 
             //get the soapbind:fault from wsdl:fault in the binding
-            SOAPFault soapFault = (SOAPFault)getExtensionOfType(bindingFault, SOAPFault.class);
+            SOAPFault soapFault = (SOAPFault) getExtensionOfType(bindingFault, SOAPFault.class);
 
             // The WSDL document is invalid, can't have wsdl:fault without soapbind:fault
-            if(soapFault == null){
-                throw new ModelerException("wsdlmodeler.invalid.bindingFault.outputMissingSoapFault",
-                    new Object[]{bindingFault.getName(), info.bindingOperation.getName()});
+            if (soapFault == null) {
+                if(options.isExtensionMode()){
+                    warning(bindingFault, ModelerMessages.WSDLMODELER_INVALID_BINDING_FAULT_OUTPUT_MISSING_SOAP_FAULT(bindingFault.getName(), info.bindingOperation.getName()));
+                    soapFault = new SOAPFault(new LocatorImpl());
+                }else{
+                    error(bindingFault, ModelerMessages.WSDLMODELER_INVALID_BINDING_FAULT_OUTPUT_MISSING_SOAP_FAULT(bindingFault.getName(), info.bindingOperation.getName()));
+                }
             }
 
             //the soapbind:fault must have use="literal" or no use attribute, in that case its assumed "literal"
-            if(!soapFault.isLiteral()){
-                if(extensions)
-                warn("wsdlmodeler.warning.ignoringFault.notLiteral",
-                    new Object[]{bindingFault.getName(), info.bindingOperation.getName()});
+            if (!soapFault.isLiteral()) {
+                if (options.isExtensionMode())
+                    warning(soapFault, ModelerMessages.WSDLMODELER_WARNING_IGNORING_FAULT_NOT_LITERAL(bindingFault.getName(), info.bindingOperation.getName()));
                 else
-                    fail("wsdlmodeler.invalid.operation.fault.notLiteral",
-                            new Object[]{bindingFault.getName(), info.bindingOperation.getName()});
+                    error(soapFault, ModelerMessages.WSDLMODELER_INVALID_OPERATION_FAULT_NOT_LITERAL(bindingFault.getName(), info.bindingOperation.getName()));
                 continue;
             }
 
             // the soapFault name must be present
-            if(soapFault.getName() == null){
-                warn("wsdlmodeler.invalid.bindingFault.noSoapFaultName",
-                    new Object[]{bindingFault.getName(), info.bindingOperation.getName()});
-            }else if (!soapFault.getName().equals(bindingFault.getName())) {
-                // the soapFault name must match bindingFault name
-                warn("wsdlmodeler.invalid.bindingFault.wrongSoapFaultName",
-                    new Object[]{soapFault.getName(), bindingFault.getName(), info.bindingOperation.getName()});
-            }else if(soapFault.getNamespace() != null){
-                // bug fix: 4852729
-                warn("wsdlmodeler.warning.r2716r2726",
-                    new Object[] { "soapbind:fault", soapFault.getName()});
+            if (soapFault.getName() == null) {
+                warning(bindingFault, ModelerMessages.WSDLMODELER_INVALID_BINDING_FAULT_NO_SOAP_FAULT_NAME(bindingFault.getName(), info.bindingOperation.getName()));
+            } else if (!soapFault.getName().equals(bindingFault.getName())) {
+                warning(soapFault, ModelerMessages.WSDLMODELER_INVALID_BINDING_FAULT_WRONG_SOAP_FAULT_NAME(soapFault.getName(), bindingFault.getName(), info.bindingOperation.getName()));
+            } else if (soapFault.getNamespace() != null) {
+                warning(soapFault, ModelerMessages.WSDLMODELER_WARNING_R_2716_R_2726("soapbind:fault", soapFault.getName()));
             }
 
             String faultNamespaceURI = soapFault.getNamespace();
-            if(faultNamespaceURI == null){
+            if (faultNamespaceURI == null) {
                 faultNamespaceURI = portTypeFault.getMessage().getNamespaceURI();
             }
 
             com.sun.tools.internal.ws.wsdl.document.Message faultMessage = portTypeFault.resolveMessage(info.document);
             Iterator iter2 = faultMessage.parts();
-            if(!iter2.hasNext()){
+            if (!iter2.hasNext()) {
                 // the WSDL document is invalid
-                throw new ModelerException("wsdlmodeler.invalid.bindingFault.emptyMessage",
-                    new Object[]{bindingFault.getName(), faultMessage.getName()});
+                error(faultMessage, ModelerMessages.WSDLMODELER_INVALID_BINDING_FAULT_EMPTY_MESSAGE(bindingFault.getName(), faultMessage.getName()));
             }
-            MessagePart faultPart = (MessagePart)iter2.next();
+            MessagePart faultPart = (MessagePart) iter2.next();
             QName faultQName = faultPart.getDescriptor();
 
             // Don't include fault messages with non-unique soap:fault names
             if (duplicateNames.contains(faultQName)) {
-                warn("wsdlmodeler.duplicate.fault.soap.name",
-                    new Object[] {bindingFault.getName(), info.portTypeOperation.getName(), faultPart.getName()});
+                warning(faultPart, ModelerMessages.WSDLMODELER_DUPLICATE_FAULT_SOAP_NAME(bindingFault.getName(), info.portTypeOperation.getName(), faultPart.getName()));
                 continue;
             }
 
             if (iter2.hasNext()) {
                 // the WSDL document is invalid
-                throw new ModelerException("wsdlmodeler.invalid.bindingFault.messageHasMoreThanOnePart",
-                    new Object[]{bindingFault.getName(), faultMessage.getName()});
+                error(faultMessage, ModelerMessages.WSDLMODELER_INVALID_BINDING_FAULT_MESSAGE_HAS_MORE_THAN_ONE_PART(bindingFault.getName(), faultMessage.getName()));
             }
 
             if (faultPart.getDescriptorKind() != SchemaKinds.XSD_ELEMENT) {
-                throw new ModelerException("wsdlmodeler.invalid.message.partMustHaveElementDescriptor",
-                    new Object[]{faultMessage.getName(), faultPart.getName()});
+                error(faultPart, ModelerMessages.WSDLMODELER_INVALID_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(faultMessage.getName(), faultPart.getName()));
             }
 
-            JAXBType jaxbType = getJAXBType(faultPart.getDescriptor());
+            JAXBType jaxbType = getJAXBType(faultPart);
 
             fault.setElementName(faultPart.getDescriptor());
-            fault.setJavaMemberName(getEnvironment().getNames().getExceptionClassMemberName());
+            fault.setJavaMemberName(Names.getExceptionClassMemberName());
 
-            Block faultBlock = new Block(faultQName, jaxbType);
+            Block faultBlock = new Block(faultQName, jaxbType, faultPart);
             fault.setBlock(faultBlock);
-            createParentFault(fault);
-            createSubfaults(fault);
-            if(!response.getFaultBlocksMap().containsKey(faultBlock.getName()))
+            //createParentFault(fault);
+            //createSubfaults(fault);
+            if (!response.getFaultBlocksMap().containsKey(faultBlock.getName()))
                 response.addFaultBlock(faultBlock);
             info.operation.addFault(fault);
         }
     }
 
-    /**
-     * @param portTypeFault
-     * @return
-     */
     private String getFaultClassName(com.sun.tools.internal.ws.wsdl.document.Fault portTypeFault) {
-        JAXWSBinding jaxwsBinding = (JAXWSBinding)getExtensionOfType(portTypeFault, JAXWSBinding.class);
-        if(jaxwsBinding != null){
+        JAXWSBinding jaxwsBinding = (JAXWSBinding) getExtensionOfType(portTypeFault, JAXWSBinding.class);
+        if (jaxwsBinding != null) {
             CustomName className = jaxwsBinding.getClassName();
-            if(className != null){
+            if (className != null) {
                 return className.getName();
             }
         }
         return portTypeFault.getMessage().getLocalPart();
     }
 
-    protected  boolean setMessagePartsBinding(StyleAndUse styleAndUse){
+    protected boolean setMessagePartsBinding(StyleAndUse styleAndUse) {
         SOAPBody inBody = getSOAPRequestBody();
         Message inMessage = getInputMessage();
-        if(!setMessagePartsBinding(inBody, inMessage, styleAndUse, true))
+        if (!setMessagePartsBinding(inBody, inMessage, styleAndUse, true))
             return false;
 
-        if(isRequestResponse()){
+        if (isRequestResponse()) {
             SOAPBody outBody = getSOAPResponseBody();
             Message outMessage = getOutputMessage();
-            if(!setMessagePartsBinding(outBody, outMessage, styleAndUse, false))
+            if (!setMessagePartsBinding(outBody, outMessage, styleAndUse, false))
                 return false;
         }
         return true;
@@ -1362,10 +1372,10 @@ public class WSDLModeler extends WSDLModelerBase {
         List headerParts = null;
         List bodyParts = getBodyParts(body, message);
 
-        if(isInput){
+        if (isInput) {
             headerParts = getHeaderPartsFromMessage(message, isInput);
             mimeParts = getMimeContentParts(message, info.bindingOperation.getInput());
-        }else{
+        } else {
             headerParts = getHeaderPartsFromMessage(message, isInput);
             mimeParts = getMimeContentParts(message, info.bindingOperation.getOutput());
         }
@@ -1377,65 +1387,61 @@ public class WSDLModeler extends WSDLModelerBase {
 
         //if soap:body parts attribute not there, then all unbounded message parts will
         // belong to the soap body
-        if(bodyParts == null){
+        if (bodyParts == null) {
             bodyParts = new ArrayList();
-            for(Iterator iter = message.parts();iter.hasNext();) {
+            for (Iterator iter = message.parts(); iter.hasNext();) {
                 MessagePart mPart = iter.next();
                 //Its a safe assumption that the parts in the message not belonging to header or mime will
                 // belong to the body?
-                if(mimeParts.contains(mPart) || headerParts.contains(mPart) || boundToFault(mPart.getName())){
+                if (mimeParts.contains(mPart) || headerParts.contains(mPart) || boundToFault(mPart.getName())) {
                     //throw error that a part cant be bound multiple times, not ignoring operation, if there
                     //is conflict it will fail latter
-                    if(extensions)
-                        warn("wsdlmodeler.warning.bindingOperation.multiplePartBinding",
-                                new Object[]{info.bindingOperation.getName(), mPart.getName()});
+                    if (options.isExtensionMode())
+                        warning(mPart, ModelerMessages.WSDLMODELER_WARNING_BINDING_OPERATION_MULTIPLE_PART_BINDING(info.bindingOperation.getName(), mPart.getName()));
                     else
-                        fail("wsdlmodeler.invalid.bindingOperation.multiplePartBinding",
-                                new Object[]{info.bindingOperation.getName(), mPart.getName()});
+                        error(mPart, ModelerMessages.WSDLMODELER_INVALID_BINDING_OPERATION_MULTIPLE_PART_BINDING(info.bindingOperation.getName(), mPart.getName()));
                 }
                 bodyParts.add(mPart);
             }
         }
 
         //now build the final parts list with header, mime parts and body parts
-        for(Iterator iter = message.parts();iter.hasNext();) {
-            MessagePart mPart = (MessagePart)iter.next();
-            if(mimeParts.contains(mPart)) {
+        for (Iterator iter = message.parts(); iter.hasNext();) {
+            MessagePart mPart = (MessagePart) iter.next();
+            if (mimeParts.contains(mPart)) {
                 mPart.setBindingExtensibilityElementKind(MessagePart.WSDL_MIME_BINDING);
                 parts.add(mPart);
-            }else if(headerParts.contains(mPart)) {
+            } else if (headerParts.contains(mPart)) {
                 mPart.setBindingExtensibilityElementKind(MessagePart.SOAP_HEADER_BINDING);
                 parts.add(mPart);
-            }else if(bodyParts.contains(mPart)) {
+            } else if (bodyParts.contains(mPart)) {
                 mPart.setBindingExtensibilityElementKind(MessagePart.SOAP_BODY_BINDING);
                 parts.add(mPart);
-            }else{
+            } else {
                 mPart.setBindingExtensibilityElementKind(MessagePart.PART_NOT_BOUNDED);
             }
         }
 
-        if(isOperationDocumentLiteral(styleAndUse) && bodyParts.size() > 1){
-            if(extensions)
-                warn("wsdlmodeler.warning.operation.MoreThanOnePartInMessage",
-                            info.portTypeOperation.getName());
+        if (isOperationDocumentLiteral(styleAndUse) && bodyParts.size() > 1) {
+            if (options.isExtensionMode())
+                warning(message, ModelerMessages.WSDLMODELER_WARNING_OPERATION_MORE_THAN_ONE_PART_IN_MESSAGE(info.portTypeOperation.getName()));
             else
-                fail("wsdlmodeler.invalid.operation.MoreThanOnePartInMessage", info.portTypeOperation.getName());
+                error(message, ModelerMessages.WSDLMODELER_INVALID_OPERATION_MORE_THAN_ONE_PART_IN_MESSAGE(info.portTypeOperation.getName()));
             return false;
         }
         return true;
     }
 
-    private boolean boundToFault(String partName){
-        for (Iterator iter = info.bindingOperation.faults(); iter.hasNext();){
-            BindingFault bindingFault = (BindingFault)iter.next();
-            if(partName.equals(bindingFault.getName()))
+    private boolean boundToFault(String partName) {
+        for (BindingFault bindingFault : info.bindingOperation.faults()) {
+            if (partName.equals(bindingFault.getName()))
                 return true;
         }
         return false;
     }
 
     //get MessagePart(s) referenced by parts attribute of soap:body element
-    private List getBodyParts(SOAPBody body, Message message){
+    private List getBodyParts(SOAPBody body, Message message) {
         String bodyParts = body.getParts();
         if (bodyParts != null) {
             List partsList = new ArrayList();
@@ -1444,9 +1450,7 @@ public class WSDLModeler extends WSDLModelerBase {
                 String part = in.nextToken();
                 MessagePart mPart = message.getPart(part);
                 if (null == mPart) {
-                    throw new ModelerException(
-                        "wsdlmodeler.error.partsNotFound",
-                        new Object[] { part, message.getName()});
+                    error(message, ModelerMessages.WSDLMODELER_ERROR_PARTS_NOT_FOUND(part, message.getName()));
                 }
                 mPart.setBindingExtensibilityElementKind(MessagePart.SOAP_BODY_BINDING);
                 partsList.add(mPart);
@@ -1456,22 +1460,22 @@ public class WSDLModeler extends WSDLModelerBase {
         return null;
     }
 
-    private List getHeaderPartsFromMessage(Message message, boolean isInput){
+    private List getHeaderPartsFromMessage(Message message, boolean isInput) {
         List headerParts = new ArrayList();
         Iterator parts = message.parts();
         List headers = getHeaderParts(isInput);
-        while(parts.hasNext()){
+        while (parts.hasNext()) {
             MessagePart part = parts.next();
-            if(headers.contains(part)){
+            if (headers.contains(part)) {
                 headerParts.add(part);
             }
         }
         return headerParts;
     }
 
-    private Message getHeaderMessage(MessagePart part, Extensible ext) {
-        Iterator headers =  getHeaderExtensions(ext).iterator();
-        while(headers.hasNext()){
+    private Message getHeaderMessage(MessagePart part, TWSDLExtensible ext) {
+        Iterator headers = getHeaderExtensions(ext).iterator();
+        while (headers.hasNext()) {
             SOAPHeader header = headers.next();
             if (!header.isLiteral())
                 continue;
@@ -1480,19 +1484,19 @@ public class WSDLModeler extends WSDLModelerBase {
                 continue;
 
             MessagePart headerPart = headerMessage.getPart(header.getPart());
-            if(headerPart == part)
+            if (headerPart == part)
                 return headerMessage;
         }
         return null;
     }
 
-    private List getHeaderPartsNotFromMessage(Message message, boolean isInput){
+    private List getHeaderPartsNotFromMessage(Message message, boolean isInput) {
         List headerParts = new ArrayList();
         List parts = message.getParts();
         Iterator headers = getHeaderParts(isInput).iterator();
-        while(headers.hasNext()){
+        while (headers.hasNext()) {
             MessagePart part = headers.next();
-            if(!parts.contains(part)){
+            if (!parts.contains(part)) {
                 headerParts.add(part);
             }
         }
@@ -1500,40 +1504,35 @@ public class WSDLModeler extends WSDLModelerBase {
     }
 
     private List getHeaderParts(boolean isInput) {
-        Extensible ext;
-        if(isInput){
+        TWSDLExtensible ext;
+        if (isInput) {
             ext = info.bindingOperation.getInput();
-        }else{
+        } else {
             ext = info.bindingOperation.getOutput();
         }
 
         List parts = new ArrayList();
-        Iterator headers =  getHeaderExtensions(ext).iterator();
-        while(headers.hasNext()){
+        Iterator headers = getHeaderExtensions(ext).iterator();
+        while (headers.hasNext()) {
             SOAPHeader header = headers.next();
-            if (!header.isLiteral()){
-                fail("wsdlmodeler.invalid.header.notLiteral",
-                        new Object[] {header.getPart(), info.bindingOperation.getName()});
+            if (!header.isLiteral()) {
+                error(header, ModelerMessages.WSDLMODELER_INVALID_HEADER_NOT_LITERAL(header.getPart(), info.bindingOperation.getName()));
             }
 
-            if (header.getNamespace() != null){
-                warn("wsdlmodeler.warning.r2716r2726",
-                        new Object[]{"soapbind:header", info.bindingOperation.getName()});
+            if (header.getNamespace() != null) {
+                warning(header, ModelerMessages.WSDLMODELER_WARNING_R_2716_R_2726("soapbind:header", info.bindingOperation.getName()));
             }
             com.sun.tools.internal.ws.wsdl.document.Message headerMessage = findMessage(header.getMessage(), info);
-            if (headerMessage == null){
-                fail("wsdlmodeler.invalid.header.cant.resolve.message",
-                        new Object[]{header.getMessage(), info.bindingOperation.getName()});
+            if (headerMessage == null) {
+                error(header, ModelerMessages.WSDLMODELER_INVALID_HEADER_CANT_RESOLVE_MESSAGE(header.getMessage(), info.bindingOperation.getName()));
             }
 
             MessagePart part = headerMessage.getPart(header.getPart());
-            if (part == null){
-                fail("wsdlmodeler.invalid.header.notFound",
-                        new Object[]{header.getPart(), info.bindingOperation.getName()});
+            if (part == null) {
+                error(header, ModelerMessages.WSDLMODELER_INVALID_HEADER_NOT_FOUND(header.getPart(), info.bindingOperation.getName()));
             }
             if (part.getDescriptorKind() != SchemaKinds.XSD_ELEMENT) {
-                fail("wsdlmodeler.invalid.header.message.partMustHaveElementDescriptor",
-                        new Object[]{part.getName(), info.bindingOperation.getName()});
+                error(part, ModelerMessages.WSDLMODELER_INVALID_HEADER_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(part.getName(), info.bindingOperation.getName()));
             }
             part.setBindingExtensibilityElementKind(MessagePart.SOAP_HEADER_BINDING);
             parts.add(part);
@@ -1541,11 +1540,11 @@ public class WSDLModeler extends WSDLModelerBase {
         return parts;
     }
 
-    private boolean isOperationDocumentLiteral(StyleAndUse styleAndUse){
+    private boolean isOperationDocumentLiteral(StyleAndUse styleAndUse) {
         return StyleAndUse.DOC_LITERAL == styleAndUse;
     }
 
-    private boolean isOperationRpcLiteral(StyleAndUse styleAndUse){
+    private boolean isOperationRpcLiteral(StyleAndUse styleAndUse) {
         return StyleAndUse.RPC_LITERAL == styleAndUse;
     }
 
@@ -1553,120 +1552,123 @@ public class WSDLModeler extends WSDLModelerBase {
      * @param part
      * @return Returns a JAXBType object
      */
-    private JAXBType getJAXBType(MessagePart part){
-        JAXBType type=null;
+    private JAXBType getJAXBType(MessagePart part) {
+        JAXBType type = null;
         QName name = part.getDescriptor();
-        if(part.getDescriptorKind().equals(SchemaKinds.XSD_ELEMENT)){
-            type = getJAXBType(name);
-        }else {
+        if (part.getDescriptorKind().equals(SchemaKinds.XSD_ELEMENT)) {
+            type = jaxbModelBuilder.getJAXBType(name);
+            if(type == null){
+                error(part, ModelerMessages.WSDLMODELER_JAXB_JAVATYPE_NOTFOUND(name, part.getName()));
+            }
+        } else {
             S2JJAXBModel jaxbModel = getJAXBModelBuilder().getJAXBModel().getS2JJAXBModel();
             TypeAndAnnotation typeAnno = jaxbModel.getJavaType(name);
-            if(typeAnno == null){
-                fail("wsdlmodeler.jaxb.javatype.notfound", new Object[]{name, part.getName()});
+            if (typeAnno == null) {
+                error(part, ModelerMessages.WSDLMODELER_JAXB_JAVATYPE_NOTFOUND(name, part.getName()));
             }
-            JavaType javaType = new  JavaSimpleType(new JAXBTypeAndAnnotation(typeAnno));
+            JavaType javaType = new JavaSimpleType(new JAXBTypeAndAnnotation(typeAnno));
             type = new JAXBType(new QName("", part.getName()), javaType);
         }
         return type;
     }
 
-    private List getDoclitParameters(Request req, Response res, List parameterList){
-        if(parameterList.size() == 0)
+    private List getDoclitParameters(Request req, Response res, List parameterList) {
+        if (parameterList.size() == 0)
             return new ArrayList();
-        List params = null;
+        List params = new ArrayList();
         Message inMsg = getInputMessage();
         Message outMsg = getOutputMessage();
         boolean unwrappable = isUnwrappable();
         List outParams = null;
         int pIndex = 0;
-        for(MessagePart part:parameterList){
+        for (MessagePart part : parameterList) {
             QName reqBodyName = part.getDescriptor();
             JAXBType jaxbType = getJAXBType(part);
-            Block block = new Block(reqBodyName, jaxbType);
-            if(unwrappable){
+            Block block = new Block(reqBodyName, jaxbType, part);
+            if (unwrappable) {
                 //So build body and header blocks and set to request and response
                 JAXBStructuredType jaxbStructType = ModelerUtils.createJAXBStructureType(jaxbType);
-                block = new Block(reqBodyName, jaxbStructType);
-                if(ModelerUtils.isBoundToSOAPBody(part)){
-                    if(part.isIN()){
+                block = new Block(reqBodyName, jaxbStructType, part);
+                if (ModelerUtils.isBoundToSOAPBody(part)) {
+                    if (part.isIN()) {
                         req.addBodyBlock(block);
-                    }else if(part.isOUT()){
+                    } else if (part.isOUT()) {
                         res.addBodyBlock(block);
-                    }else if(part.isINOUT()){
+                    } else if (part.isINOUT()) {
                         req.addBodyBlock(block);
                         res.addBodyBlock(block);
                     }
-                }else if(ModelerUtils.isUnbound(part)){
-                    if(part.isIN())
+                } else if (ModelerUtils.isUnbound(part)) {
+                    if (part.isIN())
                         req.addUnboundBlock(block);
-                    else if(part.isOUT())
+                    else if (part.isOUT())
                         res.addUnboundBlock(block);
-                    else if(part.isINOUT()){
+                    else if (part.isINOUT()) {
                         req.addUnboundBlock(block);
                         res.addUnboundBlock(block);
                     }
 
                 }
-                if(part.isIN() || part.isINOUT()){
+                if (part.isIN() || part.isINOUT()) {
                     params = ModelerUtils.createUnwrappedParameters(jaxbStructType, block);
                     int index = 0;
-                    Mode mode = (part.isINOUT())?Mode.INOUT:Mode.IN;
-                    for(Parameter param: params){
+                    Mode mode = part.isINOUT() ? Mode.INOUT : Mode.IN;
+                    for (Parameter param : params) {
                         param.setParameterIndex(index++);
                         param.setMode(mode);
                         setCustomizedParameterName(info.portTypeOperation, inMsg, part, param, unwrappable);
                     }
-                }else if(part.isOUT()){
+                } else if (part.isOUT()) {
                     outParams = ModelerUtils.createUnwrappedParameters(jaxbStructType, block);
-                    for(Parameter param: outParams){
+                    for (Parameter param : outParams) {
                         param.setMode(Mode.OUT);
                         setCustomizedParameterName(info.portTypeOperation, outMsg, part, param, unwrappable);
                     }
                 }
-            }else{
-                if(ModelerUtils.isBoundToSOAPBody(part)){
-                    if(part.isIN()){
+            } else {
+                if (ModelerUtils.isBoundToSOAPBody(part)) {
+                    if (part.isIN()) {
                         req.addBodyBlock(block);
-                    }else if(part.isOUT()){
+                    } else if (part.isOUT()) {
                         res.addBodyBlock(block);
-                    }else if(part.isINOUT()){
+                    } else if (part.isINOUT()) {
                         req.addBodyBlock(block);
                         res.addBodyBlock(block);
                     }
-                }else if(ModelerUtils.isBoundToSOAPHeader(part)){
-                    if(part.isIN()){
+                } else if (ModelerUtils.isBoundToSOAPHeader(part)) {
+                    if (part.isIN()) {
                         req.addHeaderBlock(block);
-                    }else if(part.isOUT()){
+                    } else if (part.isOUT()) {
                         res.addHeaderBlock(block);
-                    }else if(part.isINOUT()){
+                    } else if (part.isINOUT()) {
                         req.addHeaderBlock(block);
                         res.addHeaderBlock(block);
                     }
-                }else if(ModelerUtils.isBoundToMimeContent(part)){
+                } else if (ModelerUtils.isBoundToMimeContent(part)) {
                     List mimeContents = null;
 
-                    if(part.isIN()){
+                    if (part.isIN()) {
                         mimeContents = getMimeContents(info.bindingOperation.getInput(),
-                                        getInputMessage(), part.getName());
+                                getInputMessage(), part.getName());
                         jaxbType = getAttachmentType(mimeContents, part);
-                        block = new Block(jaxbType.getName(), jaxbType);
+                        block = new Block(jaxbType.getName(), jaxbType, part);
                         req.addAttachmentBlock(block);
-                    }else if(part.isOUT()){
+                    } else if (part.isOUT()) {
                         mimeContents = getMimeContents(info.bindingOperation.getOutput(),
-                                        getOutputMessage(), part.getName());
+                                getOutputMessage(), part.getName());
                         jaxbType = getAttachmentType(mimeContents, part);
-                        block = new Block(jaxbType.getName(), jaxbType);
+                        block = new Block(jaxbType.getName(), jaxbType, part);
                         res.addAttachmentBlock(block);
-                    }else if(part.isINOUT()){
+                    } else if (part.isINOUT()) {
                         mimeContents = getMimeContents(info.bindingOperation.getInput(),
-                                        getInputMessage(), part.getName());
+                                getInputMessage(), part.getName());
                         jaxbType = getAttachmentType(mimeContents, part);
-                        block = new Block(jaxbType.getName(), jaxbType);
+                        block = new Block(jaxbType.getName(), jaxbType, part);
                         req.addAttachmentBlock(block);
                         res.addAttachmentBlock(block);
 
                         mimeContents = getMimeContents(info.bindingOperation.getOutput(),
-                                        getOutputMessage(), part.getName());
+                                getOutputMessage(), part.getName());
                         JAXBType outJaxbType = getAttachmentType(mimeContents, part);
 
                         String inType = jaxbType.getJavaType().getType().getName();
@@ -1674,70 +1676,66 @@ public class WSDLModeler extends WSDLModelerBase {
 
                         TypeAndAnnotation inTa = jaxbType.getJavaType().getType().getTypeAnn();
                         TypeAndAnnotation outTa = outJaxbType.getJavaType().getType().getTypeAnn();
-                        if((((inTa != null) && (outTa != null) && inTa.equals(outTa))) && !inType.equals(outType)){
+                        if ((((inTa != null) && (outTa != null) && inTa.equals(outTa))) && !inType.equals(outType)) {
                             String javaType = "javax.activation.DataHandler";
 
                             S2JJAXBModel jaxbModel = getJAXBModelBuilder().getJAXBModel().getS2JJAXBModel();
-                            JCodeModel cm = jaxbModel.generateCode(null,
-                                        new ConsoleErrorReporter(getEnvironment(), false));
-                            JType jt= null;
-                            jt = cm.ref(javaType);
+                            //JCodeModel cm = jaxbModel.generateCode(null, errReceiver);
+                            JType jt = null;
+                            jt = options.getCodeModel().ref(javaType);
                             JAXBTypeAndAnnotation jaxbTa = jaxbType.getJavaType().getType();
                             jaxbTa.setType(jt);
                         }
                     }
-                }else if(ModelerUtils.isUnbound(part)){
-                    if(part.isIN()){
+                } else if (ModelerUtils.isUnbound(part)) {
+                    if (part.isIN()) {
                         req.addUnboundBlock(block);
-                    }else if(part.isOUT()){
+                    } else if (part.isOUT()) {
                         res.addUnboundBlock(block);
-                    }else if(part.isINOUT()){
+                    } else if (part.isINOUT()) {
                         req.addUnboundBlock(block);
                         res.addUnboundBlock(block);
                     }
                 }
-                if(params == null)
-                    params = new ArrayList();
                 Parameter param = ModelerUtils.createParameter(part.getName(), jaxbType, block);
                 param.setMode(part.getMode());
-                if(part.isReturn()){
+                if (part.isReturn()) {
                     param.setParameterIndex(-1);
-                }else{
+                } else {
                     param.setParameterIndex(pIndex++);
                 }
 
-                if(part.isIN())
+                if (part.isIN())
                     setCustomizedParameterName(info.portTypeOperation, inMsg, part, param, false);
-                else if(outMsg != null)
+                else if (outMsg != null)
                     setCustomizedParameterName(info.portTypeOperation, outMsg, part, param, false);
 
                 params.add(param);
             }
         }
-        if(unwrappable && (outParams != null)){
+        if (unwrappable && (outParams != null)) {
             int index = params.size();
-            for(Parameter param:outParams){
-                if(param.getName().equals("return")){
+            for (Parameter param : outParams) {
+                if (JAXBRIContext.mangleNameToVariableName(param.getName()).equals("return")) {
                     param.setParameterIndex(-1);
-                }else{
+                } else {
                     Parameter inParam = ModelerUtils.getParameter(param.getName(), params);
-                    if((inParam != null) && inParam.isIN()){
-                        QName inElementName = ((JAXBType)inParam.getType()).getName();
-                        QName outElementName = ((JAXBType)param.getType()).getName();
+                    if ((inParam != null) && inParam.isIN()) {
+                        QName inElementName = inParam.getType().getName();
+                        QName outElementName = param.getType().getName();
                         String inJavaType = inParam.getTypeName();
                         String outJavaType = param.getTypeName();
                         TypeAndAnnotation inTa = inParam.getType().getJavaType().getType().getTypeAnn();
                         TypeAndAnnotation outTa = param.getType().getJavaType().getType().getTypeAnn();
-                        if(inElementName.getLocalPart().equals(outElementName.getLocalPart()) &&
-                                inJavaType.equals(outJavaType) &&
-                                ((inTa == null || outTa == null)||
-                                ((inTa != null) && (outTa != null) && inTa.equals(outTa)))) {
+                        if (inElementName.getLocalPart().equals(outElementName.getLocalPart()) && inJavaType.equals(outJavaType) &&
+                                (inTa == null || outTa == null || inTa.equals(outTa))) {
                             inParam.setMode(Mode.INOUT);
                             continue;
                         }
-                    }else if(outParams.size() == 1){
+                    }
+                    if (outParams.size() == 1) {
                         param.setParameterIndex(-1);
-                    }else{
+                    } else {
                         param.setParameterIndex(index++);
                     }
                 }
@@ -1747,42 +1745,42 @@ public class WSDLModeler extends WSDLModelerBase {
         return params;
     }
 
-    private List getRpcLitParameters(Request req, Response res, Block reqBlock, Block resBlock, List paramList){
+    private List getRpcLitParameters(Request req, Response res, Block reqBlock, Block resBlock, List paramList) {
         List params = new ArrayList();
         Message inMsg = getInputMessage();
         Message outMsg = getOutputMessage();
-        S2JJAXBModel jaxbModel = ((RpcLitStructure)reqBlock.getType()).getJaxbModel().getS2JJAXBModel();
-        List inParams = ModelerUtils.createRpcLitParameters(inMsg, reqBlock, jaxbModel);
+        S2JJAXBModel jaxbModel = ((RpcLitStructure) reqBlock.getType()).getJaxbModel().getS2JJAXBModel();
+        List inParams = ModelerUtils.createRpcLitParameters(inMsg, reqBlock, jaxbModel, errReceiver);
         List outParams = null;
-        if(outMsg != null)
-            outParams = ModelerUtils.createRpcLitParameters(outMsg, resBlock, jaxbModel);
+        if (outMsg != null)
+            outParams = ModelerUtils.createRpcLitParameters(outMsg, resBlock, jaxbModel, errReceiver);
 
         //create parameters for header and mime parts
         int index = 0;
-        for(MessagePart part: paramList){
-             Parameter param = null;
-            if(ModelerUtils.isBoundToSOAPBody(part)){
-                if(part.isIN()){
+        for (MessagePart part : paramList) {
+            Parameter param = null;
+            if (ModelerUtils.isBoundToSOAPBody(part)) {
+                if (part.isIN()) {
                     param = ModelerUtils.getParameter(part.getName(), inParams);
-                }else if(outParams != null){
+                } else if (outParams != null) {
                     param = ModelerUtils.getParameter(part.getName(), outParams);
                 }
-            }else if(ModelerUtils.isBoundToSOAPHeader(part)){
+            } else if (ModelerUtils.isBoundToSOAPHeader(part)) {
                 QName headerName = part.getDescriptor();
-                JAXBType jaxbType = getJAXBType(headerName);
-                Block headerBlock = new Block(headerName, jaxbType);
+                JAXBType jaxbType = getJAXBType(part);
+                Block headerBlock = new Block(headerName, jaxbType, part);
                 param = ModelerUtils.createParameter(part.getName(), jaxbType, headerBlock);
-                if(part.isIN()){
+                if (part.isIN()) {
                     req.addHeaderBlock(headerBlock);
-                }else if(part.isOUT()){
+                } else if (part.isOUT()) {
                     res.addHeaderBlock(headerBlock);
-                }else if(part.isINOUT()){
+                } else if (part.isINOUT()) {
                     req.addHeaderBlock(headerBlock);
                     res.addHeaderBlock(headerBlock);
                 }
-            }else if(ModelerUtils.isBoundToMimeContent(part)){
+            } else if (ModelerUtils.isBoundToMimeContent(part)) {
                 List mimeContents = null;
-                if(part.isIN() || part.isINOUT())
+                if (part.isIN() || part.isINOUT())
                     mimeContents = getMimeContents(info.bindingOperation.getInput(),
                             getInputMessage(), part.getName());
                 else
@@ -1792,59 +1790,57 @@ public class WSDLModeler extends WSDLModelerBase {
                 JAXBType type = getAttachmentType(mimeContents, part);
                 //create Parameters in request or response
                 //Block mimeBlock = new Block(new QName(part.getName()), type);
-                Block mimeBlock = new Block(type.getName(), type);
+                Block mimeBlock = new Block(type.getName(), type, part);
                 param = ModelerUtils.createParameter(part.getName(), type, mimeBlock);
-                if(part.isIN()){
+                if (part.isIN()) {
                     req.addAttachmentBlock(mimeBlock);
-                }else if(part.isOUT()){
+                } else if (part.isOUT()) {
                     res.addAttachmentBlock(mimeBlock);
-                }else if(part.isINOUT()){
+                } else if (part.isINOUT()) {
                     mimeContents = getMimeContents(info.bindingOperation.getOutput(),
-                                    getOutputMessage(), part.getName());
+                            getOutputMessage(), part.getName());
                     JAXBType outJaxbType = getAttachmentType(mimeContents, part);
 
                     String inType = type.getJavaType().getType().getName();
                     String outType = outJaxbType.getJavaType().getType().getName();
-                    if(!inType.equals(outType)){
+                    if (!inType.equals(outType)) {
                         String javaType = "javax.activation.DataHandler";
-                        JCodeModel cm = jaxbModel.generateCode(null,
-                                    new ConsoleErrorReporter(getEnvironment(), false));
-                        JType jt= null;
-                        jt = cm.ref(javaType);
+                        JType jt = null;
+                        jt = options.getCodeModel().ref(javaType);
                         JAXBTypeAndAnnotation jaxbTa = type.getJavaType().getType();
                         jaxbTa.setType(jt);
                     }
                     req.addAttachmentBlock(mimeBlock);
                     res.addAttachmentBlock(mimeBlock);
                 }
-            }else if(ModelerUtils.isUnbound(part)){
+            } else if (ModelerUtils.isUnbound(part)) {
                 QName name = part.getDescriptor();
                 JAXBType type = getJAXBType(part);
-                Block unboundBlock = new Block(name, type);
-                if(part.isIN()){
+                Block unboundBlock = new Block(name, type, part);
+                if (part.isIN()) {
                     req.addUnboundBlock(unboundBlock);
-                }else if(part.isOUT()){
+                } else if (part.isOUT()) {
                     res.addUnboundBlock(unboundBlock);
-                }else if(part.isINOUT()){
+                } else if (part.isINOUT()) {
                     req.addUnboundBlock(unboundBlock);
                     res.addUnboundBlock(unboundBlock);
                 }
                 param = ModelerUtils.createParameter(part.getName(), type, unboundBlock);
             }
-            if(param != null){
-                if(part.isReturn()){
+            if (param != null) {
+                if (part.isReturn()) {
                     param.setParameterIndex(-1);
-                }else{
+                } else {
                     param.setParameterIndex(index++);
                 }
                 param.setMode(part.getMode());
                 params.add(param);
             }
         }
-        for(Parameter param : params){
-            if(param.isIN())
+        for (Parameter param : params) {
+            if (param.isIN())
                 setCustomizedParameterName(info.portTypeOperation, inMsg, inMsg.getPart(param.getName()), param, false);
-            else if(outMsg != null)
+            else if (outMsg != null)
                 setCustomizedParameterName(info.portTypeOperation, outMsg, outMsg.getPart(param.getName()), param, false);
         }
         return params;
@@ -1853,7 +1849,7 @@ public class WSDLModeler extends WSDLModelerBase {
     private List getRequestParameters(Request request, List parameterList) {
         Message inputMessage = getInputMessage();
         //there is no input message, return zero parameters
-        if(inputMessage != null && !inputMessage.parts().hasNext())
+        if (inputMessage != null && !inputMessage.parts().hasNext())
             return new ArrayList();
 
         List inParameters = null;
@@ -1863,43 +1859,43 @@ public class WSDLModeler extends WSDLModelerBase {
         boolean unwrappable = isUnwrappable();
         boolean doneSOAPBody = false;
         //setup request parameters
-        for(String inParamName: parameterList){
+        for (String inParamName : parameterList) {
             MessagePart part = inputMessage.getPart(inParamName);
-            if(part == null)
+            if (part == null)
                 continue;
             reqBodyName = part.getDescriptor();
             jaxbReqType = getJAXBType(part);
-            if(unwrappable){
+            if (unwrappable) {
                 //So build body and header blocks and set to request and response
                 JAXBStructuredType jaxbRequestType = ModelerUtils.createJAXBStructureType(jaxbReqType);
-                reqBlock = new Block(reqBodyName, jaxbRequestType);
-                if(ModelerUtils.isBoundToSOAPBody(part)){
+                reqBlock = new Block(reqBodyName, jaxbRequestType, part);
+                if (ModelerUtils.isBoundToSOAPBody(part)) {
                     request.addBodyBlock(reqBlock);
-                }else if(ModelerUtils.isUnbound(part)){
+                } else if (ModelerUtils.isUnbound(part)) {
                     request.addUnboundBlock(reqBlock);
                 }
                 inParameters = ModelerUtils.createUnwrappedParameters(jaxbRequestType, reqBlock);
-                for(Parameter param: inParameters){
+                for (Parameter param : inParameters) {
                     setCustomizedParameterName(info.portTypeOperation, inputMessage, part, param, unwrappable);
                 }
-            }else{
-                reqBlock = new Block(reqBodyName, jaxbReqType);
-                if(ModelerUtils.isBoundToSOAPBody(part) && !doneSOAPBody){
+            } else {
+                reqBlock = new Block(reqBodyName, jaxbReqType, part);
+                if (ModelerUtils.isBoundToSOAPBody(part) && !doneSOAPBody) {
                     doneSOAPBody = true;
                     request.addBodyBlock(reqBlock);
-                }else if(ModelerUtils.isBoundToSOAPHeader(part)){
+                } else if (ModelerUtils.isBoundToSOAPHeader(part)) {
                     request.addHeaderBlock(reqBlock);
-                }else if(ModelerUtils.isBoundToMimeContent(part)){
+                } else if (ModelerUtils.isBoundToMimeContent(part)) {
                     List mimeContents = getMimeContents(info.bindingOperation.getInput(),
-                        getInputMessage(), part.getName());
+                            getInputMessage(), part.getName());
                     jaxbReqType = getAttachmentType(mimeContents, part);
                     //reqBlock = new Block(new QName(part.getName()), jaxbReqType);
-                    reqBlock = new Block(jaxbReqType.getName(), jaxbReqType);
+                    reqBlock = new Block(jaxbReqType.getName(), jaxbReqType, part);
                     request.addAttachmentBlock(reqBlock);
-                }else if(ModelerUtils.isUnbound(part)){
+                } else if (ModelerUtils.isUnbound(part)) {
                     request.addUnboundBlock(reqBlock);
                 }
-                if(inParameters == null)
+                if (inParameters == null)
                     inParameters = new ArrayList();
                 Parameter param = ModelerUtils.createParameter(part.getName(), jaxbReqType, reqBlock);
                 setCustomizedParameterName(info.portTypeOperation, inputMessage, part, param, false);
@@ -1914,46 +1910,26 @@ public class WSDLModeler extends WSDLModelerBase {
      * @param param
      * @param wrapperStyle TODO
      */
-    private void setCustomizedParameterName(Extensible extension, Message msg, MessagePart part, Parameter param, boolean wrapperStyle) {
-        JAXWSBinding jaxwsBinding = (JAXWSBinding)getExtensionOfType(extension, JAXWSBinding.class);
-        if(jaxwsBinding == null)
+    private void setCustomizedParameterName(TWSDLExtensible extension, Message msg, MessagePart part, Parameter param, boolean wrapperStyle) {
+        JAXWSBinding jaxwsBinding = (JAXWSBinding) getExtensionOfType(extension, JAXWSBinding.class);
+        if (jaxwsBinding == null)
             return;
         String paramName = part.getName();
         QName elementName = part.getDescriptor();
-        if(wrapperStyle)
+        if (wrapperStyle)
             elementName = param.getType().getName();
         String customName = jaxwsBinding.getParameterName(msg.getName(), paramName, elementName, wrapperStyle);
-        if(customName != null && !customName.equals("")){
+        if (customName != null && !customName.equals("")) {
             param.setCustomName(customName);
         }
     }
 
-    /**
-     * @param name
-     * @return
-     */
-    private JAXBType getJAXBType(QName name) {
-        return jaxbModelBuilder.getJAXBType(name);
-    }
-
     protected boolean isConflictingPortClassName(String name) {
         return false;
     }
 
-    /* (non-Javadoc)
-     * @see WSDLModelerBase#getJAXBSchemaAnalyzerInstnace(WSDLModelInfo, Properties, org.w3c.dom.Element)
-     */
-    protected JAXBModelBuilder getJAXBSchemaAnalyzerInstnace(WSDLModelInfo info,
-                                                             Properties options,
-                                                             ClassNameCollector classNameCollector, List elements) {
-        return new JAXBModelBuilder(info, options, classNameCollector, elements);
-    }
-
-    /* (non-Javadoc)
-     * @see WSDLModelerBase#isUnwrappable()
-     */
     protected boolean isUnwrappable() {
-        if(!getWrapperStyleCustomization())
+        if (!getWrapperStyleCustomization())
             return false;
 
         com.sun.tools.internal.ws.wsdl.document.Message inputMessage = getInputMessage();
@@ -1962,27 +1938,27 @@ public class WSDLModeler extends WSDLModelerBase {
         // Wrapper style if the operation's input and output messages each contain
         // only a single part
         if ((inputMessage != null && inputMessage.numParts() != 1)
-            || (outputMessage != null && outputMessage.numParts() != 1)) {
+                || (outputMessage != null && outputMessage.numParts() != 1)) {
             return false;
         }
 
         MessagePart inputPart = inputMessage != null
-                ? (MessagePart)inputMessage.parts().next() : null;
+                ? inputMessage.parts().next() : null;
         MessagePart outputPart = outputMessage != null
-                ? (MessagePart)outputMessage.parts().next() : null;
+                ? outputMessage.parts().next() : null;
         String operationName = info.portTypeOperation.getName();
 
         // Wrapper style if the input message part refers to a global element declaration whose localname
         // is equal to the operation name
         // Wrapper style if the output message part refers to a global element declaration
         if ((inputPart != null && !inputPart.getDescriptor().getLocalPart().equals(operationName)) ||
-            (outputPart != null && outputPart.getDescriptorKind() != SchemaKinds.XSD_ELEMENT))
+                (outputPart != null && outputPart.getDescriptorKind() != SchemaKinds.XSD_ELEMENT))
             return false;
 
         //check to see if either input or output message part not bound to soapbing:body
         //in that case the operation is not wrapper style
-        if(((inputPart != null) && (inputPart.getBindingExtensibilityElementKind() != MessagePart.SOAP_BODY_BINDING)) ||
-                ((outputPart != null) &&(outputPart.getBindingExtensibilityElementKind() != MessagePart.SOAP_BODY_BINDING)))
+        if (((inputPart != null) && (inputPart.getBindingExtensibilityElementKind() != MessagePart.SOAP_BODY_BINDING)) ||
+                ((outputPart != null) && (outputPart.getBindingExtensibilityElementKind() != MessagePart.SOAP_BODY_BINDING)))
             return false;
 
         // Wrapper style if the elements referred to by the input and output message parts
@@ -1993,52 +1969,49 @@ public class WSDLModeler extends WSDLModelerBase {
         //These checkins are done by jaxb, we just check if jaxb has wrapper children. If there
         // are then its wrapper style
         //if(inputPart != null && outputPart != null){
-        if(inputPart != null){
+        if (inputPart != null) {
             boolean inputWrappable = false;
-            JAXBType inputType = getJAXBType(inputPart.getDescriptor());
-            if(inputType != null){
+            JAXBType inputType = getJAXBType(inputPart);
+            if (inputType != null) {
                 inputWrappable = inputType.isUnwrappable();
             }
             //if there are no output part (oneway), the operation can still be wrapper style
-            if(outputPart == null){
-               return inputWrappable;
+            if (outputPart == null) {
+                return inputWrappable;
             }
-            JAXBType outputType = getJAXBType(outputPart.getDescriptor());
-            if((inputType != null) && (outputType != null))
+            JAXBType outputType = getJAXBType(outputPart);
+            if ((inputType != null) && (outputType != null))
                 return inputType.isUnwrappable() && outputType.isUnwrappable();
         }
 
         return false;
     }
 
-    /**
-     * @return
-     */
     private boolean getWrapperStyleCustomization() {
         //first we look into wsdl:portType/wsdl:operation
         com.sun.tools.internal.ws.wsdl.document.Operation portTypeOperation = info.portTypeOperation;
-        JAXWSBinding jaxwsBinding = (JAXWSBinding)getExtensionOfType(portTypeOperation, JAXWSBinding.class);
-        if(jaxwsBinding != null){
-             Boolean isWrappable = jaxwsBinding.isEnableWrapperStyle();
-             if(isWrappable != null)
-                 return isWrappable;
+        JAXWSBinding jaxwsBinding = (JAXWSBinding) getExtensionOfType(portTypeOperation, JAXWSBinding.class);
+        if (jaxwsBinding != null) {
+            Boolean isWrappable = jaxwsBinding.isEnableWrapperStyle();
+            if (isWrappable != null)
+                return isWrappable;
         }
 
         //then into wsdl:portType
         PortType portType = info.port.resolveBinding(document).resolvePortType(document);
-        jaxwsBinding = (JAXWSBinding)getExtensionOfType(portType, JAXWSBinding.class);
-        if(jaxwsBinding != null){
-             Boolean isWrappable = jaxwsBinding.isEnableWrapperStyle();
-             if(isWrappable != null)
-                 return isWrappable;
+        jaxwsBinding = (JAXWSBinding) getExtensionOfType(portType, JAXWSBinding.class);
+        if (jaxwsBinding != null) {
+            Boolean isWrappable = jaxwsBinding.isEnableWrapperStyle();
+            if (isWrappable != null)
+                return isWrappable;
         }
 
         //then wsdl:definitions
-        jaxwsBinding = (JAXWSBinding)getExtensionOfType(document.getDefinitions(), JAXWSBinding.class);
-        if(jaxwsBinding != null){
-             Boolean isWrappable = jaxwsBinding.isEnableWrapperStyle();
-             if(isWrappable != null)
-                 return isWrappable;
+        jaxwsBinding = (JAXWSBinding) getExtensionOfType(document.getDefinitions(), JAXWSBinding.class);
+        if (jaxwsBinding != null) {
+            Boolean isWrappable = jaxwsBinding.isEnableWrapperStyle();
+            if (isWrappable != null)
+                return isWrappable;
         }
         return true;
     }
@@ -2047,21 +2020,21 @@ public class WSDLModeler extends WSDLModelerBase {
      * @see WSDLModelerBase#isSingleInOutPart(Set, MessagePart)
      */
     protected boolean isSingleInOutPart(Set inputParameterNames,
-            MessagePart outputPart) {
+                                        MessagePart outputPart) {
         // As of now, we dont have support for in/out in doc-lit. So return false.
         SOAPOperation soapOperation =
-            (SOAPOperation) getExtensionOfType(info.bindingOperation,
-                    SOAPOperation.class);
-        if((soapOperation != null) && (soapOperation.isDocument() || info.soapBinding.isDocument())) {
+                (SOAPOperation) getExtensionOfType(info.bindingOperation,
+                        SOAPOperation.class);
+        if ((soapOperation != null) && (soapOperation.isDocument() || info.soapBinding.isDocument())) {
             Iterator iter = getInputMessage().parts();
-            while(iter.hasNext()){
-                MessagePart part = (MessagePart)iter.next();
-                if(outputPart.getName().equals(part.getName()) && outputPart.getDescriptor().equals(part.getDescriptor()))
+            while (iter.hasNext()) {
+                MessagePart part = (MessagePart) iter.next();
+                if (outputPart.getName().equals(part.getName()) && outputPart.getDescriptor().equals(part.getDescriptor()))
                     return true;
             }
-        }else if(soapOperation != null && soapOperation.isRPC()|| info.soapBinding.isRPC()){
+        } else if (soapOperation != null && soapOperation.isRPC() || info.soapBinding.isRPC()) {
             com.sun.tools.internal.ws.wsdl.document.Message inputMessage = getInputMessage();
-            if(inputParameterNames.contains(outputPart.getName())) {
+            if (inputParameterNames.contains(outputPart.getName())) {
                 if (inputMessage.getPart(outputPart.getName()).getDescriptor().equals(outputPart.getDescriptor())) {
                     return true;
                 }
@@ -2072,27 +2045,27 @@ public class WSDLModeler extends WSDLModelerBase {
 
     private List createRpcLitRequestParameters(Request request, List parameterList, Block block) {
         Message message = getInputMessage();
-        S2JJAXBModel jaxbModel = ((RpcLitStructure)block.getType()).getJaxbModel().getS2JJAXBModel();
-        List parameters = ModelerUtils.createRpcLitParameters(message, block, jaxbModel);
+        S2JJAXBModel jaxbModel = ((RpcLitStructure) block.getType()).getJaxbModel().getS2JJAXBModel();
+        List parameters = ModelerUtils.createRpcLitParameters(message, block, jaxbModel, errReceiver);
 
         //create parameters for header and mime parts
-        for(String paramName: parameterList){
+        for (String paramName : parameterList) {
             MessagePart part = message.getPart(paramName);
-            if(part == null)
+            if (part == null)
                 continue;
-            if(ModelerUtils.isBoundToSOAPHeader(part)){
-                if(parameters == null)
+            if (ModelerUtils.isBoundToSOAPHeader(part)) {
+                if (parameters == null)
                     parameters = new ArrayList();
                 QName headerName = part.getDescriptor();
-                JAXBType jaxbType = getJAXBType(headerName);
-                Block headerBlock = new Block(headerName, jaxbType);
+                JAXBType jaxbType = getJAXBType(part);
+                Block headerBlock = new Block(headerName, jaxbType, part);
                 request.addHeaderBlock(headerBlock);
                 Parameter param = ModelerUtils.createParameter(part.getName(), jaxbType, headerBlock);
-                if(param != null){
+                if (param != null) {
                     parameters.add(param);
                 }
-            }else if(ModelerUtils.isBoundToMimeContent(part)){
-                if(parameters == null)
+            } else if (ModelerUtils.isBoundToMimeContent(part)) {
+                if (parameters == null)
                     parameters = new ArrayList();
                 List mimeContents = getMimeContents(info.bindingOperation.getInput(),
                         getInputMessage(), paramName);
@@ -2100,73 +2073,70 @@ public class WSDLModeler extends WSDLModelerBase {
                 JAXBType type = getAttachmentType(mimeContents, part);
                 //create Parameters in request or response
                 //Block mimeBlock = new Block(new QName(part.getName()), type);
-                Block mimeBlock = new Block(type.getName(), type);
+                Block mimeBlock = new Block(type.getName(), type, part);
                 request.addAttachmentBlock(mimeBlock);
                 Parameter param = ModelerUtils.createParameter(part.getName(), type, mimeBlock);
-                if(param != null){
+                if (param != null) {
                     parameters.add(param);
                 }
-            }else if(ModelerUtils.isUnbound(part)){
-                if(parameters == null)
+            } else if (ModelerUtils.isUnbound(part)) {
+                if (parameters == null)
                     parameters = new ArrayList();
                 QName name = part.getDescriptor();
                 JAXBType type = getJAXBType(part);
-                Block unboundBlock = new Block(name, type);
+                Block unboundBlock = new Block(name, type, part);
                 request.addUnboundBlock(unboundBlock);
                 Parameter param = ModelerUtils.createParameter(part.getName(), type, unboundBlock);
-                if(param != null){
+                if (param != null) {
                     parameters.add(param);
                 }
             }
         }
-        for(Parameter param : parameters){
+        for (Parameter param : parameters) {
             setCustomizedParameterName(info.portTypeOperation, message, message.getPart(param.getName()), param, false);
         }
         return parameters;
     }
 
-    private String getJavaTypeForMimeType(String mimeType){
-        if(mimeType.equals("image/jpeg") || mimeType.equals("image/gif")){
+    private String getJavaTypeForMimeType(String mimeType) {
+        if (mimeType.equals("image/jpeg") || mimeType.equals("image/gif")) {
             return "java.awt.Image";
-        }else if(mimeType.equals("text/xml") || mimeType.equals("application/xml")){
+        } else if (mimeType.equals("text/xml") || mimeType.equals("application/xml")) {
             return "javax.xml.transform.Source";
         }
         return "javax.activation.DataHandler";
     }
 
-    /**
-     * @param mimeContents
-     * @return
-     */
     private JAXBType getAttachmentType(List mimeContents, MessagePart part) {
-        if(!enableMimeContent()){
+        if (!enableMimeContent()) {
             return getJAXBType(part);
         }
         String javaType = null;
         List mimeTypes = getAlternateMimeTypes(mimeContents);
-        if(mimeTypes.size() > 1) {
+        if (mimeTypes.size() > 1) {
             javaType = "javax.activation.DataHandler";
-        }else{
-           javaType = getJavaTypeForMimeType(mimeTypes.get(0));
+        } else {
+            javaType = getJavaTypeForMimeType(mimeTypes.get(0));
         }
 
         S2JJAXBModel jaxbModel = getJAXBModelBuilder().getJAXBModel().getS2JJAXBModel();
-        JCodeModel cm = jaxbModel.generateCode(null,
-                    new ConsoleErrorReporter(getEnvironment(), false));
-        JType jt= null;
-        jt = cm.ref(javaType);
+        JType jt = null;
+        jt = options.getCodeModel().ref(javaType);
         QName desc = part.getDescriptor();
         TypeAndAnnotation typeAnno = null;
 
         if (part.getDescriptorKind() == SchemaKinds.XSD_TYPE) {
             typeAnno = jaxbModel.getJavaType(desc);
             desc = new QName("", part.getName());
-        } else if (part.getDescriptorKind()== SchemaKinds.XSD_ELEMENT) {
+        } else if (part.getDescriptorKind() == SchemaKinds.XSD_ELEMENT) {
             typeAnno = getJAXBModelBuilder().getElementTypeAndAnn(desc);
-            for(Iterator mimeTypeIter = mimeTypes.iterator(); mimeTypeIter.hasNext();) {
-                String mimeType = (String)mimeTypeIter.next();
-                if((!mimeType.equals("text/xml") &&
-                        !mimeType.equals("application/xml"))){
+            if(typeAnno == null){
+                error(part, ModelerMessages.WSDLMODELER_JAXB_JAVATYPE_NOTFOUND(part.getDescriptor(), part.getName()));
+            }
+            for (Iterator mimeTypeIter = mimeTypes.iterator(); mimeTypeIter.hasNext();) {
+                String mimeType = (String) mimeTypeIter.next();
+                if ((!mimeType.equals("text/xml") &&
+                        !mimeType.equals("application/xml"))) {
                     //According to AP 1.0,
                     //RZZZZ: In a DESCRIPTION, if a wsdl:part element refers to a
                     //global element declaration (via the element attribute of the wsdl:part
@@ -2175,48 +2145,45 @@ public class WSDLModeler extends WSDLModelerBase {
                     //XML serialization.
                     //should we throw warning?
                     //type = MimeHelper.javaType.DATA_HANDLER_JAVATYPE;
-                    warn("mimemodeler.elementPart.invalidElementMimeType",
-                            new Object[] {
-                            part.getName(), mimeType});
+                    warning(part, ModelerMessages.MIMEMODELER_ELEMENT_PART_INVALID_ELEMENT_MIME_TYPE(part.getName(), mimeType));
                 }
             }
         }
-        if(typeAnno == null){
-            fail("wsdlmodeler.jaxb.javatype.notfound", new Object[]{desc, part.getName()});
+        if (typeAnno == null) {
+            error(part, ModelerMessages.WSDLMODELER_JAXB_JAVATYPE_NOTFOUND(desc, part.getName()));
         }
         return new JAXBType(desc, new JavaSimpleType(new JAXBTypeAndAnnotation(typeAnno, jt)),
                 null, getJAXBModelBuilder().getJAXBModel());
     }
 
-    protected void buildJAXBModel(WSDLDocument wsdlDocument, WSDLModelInfo modelInfo, ClassNameCollector classNameCollector) {
-        JAXBModelBuilder jaxbModelBuilder = new JAXBModelBuilder(getWSDLModelInfo(), _options, classNameCollector, parser.getSchemaElements());
+    protected void buildJAXBModel(WSDLDocument wsdlDocument) {
+        JAXBModelBuilder jaxbModelBuilder = new JAXBModelBuilder(options, classNameCollector, forest, errReceiver);
         //set the java package where wsdl artifacts will be generated
         //if user provided package name  using -p switch (or package property on wsimport ant task)
         //ignore the package customization in the wsdl and schema bidnings
-        if(getWSDLModelInfo().getDefaultJavaPackage() != null){
-            getWSDLModelInfo().setJavaPackageName(getWSDLModelInfo().getDefaultJavaPackage());
-            jaxbModelBuilder.getJAXBSchemaCompiler().forcePackageName(getWSDLModelInfo().getJavaPackageName());
-        }else{
-            String jaxwsPackage = getJavaPackage();
-            getWSDLModelInfo().setJavaPackageName(jaxwsPackage);
+        //formce the -p option only in the first pass
+        if (explicitDefaultPackage != null) {
+            jaxbModelBuilder.getJAXBSchemaCompiler().forcePackageName(options.defaultPackage);
+        } else {
+            options.defaultPackage = getJavaPackage();
         }
 
         //create pseudo schema for async operations(if any) response bean
-        List schemas = PseudoSchemaBuilder.build(this, _modelInfo);
-        for(InputSource schema : schemas){
+        List schemas = PseudoSchemaBuilder.build(this, options, errReceiver);
+        for (InputSource schema : schemas) {
             jaxbModelBuilder.getJAXBSchemaCompiler().parseSchema(schema);
         }
         jaxbModelBuilder.bind();
         this.jaxbModelBuilder = jaxbModelBuilder;
     }
 
-    protected String getJavaPackage(){
+    protected String getJavaPackage() {
         String jaxwsPackage = null;
-        JAXWSBinding jaxwsCustomization = (JAXWSBinding)getExtensionOfType(document.getDefinitions(), JAXWSBinding.class);
-        if(jaxwsCustomization != null && jaxwsCustomization.getJaxwsPackage() != null){
+        JAXWSBinding jaxwsCustomization = (JAXWSBinding) getExtensionOfType(document.getDefinitions(), JAXWSBinding.class);
+        if (jaxwsCustomization != null && jaxwsCustomization.getJaxwsPackage() != null) {
             jaxwsPackage = jaxwsCustomization.getJaxwsPackage().getName();
         }
-        if(jaxwsPackage != null){
+        if (jaxwsPackage != null) {
             return jaxwsPackage;
         }
         String wsdlUri = document.getDefinitions().getTargetNamespaceURI();
@@ -2231,7 +2198,7 @@ public class WSDLModeler extends WSDLModelerBase {
     }
 
     protected void createJavaInterfaceForPort(Port port, boolean isProvider) {
-        if(isProvider){
+        if (isProvider) {
             createJavaInterfaceForProviderPort(port);
             return;
         }
@@ -2244,13 +2211,13 @@ public class WSDLModeler extends WSDLModelerBase {
         JavaInterface intf = new JavaInterface(interfaceName);
         for (Operation operation : port.getOperations()) {
             createJavaMethodForOperation(
-                port,
-                operation,
-                intf);
+                    port,
+                    operation,
+                    intf);
 
-            for(JavaParameter jParam : operation.getJavaMethod().getParametersList()){
+            for (JavaParameter jParam : operation.getJavaMethod().getParametersList()) {
                 Parameter param = jParam.getParameter();
-                if(param.getCustomName() != null)
+                if (param.getCustomName() != null)
                     jParam.setName(param.getCustomName());
             }
         }
@@ -2260,39 +2227,31 @@ public class WSDLModeler extends WSDLModelerBase {
 
     protected String getServiceInterfaceName(QName serviceQName, com.sun.tools.internal.ws.wsdl.document.Service wsdlService) {
         String serviceName = wsdlService.getName();
-        JAXWSBinding jaxwsCust = (JAXWSBinding)getExtensionOfType(wsdlService, JAXWSBinding.class);
-        if(jaxwsCust != null && jaxwsCust.getClassName() != null){
+        JAXWSBinding jaxwsCust = (JAXWSBinding) getExtensionOfType(wsdlService, JAXWSBinding.class);
+        if (jaxwsCust != null && jaxwsCust.getClassName() != null) {
             CustomName name = jaxwsCust.getClassName();
-            if(name != null && !name.equals(""))
+            if (name != null && !name.equals(""))
                 serviceName = name.getName();
         }
         String serviceInterface = "";
-        String javaPackageName = null;
-        if (_modelInfo.getJavaPackageName() != null
-            && !_modelInfo.getJavaPackageName().equals("")) {
-            javaPackageName = _modelInfo.getJavaPackageName();
-        }
-        if (javaPackageName != null) {
-            serviceInterface = javaPackageName + ".";
-        }
+        String javaPackageName = options.defaultPackage;
+        serviceInterface = javaPackageName + ".";
+
         serviceInterface
-            += getEnvironment().getNames().validJavaClassName(serviceName);
+                += JAXBRIContext.mangleNameToClassName(serviceName);
         return serviceInterface;
     }
 
     protected String getJavaNameOfSEI(Port port) {
         QName portTypeName =
-            (QName)port.getProperty(
-                ModelProperties.PROPERTY_WSDL_PORT_TYPE_NAME);
-        PortType pt = (PortType)document.find(Kinds.PORT_TYPE, portTypeName);
-        JAXWSBinding jaxwsCust = (JAXWSBinding)getExtensionOfType(pt, JAXWSBinding.class);
-        if(jaxwsCust != null && jaxwsCust.getClassName() != null){
+                (QName) port.getProperty(
+                        ModelProperties.PROPERTY_WSDL_PORT_TYPE_NAME);
+        PortType pt = (PortType) document.find(Kinds.PORT_TYPE, portTypeName);
+        JAXWSBinding jaxwsCust = (JAXWSBinding) getExtensionOfType(pt, JAXWSBinding.class);
+        if (jaxwsCust != null && jaxwsCust.getClassName() != null) {
             CustomName name = jaxwsCust.getClassName();
-            if(name != null && !name.equals("")){
-                return makePackageQualified(
-                        name.getName(),
-                        portTypeName,
-                        false);
+            if (name != null && !name.equals("")) {
+                return makePackageQualified(name.getName());
             }
         }
 
@@ -2300,62 +2259,54 @@ public class WSDLModeler extends WSDLModelerBase {
         if (portTypeName != null) {
             // got portType information from WSDL, use it to name the interface
             interfaceName =
-                makePackageQualified(JAXBRIContext.mangleNameToClassName(portTypeName.getLocalPart()),
-                                        portTypeName,
-                                        false);
+                    makePackageQualified(JAXBRIContext.mangleNameToClassName(portTypeName.getLocalPart()));
         } else {
             // somehow we only got the port name, so we use that
             interfaceName =
-                makePackageQualified(
-                    JAXBRIContext.mangleNameToClassName(port.getName().getLocalPart()),
-                    port.getName(),
-                    false);
+                    makePackageQualified(JAXBRIContext.mangleNameToClassName(port.getName().getLocalPart()));
         }
         return interfaceName;
     }
 
     private void createJavaMethodForAsyncOperation(Port port, Operation operation,
-            JavaInterface intf){
+                                                   JavaInterface intf) {
         String candidateName = getJavaNameForOperation(operation);
-        JavaMethod method = new JavaMethod(candidateName);
-        method.setThrowsRemoteException(false);
+        JavaMethod method = new JavaMethod(candidateName, errReceiver);
         Request request = operation.getRequest();
         Iterator requestBodyBlocks = request.getBodyBlocks();
         Block requestBlock =
-            (requestBodyBlocks.hasNext()
-                ? (Block)request.getBodyBlocks().next()
-                : null);
+                (requestBodyBlocks.hasNext()
+                        ? (Block) request.getBodyBlocks().next()
+                        : null);
 
         Response response = operation.getResponse();
         Iterator responseBodyBlocks = null;
-        Block responseBlock = null;
+        Block responseBlock;
         if (response != null) {
             responseBodyBlocks = response.getBodyBlocks();
             responseBlock =
-                responseBodyBlocks.hasNext()
-                    ? (Block)response.getBodyBlocks().next()
-                    : null;
+                    responseBodyBlocks.hasNext()
+                            ? (Block) response.getBodyBlocks().next()
+                            : null;
         }
 
         // build a signature of the form "opName%arg1type%arg2type%...%argntype so that we
         // detect overloading conflicts in the generated java interface/classes
         String signature = candidateName;
         for (Iterator iter = request.getParameters(); iter.hasNext();) {
-            Parameter parameter = (Parameter)iter.next();
+            Parameter parameter = (Parameter) iter.next();
 
             if (parameter.getJavaParameter() != null) {
-                throw new ModelerException(
-                    "wsdlmodeler.invalidOperation",
-                    operation.getName().getLocalPart());
+                error(operation.getEntity(), ModelerMessages.WSDLMODELER_INVALID_OPERATION(operation.getName().getLocalPart()));
             }
 
             JavaType parameterType = parameter.getType().getJavaType();
             JavaParameter javaParameter =
-                new JavaParameter(
-                    JAXBRIContext.mangleNameToVariableName(parameter.getName()),
-                    parameterType,
-                    parameter,
-                    parameter.getLinkedParameter() != null);
+                    new JavaParameter(
+                            JAXBRIContext.mangleNameToVariableName(parameter.getName()),
+                            parameterType,
+                            parameter,
+                            parameter.getLinkedParameter() != null);
             if (javaParameter.isHolder()) {
                 javaParameter.setHolderName(javax.xml.ws.Holder.class.getName());
             }
@@ -2367,9 +2318,9 @@ public class WSDLModeler extends WSDLModelerBase {
 
         if (response != null) {
             String resultParameterName =
-                (String)operation.getProperty(WSDL_RESULT_PARAMETER);
+                    (String) operation.getProperty(WSDL_RESULT_PARAMETER);
             Parameter resultParameter =
-                response.getParameterByName(resultParameterName);
+                    response.getParameterByName(resultParameterName);
             JavaType returnType = resultParameter.getType().getJavaType();
             method.setReturnType(returnType);
 
@@ -2379,34 +2330,40 @@ public class WSDLModeler extends WSDLModelerBase {
     }
 
     /* (non-Javadoc)
-     * @see WSDLModelerBase#createJavaMethodForOperation(Port, Operation, JavaInterface, Set, Set)
+     * @see WSDLModelerBase#createJavaMethodForOperation(WSDLPort, WSDLOperation, JavaInterface, Set, Set)
      */
     protected void createJavaMethodForOperation(Port port, Operation operation, JavaInterface intf) {
-        if((operation instanceof AsyncOperation)){
+        if ((operation instanceof AsyncOperation)) {
             createJavaMethodForAsyncOperation(port, operation, intf);
             return;
         }
         String candidateName = getJavaNameForOperation(operation);
-        JavaMethod method = new JavaMethod(candidateName);
+        JavaMethod method = new JavaMethod(candidateName, errReceiver);
         Request request = operation.getRequest();
-        Parameter returnParam = (Parameter)operation.getProperty(WSDL_RESULT_PARAMETER);
-        if(returnParam != null){
+        Parameter returnParam = (Parameter) operation.getProperty(WSDL_RESULT_PARAMETER);
+        if (returnParam != null) {
             JavaType parameterType = returnParam.getType().getJavaType();
             method.setReturnType(parameterType);
-        }else{
+        } else {
             JavaType ret = new JavaSimpleTypeCreator().VOID_JAVATYPE;
             method.setReturnType(ret);
         }
-        List parameterOrder = (List)operation.getProperty(WSDL_PARAMETER_ORDER);
-        for(Parameter param:parameterOrder){
+        List parameterOrder = (List) operation.getProperty(WSDL_PARAMETER_ORDER);
+        for (Parameter param : parameterOrder) {
             JavaType parameterType = param.getType().getJavaType();
-            String name = (param.getCustomName() != null)?param.getCustomName():param.getName();
+            String name = (param.getCustomName() != null) ? param.getCustomName() : param.getName();
+            name = JAXBRIContext.mangleNameToVariableName(name);
+            //if its a java keyword after name mangling, then we simply put underscore as there is no
+            //need to ask user to customize the parameter name if its java keyword
+            if(Names.isJavaReservedWord(name)){
+                name = "_"+name;
+            }
             JavaParameter javaParameter =
-                new JavaParameter(
-                    JAXBRIContext.mangleNameToVariableName(name),
-                    parameterType,
-                    param,
-                    param.isINOUT()||param.isOUT());
+                    new JavaParameter(
+                            name,
+                            parameterType,
+                            param,
+                            param.isINOUT() || param.isOUT());
             if (javaParameter.isHolder()) {
                 javaParameter.setHolderName(javax.xml.ws.Holder.class.getName());
             }
@@ -2418,15 +2375,15 @@ public class WSDLModeler extends WSDLModelerBase {
 
         String opName = JAXBRIContext.mangleNameToVariableName(operation.getName().getLocalPart());
         for (Iterator iter = operation.getFaults();
-            iter != null && iter.hasNext();
-            ) {
-            Fault fault = (Fault)iter.next();
+             iter != null && iter.hasNext();
+                ) {
+            Fault fault = (Fault) iter.next();
             createJavaExceptionFromLiteralType(fault, port, opName);
         }
         JavaException javaException;
         Fault fault;
         for (Iterator iter = operation.getFaults(); iter.hasNext();) {
-            fault = (Fault)iter.next();
+            fault = (Fault) iter.next();
             javaException = fault.getJavaException();
             method.addException(javaException.getName());
         }
@@ -2434,32 +2391,28 @@ public class WSDLModeler extends WSDLModelerBase {
     }
 
     protected boolean createJavaExceptionFromLiteralType(Fault fault, com.sun.tools.internal.ws.processor.model.Port port, String operationName) {
-        ProcessorEnvironment _env = getProcessorEnvironment();
-
-        JAXBType faultType = (JAXBType)fault.getBlock().getType();
+        JAXBType faultType = (JAXBType) fault.getBlock().getType();
 
         String exceptionName =
-            makePackageQualified(
-                _env.getNames().validJavaClassName(fault.getName()),
-                port.getName());
+                makePackageQualified(JAXBRIContext.mangleNameToClassName(fault.getName()));
 
         // use fault namespace attribute
         JAXBStructuredType jaxbStruct = new JAXBStructuredType(new QName(
-                                            fault.getBlock().getName().getNamespaceURI(),
-                                            fault.getName()));
+                fault.getBlock().getName().getNamespaceURI(),
+                fault.getName()));
 
         QName memberName = fault.getElementName();
         JAXBElementMember jaxbMember =
-            new JAXBElementMember(memberName, faultType);
+                new JAXBElementMember(memberName, faultType);
         //jaxbMember.setNillable(faultType.isNillable());
 
         String javaMemberName = getLiteralJavaMemberName(fault);
         JavaStructureMember javaMember = new JavaStructureMember(
-                                            javaMemberName,
-                                            faultType.getJavaType(),
-                                            jaxbMember);
+                javaMemberName,
+                faultType.getJavaType(),
+                jaxbMember);
         jaxbMember.setJavaStructureMember(javaMember);
-        javaMember.setReadMethod(_env.getNames().getJavaMemberReadMethod(javaMember));
+        javaMember.setReadMethod(Names.getJavaMemberReadMethod(javaMember));
         javaMember.setInherited(false);
         jaxbMember.setJavaStructureMember(javaMember);
         jaxbStruct.add(jaxbMember);
@@ -2468,11 +2421,11 @@ public class WSDLModeler extends WSDLModelerBase {
             exceptionName += "_Exception";
         }
 
-        JavaException existingJavaException = (JavaException)_javaExceptions.get(exceptionName);
+        JavaException existingJavaException = (JavaException) _javaExceptions.get(exceptionName);
         if (existingJavaException != null) {
             if (existingJavaException.getName().equals(exceptionName)) {
-                if (((JAXBType)existingJavaException.getOwner()).getName().equals(jaxbStruct.getName())
-                    || ModelerUtils.isEquivalentLiteralStructures(jaxbStruct, (JAXBStructuredType) existingJavaException.getOwner())) {
+                if (((JAXBType) existingJavaException.getOwner()).getName().equals(jaxbStruct.getName())
+                        || ModelerUtils.isEquivalentLiteralStructures(jaxbStruct, (JAXBStructuredType) existingJavaException.getOwner())) {
                     // we have mapped this fault already
                     if (faultType instanceof JAXBStructuredType) {
                         fault.getBlock().setType((JAXBType) existingJavaException.getOwner());
@@ -2493,23 +2446,23 @@ public class WSDLModeler extends WSDLModelerBase {
         return true;
     }
 
-    protected boolean isRequestResponse(){
+    protected boolean isRequestResponse() {
         return info.portTypeOperation.getStyle() == OperationStyle.REQUEST_RESPONSE;
     }
 
-    protected java.util.List getAsynParameterOrder(){
+    protected java.util.List getAsynParameterOrder() {
         //for async operation ignore the parameterOrder
         java.util.List parameterList = new ArrayList();
         Message inputMessage = getInputMessage();
         List inputParts = inputMessage.getParts();
-        for(MessagePart part: inputParts){
+        for (MessagePart part : inputParts) {
             parameterList.add(part.getName());
         }
         return parameterList;
     }
 
 
-    protected List getParameterOrder(){
+    protected List getParameterOrder() {
         List params = new ArrayList();
         String parameterOrder = info.portTypeOperation.getParameterOrder();
         java.util.List parameterList = new ArrayList();
@@ -2525,44 +2478,43 @@ public class WSDLModeler extends WSDLModelerBase {
         List outputParts = null;
         List inputParts = inputMessage.getParts();
         //reset the mode and ret flag, as MEssagePArts aer shared across ports
-        for(MessagePart part:inputParts){
+        for (MessagePart part : inputParts) {
             part.setMode(Mode.IN);
             part.setReturn(false);
         }
-        if(isRequestResponse()){
+        if (isRequestResponse()) {
             outputParts = outputMessage.getParts();
-            for(MessagePart part:outputParts){
+            for (MessagePart part : outputParts) {
                 part.setMode(Mode.OUT);
                 part.setReturn(false);
             }
         }
 
-        if(parameterOrderPresent){
+        if (parameterOrderPresent) {
             boolean validParameterOrder = true;
             Iterator paramOrders = parameterList.iterator();
             // If any part in the parameterOrder is not present in the request or
             // response message, we completely ignore the parameterOrder hint
-            while(paramOrders.hasNext()){
+            while (paramOrders.hasNext()) {
                 String param = paramOrders.next();
                 boolean partFound = false;
-                for(MessagePart part : inputParts){
-                    if(param.equals(part.getName())){
+                for (MessagePart part : inputParts) {
+                    if (param.equals(part.getName())) {
                         partFound = true;
                         break;
                     }
                 }
                 // if not found, check in output parts
-                if(!partFound){
-                    for(MessagePart part : outputParts){
-                        if(param.equals(part.getName())){
+                if (!partFound) {
+                    for (MessagePart part : outputParts) {
+                        if (param.equals(part.getName())) {
                             partFound = true;
                             break;
                         }
                     }
                 }
-                if(!partFound){
-                    warn("wsdlmodeler.invalid.parameterorder.parameter",
-                            new Object[] {param, info.operation.getName().getLocalPart()});
+                if (!partFound) {
+                    warning(info.operation.getEntity(), ModelerMessages.WSDLMODELER_INVALID_PARAMETERORDER_PARAMETER(param, info.operation.getName().getLocalPart()));
                     validParameterOrder = false;
                 }
             }
@@ -2571,51 +2523,51 @@ public class WSDLModeler extends WSDLModelerBase {
             List outputUnlistedParts = new ArrayList();
 
             //gather input Parts
-            if(validParameterOrder){
-                for(String param:parameterList){
+            if (validParameterOrder) {
+                for (String param : parameterList) {
                     MessagePart part = inputMessage.getPart(param);
-                    if(part != null){
+                    if (part != null) {
                         params.add(part);
                         continue;
                     }
-                    if(isRequestResponse()){
+                    if (isRequestResponse()) {
                         MessagePart outPart = outputMessage.getPart(param);
-                        if(outPart != null){
+                        if (outPart != null) {
                             params.add(outPart);
                             continue;
                         }
                     }
                 }
 
-                for(MessagePart part: inputParts){
-                    if(!parameterList.contains(part.getName())) {
+                for (MessagePart part : inputParts) {
+                    if (!parameterList.contains(part.getName())) {
                         inputUnlistedParts.add(part);
                     }
                 }
 
-                if(isRequestResponse()){
+                if (isRequestResponse()) {
                     // at most one output part should be unlisted
-                    for(MessagePart part: outputParts){
-                        if(!parameterList.contains(part.getName())) {
+                    for (MessagePart part : outputParts) {
+                        if (!parameterList.contains(part.getName())) {
                             MessagePart inPart = inputMessage.getPart(part.getName());
                             //dont add inout as unlisted part
-                            if((inPart != null) && inPart.getDescriptor().equals(part.getDescriptor())){
+                            if ((inPart != null) && inPart.getDescriptor().equals(part.getDescriptor())) {
                                 inPart.setMode(Mode.INOUT);
-                            }else{
+                            } else {
                                 outputUnlistedParts.add(part);
                             }
-                        }else{
+                        } else {
                             //param list may contain it, check if its INOUT
                             MessagePart inPart = inputMessage.getPart(part.getName());
                             //dont add inout as unlisted part
-                            if((inPart != null) && inPart.getDescriptor().equals(part.getDescriptor())){
+                            if ((inPart != null) && inPart.getDescriptor().equals(part.getDescriptor())) {
                                 inPart.setMode(Mode.INOUT);
-                            }else if(!params.contains(part)){
+                            } else if (!params.contains(part)) {
                                 params.add(part);
                             }
                         }
                     }
-                    if(outputUnlistedParts.size() == 1){
+                    if (outputUnlistedParts.size() == 1) {
                         MessagePart resultPart = outputUnlistedParts.get(0);
                         resultPart.setReturn(true);
                         params.add(resultPart);
@@ -2624,19 +2576,18 @@ public class WSDLModeler extends WSDLModelerBase {
                 }
 
                 //add the input and output unlisted parts
-                for(MessagePart part : inputUnlistedParts){
+                for (MessagePart part : inputUnlistedParts) {
                     params.add(part);
                 }
 
-                for(MessagePart part : outputUnlistedParts){
+                for (MessagePart part : outputUnlistedParts) {
                     params.add(part);
                 }
                 return params;
 
             }
             //parameterOrder attribute is not valid, we ignore it
-            warn("wsdlmodeler.invalid.parameterOrder.invalidParameterOrder",
-                    new Object[] {info.operation.getName().getLocalPart()});
+            warning(info.operation.getEntity(), ModelerMessages.WSDLMODELER_INVALID_PARAMETER_ORDER_INVALID_PARAMETER_ORDER(info.operation.getName().getLocalPart()));
             parameterOrderPresent = false;
             parameterList.clear();
         }
@@ -2644,15 +2595,15 @@ public class WSDLModeler extends WSDLModelerBase {
         List outParts = new ArrayList();
 
         //construct input parameter list with the same order as in input message
-        for(MessagePart part: inputParts){
+        for (MessagePart part : inputParts) {
             params.add(part);
         }
 
-        if(isRequestResponse()){
-            for(MessagePart part:outputParts){
+        if (isRequestResponse()) {
+            for (MessagePart part : outputParts) {
                 MessagePart inPart = inputMessage.getPart(part.getName());
-                if(inPart != null && part.getDescriptorKind() == inPart.getDescriptorKind() &&
-                        part.getDescriptor().equals(inPart.getDescriptor())){
+                if (inPart != null && part.getDescriptorKind() == inPart.getDescriptorKind() &&
+                        part.getDescriptor().equals(inPart.getDescriptor())) {
                     inPart.setMode(Mode.INOUT);
                     continue;
                 }
@@ -2660,8 +2611,8 @@ public class WSDLModeler extends WSDLModelerBase {
             }
 
             //append the out parts to the parameterList
-            for(MessagePart part : outParts){
-                if(outParts.size() == 1)
+            for (MessagePart part : outParts) {
+                if (outParts.size() == 1)
                     part.setReturn(true);
                 params.add(part);
             }
@@ -2670,56 +2621,36 @@ public class WSDLModeler extends WSDLModelerBase {
     }
 
     /**
-     *
      * @param port
      * @param suffix
      * @return the Java ClassName for a port
      */
     protected String getClassName(Port port, String suffix) {
-        String name = "";
-        String javaPackageName = "";
-        if (_modelInfo.getJavaPackageName() != null
-            && !_modelInfo.getJavaPackageName().equals("")) {
-            javaPackageName = _modelInfo.getJavaPackageName();
-        }
-        String prefix = getEnvironment().getNames().validJavaClassName(port.getName().getLocalPart());
-        name = javaPackageName+"."+prefix+suffix;
-        return name;
+        String prefix = JAXBRIContext.mangleNameToClassName((port.getName().getLocalPart()));
+        return options.defaultPackage + "." + prefix + suffix;
     }
 
     protected boolean isConflictingServiceClassName(String name) {
-       if(conflictsWithSEIClass(name) || conflictsWithJAXBClass(name) ||conflictsWithExceptionClass(name)){
-            return true;
-        }
-        return false;
+        return conflictsWithSEIClass(name) || conflictsWithJAXBClass(name) || conflictsWithExceptionClass(name);
     }
 
-    private boolean conflictsWithSEIClass(String name){
+    private boolean conflictsWithSEIClass(String name) {
         Set seiNames = classNameCollector.getSeiClassNames();
-        if(seiNames != null && seiNames.contains(name))
-            return true;
-        return false;
+        return seiNames != null && seiNames.contains(name);
     }
 
-    private boolean conflictsWithJAXBClass(String name){
+    private boolean conflictsWithJAXBClass(String name) {
         Set jaxbNames = classNameCollector.getJaxbGeneratedClassNames();
-        if(jaxbNames != null && jaxbNames.contains(name))
-            return true;
-        return false;
+        return jaxbNames != null && jaxbNames.contains(name);
     }
 
-    private boolean conflictsWithExceptionClass(String name){
+    private boolean conflictsWithExceptionClass(String name) {
         Set exceptionNames = classNameCollector.getExceptionClassNames();
-        if(exceptionNames != null && exceptionNames.contains(name))
-            return true;
-        return false;
+        return exceptionNames != null && exceptionNames.contains(name);
     }
 
     protected boolean isConflictingExceptionClassName(String name) {
-        if(conflictsWithSEIClass(name) || conflictsWithJAXBClass(name)){
-            return true;
-        }
-        return false;
+        return conflictsWithSEIClass(name) || conflictsWithJAXBClass(name);
     }
 
     protected JAXBModelBuilder getJAXBModelBuilder() {
@@ -2727,32 +2658,31 @@ public class WSDLModeler extends WSDLModelerBase {
     }
 
     protected boolean validateWSDLBindingStyle(Binding binding) {
-        boolean mixedStyle = false;
         SOAPBinding soapBinding =
-            (SOAPBinding)getExtensionOfType(binding, SOAPBinding.class);
+                (SOAPBinding) getExtensionOfType(binding, SOAPBinding.class);
 
         //dont process the binding
-        if(soapBinding == null)
+        if (soapBinding == null)
             soapBinding =
-                (SOAPBinding)getExtensionOfType(binding, SOAP12Binding.class);
-        if(soapBinding == null)
+                    (SOAPBinding) getExtensionOfType(binding, SOAP12Binding.class);
+        if (soapBinding == null)
             return false;
 
         //if soapbind:binding has no style attribute, the default is DOCUMENT
-        if(soapBinding.getStyle() == null)
+        if (soapBinding.getStyle() == null)
             soapBinding.setStyle(SOAPStyle.DOCUMENT);
 
         SOAPStyle opStyle = soapBinding.getStyle();
         for (Iterator iter = binding.operations(); iter.hasNext();) {
             BindingOperation bindingOperation =
-                (BindingOperation)iter.next();
+                    (BindingOperation) iter.next();
             SOAPOperation soapOperation =
-                (SOAPOperation) getExtensionOfType(bindingOperation,
-                    SOAPOperation.class);
-            if(soapOperation != null){
-                SOAPStyle currOpStyle = (soapOperation.getStyle() != null)?soapOperation.getStyle():soapBinding.getStyle();
+                    (SOAPOperation) getExtensionOfType(bindingOperation,
+                            SOAPOperation.class);
+            if (soapOperation != null) {
+                SOAPStyle currOpStyle = (soapOperation.getStyle() != null) ? soapOperation.getStyle() : soapBinding.getStyle();
                 //dont check for the first operation
-                if(!currOpStyle.equals(opStyle))
+                if (!currOpStyle.equals(opStyle))
                     return false;
             }
         }
@@ -2763,16 +2693,16 @@ public class WSDLModeler extends WSDLModelerBase {
      * @param port
      */
     private void applyWrapperStyleCustomization(Port port, PortType portType) {
-        JAXWSBinding jaxwsBinding = (JAXWSBinding)getExtensionOfType(portType, JAXWSBinding.class);
-        Boolean wrapperStyle = (jaxwsBinding != null)?jaxwsBinding.isEnableWrapperStyle():null;
-        if(wrapperStyle != null){
+        JAXWSBinding jaxwsBinding = (JAXWSBinding) getExtensionOfType(portType, JAXWSBinding.class);
+        Boolean wrapperStyle = (jaxwsBinding != null) ? jaxwsBinding.isEnableWrapperStyle() : null;
+        if (wrapperStyle != null) {
             port.setWrapped(wrapperStyle);
         }
     }
 
     protected static void setDocumentationIfPresent(
-        ModelObject obj,
-        Documentation documentation) {
+            ModelObject obj,
+            Documentation documentation) {
         if (documentation != null && documentation.getContent() != null) {
             obj.setJavaDoc(documentation.getContent());
         }
@@ -2780,16 +2710,20 @@ public class WSDLModeler extends WSDLModelerBase {
 
     protected String getJavaNameForOperation(Operation operation) {
         String name = operation.getJavaMethodName();
-        if(getEnvironment().getNames().isJavaReservedWord(name)){
-            name = "_"+name;
+        if (Names.isJavaReservedWord(name)) {
+            name = "_" + name;
         }
         return name;
     }
 
-    protected void fail(String key, String arg){
-        throw new ModelerException(key, arg);
-    }
-    protected void fail(String key, Object[] args){
-        throw new ModelerException(key, args);
+    private void reportError(Entity entity,
+        String formattedMsg, Exception nestedException ) {
+        Locator locator = (entity == null)?NULL_LOCATOR:entity.getLocator();
+
+        SAXParseException e = new SAXParseException2( formattedMsg,
+            locator,
+            nestedException );
+        errReceiver.error(e);
     }
+
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModelerBase.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModelerBase.java
index fc5f028b58d..89eab9108bb 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModelerBase.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModelerBase.java
@@ -1,6 +1,5 @@
-
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,64 +23,41 @@
  * have any questions.
  */
 
+
 package com.sun.tools.internal.ws.processor.modeler.wsdl;
 
-import com.sun.tools.internal.ws.processor.config.WSDLModelInfo;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtensible;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtension;
 import com.sun.tools.internal.ws.processor.generator.Names;
-import com.sun.tools.internal.ws.processor.model.AbstractType;
-import com.sun.tools.internal.ws.processor.model.Block;
 import com.sun.tools.internal.ws.processor.model.Fault;
-import com.sun.tools.internal.ws.processor.model.Model;
-import com.sun.tools.internal.ws.processor.model.ModelObject;
-import com.sun.tools.internal.ws.processor.model.ModelProperties;
 import com.sun.tools.internal.ws.processor.model.Operation;
-import com.sun.tools.internal.ws.processor.model.Parameter;
 import com.sun.tools.internal.ws.processor.model.Port;
+import com.sun.tools.internal.ws.processor.model.java.JavaException;
 import com.sun.tools.internal.ws.processor.modeler.JavaSimpleTypeCreator;
 import com.sun.tools.internal.ws.processor.modeler.Modeler;
-import com.sun.tools.internal.ws.processor.modeler.ModelerException;
-import com.sun.tools.internal.ws.processor.util.ProcessorEnvironment;
-import com.sun.tools.internal.ws.wsdl.document.Binding;
-import com.sun.tools.internal.ws.wsdl.document.BindingFault;
-import com.sun.tools.internal.ws.wsdl.document.BindingOperation;
-import com.sun.tools.internal.ws.wsdl.document.Documentation;
-import com.sun.tools.internal.ws.wsdl.document.Kinds;
-import com.sun.tools.internal.ws.wsdl.document.Message;
-import com.sun.tools.internal.ws.wsdl.document.MessagePart;
-import com.sun.tools.internal.ws.wsdl.document.OperationStyle;
-import com.sun.tools.internal.ws.wsdl.document.WSDLDocument;
+import com.sun.tools.internal.ws.resources.ModelerMessages;
+import com.sun.tools.internal.ws.wscompile.AbortException;
+import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
+import com.sun.tools.internal.ws.wscompile.ErrorReceiverFilter;
+import com.sun.tools.internal.ws.wscompile.WsimportOptions;
+import com.sun.tools.internal.ws.wsdl.document.*;
 import com.sun.tools.internal.ws.wsdl.document.jaxws.JAXWSBinding;
 import com.sun.tools.internal.ws.wsdl.document.mime.MIMEContent;
 import com.sun.tools.internal.ws.wsdl.document.mime.MIMEMultipartRelated;
 import com.sun.tools.internal.ws.wsdl.document.mime.MIMEPart;
 import com.sun.tools.internal.ws.wsdl.document.schema.SchemaKinds;
-import com.sun.tools.internal.ws.wsdl.document.soap.SOAPBinding;
-import com.sun.tools.internal.ws.wsdl.document.soap.SOAPBody;
-import com.sun.tools.internal.ws.wsdl.document.soap.SOAPFault;
-import com.sun.tools.internal.ws.wsdl.document.soap.SOAPHeader;
-import com.sun.tools.internal.ws.wsdl.document.soap.SOAPOperation;
-import com.sun.tools.internal.ws.wsdl.framework.Extensible;
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
+import com.sun.tools.internal.ws.wsdl.document.soap.*;
+import com.sun.tools.internal.ws.wsdl.framework.Entity;
 import com.sun.tools.internal.ws.wsdl.framework.GloballyKnown;
 import com.sun.tools.internal.ws.wsdl.framework.NoSuchEntityException;
-import com.sun.tools.internal.ws.wsdl.parser.Constants;
-import com.sun.tools.internal.ws.wsdl.parser.Util;
+import com.sun.tools.internal.ws.wsdl.parser.DOMForest;
 import com.sun.tools.internal.ws.wsdl.parser.WSDLParser;
-import com.sun.xml.internal.ws.util.localization.Localizable;
-import com.sun.xml.internal.ws.util.localization.LocalizableMessageFactory;
-import com.sun.xml.internal.ws.util.xml.XmlUtil;
-import org.w3c.dom.Element;
+import com.sun.tools.internal.ws.wsdl.parser.MetadataFinder;
+import com.sun.xml.internal.bind.api.JAXBRIContext;
+import org.xml.sax.helpers.LocatorImpl;
 
 import javax.xml.namespace.QName;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.StringTokenizer;
+import java.util.*;
 
 /**
  *
@@ -90,53 +66,18 @@ import java.util.StringTokenizer;
  * Base class for WSDL->Model classes.
  */
 public abstract class WSDLModelerBase implements Modeler {
-    public WSDLModelerBase(WSDLModelInfo modelInfo, Properties options) {
-        //init();
-        _modelInfo = modelInfo;
-        _options = options;
-        _messageFactory =
-            new LocalizableMessageFactory("com.sun.tools.internal.ws.resources.modeler");
-        _conflictingClassNames = null;
-        _env = (ProcessorEnvironment)modelInfo.getParent().getEnvironment();
-        hSet = null;
-        reqResNames = new HashSet();
-    }
+    protected final ErrorReceiverFilter errReceiver;
+    protected final WsimportOptions options;
+    protected MetadataFinder forest;
 
 
-    protected WSDLParser createWSDLParser(){
-        return new WSDLParser(_modelInfo);
+    public WSDLModelerBase(WsimportOptions options, ErrorReceiver receiver) {
+        this.options = options;
+        this.errReceiver = new ErrorReceiverFilter(receiver);;
     }
 
     /**
-     * Builds model from WSDL document. Model contains abstraction which is used by the
-     * generators to generate the stub/tie/serializers etc. code.
      *
-     * @see Modeler#buildModel()
-     */
-    public Model buildModel() {
-        return null;
-    }
-
-    protected WSDLModelInfo getWSDLModelInfo(){
-        return _modelInfo;
-    }
-
-    protected Documentation getDocumentationFor(Element e) {
-        String s = XmlUtil.getTextForNode(e);
-        if (s == null) {
-            return null;
-        } else {
-            return new Documentation(s);
-        }
-    }
-
-    protected void checkNotWsdlElement(Element e) {
-        // possible extensibility element -- must live outside the WSDL namespace
-        if (e.getNamespaceURI().equals(Constants.NS_WSDL))
-            Util.fail("parsing.invalidWsdlElement", e.getTagName());
-    }
-
-    /**
      * @param port
      * @param wsdlPort
      */
@@ -150,7 +91,7 @@ public abstract class WSDLModelerBase implements Modeler {
             port.setPortGetter(portMethodName);
         }else{
             portMethodName = Names.getPortName(port);
-            portMethodName = getEnvironment().getNames().validJavaClassName(portMethodName);
+            portMethodName = JAXBRIContext.mangleNameToClassName(portMethodName);
             port.setPortGetter("get"+portMethodName);
         }
 
@@ -170,78 +111,19 @@ public abstract class WSDLModelerBase implements Modeler {
         return false;
     }
 
-    protected void createParentFault(Fault fault) {
-        AbstractType faultType = fault.getBlock().getType();
-        AbstractType parentType = null;
-
-
-        if (parentType == null) {
-            return;
-        }
-
-        if (fault.getParentFault() != null) {
-            return;
-        }
-        Fault parentFault =
-            new Fault(((AbstractType)parentType).getName().getLocalPart());
-        /* this is what it really should be but for interop with JAXRPC 1.0.1 we are not doing
-         * this at this time.
-         *
-         * TODO - we should double-check this; the above statement might not be true anymore.
-         */
-        QName faultQName =
-            new QName(
-                fault.getBlock().getName().getNamespaceURI(),
-                parentFault.getName());
-        Block block = new Block(faultQName);
-        block.setType((AbstractType)parentType);
-        parentFault.setBlock(block);
-        parentFault.addSubfault(fault);
-        createParentFault(parentFault);
-    }
-
-    protected void createSubfaults(Fault fault) {
-        AbstractType faultType = fault.getBlock().getType();
-        Iterator subtypes = null;
-        if (subtypes != null) {
-            AbstractType subtype;
-            while (subtypes.hasNext()) {
-                subtype = (AbstractType)subtypes.next();
-                Fault subFault = new Fault(subtype.getName().getLocalPart());
-                /* this is what it really is but for interop with JAXRPC 1.0.1 we are not doing
-                 * this at this time
-                 *
-                 * TODO - we should double-check this; the above statement might not be true anymore.
-                 */
-                QName faultQName =
-                    new QName(
-                        fault.getBlock().getName().getNamespaceURI(),
-                        subFault.getName());
-                Block block = new Block(faultQName);
-                block.setType(subtype);
-                subFault.setBlock(block);
-                fault.addSubfault(subFault);
-                createSubfaults(subFault);
-            }
-        }
-    }
-
     protected SOAPBody getSOAPRequestBody() {
         SOAPBody requestBody =
             (SOAPBody)getAnyExtensionOfType(info.bindingOperation.getInput(),
                 SOAPBody.class);
         if (requestBody == null) {
             // the WSDL document is invalid
-            throw new ModelerException(
-                "wsdlmodeler.invalid.bindingOperation.inputMissingSoapBody",
-                new Object[] { info.bindingOperation.getName()});
+            error(info.bindingOperation.getInput(), ModelerMessages.WSDLMODELER_INVALID_BINDING_OPERATION_INPUT_MISSING_SOAP_BODY(info.bindingOperation.getName()));
         }
         return requestBody;
     }
 
     protected boolean isRequestMimeMultipart() {
-        for (Iterator iter = info.bindingOperation.getInput().extensions(); iter.hasNext();) {
-            Extension extension = (Extension)iter.next();
+        for (TWSDLExtension extension: info.bindingOperation.getInput().extensions()) {
             if (extension.getClass().equals(MIMEMultipartRelated.class)) {
                 return true;
             }
@@ -250,8 +132,7 @@ public abstract class WSDLModelerBase implements Modeler {
     }
 
     protected boolean isResponseMimeMultipart() {
-        for (Iterator iter = info.bindingOperation.getOutput().extensions(); iter.hasNext();) {
-            Extension extension = (Extension)iter.next();
+        for (TWSDLExtension extension: info.bindingOperation.getOutput().extensions()) {
             if (extension.getClass().equals(MIMEMultipartRelated.class)) {
                 return true;
             }
@@ -268,9 +149,7 @@ public abstract class WSDLModelerBase implements Modeler {
                 SOAPBody.class);
         if (responseBody == null) {
             // the WSDL document is invalid
-            throw new ModelerException(
-                "wsdlmodeler.invalid.bindingOperation.outputMissingSoapBody",
-                new Object[] { info.bindingOperation.getName()});
+            error(info.bindingOperation.getOutput(),  ModelerMessages.WSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_MISSING_SOAP_BODY(info.bindingOperation.getName()));
         }
         return responseBody;
     }
@@ -290,15 +169,15 @@ public abstract class WSDLModelerBase implements Modeler {
      * @param message Input or output message, equivalent to wsdl:message
      * @return iterator over MessagePart
      */
-    protected List getMessageParts(
+    protected List getMessageParts(
         SOAPBody body,
         com.sun.tools.internal.ws.wsdl.document.Message message, boolean isInput) {
         String bodyParts = body.getParts();
-        ArrayList partsList = new ArrayList();
-        List parts = new ArrayList();
+        ArrayList partsList = new ArrayList();
+        List parts = new ArrayList();
 
         //get Mime parts
-        List mimeParts = null;
+        List mimeParts;
         if(isInput)
             mimeParts = getMimeContentParts(message, info.bindingOperation.getInput());
         else
@@ -308,26 +187,22 @@ public abstract class WSDLModelerBase implements Modeler {
             StringTokenizer in = new StringTokenizer(bodyParts.trim(), " ");
             while (in.hasMoreTokens()) {
                 String part = in.nextToken();
-                MessagePart mPart = (MessagePart)message.getPart(part);
+                MessagePart mPart = message.getPart(part);
                 if (null == mPart) {
-                    throw new ModelerException(
-                        "wsdlmodeler.error.partsNotFound",
-                        new Object[] { part, message.getName()});
+                    error(message,  ModelerMessages.WSDLMODELER_ERROR_PARTS_NOT_FOUND(part, message.getName()));
                 }
                 mPart.setBindingExtensibilityElementKind(MessagePart.SOAP_BODY_BINDING);
                 partsList.add(mPart);
             }
         } else {
-            for(Iterator iter = message.parts();iter.hasNext();) {
-                MessagePart mPart = (MessagePart)iter.next();
-                if(!mimeParts.contains(mPart))
+            for (MessagePart mPart : message.getParts()) {
+                if (!mimeParts.contains(mPart))
                     mPart.setBindingExtensibilityElementKind(MessagePart.SOAP_BODY_BINDING);
                 partsList.add(mPart);
             }
         }
 
-        for(Iterator iter = message.parts();iter.hasNext();) {
-            MessagePart mPart = (MessagePart)iter.next();
+        for (MessagePart mPart : message.getParts()) {
             if(mimeParts.contains(mPart)) {
                 mPart.setBindingExtensibilityElementKind(MessagePart.WSDL_MIME_BINDING);
                 parts.add(mPart);
@@ -344,14 +219,12 @@ public abstract class WSDLModelerBase implements Modeler {
      * @param message
      * @return MessageParts referenced by the mime:content
      */
-    protected List getMimeContentParts(Message message, Extensible ext) {
-        ArrayList mimeContentParts = new ArrayList();
-        String mimeContentPartName = null;
-        Iterator mimeParts = getMimeParts(ext);
+    protected List getMimeContentParts(Message message, TWSDLExtensible ext) {
+        ArrayList mimeContentParts = new ArrayList();
 
-        while(mimeParts.hasNext()) {
-            MessagePart part = getMimeContentPart(message, (MIMEPart)mimeParts.next());
-            if(part != null)
+        for (MIMEPart mimePart : getMimeParts(ext)) {
+            MessagePart part = getMimeContentPart(message, mimePart);
+            if (part != null)
                 mimeContentParts.add(part);
         }
         return mimeContentParts;
@@ -360,32 +233,25 @@ public abstract class WSDLModelerBase implements Modeler {
     /**
      * @param mimeParts
      */
-    protected boolean validateMimeParts(Iterator mimeParts) {
+    protected boolean validateMimeParts(Iterable mimeParts) {
         boolean gotRootPart = false;
-        List mimeContents = new ArrayList();
-        while(mimeParts.hasNext()) {
-            MIMEPart mPart = (MIMEPart)mimeParts.next();
-            Iterator extns = mPart.extensions();
-            while(extns.hasNext()){
-                Object obj = extns.next();
-                if(obj instanceof SOAPBody){
-                    if(gotRootPart) {
-                        //bug fix: 5024020
-                        warn("mimemodeler.invalidMimePart.moreThanOneSOAPBody",
-                                new Object[] {info.operation.getName().getLocalPart()});
+        List mimeContents = new ArrayList();
+        for (MIMEPart mPart : mimeParts) {
+            for (TWSDLExtension obj : mPart.extensions()) {
+                if (obj instanceof SOAPBody) {
+                    if (gotRootPart) {
+                        warning(mPart, ModelerMessages.MIMEMODELER_INVALID_MIME_PART_MORE_THAN_ONE_SOAP_BODY(info.operation.getName().getLocalPart()));
                         return false;
                     }
                     gotRootPart = true;
-                }else if (obj instanceof MIMEContent) {
-                    mimeContents.add((MIMEContent)obj);
+                } else if (obj instanceof MIMEContent) {
+                    mimeContents.add((MIMEContent) obj);
                 }
             }
-            if(!validateMimeContentPartNames(mimeContents.iterator()))
+            if(!validateMimeContentPartNames(mimeContents))
                 return false;
             if(mPart.getName() != null) {
-                //bug fix: 5024018
-                warn("mimemodeler.invalidMimePart.nameNotAllowed",
-                        info.portTypeOperation.getName());
+                warning(mPart, ModelerMessages.MIMEMODELER_INVALID_MIME_PART_NAME_NOT_ALLOWED(info.portTypeOperation.getName()));
             }
         }
         return true;
@@ -393,15 +259,12 @@ public abstract class WSDLModelerBase implements Modeler {
     }
 
     private MessagePart getMimeContentPart(Message message, MIMEPart part) {
-        String mimeContentPartName = null;
-        Iterator mimeContents = getMimeContents(part).iterator();
-        if(mimeContents.hasNext()) {
-            mimeContentPartName = ((MIMEContent)mimeContents.next()).getPart();
-            MessagePart mPart = (MessagePart)message.getPart(mimeContentPartName);
+        for( MIMEContent mimeContent : getMimeContents(part) ) {
+            String mimeContentPartName = mimeContent.getPart();
+            MessagePart mPart = message.getPart(mimeContentPartName);
             //RXXXX mime:content MUST have part attribute
             if(null == mPart) {
-                throw new ModelerException("wsdlmodeler.error.partsNotFound",
-                        new Object[] {mimeContentPartName, message.getName()});
+                error(mimeContent,  ModelerMessages.WSDLMODELER_ERROR_PARTS_NOT_FOUND(mimeContentPartName, message.getName()));
             }
             mPart.setBindingExtensibilityElementKind(MessagePart.WSDL_MIME_BINDING);
             return mPart;
@@ -422,29 +285,24 @@ public abstract class WSDLModelerBase implements Modeler {
         return mimeTypes;
     }
 
-    /**
-     * @param iterator
-     */
-    private boolean validateMimeContentPartNames(Iterator mimeContents) {
+    private boolean validateMimeContentPartNames(List mimeContents) {
         //validate mime:content(s) in the mime:part as per R2909
-        while(mimeContents.hasNext()){
+        for (MIMEContent mimeContent : mimeContents) {
             String mimeContnetPart = null;
             if(mimeContnetPart == null) {
-                mimeContnetPart = getMimeContentPartName((MIMEContent)mimeContents.next());
+                mimeContnetPart = getMimeContentPartName(mimeContent);
                 if(mimeContnetPart == null) {
-                    warn("mimemodeler.invalidMimeContent.missingPartAttribute",
-                            new Object[] {info.operation.getName().getLocalPart()});
+                    warning(mimeContent, ModelerMessages.MIMEMODELER_INVALID_MIME_CONTENT_MISSING_PART_ATTRIBUTE(info.operation.getName().getLocalPart()));
                     return false;
                 }
             }else {
-                String newMimeContnetPart = getMimeContentPartName((MIMEContent)mimeContents.next());
+                String newMimeContnetPart = getMimeContentPartName(mimeContent);
                 if(newMimeContnetPart == null) {
-                    warn("mimemodeler.invalidMimeContent.missingPartAttribute",
-                            new Object[] {info.operation.getName().getLocalPart()});
+                    warning(mimeContent, ModelerMessages.MIMEMODELER_INVALID_MIME_CONTENT_MISSING_PART_ATTRIBUTE(info.operation.getName().getLocalPart()));
                     return false;
                 }else if(!newMimeContnetPart.equals(mimeContnetPart)) {
                     //throw new ModelerException("mimemodeler.invalidMimeContent.differentPart");
-                    warn("mimemodeler.invalidMimeContent.differentPart");
+                    warning(mimeContent, ModelerMessages.MIMEMODELER_INVALID_MIME_CONTENT_DIFFERENT_PART());
                     return false;
                 }
             }
@@ -452,13 +310,12 @@ public abstract class WSDLModelerBase implements Modeler {
         return true;
     }
 
-    protected Iterator getMimeParts(Extensible ext) {
+    protected Iterable getMimeParts(TWSDLExtensible ext) {
         MIMEMultipartRelated multiPartRelated =
             (MIMEMultipartRelated) getAnyExtensionOfType(ext,
                     MIMEMultipartRelated.class);
         if(multiPartRelated == null) {
-            List parts = new ArrayList();
-            return parts.iterator();
+            return Collections.emptyList();
         }
         return multiPartRelated.getParts();
     }
@@ -466,11 +323,9 @@ public abstract class WSDLModelerBase implements Modeler {
     //returns MIMEContents
     protected List getMimeContents(MIMEPart part) {
         List mimeContents = new ArrayList();
-        Iterator parts = part.extensions();
-        while(parts.hasNext()) {
-            Extension mimeContent = (Extension) parts.next();
+        for (TWSDLExtension mimeContent : part.extensions()) {
             if (mimeContent instanceof MIMEContent) {
-                mimeContents.add((MIMEContent)mimeContent);
+                mimeContents.add((MIMEContent) mimeContent);
             }
         }
         //validateMimeContentPartNames(mimeContents.iterator());
@@ -490,8 +345,7 @@ public abstract class WSDLModelerBase implements Modeler {
     private String getMimeContentType(MIMEContent mimeContent){
         String mimeType = mimeContent.getType();
         if(mimeType == null){
-            throw new ModelerException("mimemodeler.invalidMimeContent.missingTypeAttribute",
-                    new Object[] {info.operation.getName().getLocalPart()});
+            error(mimeContent, ModelerMessages.MIMEMODELER_INVALID_MIME_CONTENT_MISSING_TYPE_ATTRIBUTE(info.operation.getName().getLocalPart()));
         }
         return mimeType;
     }
@@ -534,9 +388,7 @@ public abstract class WSDLModelerBase implements Modeler {
         if (namespaceURI == null) {
             // the WSDL document is invalid
             // at least, that's my interpretation of section 3.5 of the WSDL 1.1 spec!
-            throw new ModelerException(
-                "wsdlmodeler.invalid.bindingOperation.inputSoapBody.missingNamespace",
-                new Object[] { info.bindingOperation.getName()});
+            error(body, ModelerMessages.WSDLMODELER_INVALID_BINDING_OPERATION_INPUT_SOAP_BODY_MISSING_NAMESPACE(info.bindingOperation.getName()));
         }
         return namespaceURI;
     }
@@ -546,9 +398,7 @@ public abstract class WSDLModelerBase implements Modeler {
         if (namespaceURI == null) {
             // the WSDL document is invalid
             // at least, that's my interpretation of section 3.5 of the WSDL 1.1 spec!
-            throw new ModelerException(
-                "wsdlmodeler.invalid.bindingOperation.outputSoapBody.missingNamespace",
-                new Object[] { info.bindingOperation.getName()});
+            error(body, ModelerMessages.WSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_SOAP_BODY_MISSING_NAMESPACE(info.bindingOperation.getName()));
         }
         return namespaceURI;
     }
@@ -556,39 +406,27 @@ public abstract class WSDLModelerBase implements Modeler {
     /**
      * @return List of SOAPHeader extensions
      */
-    protected List getHeaderExtensions(Extensible extensible) {
+    protected List getHeaderExtensions(TWSDLExtensible extensible) {
         List headerList = new ArrayList();
-        Iterator bindingIter = extensible.extensions();
-        while (bindingIter.hasNext()) {
-            Extension extension = (Extension) bindingIter.next();
-            if (extension.getClass().equals(MIMEMultipartRelated.class)) {
-                for (Iterator parts = ((MIMEMultipartRelated) extension).getParts();
-                parts.hasNext();) {
-                    Extension part = (Extension) parts.next();
-                    if (part.getClass().equals(MIMEPart.class)) {
-                        boolean isRootPart = isRootPart((MIMEPart)part);
-                        Iterator iter = ((MIMEPart)part).extensions();
-                        while(iter.hasNext()) {
-                            Object obj = iter.next();
-                            if(obj instanceof SOAPHeader){
-                                //bug fix: 5024015
-                                if(!isRootPart) {
-                                    warn(
-                                            "mimemodeler.warning.IgnoringinvalidHeaderPart.notDeclaredInRootPart",
-                                            new Object[] {
-                                                    info.bindingOperation.getName()});
-                                    return new ArrayList();
-                                }
-                                headerList.add((SOAPHeader)obj);
+        for (TWSDLExtension extension : extensible.extensions()) {
+            if (extension.getClass()==MIMEMultipartRelated.class) {
+                for( MIMEPart part : ((MIMEMultipartRelated) extension).getParts() ) {
+                    boolean isRootPart = isRootPart(part);
+                    for (TWSDLExtension obj : part.extensions()) {
+                        if (obj instanceof SOAPHeader) {
+                            //bug fix: 5024015
+                            if (!isRootPart) {
+                                warning((Entity) obj, ModelerMessages.MIMEMODELER_WARNING_IGNORINGINVALID_HEADER_PART_NOT_DECLARED_IN_ROOT_PART(info.bindingOperation.getName()));
+                                return new ArrayList();
                             }
+                            headerList.add((SOAPHeader) obj);
                         }
                     }
-
                 }
-            }else if(extension instanceof SOAPHeader) {
-                headerList.add((SOAPHeader)extension);
+            } else if (extension instanceof SOAPHeader) {
+                headerList.add((SOAPHeader) extension);
             }
-         }
+        }
          return headerList;
     }
 
@@ -597,9 +435,8 @@ public abstract class WSDLModelerBase implements Modeler {
      * @return true if part is the Root part
      */
     private boolean isRootPart(MIMEPart part) {
-        Iterator iter = part.extensions();
-        while(iter.hasNext()){
-            if(iter.next() instanceof SOAPBody)
+        for (TWSDLExtension twsdlExtension : part.extensions()) {
+            if (twsdlExtension instanceof SOAPBody)
                 return true;
         }
         return false;
@@ -607,25 +444,16 @@ public abstract class WSDLModelerBase implements Modeler {
 
     protected Set getDuplicateFaultNames() {
         // look for fault messages with the same soap:fault name
-        Set faultNames = new HashSet();
-        Set duplicateNames = new HashSet();
-        for (Iterator iter = info.bindingOperation.faults(); iter.hasNext();) {
-            BindingFault bindingFault = (BindingFault)iter.next();
+        Set faultNames = new HashSet();
+        Set duplicateNames = new HashSet();
+        for( BindingFault bindingFault : info.bindingOperation.faults() ) {
             com.sun.tools.internal.ws.wsdl.document.Fault portTypeFault = null;
-            for (Iterator iter2 = info.portTypeOperation.faults();
-                iter2.hasNext();
-                ) {
-                com.sun.tools.internal.ws.wsdl.document.Fault aFault =
-                    (com.sun.tools.internal.ws.wsdl.document.Fault)iter2.next();
-
+            for (com.sun.tools.internal.ws.wsdl.document.Fault aFault : info.portTypeOperation.faults()) {
                 if (aFault.getName().equals(bindingFault.getName())) {
                     if (portTypeFault != null) {
                         // the WSDL document is invalid
-                        throw new ModelerException(
-                            "wsdlmodeler.invalid.bindingFault.notUnique",
-                            new Object[] {
-                                bindingFault.getName(),
-                                info.bindingOperation.getName()});
+                        error(bindingFault, ModelerMessages.WSDLMODELER_INVALID_BINDING_FAULT_NOT_UNIQUE(bindingFault.getName(),
+                            info.bindingOperation.getName()));
                     } else {
                         portTypeFault = aFault;
                     }
@@ -633,46 +461,34 @@ public abstract class WSDLModelerBase implements Modeler {
             }
             if (portTypeFault == null) {
                 // the WSDL document is invalid
-                throw new ModelerException(
-                    "wsdlmodeler.invalid.bindingFault.notFound",
-                    new Object[] {
-                        bindingFault.getName(),
-                        info.bindingOperation.getName()});
-
+                error(bindingFault, ModelerMessages.WSDLMODELER_INVALID_BINDING_FAULT_NOT_FOUND(bindingFault.getName(),
+                    info.bindingOperation.getName()));
             }
             SOAPFault soapFault =
                 (SOAPFault)getExtensionOfType(bindingFault, SOAPFault.class);
             if (soapFault == null) {
                 // the WSDL document is invalid
-                throw new ModelerException(
-                    "wsdlmodeler.invalid.bindingFault.outputMissingSoapFault",
-                    new Object[] {
-                        bindingFault.getName(),
-                        info.bindingOperation.getName()});
+                if(options.isExtensionMode()){
+                    warning(bindingFault, ModelerMessages.WSDLMODELER_INVALID_BINDING_FAULT_OUTPUT_MISSING_SOAP_FAULT(bindingFault.getName(),
+                    info.bindingOperation.getName()));
+                }else {
+                    error(bindingFault, ModelerMessages.WSDLMODELER_INVALID_BINDING_FAULT_OUTPUT_MISSING_SOAP_FAULT(bindingFault.getName(),
+                        info.bindingOperation.getName()));
+                }
             }
 
             com.sun.tools.internal.ws.wsdl.document.Message faultMessage =
                 portTypeFault.resolveMessage(info.document);
-            Iterator iter2 = faultMessage.parts();
-            if (!iter2.hasNext()) {
+            if(faultMessage.getParts().isEmpty()) {
                 // the WSDL document is invalid
-                throw new ModelerException(
-                    "wsdlmodeler.invalid.bindingFault.emptyMessage",
-                    new Object[] {
-                        bindingFault.getName(),
-                        faultMessage.getName()});
+                error(faultMessage, ModelerMessages.WSDLMODELER_INVALID_BINDING_FAULT_EMPTY_MESSAGE(bindingFault.getName(),
+                    faultMessage.getName()));
             }
             //  bug fix: 4852729
-            if (useWSIBasicProfile && (soapFault.getNamespace() != null)) {
-                warn(
-                    "wsdlmodeler.warning.r2716r2726",
-                    new Object[] { "soapbind:fault", soapFault.getName()});
-            }
-            String faultNamespaceURI = soapFault.getNamespace();
-            if (faultNamespaceURI == null) {
-                faultNamespaceURI =
-                    portTypeFault.getMessage().getNamespaceURI();
+            if (!options.isExtensionMode() && (soapFault != null && soapFault.getNamespace() != null)) {
+                warning(soapFault, ModelerMessages.WSDLMODELER_WARNING_R_2716_R_2726("soapbind:fault", soapFault.getName()));
             }
+            String faultNamespaceURI = (soapFault != null && soapFault.getNamespace() != null)?soapFault.getNamespace():portTypeFault.getMessage().getNamespaceURI();
             String faultName = faultMessage.getName();
             QName faultQName = new QName(faultNamespaceURI, faultName);
             if (faultNames.contains(faultQName)) {
@@ -693,12 +509,12 @@ public abstract class WSDLModelerBase implements Modeler {
         boolean isRequestResponse =
             info.portTypeOperation.getStyle()
             == OperationStyle.REQUEST_RESPONSE;
-        List inputParts = getMessageParts(getSOAPRequestBody(), getInputMessage(), true);
+        List inputParts = getMessageParts(getSOAPRequestBody(), getInputMessage(), true);
         if(!validateStyleAndPart(operation, inputParts))
             return false;
 
         if(isRequestResponse){
-            List outputParts = getMessageParts(getSOAPResponseBody(), getOutputMessage(), false);
+            List outputParts = getMessageParts(getSOAPResponseBody(), getOutputMessage(), false);
             if(!validateStyleAndPart(operation, outputParts))
                 return false;
         }
@@ -709,13 +525,12 @@ public abstract class WSDLModelerBase implements Modeler {
      * @param operation
      * @return true if operation has valid style and part
      */
-    private boolean validateStyleAndPart(BindingOperation operation, List parts) {
+    private boolean validateStyleAndPart(BindingOperation operation, List parts) {
         SOAPOperation soapOperation =
             (SOAPOperation) getExtensionOfType(operation, SOAPOperation.class);
-        for(Iterator iter = parts.iterator(); iter.hasNext();){
-            MessagePart part = (MessagePart)iter.next();
-            if(part.getBindingExtensibilityElementKind() == MessagePart.SOAP_BODY_BINDING){
-                if(!isStyleAndPartMatch(soapOperation, part))
+        for (MessagePart part : parts) {
+            if (part.getBindingExtensibilityElementKind() == MessagePart.SOAP_BODY_BINDING) {
+                if (!isStyleAndPartMatch(soapOperation, part))
                     return false;
             }
         }
@@ -738,94 +553,26 @@ public abstract class WSDLModelerBase implements Modeler {
      * @param name
      * @return List of MimeContents from ext
      */
-    protected List getMimeContents(Extensible ext, Message message, String name) {
-        Iterator mimeParts = getMimeParts(ext);
-        while(mimeParts.hasNext()){
-            MIMEPart mimePart = (MIMEPart)mimeParts.next();
+    protected List getMimeContents(TWSDLExtensible ext, Message message, String name) {
+        for (MIMEPart mimePart : getMimeParts(ext)) {
             List mimeContents = getMimeContents(mimePart);
-            for(MIMEContent mimeContent:mimeContents){
-                if(mimeContent.getPart().equals(name))
+            for (MIMEContent mimeContent : mimeContents) {
+                if (mimeContent.getPart().equals(name))
                     return mimeContents;
             }
         }
         return null;
     }
 
-    protected ProcessorEnvironment getEnvironment() {
-        return _env;
-    }
-
-    protected void warn(Localizable msg) {
-        getEnvironment().warn(msg);
-    }
-
-    protected void warn(String key) {
-        getEnvironment().warn(_messageFactory.getMessage(key));
-    }
-
-    protected void warn(String key, String arg) {
-        getEnvironment().warn(_messageFactory.getMessage(key, arg));
-    }
-
-    protected void error(String key, String arg) {
-        getEnvironment().error(_messageFactory.getMessage(key, arg));
-    }
-
-    protected void warn(String key, Object[] args) {
-        getEnvironment().warn(_messageFactory.getMessage(key, args));
-    }
-
-    protected void info(String key) {
-        getEnvironment().info(_messageFactory.getMessage(key));
-    }
-
-    protected void info(String key, String arg) {
-        getEnvironment().info(_messageFactory.getMessage(key, arg));
-    }
-
-    protected String makePackageQualified(String s, QName name) {
-        return makePackageQualified(s, name, true);
-    }
-
-    protected String makePackageQualified(
-        String s,
-        QName name,
-        boolean useNamespaceMapping) {
-        String javaPackageName = null;
-        if (useNamespaceMapping) {
-            javaPackageName = getJavaPackageName(name);
-        }
-        if (javaPackageName != null) {
-            return javaPackageName + "." + s;
-        } else if (
-            _modelInfo.getJavaPackageName() != null
-                && !_modelInfo.getJavaPackageName().equals("")) {
-            return _modelInfo.getJavaPackageName() + "." + s;
+    protected String makePackageQualified(String s) {
+        if (options.defaultPackage != null
+            && !options.defaultPackage.equals("")) {
+            return options.defaultPackage + "." + s;
         } else {
             return s;
         }
     }
 
-    protected QName makePackageQualified(QName name) {
-        return makePackageQualified(name, true);
-    }
-
-    protected QName makePackageQualified(
-        QName name,
-        boolean useNamespaceMapping) {
-        return new QName(
-            name.getNamespaceURI(),
-            makePackageQualified(name.getLocalPart(), name));
-    }
-
-    protected String makeNameUniqueInSet(String candidateName, Set names) {
-        String baseName = candidateName;
-        String name = baseName;
-        for (int i = 2; names.contains(name); ++i) {
-            name = baseName + Integer.toString(i);
-        }
-        return name;
-    }
 
     protected String getUniqueName(
         com.sun.tools.internal.ws.wsdl.document.Operation operation,
@@ -837,52 +584,16 @@ public abstract class WSDLModelerBase implements Modeler {
         }
     }
 
-    protected String getUniqueParameterName(
-        Operation operation,
-        String baseName) {
-        Set names = new HashSet();
-        for (Iterator iter = operation.getRequest().getParameters();
-            iter.hasNext();
-            ) {
-            Parameter p = (Parameter)iter.next();
-            names.add(p.getName());
-        }
-        for (Iterator iter = operation.getResponse().getParameters();
-            iter.hasNext();
-            ) {
-            Parameter p = (Parameter)iter.next();
-            names.add(p.getName());
-        }
-        String candidateName = baseName;
-        while (names.contains(candidateName)) {
-            candidateName += "_prime";
-        }
-        return candidateName;
-    }
-
-    protected String getNonQualifiedNameFor(QName name) {
-        return _env.getNames().validJavaClassName(name.getLocalPart());
-    }
-
-    protected static void setDocumentationIfPresent(
-        ModelObject obj,
-        Documentation documentation) {
-        if (documentation != null && documentation.getContent() != null) {
-            obj.setProperty(WSDL_DOCUMENTATION, documentation.getContent());
-        }
-    }
-
     protected static QName getQNameOf(GloballyKnown entity) {
         return new QName(
             entity.getDefining().getTargetNamespaceURI(),
             entity.getName());
     }
 
-    protected static Extension getExtensionOfType(
-            Extensible extensible,
+    protected static TWSDLExtension getExtensionOfType(
+            TWSDLExtensible extensible,
             Class type) {
-        for (Iterator iter = extensible.extensions(); iter.hasNext();) {
-            Extension extension = (Extension)iter.next();
+        for (TWSDLExtension extension:extensible.extensions()) {
             if (extension.getClass().equals(type)) {
                 return extension;
             }
@@ -891,30 +602,22 @@ public abstract class WSDLModelerBase implements Modeler {
         return null;
     }
 
-    protected Extension getAnyExtensionOfType(
-        Extensible extensible,
+    protected TWSDLExtension getAnyExtensionOfType(
+        TWSDLExtensible extensible,
         Class type) {
         if(extensible == null)
             return null;
-        for (Iterator iter = extensible.extensions(); iter.hasNext();) {
-            Extension extension = (Extension)iter.next();
+        for (TWSDLExtension extension:extensible.extensions()) {
             if(extension.getClass().equals(type)) {
                 return extension;
             }else if (extension.getClass().equals(MIMEMultipartRelated.class) &&
                     (type.equals(SOAPBody.class) || type.equals(MIMEContent.class)
                             || type.equals(MIMEPart.class))) {
-                for (Iterator parts =
-                    ((MIMEMultipartRelated) extension).getParts();
-                parts.hasNext();
-                ) {
-                    Extension part = (Extension) parts.next();
-                    if (part.getClass().equals(MIMEPart.class)) {
-                        MIMEPart mPart = (MIMEPart)part;
-                        //bug fix: 5024001
-                        Extension extn =  getExtensionOfType((Extensible) part, type);
-                        if(extn != null)
-                            return extn;
-                    }
+                for (MIMEPart part : ((MIMEMultipartRelated)extension).getParts()) {
+                    //bug fix: 5024001
+                    TWSDLExtension extn = getExtensionOfType(part, type);
+                    if (extn != null)
+                        return extn;
                 }
             }
         }
@@ -965,20 +668,6 @@ public abstract class WSDLModelerBase implements Modeler {
         return uniqueName;
     }
 
-    private String getJavaPackageName(QName name) {
-        String packageName = null;
-/*        if (_modelInfo.getNamespaceMappingRegistry() != null) {
-            NamespaceMappingInfo i =
-                _modelInfo
-                    .getNamespaceMappingRegistry()
-                    .getNamespaceMappingInfo(
-                    name);
-            if (i != null)
-                return i.getJavaPackageName();
-        }*/
-        return packageName;
-    }
-
     protected boolean isConflictingClassName(String name) {
         if (_conflictingClassNames == null) {
             return false;
@@ -1007,10 +696,28 @@ public abstract class WSDLModelerBase implements Modeler {
         return isConflictingClassName(name);
     }
 
+    int numPasses = 0;
+
+    protected void warning(Entity entity, String message){
+        //avoid duplicate warning for the second pass
+        if(numPasses > 1)
+            return;
+        if(entity == null)
+            errReceiver.warning(NULL_LOCATOR, message);
+        else
+            errReceiver.warning(entity.getLocator(), message);
+    }
+
+    protected void error(Entity entity, String message){
+        if(entity == null)
+            errReceiver.error(NULL_LOCATOR, message);
+        else
+            errReceiver.error(entity.getLocator(), message);
+        throw new AbortException();
+    }
+
     protected static final String OPERATION_HAS_VOID_RETURN_TYPE =
         "com.sun.xml.internal.ws.processor.modeler.wsdl.operationHasVoidReturnType";
-    private static final String WSDL_DOCUMENTATION =
-        "com.sun.xml.internal.ws.processor.modeler.wsdl.documentation";
     protected static final String WSDL_PARAMETER_ORDER =
         "com.sun.xml.internal.ws.processor.modeler.wsdl.parameterOrder";
     public static final String WSDL_RESULT_PARAMETER =
@@ -1019,23 +726,17 @@ public abstract class WSDLModelerBase implements Modeler {
         "com.sun.xml.internal.ws.processor.modeler.wsdl.mimeMultipartRelatedBinding";
 
 
-    public ProcessorEnvironment getProcessorEnvironment(){
-        return _env;
-    }
     protected ProcessSOAPOperationInfo info;
 
-    protected WSDLModelInfo _modelInfo;
-    protected Properties _options;
-    protected LocalizableMessageFactory _messageFactory;
     private Set _conflictingClassNames;
-    protected Map _javaExceptions;
+    protected Map _javaExceptions;
     protected Map _faultTypeToStructureMap;
-    private ProcessorEnvironment _env;
     protected JavaSimpleTypeCreator _javaTypes;
     protected Map _bindingNameToPortMap;
     protected boolean useWSIBasicProfile = true;
 
-    private Set reqResNames;
+    private final Set reqResNames = new HashSet();
+
     public class ProcessSOAPOperationInfo {
 
         public ProcessSOAPOperationInfo(
@@ -1077,10 +778,10 @@ public abstract class WSDLModelerBase implements Modeler {
         public String wsdlMessagePartName;
         public HashMap constructorOrder; // mapping of element name to
                                              // constructor order (of type Integer)
-    };
+    }
 
 
     protected WSDLParser parser;
     protected WSDLDocument document;
-    protected HashSet hSet;
+    protected static final LocatorImpl NULL_LOCATOR = new LocatorImpl();
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/util/ClassNameCollector.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/util/ClassNameCollector.java
index 9c75e79975c..4708b06c43d 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/util/ClassNameCollector.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/util/ClassNameCollector.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,26 +25,16 @@
 
 package com.sun.tools.internal.ws.processor.util;
 
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-
-import com.sun.tools.internal.ws.processor.model.AbstractType;
-import com.sun.tools.internal.ws.processor.model.Block;
-import com.sun.tools.internal.ws.processor.model.ExtendedModelVisitor;
-import com.sun.tools.internal.ws.processor.model.Fault;
-import com.sun.tools.internal.ws.processor.model.Model;
-import com.sun.tools.internal.ws.processor.model.ModelProperties;
-import com.sun.tools.internal.ws.processor.model.Parameter;
-import com.sun.tools.internal.ws.processor.model.Port;
-import com.sun.tools.internal.ws.processor.model.Service;
+import com.sun.tools.internal.ws.processor.model.*;
+import com.sun.tools.internal.ws.processor.model.java.JavaInterface;
 import com.sun.tools.internal.ws.processor.model.jaxb.JAXBType;
 import com.sun.tools.internal.ws.processor.model.jaxb.JAXBTypeVisitor;
 import com.sun.tools.internal.ws.processor.model.jaxb.RpcLitStructure;
-import com.sun.tools.internal.ws.processor.model.java.JavaInterface;
-import com.sun.xml.internal.ws.util.VersionUtil;
+
+import javax.xml.namespace.QName;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
 
 /**
  * This class writes out a Model as an XML document.
@@ -238,7 +228,7 @@ public class ClassNameCollector extends ExtendedModelVisitor
     private Set _exceptionClassNames;
     boolean doneVisitingJAXBModel = false;
     public void visit(JAXBType type) throws Exception {
-        if(!doneVisitingJAXBModel){
+        if(!doneVisitingJAXBModel && type.getJaxbModel() != null){
             Set classNames = type.getJaxbModel().getGeneratedClassNames();
             for(String className : classNames){
                 addJAXBGeneratedClassName(className);
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/util/ClientProcessorEnvironment.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/util/ClientProcessorEnvironment.java
deleted file mode 100644
index 5dad0230c9d..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/util/ClientProcessorEnvironment.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.tools.internal.ws.processor.util;
-
-import java.io.File;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import com.sun.tools.internal.ws.processor.ProcessorNotificationListener;
-import com.sun.tools.internal.ws.processor.generator.Names;
-import com.sun.tools.internal.ws.util.JAXWSClassFactory;
-import com.sun.xml.internal.ws.util.localization.Localizable;
-
-/**
- *
- * @author WS Development Team
- */
-public class ClientProcessorEnvironment extends ProcessorEnvironmentBase
-    implements ProcessorEnvironment {
-
-    /**
-     * The stream where error message are printed.
-     */
-    private OutputStream out;
-
-    /**
-     * A printwriter created lazily in case there are exceptions to report.
-     */
-    private PrintStream outprintstream;
-
-    /**
-     * listener for error/warning/info notifications
-     */
-    private ProcessorNotificationListener listener;
-
-    /**
-     * The classpath to use
-     */
-    private String classPath;
-
-    /**
-     * list of generated source files created in this environment and
-     * its type
-     */
-    private List generatedFiles = new ArrayList();
-
-    /**
-     * The number of errors and warnings
-     */
-    private int nwarnings;
-    private int nerrors;
-
-    /**
-     * flags
-     */
-    private int flags;
-
-    private Names names;
-
-    /**
-     * Create a ClientProcessorEnvironment with the given class path,
-     * stream for messages and ProcessorNotificationListener.
-     */
-    public ClientProcessorEnvironment(
-        OutputStream out,
-        String classPath,
-        ProcessorNotificationListener listener) {
-
-        this.out = out;
-        this.classPath = classPath;
-        this.listener = listener;
-        flags = 0;
-
-        //bug fix:4904604
-        names = JAXWSClassFactory.newInstance().createNames();
-    }
-
-    /**
-     * Set the environment flags
-     */
-    public void setFlags(int flags) {
-        this.flags = flags;
-    }
-
-    /**
-     * Get the environment flags
-     */
-    public int getFlags() {
-        return flags;
-    }
-
-    /**
-     * Get the ClassPath.
-     */
-    public String getClassPath() {
-        return classPath;
-    }
-
-    /**
-     * Is verbose turned on
-     */
-    public boolean verbose() {
-        return (flags & F_VERBOSE) != 0;
-    }
-
-    /**
-     * Remember info on  generated source file generated so that it
-     * can be removed later, if appropriate.
-     */
-    public void addGeneratedFile(GeneratedFileInfo file) {
-        generatedFiles.add(file);
-    }
-
-    /**
-     * Return all the generated files and its types.
-     */
-    public Iterator getGeneratedFiles() {
-        return generatedFiles.iterator();
-    }
-
-    /**
-     * Delete all the generated source files made during the execution
-     * of this environment (those that have been registered with the
-     * "addGeneratedFile" method).
-     */
-    public void deleteGeneratedFiles() {
-        synchronized (generatedFiles) {
-            Iterator iter = generatedFiles.iterator();
-            while (iter.hasNext()) {
-                File file = ((GeneratedFileInfo)iter.next()).getFile();
-                if (file.getName().endsWith(".java")) {
-                    file.delete();
-                }
-            }
-            generatedFiles.clear();
-        }
-    }
-
-    /**
-     * Release resources, if any.
-     */
-    public void shutdown() {
-        listener = null;
-        generatedFiles = null;
-    }
-
-    public void error(Localizable msg) {
-        if (listener != null) {
-            listener.onError(msg);
-        }
-        nerrors++;
-    }
-
-    public void warn(Localizable msg) {
-        if (warnings()) {
-            nwarnings++;
-            if (listener != null) {
-                listener.onWarning(msg);
-            }
-        }
-    }
-
-    public void info(Localizable msg) {
-        if (listener != null) {
-            listener.onInfo(msg);
-        }
-    }
-
-    public void printStackTrace(Throwable t) {
-        if (outprintstream == null) {
-            outprintstream = new PrintStream(out);
-        }
-        t.printStackTrace(outprintstream);
-    }
-
-    public Names getNames() {
-        return names;
-    }
-
-    public int getErrorCount() {
-        return nerrors;
-    }
-
-    public int getWarningCount() {
-        return nwarnings;
-    }
-
-    private boolean warnings() {
-        return (flags & F_WARNINGS) != 0;
-    }
-
-    //bug fix:4904604
-    //to called in compileTool after env is
-    public void setNames(Names names) {
-        this.names = names;
-    }
-
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/util/DirectoryUtil.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/util/DirectoryUtil.java
index 3a9e079a25f..4d5f21c5f5c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/util/DirectoryUtil.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/util/DirectoryUtil.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,11 @@
 
 package com.sun.tools.internal.ws.processor.util;
 
-import java.io.File;
-
 import com.sun.tools.internal.ws.processor.generator.GeneratorException;
 import com.sun.tools.internal.ws.util.ClassNameInfo;
 
+import java.io.File;
+
 /**
  * Util provides static utility methods used by other wscompile classes.
  *
@@ -37,8 +37,7 @@ import com.sun.tools.internal.ws.util.ClassNameInfo;
  */
 public class DirectoryUtil  {
 
-    public static File getOutputDirectoryFor(String theClass,
-        File rootDir, ProcessorEnvironment env) throws GeneratorException {
+    public static File getOutputDirectoryFor(String theClass, File rootDir) throws GeneratorException {
 
         File outputDir = null;
         String qualifiedClassName = theClass;
@@ -58,7 +57,7 @@ public class DirectoryUtil  {
                 outputDir = new File(rootDir, packagePath);
 
                 // Make sure the directory exists...
-                ensureDirectory(outputDir,env);
+                ensureDirectory(outputDir);
             } else {
 
                 // Default package, so use root as output dir...
@@ -81,7 +80,7 @@ public class DirectoryUtil  {
                 outputDir = new File(workingDir, packagePath);
 
                 // Make sure the directory exists...
-                ensureDirectory(outputDir,env);
+                ensureDirectory(outputDir);
             }
         }
 
@@ -89,7 +88,7 @@ public class DirectoryUtil  {
         return outputDir;
     }
 
-    private static void ensureDirectory(File dir, ProcessorEnvironment env)
+    private static void ensureDirectory(File dir)
         throws GeneratorException {
 
         if (!dir.exists()) {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/util/IndentingWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/util/IndentingWriter.java
index 9953023b1fc..4acc46907ae 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/util/IndentingWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/util/IndentingWriter.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,14 +25,14 @@
 
 package com.sun.tools.internal.ws.processor.util;
 
+import com.sun.tools.internal.ws.processor.generator.GeneratorException;
+
 import java.io.BufferedWriter;
 import java.io.IOException;
 import java.io.Writer;
-
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetEncoder;
 import java.text.MessageFormat;
-import com.sun.tools.internal.ws.processor.generator.GeneratorException;
 
 /**
  *
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/util/ProcessorEnvironment.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/util/ProcessorEnvironment.java
deleted file mode 100644
index 10d704d5ec0..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/util/ProcessorEnvironment.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.tools.internal.ws.processor.util;
-
-import java.net.URLClassLoader;
-import java.util.Iterator;
-
-import com.sun.tools.internal.ws.processor.generator.Names;
-import com.sun.xml.internal.ws.util.localization.Localizable;
-
-import com.sun.mirror.apt.Filer;
-
-/**
- *
- * @author WS Development Team
- */
-public interface ProcessorEnvironment {
-
-    /*
-     * Flags
-     */
-    int F_VERBOSE       = 1 << 0;
-    int F_WARNINGS      = 1 << 1;
-
-    /**
-     * Set the environment flags
-     */
-    public void setFlags(int flags);
-
-    /**
-     * Get the environment flags
-     */
-    public int getFlags();
-
-    /**
-     * Get the ClassPath.
-     */
-    public String getClassPath();
-
-    /**
-     * Is verbose turned on
-     */
-    public boolean verbose();
-
-    /**
-     * Remember a generated file and its type so that it
-     * can be removed later, if appropriate.
-     */
-    public void addGeneratedFile(GeneratedFileInfo file);
-
-    public Filer getFiler();
-    public void setFiler(Filer filer);
-
-    /**
-     * Delete all the generated files made during the execution of this
-     * environment (those that have been registered with the "addGeneratedFile"
-     * method)
-     */
-    public void deleteGeneratedFiles();
-
-    /**
-     * Get a URLClassLoader from using the classpath
-     */
-    public URLClassLoader getClassLoader();
-
-    public Iterator getGeneratedFiles();
-
-    /**
-     * Release resources, if any.
-     */
-    public void shutdown();
-
-    public void error(Localizable msg);
-
-    public void warn(Localizable msg);
-
-    public void info(Localizable msg);
-
-    public void printStackTrace(Throwable t);
-
-    public Names getNames();
-
-    public int getErrorCount();
-    public int getWarningCount();
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/util/ProcessorEnvironmentBase.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/util/ProcessorEnvironmentBase.java
deleted file mode 100644
index 815d923dd69..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/util/ProcessorEnvironmentBase.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.tools.internal.ws.processor.util;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.StringTokenizer;
-import com.sun.mirror.apt.Filer;
-
-/**
- *
- * @author WS Development Team
- */
-public abstract class ProcessorEnvironmentBase implements ProcessorEnvironment {
-
-    protected URLClassLoader classLoader = null;
-    protected Filer filer = null;
-
-    /**
-     * Get a URLClassLoader from using the classpath
-     */
-    public URLClassLoader getClassLoader() {
-        if (classLoader == null) {
-            classLoader =
-                new URLClassLoader(pathToURLs(getClassPath()),
-                    this.getClass().getClassLoader());
-        }
-        return classLoader;
-    }
-
-    /**
-     * Utility method for converting a search path string to an array
-     * of directory and JAR file URLs.
-     *
-     * @param path the search path string
-     * @return the resulting array of directory and JAR file URLs
-     */
-    public static URL[] pathToURLs(String path) {
-        StringTokenizer st = new StringTokenizer(path, File.pathSeparator);
-        URL[] urls = new URL[st.countTokens()];
-        int count = 0;
-        while (st.hasMoreTokens()) {
-            URL url = fileToURL(new File(st.nextToken()));
-            if (url != null) {
-                urls[count++] = url;
-            }
-        }
-        if (urls.length != count) {
-            URL[] tmp = new URL[count];
-            System.arraycopy(urls, 0, tmp, 0, count);
-            urls = tmp;
-        }
-        return urls;
-    }
-
-    /**
-     * Returns the directory or JAR file URL corresponding to the specified
-     * local file name.
-     *
-     * @param file the File object
-     * @return the resulting directory or JAR file URL, or null if unknown
-     */
-    public static URL fileToURL(File file) {
-        String name;
-        try {
-            name = file.getCanonicalPath();
-        } catch (IOException e) {
-            name = file.getAbsolutePath();
-        }
-        name = name.replace(File.separatorChar, '/');
-        if (!name.startsWith("/")) {
-            name = "/" + name;
-        }
-
-        // If the file does not exist, then assume that it's a directory
-        if (!file.isFile()) {
-            name = name + "/";
-        }
-        try {
-            return new URL("file", "", name);
-        } catch (MalformedURLException e) {
-            throw new IllegalArgumentException("file");
-        }
-    }
-
-    public Filer getFiler() {
-        return filer;
-    }
-
-    public void setFiler(Filer filer) {
-        this.filer = filer;
-    }
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/ConfigurationMessages.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/ConfigurationMessages.java
new file mode 100644
index 00000000000..dc7d75c4b67
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/ConfigurationMessages.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.tools.internal.ws.resources;
+
+import com.sun.xml.internal.ws.util.localization.Localizable;
+import com.sun.xml.internal.ws.util.localization.LocalizableMessageFactory;
+import com.sun.xml.internal.ws.util.localization.Localizer;
+
+
+/**
+ * Defines string formatting method for each constant in the resource file
+ *
+ */
+public final class ConfigurationMessages {
+
+    private final static LocalizableMessageFactory messageFactory = new LocalizableMessageFactory("com.sun.tools.internal.ws.resources.configuration");
+    private final static Localizer localizer = new Localizer();
+
+    public static Localizable localizableCONFIGURATION_INVALID_ELEMENT(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("configuration.invalidElement", arg0, arg1, arg2);
+    }
+
+    /**
+     * invalid element "{2}" in file "{0}" (line {1})
+     *
+     */
+    public static String CONFIGURATION_INVALID_ELEMENT(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableCONFIGURATION_INVALID_ELEMENT(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableCONFIGURATION_NOT_BINDING_FILE(Object arg0) {
+        return messageFactory.getMessage("configuration.notBindingFile", arg0);
+    }
+
+    /**
+     * Ignoring: binding file ""{0}". It is not a jaxws or a jaxb binding file.
+     *
+     */
+    public static String CONFIGURATION_NOT_BINDING_FILE(Object arg0) {
+        return localizer.localize(localizableCONFIGURATION_NOT_BINDING_FILE(arg0));
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/GeneratorMessages.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/GeneratorMessages.java
new file mode 100644
index 00000000000..eb8fde08cb2
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/GeneratorMessages.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.tools.internal.ws.resources;
+
+import com.sun.xml.internal.ws.util.localization.Localizable;
+import com.sun.xml.internal.ws.util.localization.LocalizableMessageFactory;
+import com.sun.xml.internal.ws.util.localization.Localizer;
+
+
+/**
+ * Defines string formatting method for each constant in the resource file
+ *
+ */
+public final class GeneratorMessages {
+
+    private final static LocalizableMessageFactory messageFactory = new LocalizableMessageFactory("com.sun.tools.internal.ws.resources.generator");
+    private final static Localizer localizer = new Localizer();
+
+    public static Localizable localizableGENERATOR_NESTED_GENERATOR_ERROR(Object arg0) {
+        return messageFactory.getMessage("generator.nestedGeneratorError", arg0);
+    }
+
+    /**
+     * generator error: {0}
+     *
+     */
+    public static String GENERATOR_NESTED_GENERATOR_ERROR(Object arg0) {
+        return localizer.localize(localizableGENERATOR_NESTED_GENERATOR_ERROR(arg0));
+    }
+
+    public static Localizable localizableGENERATOR_INTERNAL_ERROR_SHOULD_NOT_HAPPEN(Object arg0) {
+        return messageFactory.getMessage("generator.internal.error.should.not.happen", arg0);
+    }
+
+    /**
+     * internal error (should not happen): {0}
+     *
+     */
+    public static String GENERATOR_INTERNAL_ERROR_SHOULD_NOT_HAPPEN(Object arg0) {
+        return localizer.localize(localizableGENERATOR_INTERNAL_ERROR_SHOULD_NOT_HAPPEN(arg0));
+    }
+
+    public static Localizable localizableGENERATOR_INDENTINGWRITER_CHARSET_CANTENCODE(Object arg0) {
+        return messageFactory.getMessage("generator.indentingwriter.charset.cantencode", arg0);
+    }
+
+    /**
+     * WSDL has some characters which native java encoder can''t encode: "{0}"
+     *
+     */
+    public static String GENERATOR_INDENTINGWRITER_CHARSET_CANTENCODE(Object arg0) {
+        return localizer.localize(localizableGENERATOR_INDENTINGWRITER_CHARSET_CANTENCODE(arg0));
+    }
+
+    public static Localizable localizableGENERATOR_CANNOT_CREATE_DIR(Object arg0) {
+        return messageFactory.getMessage("generator.cannot.create.dir", arg0);
+    }
+
+    /**
+     * can''t create directory: {0}
+     *
+     */
+    public static String GENERATOR_CANNOT_CREATE_DIR(Object arg0) {
+        return localizer.localize(localizableGENERATOR_CANNOT_CREATE_DIR(arg0));
+    }
+
+    public static Localizable localizableGENERATOR_CANT_WRITE(Object arg0) {
+        return messageFactory.getMessage("generator.cant.write", arg0);
+    }
+
+    /**
+     * can''t write file: {0}
+     *
+     */
+    public static String GENERATOR_CANT_WRITE(Object arg0) {
+        return localizer.localize(localizableGENERATOR_CANT_WRITE(arg0));
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/JavacompilerMessages.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/JavacompilerMessages.java
new file mode 100644
index 00000000000..c252d194167
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/JavacompilerMessages.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.tools.internal.ws.resources;
+
+import com.sun.xml.internal.ws.util.localization.Localizable;
+import com.sun.xml.internal.ws.util.localization.LocalizableMessageFactory;
+import com.sun.xml.internal.ws.util.localization.Localizer;
+
+
+/**
+ * Defines string formatting method for each constant in the resource file
+ *
+ */
+public final class JavacompilerMessages {
+
+    private final static LocalizableMessageFactory messageFactory = new LocalizableMessageFactory("com.sun.tools.internal.ws.resources.javacompiler");
+    private final static Localizer localizer = new Localizer();
+
+    public static Localizable localizableJAVACOMPILER_CLASSPATH_ERROR(Object arg0) {
+        return messageFactory.getMessage("javacompiler.classpath.error", arg0);
+    }
+
+    /**
+     * {0} is not available in the classpath, requires Sun's JDK version 5.0 or latter.
+     *
+     */
+    public static String JAVACOMPILER_CLASSPATH_ERROR(Object arg0) {
+        return localizer.localize(localizableJAVACOMPILER_CLASSPATH_ERROR(arg0));
+    }
+
+    public static Localizable localizableJAVACOMPILER_NOSUCHMETHOD_ERROR(Object arg0) {
+        return messageFactory.getMessage("javacompiler.nosuchmethod.error", arg0);
+    }
+
+    /**
+     * There is no such method {0} available, requires Sun's JDK version 5.0 or latter.
+     *
+     */
+    public static String JAVACOMPILER_NOSUCHMETHOD_ERROR(Object arg0) {
+        return localizer.localize(localizableJAVACOMPILER_NOSUCHMETHOD_ERROR(arg0));
+    }
+
+    public static Localizable localizableJAVACOMPILER_ERROR(Object arg0) {
+        return messageFactory.getMessage("javacompiler.error", arg0);
+    }
+
+    /**
+     * error : {0}.
+     *
+     */
+    public static String JAVACOMPILER_ERROR(Object arg0) {
+        return localizer.localize(localizableJAVACOMPILER_ERROR(arg0));
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/ModelMessages.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/ModelMessages.java
new file mode 100644
index 00000000000..c8e2153530c
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/ModelMessages.java
@@ -0,0 +1,702 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.tools.internal.ws.resources;
+
+import com.sun.xml.internal.ws.util.localization.Localizable;
+import com.sun.xml.internal.ws.util.localization.LocalizableMessageFactory;
+import com.sun.xml.internal.ws.util.localization.Localizer;
+
+
+/**
+ * Defines string formatting method for each constant in the resource file
+ *
+ */
+public final class ModelMessages {
+
+    private final static LocalizableMessageFactory messageFactory = new LocalizableMessageFactory("com.sun.tools.internal.ws.resources.model");
+    private final static Localizer localizer = new Localizer();
+
+    public static Localizable localizableMODEL_DUPLICATE_SERVICE(Object arg0) {
+        return messageFactory.getMessage("model.duplicate.service", arg0);
+    }
+
+    /**
+     * duplicate service added to model: {0}
+     *
+     */
+    public static String MODEL_DUPLICATE_SERVICE(Object arg0) {
+        return localizer.localize(localizableMODEL_DUPLICATE_SERVICE(arg0));
+    }
+
+    public static Localizable localizableMODEL_NESTED_MODEL_ERROR(Object arg0) {
+        return messageFactory.getMessage("model.nestedModelError", arg0);
+    }
+
+    /**
+     * model error: {0}
+     *
+     */
+    public static String MODEL_NESTED_MODEL_ERROR(Object arg0) {
+        return localizer.localize(localizableMODEL_NESTED_MODEL_ERROR(arg0));
+    }
+
+    public static Localizable localizableMODEL_DUPLICATE_PORTTYPE(Object arg0) {
+        return messageFactory.getMessage("model.duplicate.porttype", arg0);
+    }
+
+    /**
+     * duplicate PortType added to model: {0}
+     *
+     */
+    public static String MODEL_DUPLICATE_PORTTYPE(Object arg0) {
+        return localizer.localize(localizableMODEL_DUPLICATE_PORTTYPE(arg0));
+    }
+
+    public static Localizable localizableMODEL_EXCEPTION_NOTUNIQUE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("model.exception.notunique", arg0, arg1);
+    }
+
+    /**
+     * Failed to generate Java signature: duplicate exception names {0}. Use JAXWS binding customization to rename the wsdl:part "{1}"
+     *
+     */
+    public static String MODEL_EXCEPTION_NOTUNIQUE(Object arg0, Object arg1) {
+        return localizer.localize(localizableMODEL_EXCEPTION_NOTUNIQUE(arg0, arg1));
+    }
+
+    public static Localizable localizableMODEL_SCHEMA_INVALID_WILDCARD_ALL_COMPOSITOR(Object arg0) {
+        return messageFactory.getMessage("model.schema.invalidWildcard.allCompositor", arg0);
+    }
+
+    /**
+     * xsd:all compositor not supported for the wildcard in schema type: "{0}"
+     *
+     */
+    public static String MODEL_SCHEMA_INVALID_WILDCARD_ALL_COMPOSITOR(Object arg0) {
+        return localizer.localize(localizableMODEL_SCHEMA_INVALID_WILDCARD_ALL_COMPOSITOR(arg0));
+    }
+
+    public static Localizable localizableMODEL_SCHEMA_SIMPLE_TYPE_WITH_FACETS(Object arg0) {
+        return messageFactory.getMessage("model.schema.simpleTypeWithFacets", arg0);
+    }
+
+    /**
+     * facet "{0}" not supported on simple type: "{0}"
+     *
+     */
+    public static String MODEL_SCHEMA_SIMPLE_TYPE_WITH_FACETS(Object arg0) {
+        return localizer.localize(localizableMODEL_SCHEMA_SIMPLE_TYPE_WITH_FACETS(arg0));
+    }
+
+    public static Localizable localizableMODEL_SCHEMA_UNSUPPORTED_TYPE_ANONYMOUS(Object arg0) {
+        return messageFactory.getMessage("model.schema.unsupportedType.anonymous", arg0);
+    }
+
+    /**
+     * unsupported anonymous type ({0})
+     *
+     */
+    public static String MODEL_SCHEMA_UNSUPPORTED_TYPE_ANONYMOUS(Object arg0) {
+        return localizer.localize(localizableMODEL_SCHEMA_UNSUPPORTED_TYPE_ANONYMOUS(arg0));
+    }
+
+    public static Localizable localizableMODEL_COMPLEX_TYPE_SIMPLE_CONTENT_RESERVED_NAME(Object arg0) {
+        return messageFactory.getMessage("model.complexType.simpleContent.reservedName", arg0);
+    }
+
+    /**
+     * invalid attribute name: "_value" in complexType: "{0}", _value is JAXWS reserved name, this name is generated in the generated javabean class to hold content value in the generated javabean class for complexType/simpleContent.
+     *
+     */
+    public static String MODEL_COMPLEX_TYPE_SIMPLE_CONTENT_RESERVED_NAME(Object arg0) {
+        return localizer.localize(localizableMODEL_COMPLEX_TYPE_SIMPLE_CONTENT_RESERVED_NAME(arg0));
+    }
+
+    public static Localizable localizableMODEL_SCHEMA_UNION_NOT_SUPPORTED(Object arg0) {
+        return messageFactory.getMessage("model.schema.unionNotSupported", arg0);
+    }
+
+    /**
+     * simpleType: "{0}" derivation by xsd:union not supported
+     *
+     */
+    public static String MODEL_SCHEMA_UNION_NOT_SUPPORTED(Object arg0) {
+        return localizer.localize(localizableMODEL_SCHEMA_UNION_NOT_SUPPORTED(arg0));
+    }
+
+    public static Localizable localizableMODEL_SCHEMA_JAXB_EXCEPTION_MESSAGE(Object arg0) {
+        return messageFactory.getMessage("model.schema.jaxbException.message", arg0);
+    }
+
+    /**
+     * "{0}"
+     *
+     */
+    public static String MODEL_SCHEMA_JAXB_EXCEPTION_MESSAGE(Object arg0) {
+        return localizer.localize(localizableMODEL_SCHEMA_JAXB_EXCEPTION_MESSAGE(arg0));
+    }
+
+    public static Localizable localizableMODEL_IMPORTER_INVALID_ID(Object arg0, Object arg1) {
+        return messageFactory.getMessage("model.importer.invalidId", arg0, arg1);
+    }
+
+    /**
+     * invalid id "{1} in model document (line {0})
+     *
+     */
+    public static String MODEL_IMPORTER_INVALID_ID(Object arg0, Object arg1) {
+        return localizer.localize(localizableMODEL_IMPORTER_INVALID_ID(arg0, arg1));
+    }
+
+    public static Localizable localizableMODEL_INVALID_MESSAGE_TYPE(Object arg0) {
+        return messageFactory.getMessage("model.invalid.message.type", arg0);
+    }
+
+    /**
+     * invalid message type: {0}
+     *
+     */
+    public static String MODEL_INVALID_MESSAGE_TYPE(Object arg0) {
+        return localizer.localize(localizableMODEL_INVALID_MESSAGE_TYPE(arg0));
+    }
+
+    public static Localizable localizableCONSOLE_ERROR_REPORTER_UNKNOWN_LOCATION() {
+        return messageFactory.getMessage("ConsoleErrorReporter.UnknownLocation");
+    }
+
+    /**
+     * unknown location
+     *
+     */
+    public static String CONSOLE_ERROR_REPORTER_UNKNOWN_LOCATION() {
+        return localizer.localize(localizableCONSOLE_ERROR_REPORTER_UNKNOWN_LOCATION());
+    }
+
+    public static Localizable localizableMODEL_EXPORTER_UNSUPPORTED_CLASS(Object arg0) {
+        return messageFactory.getMessage("model.exporter.unsupportedClass", arg0);
+    }
+
+    /**
+     * model exporter: unsupported class: {0}
+     *
+     */
+    public static String MODEL_EXPORTER_UNSUPPORTED_CLASS(Object arg0) {
+        return localizer.localize(localizableMODEL_EXPORTER_UNSUPPORTED_CLASS(arg0));
+    }
+
+    public static Localizable localizableMODEL_SCHEMA_ENCODER_NOT_FOUND(Object arg0) {
+        return messageFactory.getMessage("model.schema.encoderNotFound", arg0);
+    }
+
+    /**
+     * no encoder found for simpleType: "{0}"
+     *
+     */
+    public static String MODEL_SCHEMA_ENCODER_NOT_FOUND(Object arg0) {
+        return localizer.localize(localizableMODEL_SCHEMA_ENCODER_NOT_FOUND(arg0));
+    }
+
+    public static Localizable localizableMODEL_SCHEMA_ELEMENT_NOT_FOUND(Object arg0) {
+        return messageFactory.getMessage("model.schema.elementNotFound", arg0);
+    }
+
+    /**
+     * Element "{0}" not found.
+     *
+     */
+    public static String MODEL_SCHEMA_ELEMENT_NOT_FOUND(Object arg0) {
+        return localizer.localize(localizableMODEL_SCHEMA_ELEMENT_NOT_FOUND(arg0));
+    }
+
+    public static Localizable localizableMODEL_UNIQUENESS_JAVASTRUCTURETYPE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("model.uniqueness.javastructuretype", arg0, arg1);
+    }
+
+    /**
+     * uniqueness constraint violation, duplicate member "{0}" added to JavaStructureType "{1}"
+     *
+     */
+    public static String MODEL_UNIQUENESS_JAVASTRUCTURETYPE(Object arg0, Object arg1) {
+        return localizer.localize(localizableMODEL_UNIQUENESS_JAVASTRUCTURETYPE(arg0, arg1));
+    }
+
+    public static Localizable localizableMODEL_SAXPARSER_EXCEPTION(Object arg0, Object arg1) {
+        return messageFactory.getMessage("model.saxparser.exception", arg0, arg1);
+    }
+
+    /**
+     * {0}
+     * {1}
+     *
+     */
+    public static String MODEL_SAXPARSER_EXCEPTION(Object arg0, Object arg1) {
+        return localizer.localize(localizableMODEL_SAXPARSER_EXCEPTION(arg0, arg1));
+    }
+
+    public static Localizable localizable_002F_002F_JAXWS() {
+        return messageFactory.getMessage("//JAXWS");
+    }
+
+    /**
+     *  2.0
+     *
+     */
+    public static String _002F_002F_JAXWS() {
+        return localizer.localize(localizable_002F_002F_JAXWS());
+    }
+
+    public static Localizable localizableMODEL_DUPLICATE_FAULTMESSAGE(Object arg0) {
+        return messageFactory.getMessage("model.duplicate.faultmessage", arg0);
+    }
+
+    /**
+     * duplicate fault message added to model: {0}
+     *
+     */
+    public static String MODEL_DUPLICATE_FAULTMESSAGE(Object arg0) {
+        return localizer.localize(localizableMODEL_DUPLICATE_FAULTMESSAGE(arg0));
+    }
+
+    public static Localizable localizableMODEL_IMPORTER_INVALID_PROPERTY(Object arg0) {
+        return messageFactory.getMessage("model.importer.invalidProperty", arg0);
+    }
+
+    /**
+     * invalid property in model document (line {0}
+     *
+     */
+    public static String MODEL_IMPORTER_INVALID_PROPERTY(Object arg0) {
+        return localizer.localize(localizableMODEL_IMPORTER_INVALID_PROPERTY(arg0));
+    }
+
+    public static Localizable localizableMODEL_IMPORTER_SYNTAX_ERROR(Object arg0) {
+        return messageFactory.getMessage("model.importer.syntaxError", arg0);
+    }
+
+    /**
+     * syntax error in model document (line {0})
+     *
+     */
+    public static String MODEL_IMPORTER_SYNTAX_ERROR(Object arg0) {
+        return localizer.localize(localizableMODEL_IMPORTER_SYNTAX_ERROR(arg0));
+    }
+
+    public static Localizable localizableMODEL_SCHEMA_UNSUPPORTED_TYPE(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("model.schema.unsupportedType", arg0, arg1, arg2);
+    }
+
+    /**
+     * unsupported type ({0}): "{1}" (namespace: {2})
+     *
+     */
+    public static String MODEL_SCHEMA_UNSUPPORTED_TYPE(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableMODEL_SCHEMA_UNSUPPORTED_TYPE(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableMODEL_SCHEMA_INVALID_SIMPLE_TYPE_NO_JAVA_TYPE(Object arg0) {
+        return messageFactory.getMessage("model.schema.invalidSimpleType.noJavaType", arg0);
+    }
+
+    /**
+     * no java mapping for simpleType: "{0}"
+     *
+     */
+    public static String MODEL_SCHEMA_INVALID_SIMPLE_TYPE_NO_JAVA_TYPE(Object arg0) {
+        return localizer.localize(localizableMODEL_SCHEMA_INVALID_SIMPLE_TYPE_NO_JAVA_TYPE(arg0));
+    }
+
+    public static Localizable localizableMODEL_SCHEMA_LIST_NOT_SUPPORTED(Object arg0) {
+        return messageFactory.getMessage("model.schema.listNotSupported", arg0);
+    }
+
+    /**
+     * simpleType: "{0}" derivation by xsd:list not supported
+     *
+     */
+    public static String MODEL_SCHEMA_LIST_NOT_SUPPORTED(Object arg0) {
+        return localizer.localize(localizableMODEL_SCHEMA_LIST_NOT_SUPPORTED(arg0));
+    }
+
+    public static Localizable localizableMODEL_ARRAYWRAPPER_NO_PARENT() {
+        return messageFactory.getMessage("model.arraywrapper.no.parent");
+    }
+
+    /**
+     * LiteralArrayWrapper cannot have a parent type
+     *
+     */
+    public static String MODEL_ARRAYWRAPPER_NO_PARENT() {
+        return localizer.localize(localizableMODEL_ARRAYWRAPPER_NO_PARENT());
+    }
+
+    public static Localizable localizableMODEL_DUPLICATE_PART(Object arg0) {
+        return messageFactory.getMessage("model.duplicate.part", arg0);
+    }
+
+    /**
+     * duplicate part added to model: {0}
+     *
+     */
+    public static String MODEL_DUPLICATE_PART(Object arg0) {
+        return localizer.localize(localizableMODEL_DUPLICATE_PART(arg0));
+    }
+
+    public static Localizable localizableMODEL_DUPLICATE_OPERATION(Object arg0) {
+        return messageFactory.getMessage("model.duplicate.operation", arg0);
+    }
+
+    /**
+     * duplicate Operation added to model: {0}
+     *
+     */
+    public static String MODEL_DUPLICATE_OPERATION(Object arg0) {
+        return localizer.localize(localizableMODEL_DUPLICATE_OPERATION(arg0));
+    }
+
+    public static Localizable localizableMODEL_PARENT_TYPE_ALREADY_SET(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("model.parent.type.already.set", arg0, arg1, arg2);
+    }
+
+    /**
+     * parent of type "{0}" already set to "{1}", new value = "{2}"
+     *
+     */
+    public static String MODEL_PARENT_TYPE_ALREADY_SET(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableMODEL_PARENT_TYPE_ALREADY_SET(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableMODEL_ARRAYWRAPPER_NO_SUBTYPES() {
+        return messageFactory.getMessage("model.arraywrapper.no.subtypes");
+    }
+
+    /**
+     * LiteralArrayWrapper cannot have subtypes
+     *
+     */
+    public static String MODEL_ARRAYWRAPPER_NO_SUBTYPES() {
+        return localizer.localize(localizableMODEL_ARRAYWRAPPER_NO_SUBTYPES());
+    }
+
+    public static Localizable localizableMODEL_SCHEMA_INVALID_LITERAL_IN_ENUMERATION(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("model.schema.invalidLiteralInEnumeration", arg0, arg1, arg2);
+    }
+
+    /**
+     * invalid literal "{0}" in enumeration "{1}" (namespace: {2})
+     *
+     */
+    public static String MODEL_SCHEMA_INVALID_LITERAL_IN_ENUMERATION(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableMODEL_SCHEMA_INVALID_LITERAL_IN_ENUMERATION(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableMODEL_SCHEMA_UNSUPPORTED_SCHEMA_TYPE(Object arg0) {
+        return messageFactory.getMessage("model.schema.unsupportedSchemaType", arg0);
+    }
+
+    /**
+     * unsupported schema type: "{0}"
+     *
+     */
+    public static String MODEL_SCHEMA_UNSUPPORTED_SCHEMA_TYPE(Object arg0) {
+        return localizer.localize(localizableMODEL_SCHEMA_UNSUPPORTED_SCHEMA_TYPE(arg0));
+    }
+
+    public static Localizable localizableMODEL_IMPORTER_INVALID_MINOR_MINOR_OR_PATCH_VERSION(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("model.importer.invalidMinorMinorOrPatchVersion", arg0, arg1, arg2);
+    }
+
+    /**
+     * model version "{1}" newer than runtime version "{2}" (line {0}): need to upgrade to a newer runtime
+     *
+     */
+    public static String MODEL_IMPORTER_INVALID_MINOR_MINOR_OR_PATCH_VERSION(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableMODEL_IMPORTER_INVALID_MINOR_MINOR_OR_PATCH_VERSION(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableMODEL_SCHEMA_CIRCULARITY(Object arg0) {
+        return messageFactory.getMessage("model.schema.circularity", arg0);
+    }
+
+    /**
+     * circularity detected in schema: "{0}"
+     *
+     */
+    public static String MODEL_SCHEMA_CIRCULARITY(Object arg0) {
+        return localizer.localize(localizableMODEL_SCHEMA_CIRCULARITY(arg0));
+    }
+
+    public static Localizable localizableMODEL_SCHEMA_NOT_IMPLEMENTED_GENERATING_SOAP_ELEMENT(Object arg0, Object arg1) {
+        return messageFactory.getMessage("model.schema.notImplemented.generatingSOAPElement", arg0, arg1);
+    }
+
+    /**
+     * unsupported XML Schema feature: "{0}" in component {1}, mapping it to javax.xml.soap.SOAPElement
+     *
+     */
+    public static String MODEL_SCHEMA_NOT_IMPLEMENTED_GENERATING_SOAP_ELEMENT(Object arg0, Object arg1) {
+        return localizer.localize(localizableMODEL_SCHEMA_NOT_IMPLEMENTED_GENERATING_SOAP_ELEMENT(arg0, arg1));
+    }
+
+    public static Localizable localizableMODEL_ARRAYWRAPPER_MEMBER_ALREADY_SET() {
+        return messageFactory.getMessage("model.arraywrapper.member.already.set");
+    }
+
+    /**
+     * LiteralArrayWrapper element member already set.
+     *
+     */
+    public static String MODEL_ARRAYWRAPPER_MEMBER_ALREADY_SET() {
+        return localizer.localize(localizableMODEL_ARRAYWRAPPER_MEMBER_ALREADY_SET());
+    }
+
+    public static Localizable localizableMODEL_IMPORTER_INVALID_CLASS(Object arg0, Object arg1) {
+        return messageFactory.getMessage("model.importer.invalidClass", arg0, arg1);
+    }
+
+    /**
+     * invalid class name "{1}" in model document (line {0})
+     *
+     */
+    public static String MODEL_IMPORTER_INVALID_CLASS(Object arg0, Object arg1) {
+        return localizer.localize(localizableMODEL_IMPORTER_INVALID_CLASS(arg0, arg1));
+    }
+
+    public static Localizable localizableMODEL_IMPORTER_NON_MODEL() {
+        return messageFactory.getMessage("model.importer.nonModel");
+    }
+
+    /**
+     * not a valid model document
+     *
+     */
+    public static String MODEL_IMPORTER_NON_MODEL() {
+        return localizer.localize(localizableMODEL_IMPORTER_NON_MODEL());
+    }
+
+    public static Localizable localizableMODEL_IMPORTER_INVALID_VERSION(Object arg0, Object arg1) {
+        return messageFactory.getMessage("model.importer.invalidVersion", arg0, arg1);
+    }
+
+    /**
+     * invalid version "{1}" in model document (line {0})
+     *
+     */
+    public static String MODEL_IMPORTER_INVALID_VERSION(Object arg0, Object arg1) {
+        return localizer.localize(localizableMODEL_IMPORTER_INVALID_VERSION(arg0, arg1));
+    }
+
+    public static Localizable localizableMODEL_SCHEMA_INVALID_SIMPLE_TYPE_NO_NAMESPACE_URI(Object arg0) {
+        return messageFactory.getMessage("model.schema.invalidSimpleType.noNamespaceURI", arg0);
+    }
+
+    /**
+     * invalid simpleType: "{0}", had null namespaceURI
+     *
+     */
+    public static String MODEL_SCHEMA_INVALID_SIMPLE_TYPE_NO_NAMESPACE_URI(Object arg0) {
+        return localizer.localize(localizableMODEL_SCHEMA_INVALID_SIMPLE_TYPE_NO_NAMESPACE_URI(arg0));
+    }
+
+    public static Localizable localizableCONSOLE_ERROR_REPORTER_LINE_X_OF_Y(Object arg0, Object arg1) {
+        return messageFactory.getMessage("ConsoleErrorReporter.LineXOfY", arg0, arg1);
+    }
+
+    /**
+     *   line {0} of {1}
+     *
+     */
+    public static String CONSOLE_ERROR_REPORTER_LINE_X_OF_Y(Object arg0, Object arg1) {
+        return localizer.localize(localizableCONSOLE_ERROR_REPORTER_LINE_X_OF_Y(arg0, arg1));
+    }
+
+    public static Localizable localizableMODEL_PARAMETER_NOTUNIQUE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("model.parameter.notunique", arg0, arg1);
+    }
+
+    /**
+     * Failed to generate Java signature: duplicate parameter names {0}. Use JAXWS binding customization to rename the wsdl:part "{1}"
+     *
+     */
+    public static String MODEL_PARAMETER_NOTUNIQUE(Object arg0, Object arg1) {
+        return localizer.localize(localizableMODEL_PARAMETER_NOTUNIQUE(arg0, arg1));
+    }
+
+    public static Localizable localizableMODEL_SCHEMA_INVALID_SIMPLE_TYPE_INVALID_ITEM_TYPE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("model.schema.invalidSimpleType.invalidItemType", arg0, arg1);
+    }
+
+    /**
+     * in simpleType: "{0}", itemType "{1}" can not be derived by list
+     *
+     */
+    public static String MODEL_SCHEMA_INVALID_SIMPLE_TYPE_INVALID_ITEM_TYPE(Object arg0, Object arg1) {
+        return localizer.localize(localizableMODEL_SCHEMA_INVALID_SIMPLE_TYPE_INVALID_ITEM_TYPE(arg0, arg1));
+    }
+
+    public static Localizable localizableMODEL_DUPLICATE_PROPERTY(Object arg0) {
+        return messageFactory.getMessage("model.duplicate.property", arg0);
+    }
+
+    /**
+     * duplicate property added to model: {0}
+     *
+     */
+    public static String MODEL_DUPLICATE_PROPERTY(Object arg0) {
+        return localizer.localize(localizableMODEL_DUPLICATE_PROPERTY(arg0));
+    }
+
+    public static Localizable localizableMODEL_UNIQUENESS() {
+        return messageFactory.getMessage("model.uniqueness");
+    }
+
+    /**
+     * uniqueness constraint violation
+     *
+     */
+    public static String MODEL_UNIQUENESS() {
+        return localizer.localize(localizableMODEL_UNIQUENESS());
+    }
+
+    public static Localizable localizable_002F_002F_REPLACEMENT() {
+        return messageFactory.getMessage("//replacement");
+    }
+
+    /**
+     * for Uxxx codes
+     *
+     */
+    public static String _002F_002F_REPLACEMENT() {
+        return localizer.localize(localizable_002F_002F_REPLACEMENT());
+    }
+
+    public static Localizable localizableMODEL_SCHEMA_INVALID_SIMPLE_TYPE_NO_ITEM_LITERAL_TYPE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("model.schema.invalidSimpleType.noItemLiteralType", arg0, arg1);
+    }
+
+    /**
+     * in simpleType: "{0}", xsd:list itemType "{1}" is invalid
+     *
+     */
+    public static String MODEL_SCHEMA_INVALID_SIMPLE_TYPE_NO_ITEM_LITERAL_TYPE(Object arg0, Object arg1) {
+        return localizer.localize(localizableMODEL_SCHEMA_INVALID_SIMPLE_TYPE_NO_ITEM_LITERAL_TYPE(arg0, arg1));
+    }
+
+    public static Localizable localizableMODEL_SCHEMA_INVALID_SIMPLE_TYPE(Object arg0) {
+        return messageFactory.getMessage("model.schema.invalidSimpleType", arg0);
+    }
+
+    /**
+     * invalid simpleType: "{0}"
+     *
+     */
+    public static String MODEL_SCHEMA_INVALID_SIMPLE_TYPE(Object arg0) {
+        return localizer.localize(localizableMODEL_SCHEMA_INVALID_SIMPLE_TYPE(arg0));
+    }
+
+    public static Localizable localizableMODEL_ARRAYWRAPPER_ONLY_ONE_MEMBER() {
+        return messageFactory.getMessage("model.arraywrapper.only.one.member");
+    }
+
+    /**
+     * LiteralArrayWrapper may only have one element member.
+     *
+     */
+    public static String MODEL_ARRAYWRAPPER_ONLY_ONE_MEMBER() {
+        return localizer.localize(localizableMODEL_ARRAYWRAPPER_ONLY_ONE_MEMBER());
+    }
+
+    public static Localizable localizableMODEL_IMPORTER_INVALID_LITERAL(Object arg0) {
+        return messageFactory.getMessage("model.importer.invalidLiteral", arg0);
+    }
+
+    /**
+     * invalid literal value in model document (line {0})
+     *
+     */
+    public static String MODEL_IMPORTER_INVALID_LITERAL(Object arg0) {
+        return localizer.localize(localizableMODEL_IMPORTER_INVALID_LITERAL(arg0));
+    }
+
+    public static Localizable localizableMODEL_SCHEMA_NOT_IMPLEMENTED(Object arg0) {
+        return messageFactory.getMessage("model.schema.notImplemented", arg0);
+    }
+
+    /**
+     * unsupported XML Schema feature ({0})
+     *
+     */
+    public static String MODEL_SCHEMA_NOT_IMPLEMENTED(Object arg0) {
+        return localizer.localize(localizableMODEL_SCHEMA_NOT_IMPLEMENTED(arg0));
+    }
+
+    public static Localizable localizableMODEL_SCHEMA_INVALID_LITERAL_IN_ENUMERATION_ANONYMOUS(Object arg0) {
+        return messageFactory.getMessage("model.schema.invalidLiteralInEnumeration.anonymous", arg0);
+    }
+
+    /**
+     * invalid literal "{0}" in anonymous enumeration
+     *
+     */
+    public static String MODEL_SCHEMA_INVALID_LITERAL_IN_ENUMERATION_ANONYMOUS(Object arg0) {
+        return localizer.localize(localizableMODEL_SCHEMA_INVALID_LITERAL_IN_ENUMERATION_ANONYMOUS(arg0));
+    }
+
+    public static Localizable localizableMODEL_ARRAYWRAPPER_NO_CONTENT_MEMBER() {
+        return messageFactory.getMessage("model.arraywrapper.no.content.member");
+    }
+
+    /**
+     * LiteralArrayWrapper cannot have a content member
+     *
+     */
+    public static String MODEL_ARRAYWRAPPER_NO_CONTENT_MEMBER() {
+        return localizer.localize(localizableMODEL_ARRAYWRAPPER_NO_CONTENT_MEMBER());
+    }
+
+    public static Localizable localizableMODEL_PART_NOT_UNIQUE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("model.part.notUnique", arg0, arg1);
+    }
+
+    /**
+     * parts in wsdl:message "{0}", reference "{1}", they must reference unique global elements.
+     *
+     */
+    public static String MODEL_PART_NOT_UNIQUE(Object arg0, Object arg1) {
+        return localizer.localize(localizableMODEL_PART_NOT_UNIQUE(arg0, arg1));
+    }
+
+    public static Localizable localizableMODEL_PARENT_FAULT_ALREADY_SET(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("model.parent.fault.already.set", arg0, arg1, arg2);
+    }
+
+    /**
+     * parent of fault "{0}" already set to "{1}", new value = "{2}"
+     *
+     */
+    public static String MODEL_PARENT_FAULT_ALREADY_SET(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableMODEL_PARENT_FAULT_ALREADY_SET(arg0, arg1, arg2));
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/ModelerMessages.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/ModelerMessages.java
new file mode 100644
index 00000000000..05c04868886
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/ModelerMessages.java
@@ -0,0 +1,1602 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.tools.internal.ws.resources;
+
+import com.sun.xml.internal.ws.util.localization.Localizable;
+import com.sun.xml.internal.ws.util.localization.LocalizableMessageFactory;
+import com.sun.xml.internal.ws.util.localization.Localizer;
+
+
+/**
+ * Defines string formatting method for each constant in the resource file
+ *
+ */
+public final class ModelerMessages {
+
+    private final static LocalizableMessageFactory messageFactory = new LocalizableMessageFactory("com.sun.tools.internal.ws.resources.modeler");
+    private final static Localizer localizer = new Localizer();
+
+    public static Localizable localizableMIMEMODELER_INVALID_MIME_CONTENT_INVALID_SCHEMA_TYPE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("mimemodeler.invalidMimeContent.invalidSchemaType", arg0, arg1);
+    }
+
+    /**
+     * Ignoring the mime:part. mime part: {0} can not be mapped to schema type: {1}
+     *
+     */
+    public static String MIMEMODELER_INVALID_MIME_CONTENT_INVALID_SCHEMA_TYPE(Object arg0, Object arg1) {
+        return localizer.localize(localizableMIMEMODELER_INVALID_MIME_CONTENT_INVALID_SCHEMA_TYPE(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_PARAMETERORDER_PARAMETER(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.parameterorder.parameter", arg0, arg1);
+    }
+
+    /**
+     * "{0}" specified in the parameterOrder attribute of operation "{1}" is not a valid part of the message.
+     *
+     */
+    public static String WSDLMODELER_INVALID_PARAMETERORDER_PARAMETER(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_PARAMETERORDER_PARAMETER(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_NO_SOAP_FAULT_NAME(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.bindingFault.noSoapFaultName", arg0, arg1);
+    }
+
+    /**
+     * soap:fault name not specified, wsdl:fault "{0}" in operation "{1}"
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_FAULT_NO_SOAP_FAULT_NAME(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_NO_SOAP_FAULT_NAME(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_NONCONFORMING_WSDL_IMPORT() {
+        return messageFactory.getMessage("wsdlmodeler.warning.nonconforming.wsdl.import");
+    }
+
+    /**
+     * Non conforming WS-I WSDL used for wsdl:import
+     *
+     */
+    public static String WSDLMODELER_WARNING_NONCONFORMING_WSDL_IMPORT() {
+        return localizer.localize(localizableWSDLMODELER_WARNING_NONCONFORMING_WSDL_IMPORT());
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_SOAP_BODY_MISSING_NAMESPACE(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.outputSoapBody.missingNamespace", arg0);
+    }
+
+    /**
+     * output message of binding operation "{0}" must specify a value for the "namespace" attribute
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_SOAP_BODY_MISSING_NAMESPACE(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_SOAP_BODY_MISSING_NAMESPACE(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_OPERATION_FAULT_NOT_LITERAL(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.operation.fault.notLiteral", arg0, arg1);
+    }
+
+    /**
+     * ignoring encoded fault "{0}" in literal binding operation "{1}"
+     *
+     */
+    public static String WSDLMODELER_INVALID_OPERATION_FAULT_NOT_LITERAL(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_OPERATION_FAULT_NOT_LITERAL(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_INPUT_MISSING_SOAP_BODY(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.inputMissingSoapBody", arg0);
+    }
+
+    /**
+     * input message of binding operation "{0}" does not have a SOAP body extension
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_OPERATION_INPUT_MISSING_SOAP_BODY(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_INPUT_MISSING_SOAP_BODY(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_SOAP_BINDING_NON_HTTP_TRANSPORT(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringSOAPBinding.nonHTTPTransport", arg0);
+    }
+
+    /**
+     * ignoring SOAP port "{0}": unrecognized transport. try running wsimport with -extension switch.
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_SOAP_BINDING_NON_HTTP_TRANSPORT(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_SOAP_BINDING_NON_HTTP_TRANSPORT(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_NOT_FOUND(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.notFound", arg0, arg1);
+    }
+
+    /**
+     * in binding "{1}", operation "{0}" does not match any operation in the corresponding port type
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_OPERATION_NOT_FOUND(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_NOT_FOUND(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_UNSUPPORTED_BINDING_MIME() {
+        return messageFactory.getMessage("wsdlmodeler.unsupportedBinding.mime");
+    }
+
+    /**
+     * WSDL MIME binding is not currently supported!
+     *
+     */
+    public static String WSDLMODELER_UNSUPPORTED_BINDING_MIME() {
+        return localizer.localize(localizableWSDLMODELER_UNSUPPORTED_BINDING_MIME());
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NO_ELEMENT_ATTRIBUTE(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringHeaderFault.noElementAttribute", arg0, arg1, arg2);
+    }
+
+    /**
+     * ignoring header fault part="{0}" message="{1}" of operation {2}
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NO_ELEMENT_ATTRIBUTE(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NO_ELEMENT_ATTRIBUTE(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_NON_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.nonWrapperStyle", arg0, arg1, arg2);
+    }
+
+    /**
+     * Invalid operation "{0}", can''t generate java method. Parameter: part "{2}" in wsdl:message "{1}", is a java keyword. Use customization to change the parameter name or change the wsdl:part name.
+     *
+     */
+    public static String WSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_NON_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_NON_WRAPPER_STYLE(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_HEADERFAULT_NOT_LITERAL(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.headerfault.notLiteral", arg0, arg1);
+    }
+
+    /**
+     * Invalid headerfault "{0}" of binding operation "{1}": not literal
+     *
+     */
+    public static String WSDLMODELER_INVALID_HEADERFAULT_NOT_LITERAL(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_HEADERFAULT_NOT_LITERAL(arg0, arg1));
+    }
+
+    public static Localizable localizableMIMEMODELER_INVALID_MIME_CONTENT_DIFFERENT_PART() {
+        return messageFactory.getMessage("mimemodeler.invalidMimeContent.differentPart");
+    }
+
+    /**
+     * Ignoring the mime:part. Invalid mime:part, the mime:content has different part attribute.
+     *
+     */
+    public static String MIMEMODELER_INVALID_MIME_CONTENT_DIFFERENT_PART() {
+        return localizer.localize(localizableMIMEMODELER_INVALID_MIME_CONTENT_DIFFERENT_PART());
+    }
+
+    public static Localizable localizableWSDLMODELER_ERROR_PART_NOT_FOUND(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.error.partNotFound", arg0, arg1);
+    }
+
+    /**
+     * part "{1}" of operation "{0}" could not be resolved!
+     *
+     */
+    public static String WSDLMODELER_ERROR_PART_NOT_FOUND(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_ERROR_PART_NOT_FOUND(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_HEADER_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.header.message.partMustHaveElementDescriptor", arg0, arg1);
+    }
+
+    /**
+     * Invalid header "{0}" in operation {1}: part must specify a "element" attribute
+     *
+     */
+    public static String WSDLMODELER_INVALID_HEADER_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_HEADER_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_OPERATION_NAME(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.operationName", arg0);
+    }
+
+    /**
+     * Invalid operation "{0}", it''s java reserved word, can''t generate java method. Use customization to change the operation name.
+     *
+     */
+    public static String WSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_OPERATION_NAME(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_OPERATION_NAME(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_OUTPUT_MISSING_SOAP_FAULT(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.bindingFault.outputMissingSoapFault", arg0, arg1);
+    }
+
+    /**
+     * fault "{0}" in operation "{1}" does not have a SOAP fault extension
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_FAULT_OUTPUT_MISSING_SOAP_FAULT(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_OUTPUT_MISSING_SOAP_FAULT(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_ELEMENT_MESSAGE_PART(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleElementMessagePart", arg0);
+    }
+
+    /**
+     * ignoring operation "{0}": message part does not refer to a schema type declaration
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_ELEMENT_MESSAGE_PART(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_ELEMENT_MESSAGE_PART(arg0));
+    }
+
+    public static Localizable localizableWSDLMODLER_WARNING_OPERATION_USE() {
+        return messageFactory.getMessage("wsdlmodler.warning.operation.use");
+    }
+
+    /**
+     * The WSDL used has operations with literal and encoded use. -f:searchschema is not supported for this scenario.
+     *
+     */
+    public static String WSDLMODLER_WARNING_OPERATION_USE() {
+        return localizer.localize(localizableWSDLMODLER_WARNING_OPERATION_USE());
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_NON_SOAP_PORT(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringNonSOAPPort", arg0);
+    }
+
+    /**
+     * ignoring port "{0}": not a standard SOAP port. try running wsimport with -extension switch.
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_NON_SOAP_PORT(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_NON_SOAP_PORT(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_MESSAGE_HAS_MORE_THAN_ONE_PART(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.bindingFault.messageHasMoreThanOnePart", arg0, arg1);
+    }
+
+    /**
+     * fault "{0}" refers to message "{1}", but the message has more than one parts
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_FAULT_MESSAGE_HAS_MORE_THAN_ONE_PART(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_MESSAGE_HAS_MORE_THAN_ONE_PART(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_NO_SERVICE_DEFINITIONS_FOUND() {
+        return messageFactory.getMessage("wsdlmodeler.warning.noServiceDefinitionsFound");
+    }
+
+    /**
+     * WSDL document does not define any services
+     *
+     */
+    public static String WSDLMODELER_WARNING_NO_SERVICE_DEFINITIONS_FOUND() {
+        return localizer.localize(localizableWSDLMODELER_WARNING_NO_SERVICE_DEFINITIONS_FOUND());
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_FAULT_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringFault.cant.resolve.message", arg0, arg1);
+    }
+
+    /**
+     * ignoring fault "{0}" of binding operation "{1}": cannot resolve message
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_FAULT_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_FAULT_CANT_RESOLVE_MESSAGE(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_JAXB_JAVATYPE_NOTFOUND(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.jaxb.javatype.notfound", arg0, arg1);
+    }
+
+    /**
+     * Schema descriptor {0} in message part "{1}" could not be bound to Java!
+     *
+     */
+    public static String WSDLMODELER_JAXB_JAVATYPE_NOTFOUND(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_JAXB_JAVATYPE_NOTFOUND(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_PORT_SOAP_BINDING_MIXED_STYLE(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.warning.port.SOAPBinding.mixedStyle", arg0);
+    }
+
+    /**
+     * not a WS-I BP1.1 compliant SOAP port "{0}": the wsdl binding has mixed style, it must be rpc-literal or document-literal operation!
+     *
+     */
+    public static String WSDLMODELER_WARNING_PORT_SOAP_BINDING_MIXED_STYLE(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_PORT_SOAP_BINDING_MIXED_STYLE(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_DOCLITOPERATION(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.doclitoperation", arg0);
+    }
+
+    /**
+     * Invalid wsdl:operation "{0}": its a document-literal operation,  message part must refer to a schema element declaration
+     *
+     */
+    public static String WSDLMODELER_INVALID_DOCLITOPERATION(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_DOCLITOPERATION(arg0));
+    }
+
+    public static Localizable localizableMODELER_NESTED_MODEL_ERROR(Object arg0) {
+        return messageFactory.getMessage("modeler.nestedModelError", arg0);
+    }
+
+    /**
+     * modeler error: {0}
+     *
+     */
+    public static String MODELER_NESTED_MODEL_ERROR(Object arg0) {
+        return localizer.localize(localizableMODELER_NESTED_MODEL_ERROR(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_DUPLICATE_FAULT_SOAP_NAME(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("wsdlmodeler.duplicate.fault.soap.name", arg0, arg1, arg2);
+    }
+
+    /**
+     * ignoring fault "{0}" of operation "{1}", soap:fault name "{2}" is not unique
+     *
+     */
+    public static String WSDLMODELER_DUPLICATE_FAULT_SOAP_NAME(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWSDLMODELER_DUPLICATE_FAULT_SOAP_NAME(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_WRONG_SOAP_FAULT_NAME(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.bindingFault.wrongSoapFaultName", arg0, arg1, arg2);
+    }
+
+    /**
+     * name of soap:fault "{0}" doesn''t match the name of wsdl:fault "{1}" in operation "{2}"
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_FAULT_WRONG_SOAP_FAULT_NAME(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_WRONG_SOAP_FAULT_NAME(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_LITERAL(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.notLiteral", arg0);
+    }
+
+    /**
+     * ignoring document-style operation "{0}": parameters are not literal
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_NOT_LITERAL(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_LITERAL(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_DOCUMENT_STYLE(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleDocumentStyle", arg0);
+    }
+
+    /**
+     * ignoring operation "{0}": cannot handle document-style operations
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_DOCUMENT_STYLE(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_DOCUMENT_STYLE(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_FAULT_NOT_LITERAL(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringFault.notLiteral", arg0, arg1);
+    }
+
+    /**
+     * ignoring encoded fault "{0}" of binding operation "{1}"
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_FAULT_NOT_LITERAL(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_FAULT_NOT_LITERAL(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_RPCLITOPERATION(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.rpclitoperation", arg0);
+    }
+
+    /**
+     * Invalid wsdl:operation "{0}": its a rpc-literal operation,  message part must refer to a schema type declaration
+     *
+     */
+    public static String WSDLMODELER_INVALID_RPCLITOPERATION(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_RPCLITOPERATION(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOM_NAME(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.customName", arg0, arg1);
+    }
+
+    /**
+     * Invalid operation "{0}", can''t generate java method. Parameter,customized name "{1}"  is a java keyword.
+     *
+     */
+    public static String WSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOM_NAME(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOM_NAME(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_BINDING_OPERATION_MULTIPLE_PART_BINDING(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.warning.bindingOperation.multiplePartBinding", arg0, arg1);
+    }
+
+    /**
+     * Check the abstract operation "{0}" binding, part "{1}" has multiple binding. Will try to generated artiffacts anyway...
+     *
+     */
+    public static String WSDLMODELER_WARNING_BINDING_OPERATION_MULTIPLE_PART_BINDING(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_BINDING_OPERATION_MULTIPLE_PART_BINDING(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_PORT_SOAP_BINDING_12(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.warning.port.SOAPBinding12", arg0);
+    }
+
+    /**
+     * SOAP port "{0}": uses a non-standard SOAP 1.2 binding.
+     *
+     */
+    public static String WSDLMODELER_WARNING_PORT_SOAP_BINDING_12(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_PORT_SOAP_BINDING_12(arg0));
+    }
+
+    public static Localizable localizableMIMEMODELER_INVALID_MIME_PART_NAME_NOT_ALLOWED(Object arg0) {
+        return messageFactory.getMessage("mimemodeler.invalidMimePart.nameNotAllowed", arg0);
+    }
+
+    /**
+     * name attribute on wsdl:part in Operation "{0}" is ignored. Its not allowed as per WS-I AP 1.0.
+     *
+     */
+    public static String MIMEMODELER_INVALID_MIME_PART_NAME_NOT_ALLOWED(Object arg0) {
+        return localizer.localize(localizableMIMEMODELER_INVALID_MIME_PART_NAME_NOT_ALLOWED(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_MIME_PART_NOT_FOUND(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringMimePart.notFound", arg0, arg1);
+    }
+
+    /**
+     * ignoring mime:part, cannot find part "{0}" referenced by the mime:content in the wsdl:operation "{1}"
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_MIME_PART_NOT_FOUND(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_MIME_PART_NOT_FOUND(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_OPERATION_MORE_THAN_ONE_PART_IN_MESSAGE(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.warning.operation.MoreThanOnePartInMessage", arg0);
+    }
+
+    /**
+     * Ingoring operation "{0}": more than one part bound to body
+     *
+     */
+    public static String WSDLMODELER_WARNING_OPERATION_MORE_THAN_ONE_PART_IN_MESSAGE(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_OPERATION_MORE_THAN_ONE_PART_IN_MESSAGE(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_NON_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.nonWrapperStyle", arg0, arg1, arg2);
+    }
+
+    /**
+     * Ignoring operation "{0}", can''t generate java method. Parameter: part "{2}" in wsdl:message "{1}", is a java keyword. Use customization to change the parameter name or change the wsdl:part name.
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_NON_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_NON_WRAPPER_STYLE(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_FAULT_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.fault.cant.resolve.message", arg0, arg1);
+    }
+
+    /**
+     * fault message "{0}" in binding operation "{1}" could not be resolved
+     *
+     */
+    public static String WSDLMODELER_INVALID_FAULT_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_FAULT_CANT_RESOLVE_MESSAGE(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_EMPTY_MESSAGE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.bindingFault.emptyMessage", arg0, arg1);
+    }
+
+    /**
+     * fault "{0}" refers to message "{1}", but the message has no parts
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_FAULT_EMPTY_MESSAGE(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_EMPTY_MESSAGE(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_RPCLIT_UNKOWNSCHEMATYPE(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("wsdlmodeler.rpclit.unkownschematype", arg0, arg1, arg2);
+    }
+
+    /**
+     * XML type "{0}" could not be resolved, XML to JAVA binding failed! Please check the wsdl:part "{1}" in the wsdl:message "{2}".
+     *
+     */
+    public static String WSDLMODELER_RPCLIT_UNKOWNSCHEMATYPE(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWSDLMODELER_RPCLIT_UNKOWNSCHEMATYPE(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWSDLMODELER_HEADERFAULT_PART_NOT_FOUND(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("wsdlmodeler.headerfault.part.notFound", arg0, arg1, arg2);
+    }
+
+    /**
+     * part "{1}" not found for the header fault "{0}", in binding "{2}"
+     *
+     */
+    public static String WSDLMODELER_HEADERFAULT_PART_NOT_FOUND(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWSDLMODELER_HEADERFAULT_PART_NOT_FOUND(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_BODY_PARTS_ATTRIBUTE(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleBodyPartsAttribute", arg0);
+    }
+
+    /**
+     * ignoring operation "{0}": cannot handle "parts" attribute of "soap:body" element
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_BODY_PARTS_ATTRIBUTE(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_BODY_PARTS_ATTRIBUTE(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_SOAP_BINDING_MIXED_STYLE(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringSOAPBinding.mixedStyle", arg0);
+    }
+
+    /**
+     * ignoring port "{0}", its not WS-I BP 1.1 compliant: the wsdl binding has mixed style, it must be rpc-literal or document-literal operation. try running wsimport with -extension switch.
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_SOAP_BINDING_MIXED_STYLE(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_SOAP_BINDING_MIXED_STYLE(arg0));
+    }
+
+    public static Localizable localizableMIMEMODELER_INVALID_MIME_CONTENT_MISSING_TYPE_ATTRIBUTE(Object arg0) {
+        return messageFactory.getMessage("mimemodeler.invalidMimeContent.missingTypeAttribute", arg0);
+    }
+
+    /**
+     * Missing type attribute in mime:content in operation "{0}". part attribute must be present in mime:content declaration.
+     *
+     */
+    public static String MIMEMODELER_INVALID_MIME_CONTENT_MISSING_TYPE_ATTRIBUTE(Object arg0) {
+        return localizer.localize(localizableMIMEMODELER_INVALID_MIME_CONTENT_MISSING_TYPE_ATTRIBUTE(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_EMPTY_INPUT_MESSAGE(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleEmptyInputMessage", arg0);
+    }
+
+    /**
+     * ignoring operation "{0}": input message is empty
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_EMPTY_INPUT_MESSAGE(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_EMPTY_INPUT_MESSAGE(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_NO_PORTS_IN_SERVICE(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.warning.noPortsInService", arg0);
+    }
+
+    /**
+     * Service "{0}" does not contain any usable ports. try running wsimport with -extension switch.
+     *
+     */
+    public static String WSDLMODELER_WARNING_NO_PORTS_IN_SERVICE(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_NO_PORTS_IN_SERVICE(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_PARAMETER_ORDER_TOO_MANY_UNMENTIONED_PARTS(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.parameterOrder.tooManyUnmentionedParts", arg0);
+    }
+
+    /**
+     * more than one part left out in the parameterOrder attribute of operation "{0}"
+     *
+     */
+    public static String WSDLMODELER_INVALID_PARAMETER_ORDER_TOO_MANY_UNMENTIONED_PARTS(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_PARAMETER_ORDER_TOO_MANY_UNMENTIONED_PARTS(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_INPUT_SOAP_BODY_MISSING_NAMESPACE(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.inputSoapBody.missingNamespace", arg0);
+    }
+
+    /**
+     * input message of binding operation "{0}" must specify a value for the "namespace" attribute
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_OPERATION_INPUT_SOAP_BODY_MISSING_NAMESPACE(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_INPUT_SOAP_BODY_MISSING_NAMESPACE(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringHeader", arg0, arg1);
+    }
+
+    /**
+     * ignoring header "{0}" of binding operation "{1}"
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_HEADER(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_RESPONSEBEAN_NOTFOUND(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.responsebean.notfound", arg0);
+    }
+
+    /**
+     * wsimport failed to generate async response bean for operation: {0}
+     *
+     */
+    public static String WSDLMODELER_RESPONSEBEAN_NOTFOUND(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_RESPONSEBEAN_NOTFOUND(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_20_RPCENC_NOT_SUPPORTED() {
+        return messageFactory.getMessage("wsdlmodeler20.rpcenc.not.supported");
+    }
+
+    /**
+     * rpc/encoded wsdl's are not supported in JAXWS 2.0.
+     *
+     */
+    public static String WSDLMODELER_20_RPCENC_NOT_SUPPORTED() {
+        return localizer.localize(localizableWSDLMODELER_20_RPCENC_NOT_SUPPORTED());
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_PART_NOT_FOUND(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.partNotFound", arg0, arg1);
+    }
+
+    /**
+     * ignoring operation "{0}": part "{1}" not found
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_PART_NOT_FOUND(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_PART_NOT_FOUND(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.message.partMustHaveElementDescriptor", arg0, arg1);
+    }
+
+    /**
+     * in message "{0}", part "{1}" must specify a "element" attribute
+     *
+     */
+    public static String WSDLMODELER_INVALID_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_ERROR_PARTS_NOT_FOUND(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.error.partsNotFound", arg0, arg1);
+    }
+
+    /**
+     * parts "{0}" not found in the message "{1}", wrong WSDL
+     *
+     */
+    public static String WSDLMODELER_ERROR_PARTS_NOT_FOUND(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_ERROR_PARTS_NOT_FOUND(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_FAULT_NOT_ENCODED(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringFault.notEncoded", arg0, arg1);
+    }
+
+    /**
+     * ignoring literal fault "{0}" of binding operation "{1}"
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_FAULT_NOT_ENCODED(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_FAULT_NOT_ENCODED(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_SUPPORTED_STYLE(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.notSupportedStyle", arg0);
+    }
+
+    /**
+     * ignoring operation "{0}": not request-response or one-way
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_NOT_SUPPORTED_STYLE(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_SUPPORTED_STYLE(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_MESSAGE_PART_MUST_HAVE_TYPE_DESCRIPTOR(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.message.partMustHaveTypeDescriptor", arg0, arg1);
+    }
+
+    /**
+     * in message "{0}", part "{1}" must specify a "type" attribute
+     *
+     */
+    public static String WSDLMODELER_INVALID_MESSAGE_PART_MUST_HAVE_TYPE_DESCRIPTOR(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_MESSAGE_PART_MUST_HAVE_TYPE_DESCRIPTOR(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_MULTIPLE_OUTPUT_PARAMETERS(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.multipleOutputParameters", arg0);
+    }
+
+    /**
+     * multiple "out" parameters in operation: {0}
+     *
+     */
+    public static String WSDLMODELER_MULTIPLE_OUTPUT_PARAMETERS(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_MULTIPLE_OUTPUT_PARAMETERS(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_MULTIPLE_PART_BINDING(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.multiplePartBinding", arg0, arg1);
+    }
+
+    /**
+     * abstract operation "{0}" binding, part "{1}" has multiple binding.
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_OPERATION_MULTIPLE_PART_BINDING(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_MULTIPLE_PART_BINDING(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID() {
+        return messageFactory.getMessage("wsdlmodeler.invalid");
+    }
+
+    /**
+     * invalid WSDL document
+     *
+     */
+    public static String WSDLMODELER_INVALID() {
+        return localizer.localize(localizableWSDLMODELER_INVALID());
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_MULTIPLE_MATCHING_OPERATIONS(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.multipleMatchingOperations", arg0, arg1);
+    }
+
+    /**
+     * in binding "{1}", operation "{0}" does not reference a unique operation in the corresponding port type
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_OPERATION_MULTIPLE_MATCHING_OPERATIONS(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_MULTIPLE_MATCHING_OPERATIONS(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_NON_UNIQUE_BODY(Object arg0, Object arg1, Object arg2, Object arg3) {
+        return messageFactory.getMessage("wsdlmodeler.nonUnique.body", arg0, arg1, arg2, arg3);
+    }
+
+    /**
+     * Non unique body parts! In a port, operations must have unique operation signaure on the wire for successful dispatch. In port {0}, Operations "{1}" and "{2}" have the same request body block {3}
+     *
+     */
+    public static String WSDLMODELER_NON_UNIQUE_BODY(Object arg0, Object arg1, Object arg2, Object arg3) {
+        return localizer.localize(localizableWSDLMODELER_NON_UNIQUE_BODY(arg0, arg1, arg2, arg3));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringHeader.cant.resolve.message", arg0, arg1);
+    }
+
+    /**
+     * ignoring header "{0}" of binding operation "{1}": cannot resolve message
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_HEADER_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_CANT_RESOLVE_MESSAGE(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOMIZED_OPERATION_NAME(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.customizedOperationName", arg0, arg1);
+    }
+
+    /**
+     * Ignoring operation "{0}", can''t generate java method ,customized name "{1}" of the wsdl:operation is a java keyword.
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOMIZED_OPERATION_NAME(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOMIZED_OPERATION_NAME(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_NOT_LITERAL(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringHeader.notLiteral", arg0, arg1);
+    }
+
+    /**
+     * ignoring header "{0}" of binding operation "{1}": not literal
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_HEADER_NOT_LITERAL(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_NOT_LITERAL(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_INPUT_HEADER_MISSING_NAMESPACE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.inputHeader.missingNamespace", arg0, arg1);
+    }
+
+    /**
+     * input header "{1}" of binding operation "{0}" must specify a value for the "namespace" attribute
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_OPERATION_INPUT_HEADER_MISSING_NAMESPACE(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_INPUT_HEADER_MISSING_NAMESPACE(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_MISSING_INPUT_NAME(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.missingInputName", arg0);
+    }
+
+    /**
+     * binding operation "{0}" must specify a name for its input message
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_OPERATION_MISSING_INPUT_NAME(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_MISSING_INPUT_NAME(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_NON_SOAP_PORT_NO_ADDRESS(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringNonSOAPPort.noAddress", arg0);
+    }
+
+    /**
+     * ignoring port "{0}": no SOAP address specified. try running wsimport with -extension switch.
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_NON_SOAP_PORT_NO_ADDRESS(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_NON_SOAP_PORT_NO_ADDRESS(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_RESULT_IS_IN_OUT_PARAMETER(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.resultIsInOutParameter", arg0);
+    }
+
+    /**
+     * result is "inout" parameter in operation: {0}
+     *
+     */
+    public static String WSDLMODELER_RESULT_IS_IN_OUT_PARAMETER(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_RESULT_IS_IN_OUT_PARAMETER(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_HEADER_NOT_FOUND(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.header.notFound", arg0, arg1);
+    }
+
+    /**
+     * header "{0}" of binding operation "{1}": not found
+     *
+     */
+    public static String WSDLMODELER_INVALID_HEADER_NOT_FOUND(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_HEADER_NOT_FOUND(arg0, arg1));
+    }
+
+    public static Localizable localizableMIMEMODELER_ELEMENT_PART_INVALID_ELEMENT_MIME_TYPE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("mimemodeler.elementPart.invalidElementMimeType", arg0, arg1);
+    }
+
+    /**
+     * The mime:content part refers to wsdl:part "{0}", defined using element attribute. Please make sure the mime type: "{1}" is appropriate to serialize XML.
+     *
+     */
+    public static String MIMEMODELER_ELEMENT_PART_INVALID_ELEMENT_MIME_TYPE(Object arg0, Object arg1) {
+        return localizer.localize(localizableMIMEMODELER_ELEMENT_PART_INVALID_ELEMENT_MIME_TYPE(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_HEADER_NOT_LITERAL(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.header.notLiteral", arg0, arg1);
+    }
+
+    /**
+     * Invalid header "{0}" of binding operation "{1}": not literal
+     *
+     */
+    public static String WSDLMODELER_INVALID_HEADER_NOT_LITERAL(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_HEADER_NOT_LITERAL(arg0, arg1));
+    }
+
+    public static Localizable localizableMIMEMODELER_INVALID_MIME_CONTENT_MESAGE_PART_ELEMENT_KIND(Object arg0) {
+        return messageFactory.getMessage("mimemodeler.invalidMimeContent.mesagePartElementKind", arg0);
+    }
+
+    /**
+     * wsdl:part element referenced by mime:content part attribute: {0} must be defined using type attribute!
+     *
+     */
+    public static String MIMEMODELER_INVALID_MIME_CONTENT_MESAGE_PART_ELEMENT_KIND(Object arg0) {
+        return localizer.localize(localizableMIMEMODELER_INVALID_MIME_CONTENT_MESAGE_PART_ELEMENT_KIND(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_ENCODED(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.notEncoded", arg0);
+    }
+
+    /**
+     * ignoring RPC-style operation "{0}": parameters are not encoded
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_NOT_ENCODED(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_ENCODED(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_NONCONFORMING_WSDL_TYPES() {
+        return messageFactory.getMessage("wsdlmodeler.warning.nonconforming.wsdl.types");
+    }
+
+    /**
+     * Non conforming WS-I WSDL used for wsdl:types
+     *
+     */
+    public static String WSDLMODELER_WARNING_NONCONFORMING_WSDL_TYPES() {
+        return localizer.localize(localizableWSDLMODELER_WARNING_NONCONFORMING_WSDL_TYPES());
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_MORE_THAN_ONE_PART_IN_INPUT_MESSAGE(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleMoreThanOnePartInInputMessage", arg0);
+    }
+
+    /**
+     * ignoring operation "{0}": more than one part in input message
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_MORE_THAN_ONE_PART_IN_INPUT_MESSAGE(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_MORE_THAN_ONE_PART_IN_INPUT_MESSAGE(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_EMPTY_OUTPUT_MESSAGE(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleEmptyOutputMessage", arg0);
+    }
+
+    /**
+     * ignoring operation "{0}": output message is empty
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_EMPTY_OUTPUT_MESSAGE(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_EMPTY_OUTPUT_MESSAGE(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_R_2716_R_2726(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.warning.r2716r2726", arg0, arg1);
+    }
+
+    /**
+     * R2716/R2726 WSI-BasicProfile ver. 1.0, namespace attribute not allowed in doc/lit or rpc/lit for {0}: "{1}"
+     *
+     */
+    public static String WSDLMODELER_WARNING_R_2716_R_2726(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_R_2716_R_2726(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_NO_SOAP_ADDRESS(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.warning.noSOAPAddress", arg0);
+    }
+
+    /**
+     * port "{0}" is not a SOAP port, it has no soap:address
+     *
+     */
+    public static String WSDLMODELER_WARNING_NO_SOAP_ADDRESS(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_NO_SOAP_ADDRESS(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_FAULTS(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringFaults", arg0);
+    }
+
+    /**
+     * ignoring faults declared by operation "{0}"
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_FAULTS(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_FAULTS(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_MISSING_NAME(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.bindingFault.missingName", arg0, arg1);
+    }
+
+    /**
+     * fault "{0}" in operation "{1}" must specify a value for the "name" attribute
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_FAULT_MISSING_NAME(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_MISSING_NAME(arg0, arg1));
+    }
+
+    public static Localizable localizableMIMEMODELER_WARNING_IGNORINGINVALID_HEADER_PART_NOT_DECLARED_IN_ROOT_PART(Object arg0) {
+        return messageFactory.getMessage("mimemodeler.warning.IgnoringinvalidHeaderPart.notDeclaredInRootPart", arg0);
+    }
+
+    /**
+     * Headers not in root mime:part with soap:body, ignoring headers in operation "{0}"
+     *
+     */
+    public static String MIMEMODELER_WARNING_IGNORINGINVALID_HEADER_PART_NOT_DECLARED_IN_ROOT_PART(Object arg0) {
+        return localizer.localize(localizableMIMEMODELER_WARNING_IGNORINGINVALID_HEADER_PART_NOT_DECLARED_IN_ROOT_PART(arg0));
+    }
+
+    public static Localizable localizableMIMEMODELER_INVALID_MIME_CONTENT_ERROR_LOADING_JAVA_CLASS() {
+        return messageFactory.getMessage("mimemodeler.invalidMimeContent.errorLoadingJavaClass");
+    }
+
+    /**
+     * Couldn't find class "{0}" for mime type "{1}"
+     *
+     */
+    public static String MIMEMODELER_INVALID_MIME_CONTENT_ERROR_LOADING_JAVA_CLASS() {
+        return localizer.localize(localizableMIMEMODELER_INVALID_MIME_CONTENT_ERROR_LOADING_JAVA_CLASS());
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_NOT_IN_PORT_TYPE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.notInPortType", arg0, arg1);
+    }
+
+    /**
+     * in binding "{1}", operation "{0}" does not appear in the corresponding port type
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_OPERATION_NOT_IN_PORT_TYPE(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_NOT_IN_PORT_TYPE(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CONFLICT_STYLE_IN_WSI_MODE(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.conflictStyleInWSIMode", arg0);
+    }
+
+    /**
+     * ignoring operation "{0}": binding style and operation style are conflicting
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CONFLICT_STYLE_IN_WSI_MODE(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CONFLICT_STYLE_IN_WSI_MODE(arg0));
+    }
+
+    public static Localizable localizableMIMEMODELER_INVALID_MIME_CONTENT_MISSING_PART_ATTRIBUTE(Object arg0) {
+        return messageFactory.getMessage("mimemodeler.invalidMimeContent.missingPartAttribute", arg0);
+    }
+
+    /**
+     * Ignoring operation "{0}", missing part attribute in mime:content. part attribute must be present in mime:content declaration.
+     *
+     */
+    public static String MIMEMODELER_INVALID_MIME_CONTENT_MISSING_PART_ATTRIBUTE(Object arg0) {
+        return localizer.localize(localizableMIMEMODELER_INVALID_MIME_CONTENT_MISSING_PART_ATTRIBUTE(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_SEARCH_SCHEMA_UNRECOGNIZED_TYPES(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.warning.searchSchema.unrecognizedTypes", arg0);
+    }
+
+    /**
+     * encountered {0} unrecognized type(s)
+     *
+     */
+    public static String WSDLMODELER_WARNING_SEARCH_SCHEMA_UNRECOGNIZED_TYPES(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_SEARCH_SCHEMA_UNRECOGNIZED_TYPES(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOMIZED_OPERATION_NAME(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.customizedOperationName", arg0, arg1);
+    }
+
+    /**
+     * Invalid operation "{0}", can''t generate java method ,customized name "{1}" of the wsdl:operation is a java keyword.
+     *
+     */
+    public static String WSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOMIZED_OPERATION_NAME(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOMIZED_OPERATION_NAME(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_HEADER_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.header.cant.resolve.message", arg0, arg1);
+    }
+
+    /**
+     * header "{0}" of binding operation "{1}": cannot resolve message
+     *
+     */
+    public static String WSDLMODELER_INVALID_HEADER_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_HEADER_CANT_RESOLVE_MESSAGE(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_MISSING_NAMESPACE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.bindingFault.missingNamespace", arg0, arg1);
+    }
+
+    /**
+     * fault "{0}" in operation "{1}" must specify a value for the "namespace" attribute
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_FAULT_MISSING_NAMESPACE(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_MISSING_NAMESPACE(arg0, arg1));
+    }
+
+    public static Localizable localizableMIMEMODELER_INVALID_MIME_PART_MORE_THAN_ONE_SOAP_BODY(Object arg0) {
+        return messageFactory.getMessage("mimemodeler.invalidMimePart.moreThanOneSOAPBody", arg0);
+    }
+
+    /**
+     * Ignoring operation "{0}". The Multipart/Related structure has invalid root part: more than one soap:body parts found
+     *
+     */
+    public static String MIMEMODELER_INVALID_MIME_PART_MORE_THAN_ONE_SOAP_BODY(Object arg0) {
+        return localizer.localize(localizableMIMEMODELER_INVALID_MIME_PART_MORE_THAN_ONE_SOAP_BODY(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_INCONSISTENT_DEFINITION(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringHeader.inconsistentDefinition", arg0, arg1);
+    }
+
+    /**
+     * ignoring header "{0}" of operation "{1}": part not found
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_HEADER_INCONSISTENT_DEFINITION(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_INCONSISTENT_DEFINITION(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_NOT_FOUND(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.bindingFault.notFound", arg0, arg1);
+    }
+
+    /**
+     * fault "{0}" in operation "{1}" does not match any fault in the corresponding port type operation
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_FAULT_NOT_FOUND(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_NOT_FOUND(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOM_NAME(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.customName", arg0, arg1);
+    }
+
+    /**
+     * Ignoring operation "{0}", can''t generate java method. Parameter,customized name "{1}" is a java keyword.
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOM_NAME(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOM_NAME(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_UNRECOGNIZED_SCHEMA_EXTENSION(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringUnrecognizedSchemaExtension", arg0);
+    }
+
+    /**
+     * ignoring schema element (unsupported version): {0}
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_UNRECOGNIZED_SCHEMA_EXTENSION(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_UNRECOGNIZED_SCHEMA_EXTENSION(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NOT_FOUND(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringHeaderFault.notFound", arg0, arg1, arg2);
+    }
+
+    /**
+     * ignoring header fault "{0}", cannot find part "{1}" in binding "{2}"
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NOT_FOUND(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NOT_FOUND(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.wrapperStyle", arg0, arg1, arg2);
+    }
+
+    /**
+     * Invalid operation "{0}", can''t generate java method parameter. Local name of the wrapper child "{1}" in the global element "{2}" is a java keyword. Use customization to change the parameter name.
+     *
+     */
+    public static String WSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_WRAPPER_STYLE(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableMIMEMODELER_INVALID_MIME_CONTENT_UNKNOWN_SCHEMA_TYPE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("mimemodeler.invalidMimeContent.unknownSchemaType", arg0, arg1);
+    }
+
+    /**
+     * Unknown schema type: {1} for mime:content part: {0}
+     *
+     */
+    public static String MIMEMODELER_INVALID_MIME_CONTENT_UNKNOWN_SCHEMA_TYPE(Object arg0, Object arg1) {
+        return localizer.localize(localizableMIMEMODELER_INVALID_MIME_CONTENT_UNKNOWN_SCHEMA_TYPE(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_R_2716(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.warning.r2716", arg0, arg1);
+    }
+
+    /**
+     * R2716 WSI-BasicProfile ver. 1.0, namespace attribute not allowed in doc/lit for {0}: "{1}"
+     *
+     */
+    public static String WSDLMODELER_WARNING_R_2716(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_R_2716(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_NOT_FOUND(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringHeader.notFound", arg0, arg1);
+    }
+
+    /**
+     * ignoring header "{0}" of binding operation "{1}": not found
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_HEADER_NOT_FOUND(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_NOT_FOUND(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_TYPE_MESSAGE_PART(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleTypeMessagePart", arg0);
+    }
+
+    /**
+     * ignoring operation "{0}": message part does not refer to a schema element declaration
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_TYPE_MESSAGE_PART(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_TYPE_MESSAGE_PART(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_PARAMETER_ORDER_INVALID_PARAMETER_ORDER(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.parameterOrder.invalidParameterOrder", arg0);
+    }
+
+    /**
+     * parameterOrder attribute on operation "{0}" is invalid, ignoring parameterOrder hint
+     *
+     */
+    public static String WSDLMODELER_INVALID_PARAMETER_ORDER_INVALID_PARAMETER_ORDER(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_PARAMETER_ORDER_INVALID_PARAMETER_ORDER(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_MISSING_OUTPUT_NAME(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.missingOutputName", arg0);
+    }
+
+    /**
+     * binding operation "{0}" must specify a name for its output message
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_OPERATION_MISSING_OUTPUT_NAME(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_MISSING_OUTPUT_NAME(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_OPERATION(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.invalidOperation", arg0);
+    }
+
+    /**
+     * invalid operation: {0}
+     *
+     */
+    public static String WSDLMODELER_INVALID_OPERATION(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_OPERATION(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_HEADER_MISSING_NAMESPACE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.outputHeader.missingNamespace", arg0, arg1);
+    }
+
+    /**
+     * output header "{1}" of binding operation "{0}" must specify a value for the "namespace" attribute
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_HEADER_MISSING_NAMESPACE(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_HEADER_MISSING_NAMESPACE(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_PART_FROM_BODY(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringHeader.partFromBody", arg0);
+    }
+
+    /**
+     * header part: "{0}" already bound by soapbind:body, illegal to bind the part twice
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_HEADER_PART_FROM_BODY(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_PART_FROM_BODY(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_OPERATION_NOT_SUPPORTED_STYLE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.operation.notSupportedStyle", arg0, arg1);
+    }
+
+    /**
+     * Invalid WSDL, wsdl:operation "{0}" in wsdl:portType "{1}": not request-response or one-way
+     *
+     */
+    public static String WSDLMODELER_INVALID_OPERATION_NOT_SUPPORTED_STYLE(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_OPERATION_NOT_SUPPORTED_STYLE(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_NC_NAME(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.notNCName", arg0, arg1);
+    }
+
+    /**
+     * Ignoring operation "{0}", it has illegal character ''{1}'' in its name. Its rpc-literal operation - jaxws won't be able to serialize it!
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_NOT_NC_NAME(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_NC_NAME(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_PARAMETER_DIFFERENT_TYPES(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.parameter.differentTypes", arg0, arg1);
+    }
+
+    /**
+     * parameter "{0}" of operation "{1}" appears with different types in the input and output messages
+     *
+     */
+    public static String WSDLMODELER_INVALID_PARAMETER_DIFFERENT_TYPES(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_PARAMETER_DIFFERENT_TYPES(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_FAULT_DOCUMENT_OPERATION(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringFault.documentOperation", arg0, arg1);
+    }
+
+    /**
+     * ignoring fault "{0}" of document-style operation "{1}"
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_FAULT_DOCUMENT_OPERATION(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_FAULT_DOCUMENT_OPERATION(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_NONCONFORMING_WSDL_USE(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.warning.nonconforming.wsdl.use", arg0);
+    }
+
+    /**
+     * Processing WS-I non conforming operation "{0}" with RPC-Style and SOAP-encoded
+     *
+     */
+    public static String WSDLMODELER_WARNING_NONCONFORMING_WSDL_USE(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_NONCONFORMING_WSDL_USE(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_NON_SOAP_PORT(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.warning.nonSOAPPort", arg0);
+    }
+
+    /**
+     * port "{0}": not a standard SOAP port. The generated artifacts may not work with JAXWS runtime.
+     *
+     */
+    public static String WSDLMODELER_WARNING_NON_SOAP_PORT(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_NON_SOAP_PORT(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_HEADERFAULT_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.headerfault.message.partMustHaveElementDescriptor", arg0, arg1, arg2);
+    }
+
+    /**
+     * Invalid headerfault "{0}" for header {1} in operation {2}: part must specify a "element" attribute
+     *
+     */
+    public static String WSDLMODELER_INVALID_HEADERFAULT_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_HEADERFAULT_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_STATE_MODELING_OPERATION(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.invalidState.modelingOperation", arg0);
+    }
+
+    /**
+     * invalid state while modeling operation: {0}
+     *
+     */
+    public static String WSDLMODELER_INVALID_STATE_MODELING_OPERATION(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_STATE_MODELING_OPERATION(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_OPERATION_NAME(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.operationName", arg0);
+    }
+
+    /**
+     * Ignoring operation "{0}", it''s java reserved word, can''t generate java method. Use customization to change the operation name.
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_OPERATION_NAME(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_OPERATION_NAME(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_NOT_ENCODED(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringHeader.notEncoded", arg0, arg1);
+    }
+
+    /**
+     * ignoring header "{0}" of binding operation "{1}": not SOAP-encoded
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_HEADER_NOT_ENCODED(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_NOT_ENCODED(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_DUPLICATE_FAULT_PART_NAME(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("wsdlmodeler.duplicate.fault.part.name", arg0, arg1, arg2);
+    }
+
+    /**
+     * ignoring fault "{0}" of operation "{1}", part name "{2}" is not unique
+     *
+     */
+    public static String WSDLMODELER_DUPLICATE_FAULT_PART_NAME(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWSDLMODELER_DUPLICATE_FAULT_PART_NAME(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_OPERATION_MORE_THAN_ONE_PART_IN_MESSAGE(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.operation.MoreThanOnePartInMessage", arg0);
+    }
+
+    /**
+     * operation "{0}": more than one part bound to body
+     *
+     */
+    public static String WSDLMODELER_INVALID_OPERATION_MORE_THAN_ONE_PART_IN_MESSAGE(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_OPERATION_MORE_THAN_ONE_PART_IN_MESSAGE(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_SOAP_BINDING_12(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringSOAPBinding12", arg0);
+    }
+
+    /**
+     * Ignoring SOAP port "{0}": it uses non-standard SOAP 1.2 binding.
+     * You must specify the "-extension" option to use this binding.
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_SOAP_BINDING_12(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_SOAP_BINDING_12(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_NOT_UNIQUE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.bindingFault.notUnique", arg0, arg1);
+    }
+
+    /**
+     * fault "{0}" in operation "{1}" matches more than one fault in the corresponding port type operation
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_FAULT_NOT_UNIQUE(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_NOT_UNIQUE(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_MISSING_SOAP_BODY(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.outputMissingSoapBody", arg0);
+    }
+
+    /**
+     * output message of binding operation "{0}" does not have a SOAP body extension
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_MISSING_SOAP_BODY(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_MISSING_SOAP_BODY(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NOT_LITERAL(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringHeaderFault.notLiteral", arg0, arg1, arg2);
+    }
+
+    /**
+     * ignoring header fault part="{0}" message="{1}" of operation {2}, use attribute MUST be "literal"
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NOT_LITERAL(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NOT_LITERAL(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_MORE_THAN_ONE_PART_IN_OUTPUT_MESSAGE(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleMoreThanOnePartInOutputMessage", arg0);
+    }
+
+    /**
+     * ignoring operation "{0}": more than one part in output message
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_MORE_THAN_ONE_PART_IN_OUTPUT_MESSAGE(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_MORE_THAN_ONE_PART_IN_OUTPUT_MESSAGE(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_NO_OPERATIONS_IN_PORT(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.warning.noOperationsInPort", arg0);
+    }
+
+    /**
+     * Port "{0}" does not contain any usable operations
+     *
+     */
+    public static String WSDLMODELER_WARNING_NO_OPERATIONS_IN_PORT(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_NO_OPERATIONS_IN_PORT(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.wrapperStyle", arg0, arg1, arg2);
+    }
+
+    /**
+     * Ignoring operation "{0}", can''t generate java method parameter. Local name of the wrapper child "{1}" in the global element "{2}" is a java keyword. Use customization to change the parameter name.
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_WRAPPER_STYLE(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWSDLMODELER_UNSOLVABLE_NAMING_CONFLICTS(Object arg0) {
+        return messageFactory.getMessage("wsdlmodeler.unsolvableNamingConflicts", arg0);
+    }
+
+    /**
+     * the following naming conflicts occurred: {0}
+     *
+     */
+    public static String WSDLMODELER_UNSOLVABLE_NAMING_CONFLICTS(Object arg0) {
+        return localizer.localize(localizableWSDLMODELER_UNSOLVABLE_NAMING_CONFLICTS(arg0));
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/ProcessorNotificationListener.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/ProcessorMessages.java
similarity index 57%
rename from jaxws/src/share/classes/com/sun/tools/internal/ws/processor/ProcessorNotificationListener.java
rename to jaxws/src/share/classes/com/sun/tools/internal/ws/resources/ProcessorMessages.java
index 9259e1f8326..c0d6bb12b09 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/ProcessorNotificationListener.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/ProcessorMessages.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,19 +22,32 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-package com.sun.tools.internal.ws.processor;
+package com.sun.tools.internal.ws.resources;
 
 import com.sun.xml.internal.ws.util.localization.Localizable;
+import com.sun.xml.internal.ws.util.localization.LocalizableMessageFactory;
+import com.sun.xml.internal.ws.util.localization.Localizer;
+
 
 /**
- * A ProcessorNotificationListener is registered with a Processor and receives
- * notifications of errors, warnings and informational messages.
+ * Defines string formatting method for each constant in the resource file
  *
- * @author WS Development Team
  */
-public interface ProcessorNotificationListener {
-    public void onError(Localizable msg);
-    public void onWarning(Localizable msg);
-    public void onInfo(Localizable msg);
+public final class ProcessorMessages {
+
+    private final static LocalizableMessageFactory messageFactory = new LocalizableMessageFactory("com.sun.tools.internal.ws.resources.processor");
+    private final static Localizer localizer = new Localizer();
+
+    public static Localizable localizablePROCESSOR_MISSING_MODEL() {
+        return messageFactory.getMessage("processor.missing.model");
+    }
+
+    /**
+     * model is missing
+     *
+     */
+    public static String PROCESSOR_MISSING_MODEL() {
+        return localizer.localize(localizablePROCESSOR_MISSING_MODEL());
+    }
+
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/UtilMessages.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/UtilMessages.java
new file mode 100644
index 00000000000..2be9eef1f79
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/UtilMessages.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.tools.internal.ws.resources;
+
+import com.sun.xml.internal.ws.util.localization.Localizable;
+import com.sun.xml.internal.ws.util.localization.LocalizableMessageFactory;
+import com.sun.xml.internal.ws.util.localization.Localizer;
+
+
+/**
+ * Defines string formatting method for each constant in the resource file
+ *
+ */
+public final class UtilMessages {
+
+    private final static LocalizableMessageFactory messageFactory = new LocalizableMessageFactory("com.sun.tools.internal.ws.resources.util");
+    private final static Localizer localizer = new Localizer();
+
+    public static Localizable localizableSAX_2_DOM_NOTSUPPORTED_CREATEELEMENT(Object arg0) {
+        return messageFactory.getMessage("sax2dom.notsupported.createelement", arg0);
+    }
+
+    /**
+     * SAX2DOMEx.DomImplDoesntSupportCreateElementNs: {0}
+     *
+     */
+    public static String SAX_2_DOM_NOTSUPPORTED_CREATEELEMENT(Object arg0) {
+        return localizer.localize(localizableSAX_2_DOM_NOTSUPPORTED_CREATEELEMENT(arg0));
+    }
+
+    public static Localizable localizableNULL_NAMESPACE_FOUND(Object arg0) {
+        return messageFactory.getMessage("null.namespace.found", arg0);
+    }
+
+    /**
+     * Encountered error in wsdl. Check namespace of element <{0}>
+     *
+     */
+    public static String NULL_NAMESPACE_FOUND(Object arg0) {
+        return localizer.localize(localizableNULL_NAMESPACE_FOUND(arg0));
+    }
+
+    public static Localizable localizableHOLDER_VALUEFIELD_NOT_FOUND(Object arg0) {
+        return messageFactory.getMessage("holder.valuefield.not.found", arg0);
+    }
+
+    /**
+     * Could not find the field in the Holder that contains the Holder''s value: {0}
+     *
+     */
+    public static String HOLDER_VALUEFIELD_NOT_FOUND(Object arg0) {
+        return localizer.localize(localizableHOLDER_VALUEFIELD_NOT_FOUND(arg0));
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/WebserviceapMessages.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/WebserviceapMessages.java
new file mode 100644
index 00000000000..05b617f8d96
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/WebserviceapMessages.java
@@ -0,0 +1,893 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.tools.internal.ws.resources;
+
+import com.sun.xml.internal.ws.util.localization.Localizable;
+import com.sun.xml.internal.ws.util.localization.LocalizableMessageFactory;
+import com.sun.xml.internal.ws.util.localization.Localizer;
+
+
+/**
+ * Defines string formatting method for each constant in the resource file
+ *
+ */
+public final class WebserviceapMessages {
+
+    private final static LocalizableMessageFactory messageFactory = new LocalizableMessageFactory("com.sun.tools.internal.ws.resources.webserviceap");
+    private final static Localizer localizer = new Localizer();
+
+    public static Localizable localizableWEBSERVICEAP_RPC_LITERAL_MUST_NOT_BE_BARE(Object arg0) {
+        return messageFactory.getMessage("webserviceap.rpc.literal.must.not.be.bare", arg0);
+    }
+
+    /**
+     * RPC literal SOAPBindings must have parameterStyle WRAPPPED. Class: {0}.
+     *
+     */
+    public static String WEBSERVICEAP_RPC_LITERAL_MUST_NOT_BE_BARE(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_RPC_LITERAL_MUST_NOT_BE_BARE(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT_EXCLUDE(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("webserviceap.invalid.sei.annotation.element.exclude", arg0, arg1, arg2);
+    }
+
+    /**
+     * The @javax.jws.WebMethod({0}) cannot be used on a service endpoint interface. Class: {1} method: {2}
+     *
+     */
+    public static String WEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT_EXCLUDE(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT_EXCLUDE(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_INNERCLASS_NOT_STATIC(Object arg0) {
+        return messageFactory.getMessage("webserviceap.webservice.class.is.innerclass.not.static", arg0);
+    }
+
+    /**
+     * Inner classes annotated with @javax.jws.WebService must be static. Class: {0}
+     *
+     */
+    public static String WEBSERVICEAP_WEBSERVICE_CLASS_IS_INNERCLASS_NOT_STATIC(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_INNERCLASS_NOT_STATIC(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_WEBSERVICE_METHOD_IS_ABSTRACT(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.webservice.method.is.abstract", arg0, arg1);
+    }
+
+    /**
+     * Classes annotated with @javax.jws.WebService must not have abstract methods. Class: {0} Method: {1}
+     *
+     */
+    public static String WEBSERVICEAP_WEBSERVICE_METHOD_IS_ABSTRACT(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_WEBSERVICE_METHOD_IS_ABSTRACT(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_ONEWAY_OPERATION_CANNOT_HAVE_RETURN_TYPE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.oneway.operation.cannot.have.return.type", arg0, arg1);
+    }
+
+    /**
+     * The method {1} of class {0} is annotated @Oneway but has a return type.
+     *
+     */
+    public static String WEBSERVICEAP_ONEWAY_OPERATION_CANNOT_HAVE_RETURN_TYPE(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_ONEWAY_OPERATION_CANNOT_HAVE_RETURN_TYPE(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_WARNING(Object arg0) {
+        return messageFactory.getMessage("webserviceap.warning", arg0);
+    }
+
+    /**
+     * warning: {0}
+     *
+     */
+    public static String WEBSERVICEAP_WARNING(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_WARNING(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_RPC_SOAPBINDING_NOT_ALLOWED_ON_METHOD(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.rpc.soapbinding.not.allowed.on.method", arg0, arg1);
+    }
+
+    /**
+     * SOAPBinding.Style.RPC binding annotations are not allowed on methods.  Class: {0} Method: {1}
+     *
+     */
+    public static String WEBSERVICEAP_RPC_SOAPBINDING_NOT_ALLOWED_ON_METHOD(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_RPC_SOAPBINDING_NOT_ALLOWED_ON_METHOD(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_COULD_NOT_FIND_HANDLERCHAIN(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.could.not.find.handlerchain", arg0, arg1);
+    }
+
+    /**
+     * Could not find the handlerchain {0} in the handler file {1}
+     *
+     */
+    public static String WEBSERVICEAP_COULD_NOT_FIND_HANDLERCHAIN(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_COULD_NOT_FIND_HANDLERCHAIN(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_NO_PACKAGE_CLASS_MUST_HAVE_TARGETNAMESPACE(Object arg0) {
+        return messageFactory.getMessage("webserviceap.no.package.class.must.have.targetnamespace", arg0);
+    }
+
+    /**
+     * @javax.jws.Webservice annotated classes that do not belong to a package must have the @javax.jws.Webservice.targetNamespace element.  Class: {0}
+     *
+     */
+    public static String WEBSERVICEAP_NO_PACKAGE_CLASS_MUST_HAVE_TARGETNAMESPACE(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_NO_PACKAGE_CLASS_MUST_HAVE_TARGETNAMESPACE(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_CLASS_NOT_FOUND(Object arg0) {
+        return messageFactory.getMessage("webserviceap.class.not.found", arg0);
+    }
+
+    /**
+     * Class Not Found: {0}
+     *
+     */
+    public static String WEBSERVICEAP_CLASS_NOT_FOUND(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_CLASS_NOT_FOUND(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_DOC_BARE_NO_RETURN_AND_NO_OUT(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.doc.bare.no.return.and.no.out", arg0, arg1);
+    }
+
+    /**
+     * Document literal bare methods that do not have a return value must have a single OUT/INOUT parameter.  Class: {0} Method: {1}
+     *
+     */
+    public static String WEBSERVICEAP_DOC_BARE_NO_RETURN_AND_NO_OUT(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_DOC_BARE_NO_RETURN_AND_NO_OUT(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_METHOD_RETURN_NOT_UNIQUE(Object arg0, Object arg1, Object arg2, Object arg3) {
+        return messageFactory.getMessage("webserviceap.document.literal.bare.method.return.not.unique", arg0, arg1, arg2, arg3);
+    }
+
+    /**
+     * Document literal bare methods must have a unique result name return type combination.  Class {0} method: {1}, result name: {2} return type: {3}
+     *
+     */
+    public static String WEBSERVICEAP_DOCUMENT_LITERAL_BARE_METHOD_RETURN_NOT_UNIQUE(Object arg0, Object arg1, Object arg2, Object arg3) {
+        return localizer.localize(localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_METHOD_RETURN_NOT_UNIQUE(arg0, arg1, arg2, arg3));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_DOC_BARE_NO_OUT(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.doc.bare.no.out", arg0, arg1);
+    }
+
+    /**
+     * Document/literal bare methods with no return type or OUT/INOUT parameters must be annotated as @Oneway. Class: {0}, method: {1}
+     *
+     */
+    public static String WEBSERVICEAP_DOC_BARE_NO_OUT(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_DOC_BARE_NO_OUT(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_RPC_LITERAL_PARAMETERS_MUST_HAVE_WEBPARAM(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("webserviceap.rpc.literal.parameters.must.have.webparam", arg0, arg1, arg2);
+    }
+
+    /**
+     * All rpc literal parameters must have a WebParam annotation.  Class: {0} method: {1} parameter {2}
+     *
+     */
+    public static String WEBSERVICEAP_RPC_LITERAL_PARAMETERS_MUST_HAVE_WEBPARAM(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWEBSERVICEAP_RPC_LITERAL_PARAMETERS_MUST_HAVE_WEBPARAM(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_MODEL_ALREADY_EXISTS() {
+        return messageFactory.getMessage("webserviceap.model.already.exists");
+    }
+
+    /**
+     * model already exists
+     *
+     */
+    public static String WEBSERVICEAP_MODEL_ALREADY_EXISTS() {
+        return localizer.localize(localizableWEBSERVICEAP_MODEL_ALREADY_EXISTS());
+    }
+
+    public static Localizable localizableWEBSERVICEAP_ENDPOINTINTERFACE_ON_INTERFACE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.endpointinterface.on.interface", arg0, arg1);
+    }
+
+    /**
+     * Service endpointpoint interface: {0} has cannot have a WebService.endpointInterface annotation: {1}
+     *
+     */
+    public static String WEBSERVICEAP_ENDPOINTINTERFACE_ON_INTERFACE(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_ENDPOINTINTERFACE_ON_INTERFACE(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_METHOD_NOT_ANNOTATED(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.method.not.annotated", arg0, arg1);
+    }
+
+    /**
+     * The method {0} on class {1} is not annotated.
+     *
+     */
+    public static String WEBSERVICEAP_METHOD_NOT_ANNOTATED(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_METHOD_NOT_ANNOTATED(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_NON_IN_PARAMETERS_MUST_BE_HOLDER(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("webserviceap.non.in.parameters.must.be.holder", arg0, arg1, arg2);
+    }
+
+    /**
+     * Class: {0}, method: {1}, parameter: {2} is not WebParam.Mode.IN and is not of type javax.xml.ws.Holder.
+     *
+     */
+    public static String WEBSERVICEAP_NON_IN_PARAMETERS_MUST_BE_HOLDER(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWEBSERVICEAP_NON_IN_PARAMETERS_MUST_BE_HOLDER(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_FAILED_TO_FIND_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.failed.to.find.handlerchain.file", arg0, arg1);
+    }
+
+    /**
+     * Cannot find HandlerChain file. class: {0}, file: {1}
+     *
+     */
+    public static String WEBSERVICEAP_FAILED_TO_FIND_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_FAILED_TO_FIND_HANDLERCHAIN_FILE(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_OPERATION_NAME_NOT_UNIQUE(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("webserviceap.operation.name.not.unique", arg0, arg1, arg2);
+    }
+
+    /**
+     * Operation names must be unique.  Class: {0} method: {1} operation name: {2}
+     *
+     */
+    public static String WEBSERVICEAP_OPERATION_NAME_NOT_UNIQUE(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWEBSERVICEAP_OPERATION_NAME_NOT_UNIQUE(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_METHOD_NOT_IMPLEMENTED(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("webserviceap.method.not.implemented", arg0, arg1, arg2);
+    }
+
+    /**
+     * Methods in an endpointInterface must be implemented in the implementation class.  Interface Class:{0} Implementation Class:{1} Method: {2}
+     *
+     */
+    public static String WEBSERVICEAP_METHOD_NOT_IMPLEMENTED(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWEBSERVICEAP_METHOD_NOT_IMPLEMENTED(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_HEADER_PARAMETERS_MUST_HAVE_WEBPARAM_NAME(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("webserviceap.header.parameters.must.have.webparam.name", arg0, arg1, arg2);
+    }
+
+    /**
+     * All WebParam annotations on header parameters must specify a name.  Class: {0} method {1} paramter {2}
+     *
+     */
+    public static String WEBSERVICEAP_HEADER_PARAMETERS_MUST_HAVE_WEBPARAM_NAME(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWEBSERVICEAP_HEADER_PARAMETERS_MUST_HAVE_WEBPARAM_NAME(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_INVALID_HANDLERCHAIN_FILE_NOHANDLER_CONFIG(Object arg0) {
+        return messageFactory.getMessage("webserviceap.invalid.handlerchain.file.nohandler-config", arg0);
+    }
+
+    /**
+     * The handlerchain file {0} is invalid, it does not contain a handler-config element
+     *
+     */
+    public static String WEBSERVICEAP_INVALID_HANDLERCHAIN_FILE_NOHANDLER_CONFIG(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_INVALID_HANDLERCHAIN_FILE_NOHANDLER_CONFIG(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_ONEWAY_OPERATION_CANNOT_DECLARE_EXCEPTIONS(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("webserviceap.oneway.operation.cannot.declare.exceptions", arg0, arg1, arg2);
+    }
+
+    /**
+     * The method {1} of class {0} is annotated @Oneway but declares the exception {2}
+     *
+     */
+    public static String WEBSERVICEAP_ONEWAY_OPERATION_CANNOT_DECLARE_EXCEPTIONS(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWEBSERVICEAP_ONEWAY_OPERATION_CANNOT_DECLARE_EXCEPTIONS(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_ONEWAY_OPERATION_CANNOT_HAVE_HOLDERS(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.oneway.operation.cannot.have.holders", arg0, arg1);
+    }
+
+    /**
+     * The method {1} of class {0} is annotated @Oneway but contains inout or out paramerters (javax.xml.ws.Holder)
+     *
+     */
+    public static String WEBSERVICEAP_ONEWAY_OPERATION_CANNOT_HAVE_HOLDERS(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_ONEWAY_OPERATION_CANNOT_HAVE_HOLDERS(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_ONEWAY_AND_NOT_ONE_IN(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.oneway.and.not.one.in", arg0, arg1);
+    }
+
+    /**
+     * Document literal bare methods annotated with @javax.jws.Oneway must have one non-header IN parameter.  Class: {0} Method: {1}
+     *
+     */
+    public static String WEBSERVICEAP_ONEWAY_AND_NOT_ONE_IN(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_ONEWAY_AND_NOT_ONE_IN(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_RPC_ENCODED_NOT_SUPPORTED(Object arg0) {
+        return messageFactory.getMessage("webserviceap.rpc.encoded.not.supported", arg0);
+    }
+
+    /**
+     * The {0} class has a rpc/encoded SOAPBinding.  Rpc/encoded SOAPBindings are not supported in JAXWS 2.0.
+     *
+     */
+    public static String WEBSERVICEAP_RPC_ENCODED_NOT_SUPPORTED(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_RPC_ENCODED_NOT_SUPPORTED(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_JAVA_TYPE_NOT_FOUND(Object arg0) {
+        return messageFactory.getMessage("webserviceap.java.typeNotFound", arg0);
+    }
+
+    /**
+     * The type: {0} was not found in the mapping
+     *
+     */
+    public static String WEBSERVICEAP_JAVA_TYPE_NOT_FOUND(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_JAVA_TYPE_NOT_FOUND(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.invalid.sei.annotation", arg0, arg1);
+    }
+
+    /**
+     * The @{0} annotation cannot be used on a service endpoint interface. Class: {1}
+     *
+     */
+    public static String WEBSERVICEAP_INVALID_SEI_ANNOTATION(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_NO_WEBSERVICE_ENDPOINT_FOUND() {
+        return messageFactory.getMessage("webserviceap.no.webservice.endpoint.found");
+    }
+
+    /**
+     * A web service endpoint could not be found
+     *
+     */
+    public static String WEBSERVICEAP_NO_WEBSERVICE_ENDPOINT_FOUND() {
+        return localizer.localize(localizableWEBSERVICEAP_NO_WEBSERVICE_ENDPOINT_FOUND());
+    }
+
+    public static Localizable localizableWEBSERVICEAP_INVALID_WEBMETHOD_ELEMENT_WITH_EXCLUDE(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("webserviceap.invalid.webmethod.element.with.exclude", arg0, arg1, arg2);
+    }
+
+    /**
+     * The @javax.jws.WebMethod.{0} element cannot be specified with the @javax.jws.WebMethod.exclude element. Class: {1} method: {2}
+     *
+     */
+    public static String WEBSERVICEAP_INVALID_WEBMETHOD_ELEMENT_WITH_EXCLUDE(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWEBSERVICEAP_INVALID_WEBMETHOD_ELEMENT_WITH_EXCLUDE(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_COULD_NOT_FIND_TYPEDECL(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.could.not.find.typedecl", arg0, arg1);
+    }
+
+    /**
+     * Could not get TypeDeclaration for: {0} in apt round: {1}
+     *
+     */
+    public static String WEBSERVICEAP_COULD_NOT_FIND_TYPEDECL(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_COULD_NOT_FIND_TYPEDECL(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_CANNOT_HAVE_MORE_THAN_ONE_OUT(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.document.literal.bare.cannot.have.more.than.one.out", arg0, arg1);
+    }
+
+    /**
+     * Document literal bare methods must have a return value or one out parameter.  Class: {0} Method: {1}
+     *
+     */
+    public static String WEBSERVICEAP_DOCUMENT_LITERAL_BARE_CANNOT_HAVE_MORE_THAN_ONE_OUT(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_CANNOT_HAVE_MORE_THAN_ONE_OUT(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICE_ENCODED_NOT_SUPPORTED(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webservice.encoded.not.supported", arg0, arg1);
+    }
+
+    /**
+     * The {0} class has invalid SOAPBinding annotation. {1}/encoded SOAPBinding is not supported
+     *
+     */
+    public static String WEBSERVICE_ENCODED_NOT_SUPPORTED(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICE_ENCODED_NOT_SUPPORTED(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_FINAL(Object arg0) {
+        return messageFactory.getMessage("webserviceap.webservice.class.is.final", arg0);
+    }
+
+    /**
+     * Classes annotated with @javax.jws.WebService must not be final. Class: {0}
+     *
+     */
+    public static String WEBSERVICEAP_WEBSERVICE_CLASS_IS_FINAL(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_FINAL(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_WEBSERVICE_NO_DEFAULT_CONSTRUCTOR(Object arg0) {
+        return messageFactory.getMessage("webserviceap.webservice.no.default.constructor", arg0);
+    }
+
+    /**
+     * Classes annotated with @javax.jws.WebService must have a public default constructor. Class: {0}
+     *
+     */
+    public static String WEBSERVICEAP_WEBSERVICE_NO_DEFAULT_CONSTRUCTOR(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_WEBSERVICE_NO_DEFAULT_CONSTRUCTOR(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_SEI_CANNOT_CONTAIN_CONSTANT_VALUES(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.sei.cannot.contain.constant.values", arg0, arg1);
+    }
+
+    /**
+     * An service endpoint interface cannot contain constant declaration: Interface: {0} field: {1}.
+     *
+     */
+    public static String WEBSERVICEAP_SEI_CANNOT_CONTAIN_CONSTANT_VALUES(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_SEI_CANNOT_CONTAIN_CONSTANT_VALUES(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_ENDPOINTINTERFACE_CLASS_NOT_FOUND(Object arg0) {
+        return messageFactory.getMessage("webserviceap.endpointinterface.class.not.found", arg0);
+    }
+
+    /**
+     * The endpointInterface class {0} could not be found
+     *
+     */
+    public static String WEBSERVICEAP_ENDPOINTINTERFACE_CLASS_NOT_FOUND(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_ENDPOINTINTERFACE_CLASS_NOT_FOUND(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_MUST_HAVE_ONLY_ONE_IN_PARAMETER(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("webserviceap.document.literal.bare.must.have.only.one.in.parameter", arg0, arg1, arg2);
+    }
+
+    /**
+     * Document literal bare methods must have no more than 1 non-header in parameter. Class: {0} method: {1} number of non-header parameters: {2}
+     *
+     */
+    public static String WEBSERVICEAP_DOCUMENT_LITERAL_BARE_MUST_HAVE_ONLY_ONE_IN_PARAMETER(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_MUST_HAVE_ONLY_ONE_IN_PARAMETER(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_INFO(Object arg0) {
+        return messageFactory.getMessage("webserviceap.info", arg0);
+    }
+
+    /**
+     * info: {0}
+     *
+     */
+    public static String WEBSERVICEAP_INFO(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_INFO(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_HANDLERCLASS_NOTSPECIFIED(Object arg0) {
+        return messageFactory.getMessage("webserviceap.handlerclass.notspecified", arg0);
+    }
+
+    /**
+     * A handler in the HandlerChain file: {0} does not specify a handler-class
+     *
+     */
+    public static String WEBSERVICEAP_HANDLERCLASS_NOTSPECIFIED(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_HANDLERCLASS_NOTSPECIFIED(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.invalid.sei.annotation.element", arg0, arg1);
+    }
+
+    /**
+     * The @javax.jws.WebService.{0} element cannot be specified on a service endpoint interface. Class: {1}
+     *
+     */
+    public static String WEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_METHOD_NOT_UNIQUE(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("webserviceap.document.literal.bare.method.not.unique", arg0, arg1, arg2);
+    }
+
+    /**
+     * Document literal bare methods must have unique parameter names.  Class: {0} method: {1} parameter name: {2}
+     *
+     */
+    public static String WEBSERVICEAP_DOCUMENT_LITERAL_BARE_METHOD_NOT_UNIQUE(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_METHOD_NOT_UNIQUE(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_METHOD_EXCEPTION_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.method.exception.bean.name.not.unique", arg0, arg1);
+    }
+
+    /**
+     * Exception bean names must be unique and must not clash with other generated classes.  Class: {0} exception {1}
+     *
+     */
+    public static String WEBSERVICEAP_METHOD_EXCEPTION_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_METHOD_EXCEPTION_BEAN_NAME_NOT_UNIQUE(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_HOLDER_PARAMETERS_MUST_NOT_BE_IN_ONLY(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("webserviceap.holder.parameters.must.not.be.in.only", arg0, arg1, arg2);
+    }
+
+    /**
+     * javax.xml.ws.Holder parameters must not be annotated with the WebParam.Mode.IN property.  Class: {0} method: {1} parameter: {2}
+     *
+     */
+    public static String WEBSERVICEAP_HOLDER_PARAMETERS_MUST_NOT_BE_IN_ONLY(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWEBSERVICEAP_HOLDER_PARAMETERS_MUST_NOT_BE_IN_ONLY(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_DOC_BARE_AND_NO_ONE_IN(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.doc.bare.and.no.one.in", arg0, arg1);
+    }
+
+    /**
+     * Document literal bare methods must have one non-header, IN/INOUT parameter.  Class: {0} Method: {1}
+     *
+     */
+    public static String WEBSERVICEAP_DOC_BARE_AND_NO_ONE_IN(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_DOC_BARE_AND_NO_ONE_IN(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_RPC_LITERAL_WEBPARAMS_MUST_SPECIFY_NAME(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("webserviceap.rpc.literal.webparams.must.specify.name", arg0, arg1, arg2);
+    }
+
+    /**
+     * All rpc literal WebParams must specify a name.  Class: {0} method {1} paramter {2}
+     *
+     */
+    public static String WEBSERVICEAP_RPC_LITERAL_WEBPARAMS_MUST_SPECIFY_NAME(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWEBSERVICEAP_RPC_LITERAL_WEBPARAMS_MUST_SPECIFY_NAME(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_ENDPOINTINTERFACE_HAS_NO_WEBSERVICE_ANNOTATION(Object arg0) {
+        return messageFactory.getMessage("webserviceap.endpointinterface.has.no.webservice.annotation", arg0);
+    }
+
+    /**
+     * The endpoint interface {0} must have a WebService annotation
+     *
+     */
+    public static String WEBSERVICEAP_ENDPOINTINTERFACE_HAS_NO_WEBSERVICE_ANNOTATION(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_ENDPOINTINTERFACE_HAS_NO_WEBSERVICE_ANNOTATION(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_CANNOT_COMBINE_HANDLERCHAIN_SOAPMESSAGEHANDLERS() {
+        return messageFactory.getMessage("webserviceap.cannot.combine.handlerchain.soapmessagehandlers");
+    }
+
+    /**
+     * You cannot specify both HanlderChain and SOAPMessageHandlers annotations
+     *
+     */
+    public static String WEBSERVICEAP_CANNOT_COMBINE_HANDLERCHAIN_SOAPMESSAGEHANDLERS() {
+        return localizer.localize(localizableWEBSERVICEAP_CANNOT_COMBINE_HANDLERCHAIN_SOAPMESSAGEHANDLERS());
+    }
+
+    public static Localizable localizableWEBSERVICEAP_NESTED_MODEL_ERROR(Object arg0) {
+        return messageFactory.getMessage("webserviceap.nestedModelError", arg0);
+    }
+
+    /**
+     * modeler error: {0}
+     *
+     */
+    public static String WEBSERVICEAP_NESTED_MODEL_ERROR(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_NESTED_MODEL_ERROR(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_METHOD_REQUEST_WRAPPER_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.method.request.wrapper.bean.name.not.unique", arg0, arg1);
+    }
+
+    /**
+     * Request wrapper bean names must be unique and must not clash with other generated classes.  Class: {0} method {1}
+     *
+     */
+    public static String WEBSERVICEAP_METHOD_REQUEST_WRAPPER_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_METHOD_REQUEST_WRAPPER_BEAN_NAME_NOT_UNIQUE(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_WEBSERVICE_CLASS_NOT_PUBLIC(Object arg0) {
+        return messageFactory.getMessage("webserviceap.webservice.class.not.public", arg0);
+    }
+
+    /**
+     * Classes annotated with @javax.jws.WebService must be public. Class: {0}
+     *
+     */
+    public static String WEBSERVICEAP_WEBSERVICE_CLASS_NOT_PUBLIC(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_WEBSERVICE_CLASS_NOT_PUBLIC(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_MIXED_BINDING_STYLE(Object arg0) {
+        return messageFactory.getMessage("webserviceap.mixed.binding.style", arg0);
+    }
+
+    /**
+     * Class: {0} contains mixed bindings.  SOAPBinding.Style.RPC and SOAPBinding.Style.DOCUMENT cannot be mixed.
+     *
+     */
+    public static String WEBSERVICEAP_MIXED_BINDING_STYLE(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_MIXED_BINDING_STYLE(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_FILE_NOT_FOUND(Object arg0) {
+        return messageFactory.getMessage("webserviceap.fileNotFound", arg0);
+    }
+
+    /**
+     * error: file not found: {0}
+     *
+     */
+    public static String WEBSERVICEAP_FILE_NOT_FOUND(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_FILE_NOT_FOUND(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_ONEWAY_AND_OUT(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.oneway.and.out", arg0, arg1);
+    }
+
+    /**
+     * @Oneway methods cannot have out parameters. Class: {0} method {1}
+     *
+     */
+    public static String WEBSERVICEAP_ONEWAY_AND_OUT(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_ONEWAY_AND_OUT(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_METHOD_RESPONSE_WRAPPER_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.method.response.wrapper.bean.name.not.unique", arg0, arg1);
+    }
+
+    /**
+     * Response wrapper bean names must be unique and must not clash with other generated classes.  Class: {0} method {1}
+     *
+     */
+    public static String WEBSERVICEAP_METHOD_RESPONSE_WRAPPER_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_METHOD_RESPONSE_WRAPPER_BEAN_NAME_NOT_UNIQUE(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_COMPILATION_FAILED() {
+        return messageFactory.getMessage("webserviceap.compilationFailed");
+    }
+
+    /**
+     * compilation failed, errors should have been reported
+     *
+     */
+    public static String WEBSERVICEAP_COMPILATION_FAILED() {
+        return localizer.localize(localizableWEBSERVICEAP_COMPILATION_FAILED());
+    }
+
+    public static Localizable localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_MUST_HAVE_ONE_IN_OR_OUT(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.document.literal.bare.must.have.one.in.or.out", arg0, arg1);
+    }
+
+    /**
+     * Document literal bare methods must have at least one of: a return, an in parameter or an out parameter.  Class: {0} Method: {1}
+     *
+     */
+    public static String WEBSERVICEAP_DOCUMENT_LITERAL_BARE_MUST_HAVE_ONE_IN_OR_OUT(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_MUST_HAVE_ONE_IN_OR_OUT(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_ENDPOINTINTEFACE_PLUS_ELEMENT(Object arg0) {
+        return messageFactory.getMessage("webserviceap.endpointinteface.plus.element", arg0);
+    }
+
+    /**
+     * The @javax.jws.WebService.{0} element cannot be used in with @javax.jws.WebService.endpointInterface element.
+     *
+     */
+    public static String WEBSERVICEAP_ENDPOINTINTEFACE_PLUS_ELEMENT(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_ENDPOINTINTEFACE_PLUS_ELEMENT(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_DOC_BARE_RETURN_AND_OUT(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.doc.bare.return.and.out", arg0, arg1);
+    }
+
+    /**
+     * Document/literal bare methods cannot have a return type and out parameters. Class: {0}, method: {1}
+     *
+     */
+    public static String WEBSERVICEAP_DOC_BARE_RETURN_AND_OUT(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_DOC_BARE_RETURN_AND_OUT(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_SUCCEEDED() {
+        return messageFactory.getMessage("webserviceap.succeeded");
+    }
+
+    /**
+     * Success
+     *
+     */
+    public static String WEBSERVICEAP_SUCCEEDED() {
+        return localizer.localize(localizableWEBSERVICEAP_SUCCEEDED());
+    }
+
+    public static Localizable localizableWEBSERVICEAP_DOCUMENT_BARE_HOLDER_PARAMETERS_MUST_NOT_BE_INOUT(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("webserviceap.document.bare.holder.parameters.must.not.be.inout", arg0, arg1, arg2);
+    }
+
+    /**
+     * javax.xml.ws.Holder parameters in document bare operations must be WebParam.Mode.INOUT;  Class: {0} method: {1} parameter: {2}
+     *
+     */
+    public static String WEBSERVICEAP_DOCUMENT_BARE_HOLDER_PARAMETERS_MUST_NOT_BE_INOUT(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWEBSERVICEAP_DOCUMENT_BARE_HOLDER_PARAMETERS_MUST_NOT_BE_INOUT(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_WEBSERVICE_AND_WEBSERVICEPROVIDER(Object arg0) {
+        return messageFactory.getMessage("webserviceap.webservice.and.webserviceprovider", arg0);
+    }
+
+    /**
+     * Classes cannot be annotated with both @javax.jws.WebService and @javax.xml.ws.WebServiceProvider.  Class: {0}
+     *
+     */
+    public static String WEBSERVICEAP_WEBSERVICE_AND_WEBSERVICEPROVIDER(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_WEBSERVICE_AND_WEBSERVICEPROVIDER(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_ENDPOINTINTERFACES_DO_NOT_MATCH(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.endpointinterfaces.do.not.match", arg0, arg1);
+    }
+
+    /**
+     * The endpoint interface {0} does not match the interface {1}.
+     *
+     */
+    public static String WEBSERVICEAP_ENDPOINTINTERFACES_DO_NOT_MATCH(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_ENDPOINTINTERFACES_DO_NOT_MATCH(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_ENDPOINTINTEFACE_PLUS_ANNOTATION(Object arg0) {
+        return messageFactory.getMessage("webserviceap.endpointinteface.plus.annotation", arg0);
+    }
+
+    /**
+     * The @{0} annotation cannot be used in with @javax.jws.WebService.endpointInterface element.
+     *
+     */
+    public static String WEBSERVICEAP_ENDPOINTINTEFACE_PLUS_ANNOTATION(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_ENDPOINTINTEFACE_PLUS_ANNOTATION(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_FAILED_TO_PARSE_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.failed.to.parse.handlerchain.file", arg0, arg1);
+    }
+
+    /**
+     * Failed to parse HandlerChain file. Class: {0}, file: {1}
+     *
+     */
+    public static String WEBSERVICEAP_FAILED_TO_PARSE_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_FAILED_TO_PARSE_HANDLERCHAIN_FILE(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_METHOD_PARAMETER_TYPES_CANNOT_IMPLEMENT_REMOTE(Object arg0, Object arg1, Object arg2, Object arg3) {
+        return messageFactory.getMessage("webserviceap.method.parameter.types.cannot.implement.remote", arg0, arg1, arg2, arg3);
+    }
+
+    /**
+     * Method parameter types cannot implement java.rmi.Remote.  Class: {0} method: {1} parameter: {2} type: {3}
+     *
+     */
+    public static String WEBSERVICEAP_METHOD_PARAMETER_TYPES_CANNOT_IMPLEMENT_REMOTE(Object arg0, Object arg1, Object arg2, Object arg3) {
+        return localizer.localize(localizableWEBSERVICEAP_METHOD_PARAMETER_TYPES_CANNOT_IMPLEMENT_REMOTE(arg0, arg1, arg2, arg3));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_METHOD_RETURN_TYPE_CANNOT_IMPLEMENT_REMOTE(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("webserviceap.method.return.type.cannot.implement.remote", arg0, arg1, arg2);
+    }
+
+    /**
+     * Method return types cannot implement java.rmi.Remote.  Class: {0} method: {1} return type: {2}
+     *
+     */
+    public static String WEBSERVICEAP_METHOD_RETURN_TYPE_CANNOT_IMPLEMENT_REMOTE(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWEBSERVICEAP_METHOD_RETURN_TYPE_CANNOT_IMPLEMENT_REMOTE(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_ERROR(Object arg0) {
+        return messageFactory.getMessage("webserviceap.error", arg0);
+    }
+
+    /**
+     * error: {0}
+     *
+     */
+    public static String WEBSERVICEAP_ERROR(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_ERROR(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_ABSTRACT(Object arg0) {
+        return messageFactory.getMessage("webserviceap.webservice.class.is.abstract", arg0);
+    }
+
+    /**
+     * Classes annotated with @javax.jws.WebService must not be abstract. Class: {0}
+     *
+     */
+    public static String WEBSERVICEAP_WEBSERVICE_CLASS_IS_ABSTRACT(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_ABSTRACT(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_INIT_PARAM_FORMAT_ERROR() {
+        return messageFactory.getMessage("webserviceap.init_param.format.error");
+    }
+
+    /**
+     * a  element must have exactly 1  and 1 
+     *
+     */
+    public static String WEBSERVICEAP_INIT_PARAM_FORMAT_ERROR() {
+        return localizer.localize(localizableWEBSERVICEAP_INIT_PARAM_FORMAT_ERROR());
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/WscompileMessages.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/WscompileMessages.java
new file mode 100644
index 00000000000..e1fe69120cb
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/WscompileMessages.java
@@ -0,0 +1,648 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.tools.internal.ws.resources;
+
+import com.sun.xml.internal.ws.util.localization.Localizable;
+import com.sun.xml.internal.ws.util.localization.LocalizableMessageFactory;
+import com.sun.xml.internal.ws.util.localization.Localizer;
+
+
+/**
+ * Defines string formatting method for each constant in the resource file
+ *
+ */
+public final class WscompileMessages {
+
+    private final static LocalizableMessageFactory messageFactory = new LocalizableMessageFactory("com.sun.tools.internal.ws.resources.wscompile");
+    private final static Localizer localizer = new Localizer();
+
+    public static Localizable localizableWSGEN_CLASS_MUST_BE_IMPLEMENTATION_CLASS(Object arg0) {
+        return messageFactory.getMessage("wsgen.class.must.be.implementation.class", arg0);
+    }
+
+    /**
+     * The class "{0}" is not an endpoint implementation class.
+     *
+     */
+    public static String WSGEN_CLASS_MUST_BE_IMPLEMENTATION_CLASS(Object arg0) {
+        return localizer.localize(localizableWSGEN_CLASS_MUST_BE_IMPLEMENTATION_CLASS(arg0));
+    }
+
+    public static Localizable localizableWSGEN_CLASS_NOT_FOUND(Object arg0) {
+        return messageFactory.getMessage("wsgen.class.not.found", arg0);
+    }
+
+    /**
+     * Class not found: "{0}"
+     *
+     */
+    public static String WSGEN_CLASS_NOT_FOUND(Object arg0) {
+        return localizer.localize(localizableWSGEN_CLASS_NOT_FOUND(arg0));
+    }
+
+    public static Localizable localizableWSGEN_USAGE_EXAMPLES() {
+        return messageFactory.getMessage("wsgen.usage.examples");
+    }
+
+    /**
+     *
+     * Examples:
+     *   wsgen -cp . example.Stock
+     *   wsgen -cp . example.Stock -wsdl -servicename '{http://mynamespace}MyService'
+     *
+     *
+     */
+    public static String WSGEN_USAGE_EXAMPLES() {
+        return localizer.localize(localizableWSGEN_USAGE_EXAMPLES());
+    }
+
+    public static Localizable localizableWRAPPER_TASK_LOADING_20_API(Object arg0) {
+        return messageFactory.getMessage("wrapperTask.loading20Api", arg0);
+    }
+
+    /**
+     * You are loading JAX-WS 2.0 API from {0} but this tool requires JAX-WS 2.1 API.
+     *
+     */
+    public static String WRAPPER_TASK_LOADING_20_API(Object arg0) {
+        return localizer.localize(localizableWRAPPER_TASK_LOADING_20_API(arg0));
+    }
+
+    public static Localizable localizableWSGEN_INVALID_PROTOCOL(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsgen.invalid.protocol", arg0, arg1);
+    }
+
+    /**
+     * "{0}" is not a supported protocol.  Supported protocols include: {1}.
+     *
+     */
+    public static String WSGEN_INVALID_PROTOCOL(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSGEN_INVALID_PROTOCOL(arg0, arg1));
+    }
+
+    public static Localizable localizableWSIMPORT_USAGE_EXAMPLES() {
+        return messageFactory.getMessage("wsimport.usage.examples");
+    }
+
+    /**
+     *
+     * Examples:
+     *   wsimport stock.wsdl -b stock.xml -b stock.xjb
+     *   wsimport -d generated http://example.org/stock?wsdl
+     *
+     *
+     */
+    public static String WSIMPORT_USAGE_EXAMPLES() {
+        return localizer.localize(localizableWSIMPORT_USAGE_EXAMPLES());
+    }
+
+    public static Localizable localizableINVOKER_NEED_ENDORSED() {
+        return messageFactory.getMessage("invoker.needEndorsed");
+    }
+
+    /**
+     * You are running on JDK6 which comes with JAX-WS 2.0 API, but this tool requires JAX-WS 2.1 API. Use the endorsed standards override mechanism (http://java.sun.com/javase/6/docs/technotes/guides/standards/), or use -Xendorsed option.
+     *
+     */
+    public static String INVOKER_NEED_ENDORSED() {
+        return localizer.localize(localizableINVOKER_NEED_ENDORSED());
+    }
+
+    public static Localizable localizableWSIMPORT_MISSING_FILE() {
+        return messageFactory.getMessage("wsimport.missingFile");
+    }
+
+    /**
+     * Missing WSDL_URI
+     *
+     */
+    public static String WSIMPORT_MISSING_FILE() {
+        return localizer.localize(localizableWSIMPORT_MISSING_FILE());
+    }
+
+    public static Localizable localizableWSIMPORT_USAGE(Object arg0) {
+        return messageFactory.getMessage("wsimport.usage", arg0);
+    }
+
+    /**
+     * Usage: {0} [options] 
+     *
+     * Use "wsimport -help" for a detailed description of options.
+     *
+     */
+    public static String WSIMPORT_USAGE(Object arg0) {
+        return localizer.localize(localizableWSIMPORT_USAGE(arg0));
+    }
+
+    public static Localizable localizablePLEASE() {
+        return messageFactory.getMessage("Please");
+    }
+
+    /**
+     * specify "-extension" and "-wsdl:protocol XSoap1.2" switches. For example:
+     *
+     *
+     *
+     */
+    public static String PLEASE() {
+        return localizer.localize(localizablePLEASE());
+    }
+
+    public static Localizable localizableWSIMPORT_PARSING_WSDL() {
+        return messageFactory.getMessage("wsimport.ParsingWSDL");
+    }
+
+    /**
+     * parsing WSDL...
+     *
+     *
+     *
+     */
+    public static String WSIMPORT_PARSING_WSDL() {
+        return localizer.localize(localizableWSIMPORT_PARSING_WSDL());
+    }
+
+    public static Localizable localizableWSGEN_MISSING_FILE() {
+        return messageFactory.getMessage("wsgen.missingFile");
+    }
+
+    /**
+     * Missing SEI
+     *
+     */
+    public static String WSGEN_MISSING_FILE() {
+        return localizer.localize(localizableWSGEN_MISSING_FILE());
+    }
+
+    public static Localizable localizableWSIMPORT_HELP(Object arg0) {
+        return messageFactory.getMessage("wsimport.help", arg0);
+    }
+
+    /**
+     *
+     * Usage: {0} [options] 
+     *
+     * where [options] include:
+     *   -b                  specify jaxws/jaxb binding files or additional schemas
+     *                             (Each  must have its own -b)
+     *   -B            Pass this option to JAXB schema compiler
+     *   -catalog            specify catalog file to resolve external entity references
+     *                             supports TR9401, XCatalog, and OASIS XML Catalog format.
+     *   -d             specify where to place generated output files
+     *   -extension                allow vendor extensions - functionality not specified
+     *                             by the specification.  Use of extensions may
+     *                             result in applications that are not portable or
+     *                             may not interoperate with other implementations
+     *   -help                     display help
+     *   -httpproxy::  specify a HTTP proxy server (port defaults to 8080)
+     *   -keep                     keep generated files
+     *   -p                   specifies the target package
+     *   -quiet                    suppress wsimport output
+     *   -s             specify where to place generated source files
+     *   -target          generate code as per the given JAXWS specification version.
+     *                             version 2.0 will generate compliant code for JAXWS 2.0 spec.
+     *   -verbose                  output messages about what the compiler is doing
+     *   -version                  print version information
+     *   -wsdllocation   @WebServiceClient.wsdlLocation value
+     *
+     *
+     */
+    public static String WSIMPORT_HELP(Object arg0) {
+        return localizer.localize(localizableWSIMPORT_HELP(arg0));
+    }
+
+    public static Localizable localizableWSCOMPILE_ERROR(Object arg0) {
+        return messageFactory.getMessage("wscompile.error", arg0);
+    }
+
+    /**
+     * error: {0}
+     *
+     */
+    public static String WSCOMPILE_ERROR(Object arg0) {
+        return localizer.localize(localizableWSCOMPILE_ERROR(arg0));
+    }
+
+    public static Localizable localizableWSGEN_NO_WEBSERVICES_CLASS(Object arg0) {
+        return messageFactory.getMessage("wsgen.no.webservices.class", arg0);
+    }
+
+    /**
+     * wsgen did not find any class with @WebService annotation. Please specify @WebService annotation on {0}.
+     *
+     */
+    public static String WSGEN_NO_WEBSERVICES_CLASS(Object arg0) {
+        return localizer.localize(localizableWSGEN_NO_WEBSERVICES_CLASS(arg0));
+    }
+
+    public static Localizable localizableWSCOMPILE_NO_SUCH_DIRECTORY(Object arg0) {
+        return messageFactory.getMessage("wscompile.noSuchDirectory", arg0);
+    }
+
+    /**
+     * directory not found: {0}
+     *
+     */
+    public static String WSCOMPILE_NO_SUCH_DIRECTORY(Object arg0) {
+        return localizer.localize(localizableWSCOMPILE_NO_SUCH_DIRECTORY(arg0));
+    }
+
+    public static Localizable localizableWSCOMPILE_INFO(Object arg0) {
+        return messageFactory.getMessage("wscompile.info", arg0);
+    }
+
+    /**
+     * info: {0}
+     *
+     */
+    public static String WSCOMPILE_INFO(Object arg0) {
+        return localizer.localize(localizableWSCOMPILE_INFO(arg0));
+    }
+
+    public static Localizable localizableWSIMPORT_WARNING_MESSAGE(Object arg0) {
+        return messageFactory.getMessage("wsimport.WarningMessage", arg0);
+    }
+
+    /**
+     * [WARNING] {0}
+     *
+     */
+    public static String WSIMPORT_WARNING_MESSAGE(Object arg0) {
+        return localizer.localize(localizableWSIMPORT_WARNING_MESSAGE(arg0));
+    }
+
+    public static Localizable localizableWSCOMPILE_INVALID_OPTION(Object arg0) {
+        return messageFactory.getMessage("wscompile.invalidOption", arg0);
+    }
+
+    /**
+     * unrecognized parameter {0}
+     *
+     */
+    public static String WSCOMPILE_INVALID_OPTION(Object arg0) {
+        return localizer.localize(localizableWSCOMPILE_INVALID_OPTION(arg0));
+    }
+
+    public static Localizable localizableWSIMPORT_ERROR_MESSAGE(Object arg0) {
+        return messageFactory.getMessage("wsimport.ErrorMessage", arg0);
+    }
+
+    /**
+     * [ERROR] {0}
+     *
+     */
+    public static String WSIMPORT_ERROR_MESSAGE(Object arg0) {
+        return localizer.localize(localizableWSIMPORT_ERROR_MESSAGE(arg0));
+    }
+
+    public static Localizable localizableWSIMPORT_GENERATING_CODE() {
+        return messageFactory.getMessage("wsimport.GeneratingCode");
+    }
+
+    /**
+     * generating code...
+     *
+     */
+    public static String WSIMPORT_GENERATING_CODE() {
+        return localizer.localize(localizableWSIMPORT_GENERATING_CODE());
+    }
+
+    public static Localizable localizableWSGEN() {
+        return messageFactory.getMessage("wsgen");
+    }
+
+    /**
+     * -wsdl:protocol XSoap1.2 -extenson {1}
+     *
+     */
+    public static String WSGEN() {
+        return localizer.localize(localizableWSGEN());
+    }
+
+    public static Localizable localizableWSIMPORT_NOT_A_FILE_NOR_URL(Object arg0) {
+        return messageFactory.getMessage("wsimport.NotAFileNorURL", arg0);
+    }
+
+    /**
+     * "{0}" is neither a file name nor an URL
+     *
+     */
+    public static String WSIMPORT_NOT_A_FILE_NOR_URL(Object arg0) {
+        return localizer.localize(localizableWSIMPORT_NOT_A_FILE_NOR_URL(arg0));
+    }
+
+    public static Localizable localizableWSCOMPILE_WARNING(Object arg0) {
+        return messageFactory.getMessage("wscompile.warning", arg0);
+    }
+
+    /**
+     * warning: {0}
+     *
+     */
+    public static String WSCOMPILE_WARNING(Object arg0) {
+        return localizer.localize(localizableWSCOMPILE_WARNING(arg0));
+    }
+
+    public static Localizable localizableWRAPPER_TASK_NEED_ENDORSED(Object arg0) {
+        return messageFactory.getMessage("wrapperTask.needEndorsed", arg0);
+    }
+
+    /**
+     * You are running on JDK6 which comes with JAX-WS 2.0 API, but this tool requires JAX-WS 2.1 API. Use the endorsed standards override mechanism (http://java.sun.com/javase/6/docs/technotes/guides/standards/), or set xendorsed="true" on <{0}>.
+     *
+     */
+    public static String WRAPPER_TASK_NEED_ENDORSED(Object arg0) {
+        return localizer.localize(localizableWRAPPER_TASK_NEED_ENDORSED(arg0));
+    }
+
+    public static Localizable localizableWSIMPORT_NO_SUCH_JAXB_OPTION(Object arg0) {
+        return messageFactory.getMessage("wsimport.noSuchJaxbOption", arg0);
+    }
+
+    /**
+     * no such JAXB option: {0}
+     *
+     */
+    public static String WSIMPORT_NO_SUCH_JAXB_OPTION(Object arg0) {
+        return localizer.localize(localizableWSIMPORT_NO_SUCH_JAXB_OPTION(arg0));
+    }
+
+    public static Localizable localizableWSGEN_COULD_NOT_CREATE_FILE(Object arg0) {
+        return messageFactory.getMessage("wsgen.could.not.create.file", arg0);
+    }
+
+    /**
+     * "Could not create file: "{0}"
+     *
+     */
+    public static String WSGEN_COULD_NOT_CREATE_FILE(Object arg0) {
+        return localizer.localize(localizableWSGEN_COULD_NOT_CREATE_FILE(arg0));
+    }
+
+    public static Localizable localizableWSGEN_WSDL_ARG_NO_GENWSDL(Object arg0) {
+        return messageFactory.getMessage("wsgen.wsdl.arg.no.genwsdl", arg0);
+    }
+
+    /**
+     * The "{0}" option can only be in conjunction with the "-wsdl" option.
+     *
+     */
+    public static String WSGEN_WSDL_ARG_NO_GENWSDL(Object arg0) {
+        return localizer.localize(localizableWSGEN_WSDL_ARG_NO_GENWSDL(arg0));
+    }
+
+    public static Localizable localizableWSGEN_HELP(Object arg0) {
+        return messageFactory.getMessage("wsgen.help", arg0);
+    }
+
+    /**
+     *
+     * Usage: {0} [options] 
+     *
+     * where [options] include:
+     *   -classpath           specify where to find input class files
+     *   -cp                  same as -classpath 
+     *   -d              specify where to place generated output files
+     *   -extension                 allow vendor extensions - functionality not specified
+     *                              by the specification.  Use of extensions may
+     *                              result in applications that are not portable or
+     *                              may not interoperate with other implementations
+     *   -help                      display help
+     *   -keep                      keep generated files
+     *   -r              resource destination directory, specify where to
+     *                              place resouce files such as WSDLs
+     *   -s              specify where to place generated source files
+     *   -verbose                   output messages about what the compiler is doing
+     *   -version                   print version information
+     *   -wsdl[:protocol]           generate a WSDL file.  The protocol is optional.
+     *                              Valid protocols are soap1.1 and Xsoap1.2, the default
+     *                              is soap1.1.  Xsoap1.2 is not standard and can only be
+     *                              used in conjunction with the -extension option
+     *   -servicename         specify the Service name to use in the generated WSDL
+     *                              Used in conjunction with the -wsdl option.
+     *   -portname            specify the Port name to use in the generated WSDL
+     *                              Used in conjunction with the -wsdl option.
+     *
+     */
+    public static String WSGEN_HELP(Object arg0) {
+        return localizer.localize(localizableWSGEN_HELP(arg0));
+    }
+
+    public static Localizable localizableWSIMPORT_INFO_MESSAGE(Object arg0) {
+        return messageFactory.getMessage("wsimport.InfoMessage", arg0);
+    }
+
+    /**
+     * [INFO] {0}
+     *
+     */
+    public static String WSIMPORT_INFO_MESSAGE(Object arg0) {
+        return localizer.localize(localizableWSIMPORT_INFO_MESSAGE(arg0));
+    }
+
+    public static Localizable localizableWSGEN_SOAP_12_WITHOUT_EXTENSION() {
+        return messageFactory.getMessage("wsgen.soap12.without.extension");
+    }
+
+    /**
+     * The optional protocol "Xsoap1.2" must be used in conjunction with the "-extension" option.
+     *
+     */
+    public static String WSGEN_SOAP_12_WITHOUT_EXTENSION() {
+        return localizer.localize(localizableWSGEN_SOAP_12_WITHOUT_EXTENSION());
+    }
+
+    public static Localizable localizableWSCOMPILE_COMPILATION_FAILED() {
+        return messageFactory.getMessage("wscompile.compilationFailed");
+    }
+
+    /**
+     * compilation failed, errors should have been reported
+     *
+     */
+    public static String WSCOMPILE_COMPILATION_FAILED() {
+        return localizer.localize(localizableWSCOMPILE_COMPILATION_FAILED());
+    }
+
+    public static Localizable localizableWSCOMPILE_MISSING_OPTION_ARGUMENT(Object arg0) {
+        return messageFactory.getMessage("wscompile.missingOptionArgument", arg0);
+    }
+
+    /**
+     * option "{0}" requires an argument
+     *
+     */
+    public static String WSCOMPILE_MISSING_OPTION_ARGUMENT(Object arg0) {
+        return localizer.localize(localizableWSCOMPILE_MISSING_OPTION_ARGUMENT(arg0));
+    }
+
+    public static Localizable localizableWSGEN_CANNOT_GEN_WSDL_FOR_NON_SOAP_BINDING(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsgen.cannot.gen.wsdl.for.non.soap.binding", arg0, arg1);
+    }
+
+    /**
+     * wsgen can not generate WSDL for non-SOAP binding: {0} on Class {1}
+     *
+     */
+    public static String WSGEN_CANNOT_GEN_WSDL_FOR_NON_SOAP_BINDING(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSGEN_CANNOT_GEN_WSDL_FOR_NON_SOAP_BINDING(arg0, arg1));
+    }
+
+    public static Localizable localizableWSCOMPILE_DUPLICATE_OPTION(Object arg0) {
+        return messageFactory.getMessage("wscompile.duplicateOption", arg0);
+    }
+
+    /**
+     * duplicate option: {0}
+     *
+     */
+    public static String WSCOMPILE_DUPLICATE_OPTION(Object arg0) {
+        return localizer.localize(localizableWSCOMPILE_DUPLICATE_OPTION(arg0));
+    }
+
+    public static Localizable localizableWSIMPORT_FAILED_TO_PARSE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsimport.FailedToParse", arg0, arg1);
+    }
+
+    /**
+     * Failed to parse "{0}": {1}
+     *
+     */
+    public static String WSIMPORT_FAILED_TO_PARSE(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSIMPORT_FAILED_TO_PARSE(arg0, arg1));
+    }
+
+    public static Localizable localizableWSIMPORT_NO_WSDL(Object arg0) {
+        return messageFactory.getMessage("wsimport.no.wsdl", arg0);
+    }
+
+    /**
+     * Failed to read the WSDL document: {0}, because 1) could not find the document; /2) the document could not be read; 3) the root element of the document is not .
+     *
+     */
+    public static String WSIMPORT_NO_WSDL(Object arg0) {
+        return localizer.localize(localizableWSIMPORT_NO_WSDL(arg0));
+    }
+
+    public static Localizable localizableWSGEN_USAGE(Object arg0) {
+        return messageFactory.getMessage("wsgen.usage", arg0);
+    }
+
+    /**
+     * Usage: {0} [options] 
+     *
+     * Use "wsgen -help" for a detailed description of options.
+     *
+     */
+    public static String WSGEN_USAGE(Object arg0) {
+        return localizer.localize(localizableWSGEN_USAGE(arg0));
+    }
+
+    public static Localizable localizableWSGEN_SERVICENAME_MISSING_LOCALNAME(Object arg0) {
+        return messageFactory.getMessage("wsgen.servicename.missing.localname", arg0);
+    }
+
+    /**
+     * The service name "{0}" is missing a localname.
+     *
+     */
+    public static String WSGEN_SERVICENAME_MISSING_LOCALNAME(Object arg0) {
+        return localizer.localize(localizableWSGEN_SERVICENAME_MISSING_LOCALNAME(arg0));
+    }
+
+    public static Localizable localizableWSGEN_SERVICENAME_MISSING_NAMESPACE(Object arg0) {
+        return messageFactory.getMessage("wsgen.servicename.missing.namespace", arg0);
+    }
+
+    /**
+     * The service name "{0}" is missing a namespace.
+     *
+     */
+    public static String WSGEN_SERVICENAME_MISSING_NAMESPACE(Object arg0) {
+        return localizer.localize(localizableWSGEN_SERVICENAME_MISSING_NAMESPACE(arg0));
+    }
+
+    public static Localizable localizableWSGEN_INVALID_TRANSPORT(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsgen.invalid.transport", arg0, arg1);
+    }
+
+    /**
+     * "{0}" is not a supported transport.  Supported transport include: {1}.
+     *
+     */
+    public static String WSGEN_INVALID_TRANSPORT(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSGEN_INVALID_TRANSPORT(arg0, arg1));
+    }
+
+    public static Localizable localizableWSGEN_CANNOT_GEN_WSDL_FOR_SOAP_12_BINDING(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsgen.cannot.gen.wsdl.for.soap12.binding", arg0, arg1);
+    }
+
+    /**
+     * wsgen can not generate WSDL for SOAP 1.2 binding: {0} on class: {1}.
+     *
+     *
+     */
+    public static String WSGEN_CANNOT_GEN_WSDL_FOR_SOAP_12_BINDING(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSGEN_CANNOT_GEN_WSDL_FOR_SOAP_12_BINDING(arg0, arg1));
+    }
+
+    public static Localizable localizableWSIMPORT_ILLEGAL_TARGET_VERSION(Object arg0) {
+        return messageFactory.getMessage("wsimport.ILLEGAL_TARGET_VERSION", arg0);
+    }
+
+    /**
+     * "{0}" is not a valid target version. "2.0" and "2.1" are supported.
+     *
+     */
+    public static String WSIMPORT_ILLEGAL_TARGET_VERSION(Object arg0) {
+        return localizer.localize(localizableWSIMPORT_ILLEGAL_TARGET_VERSION(arg0));
+    }
+
+    public static Localizable localizableWSGEN_PORTNAME_MISSING_LOCALNAME(Object arg0) {
+        return messageFactory.getMessage("wsgen.portname.missing.localname", arg0);
+    }
+
+    /**
+     * The port name "{0}" is missing a localname.
+     *
+     */
+    public static String WSGEN_PORTNAME_MISSING_LOCALNAME(Object arg0) {
+        return localizer.localize(localizableWSGEN_PORTNAME_MISSING_LOCALNAME(arg0));
+    }
+
+    public static Localizable localizableWSGEN_PORTNAME_MISSING_NAMESPACE(Object arg0) {
+        return messageFactory.getMessage("wsgen.portname.missing.namespace", arg0);
+    }
+
+    /**
+     * The port name "{0}" is missing a namespace.
+     *
+     */
+    public static String WSGEN_PORTNAME_MISSING_NAMESPACE(Object arg0) {
+        return localizer.localize(localizableWSGEN_PORTNAME_MISSING_NAMESPACE(arg0));
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/WsdlMessages.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/WsdlMessages.java
new file mode 100644
index 00000000000..d334908a2fe
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/WsdlMessages.java
@@ -0,0 +1,978 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.tools.internal.ws.resources;
+
+import com.sun.xml.internal.ws.util.localization.Localizable;
+import com.sun.xml.internal.ws.util.localization.LocalizableMessageFactory;
+import com.sun.xml.internal.ws.util.localization.Localizer;
+
+
+/**
+ * Defines string formatting method for each constant in the resource file
+ *
+ */
+public final class WsdlMessages {
+
+    private final static LocalizableMessageFactory messageFactory = new LocalizableMessageFactory("com.sun.tools.internal.ws.resources.wsdl");
+    private final static Localizer localizer = new Localizer();
+
+    public static Localizable localizablePARSING_ELEMENT_EXPECTED() {
+        return messageFactory.getMessage("parsing.elementExpected");
+    }
+
+    /**
+     * unexpected non-element found
+     *
+     */
+    public static String PARSING_ELEMENT_EXPECTED() {
+        return localizer.localize(localizablePARSING_ELEMENT_EXPECTED());
+    }
+
+    public static Localizable localizableENTITY_NOT_FOUND_BINDING(Object arg0, Object arg1) {
+        return messageFactory.getMessage("entity.notFound.binding", arg0, arg1);
+    }
+
+    /**
+     * wsdl:binding "{0}" referenced by wsdl:port "{1}", but its not found in the wsdl
+     *
+     */
+    public static String ENTITY_NOT_FOUND_BINDING(Object arg0, Object arg1) {
+        return localizer.localize(localizableENTITY_NOT_FOUND_BINDING(arg0, arg1));
+    }
+
+    public static Localizable localizablePARSING_PARSE_FAILED() {
+        return messageFactory.getMessage("Parsing.ParseFailed");
+    }
+
+    /**
+     * Failed to parse the WSDL.
+     *
+     */
+    public static String PARSING_PARSE_FAILED() {
+        return localizer.localize(localizablePARSING_PARSE_FAILED());
+    }
+
+    public static Localizable localizablePARSING_UNABLE_TO_GET_METADATA(Object arg0) {
+        return messageFactory.getMessage("parsing.unableToGetMetadata", arg0);
+    }
+
+    /**
+     * Unable to get Metadata from: {0}
+     *
+     */
+    public static String PARSING_UNABLE_TO_GET_METADATA(Object arg0) {
+        return localizer.localize(localizablePARSING_UNABLE_TO_GET_METADATA(arg0));
+    }
+
+    public static Localizable localizableVALIDATION_INVALID_PREFIX(Object arg0) {
+        return messageFactory.getMessage("validation.invalidPrefix", arg0);
+    }
+
+    /**
+     * undeclared namespace prefix: "{0}"
+     *
+     */
+    public static String VALIDATION_INVALID_PREFIX(Object arg0) {
+        return localizer.localize(localizableVALIDATION_INVALID_PREFIX(arg0));
+    }
+
+    public static Localizable localizablePARSING_INVALID_ATTRIBUTE_VALUE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("parsing.invalidAttributeValue", arg0, arg1);
+    }
+
+    /**
+     * invalid value "{1}" for attribute "{0}"
+     *
+     */
+    public static String PARSING_INVALID_ATTRIBUTE_VALUE(Object arg0, Object arg1) {
+        return localizer.localize(localizablePARSING_INVALID_ATTRIBUTE_VALUE(arg0, arg1));
+    }
+
+    public static Localizable localizableVALIDATION_INVALID_ATTRIBUTE_VALUE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("validation.invalidAttributeValue", arg0, arg1);
+    }
+
+    /**
+     * invalid value "{1}" for attribute "{0}"
+     *
+     */
+    public static String VALIDATION_INVALID_ATTRIBUTE_VALUE(Object arg0, Object arg1) {
+        return localizer.localize(localizableVALIDATION_INVALID_ATTRIBUTE_VALUE(arg0, arg1));
+    }
+
+    public static Localizable localizableVALIDATION_INVALID_RANGE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("validation.invalidRange", arg0, arg1);
+    }
+
+    /**
+     * invalid range found (min: {0}, max: {1})
+     *
+     */
+    public static String VALIDATION_INVALID_RANGE(Object arg0, Object arg1) {
+        return localizer.localize(localizableVALIDATION_INVALID_RANGE(arg0, arg1));
+    }
+
+    public static Localizable localizablePARSING_INVALID_TAG(Object arg0, Object arg1) {
+        return messageFactory.getMessage("parsing.invalidTag", arg0, arg1);
+    }
+
+    /**
+     * expected element "{1}", found "{0}"
+     *
+     */
+    public static String PARSING_INVALID_TAG(Object arg0, Object arg1) {
+        return localizer.localize(localizablePARSING_INVALID_TAG(arg0, arg1));
+    }
+
+    public static Localizable localizableENTITY_NOT_FOUND_PORT_TYPE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("entity.notFound.portType", arg0, arg1);
+    }
+
+    /**
+     * wsdl:portType "{0}" referenced by wsdl:binding "{1}", but its not found in the wsdl
+     *
+     */
+    public static String ENTITY_NOT_FOUND_PORT_TYPE(Object arg0, Object arg1) {
+        return localizer.localize(localizableENTITY_NOT_FOUND_PORT_TYPE(arg0, arg1));
+    }
+
+    public static Localizable localizablePARSING_MISSING_REQUIRED_ATTRIBUTE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("parsing.missingRequiredAttribute", arg0, arg1);
+    }
+
+    /**
+     * missing required attribute "{1}" of element "{0}"
+     *
+     */
+    public static String PARSING_MISSING_REQUIRED_ATTRIBUTE(Object arg0, Object arg1) {
+        return localizer.localize(localizablePARSING_MISSING_REQUIRED_ATTRIBUTE(arg0, arg1));
+    }
+
+    public static Localizable localizablePARSING_INVALID_ELEMENT(Object arg0, Object arg1) {
+        return messageFactory.getMessage("parsing.invalidElement", arg0, arg1);
+    }
+
+    /**
+     * invalid element: "{0}" (in namespace "{1}")
+     *
+     */
+    public static String PARSING_INVALID_ELEMENT(Object arg0, Object arg1) {
+        return localizer.localize(localizablePARSING_INVALID_ELEMENT(arg0, arg1));
+    }
+
+    public static Localizable localizableVALIDATION_INVALID_ELEMENT(Object arg0) {
+        return messageFactory.getMessage("validation.invalidElement", arg0);
+    }
+
+    /**
+     * invalid element: "{0}"
+     *
+     */
+    public static String VALIDATION_INVALID_ELEMENT(Object arg0) {
+        return localizer.localize(localizableVALIDATION_INVALID_ELEMENT(arg0));
+    }
+
+    public static Localizable localizableINTERNALIZER_TWO_VERSION_ATTRIBUTES() {
+        return messageFactory.getMessage("Internalizer.TwoVersionAttributes");
+    }
+
+    /**
+     * Both jaxws:version and version are present
+     *
+     */
+    public static String INTERNALIZER_TWO_VERSION_ATTRIBUTES() {
+        return localizer.localize(localizableINTERNALIZER_TWO_VERSION_ATTRIBUTES());
+    }
+
+    public static Localizable localizableVALIDATION_DUPLICATE_PART_NAME(Object arg0, Object arg1) {
+        return messageFactory.getMessage("validation.duplicatePartName", arg0, arg1);
+    }
+
+    /**
+     * Invalid WSDL, duplicate parts in a wsdl:message is not allowed.
+     * wsdl:message {0} has duplicated part name: "{1}"
+     *
+     */
+    public static String VALIDATION_DUPLICATE_PART_NAME(Object arg0, Object arg1) {
+        return localizer.localize(localizableVALIDATION_DUPLICATE_PART_NAME(arg0, arg1));
+    }
+
+    public static Localizable localizablePARSING_INVALID_WSDL_ELEMENT(Object arg0) {
+        return messageFactory.getMessage("parsing.invalidWsdlElement", arg0);
+    }
+
+    /**
+     * invalid WSDL element: "{0}"
+     *
+     */
+    public static String PARSING_INVALID_WSDL_ELEMENT(Object arg0) {
+        return localizer.localize(localizablePARSING_INVALID_WSDL_ELEMENT(arg0));
+    }
+
+    public static Localizable localizableVALIDATION_INVALID_COMPLEX_TYPE_IN_ELEMENT(Object arg0, Object arg1) {
+        return messageFactory.getMessage("validation.invalidComplexTypeInElement", arg0, arg1);
+    }
+
+    /**
+     * invalid element: "{1}", has named complexType: "{0}"
+     *
+     */
+    public static String VALIDATION_INVALID_COMPLEX_TYPE_IN_ELEMENT(Object arg0, Object arg1) {
+        return localizer.localize(localizableVALIDATION_INVALID_COMPLEX_TYPE_IN_ELEMENT(arg0, arg1));
+    }
+
+    public static Localizable localizablePARSING_NON_WHITESPACE_TEXT_FOUND(Object arg0) {
+        return messageFactory.getMessage("parsing.nonWhitespaceTextFound", arg0);
+    }
+
+    /**
+     * found unexpected non whitespace text: "{0}"
+     *
+     */
+    public static String PARSING_NON_WHITESPACE_TEXT_FOUND(Object arg0) {
+        return localizer.localize(localizablePARSING_NON_WHITESPACE_TEXT_FOUND(arg0));
+    }
+
+    public static Localizable localizableINTERNALIZER_TARGET_NOT_FOUND(Object arg0) {
+        return messageFactory.getMessage("internalizer.targetNotFound", arg0);
+    }
+
+    /**
+     * No target found for the wsdlLocation: {0}
+     *
+     */
+    public static String INTERNALIZER_TARGET_NOT_FOUND(Object arg0) {
+        return localizer.localize(localizableINTERNALIZER_TARGET_NOT_FOUND(arg0));
+    }
+
+    public static Localizable localizableVALIDATION_NOT_SIMPLE_TYPE(Object arg0) {
+        return messageFactory.getMessage("validation.notSimpleType", arg0);
+    }
+
+    /**
+     * not a simple type: "{0}"
+     *
+     */
+    public static String VALIDATION_NOT_SIMPLE_TYPE(Object arg0) {
+        return localizer.localize(localizableVALIDATION_NOT_SIMPLE_TYPE(arg0));
+    }
+
+    public static Localizable localizablePARSING_SAX_EXCEPTION_WITH_SYSTEM_ID(Object arg0) {
+        return messageFactory.getMessage("parsing.saxExceptionWithSystemId", arg0);
+    }
+
+    /**
+     * invalid WSDL file! failed to parse document at "{0}"
+     *
+     */
+    public static String PARSING_SAX_EXCEPTION_WITH_SYSTEM_ID(Object arg0) {
+        return localizer.localize(localizablePARSING_SAX_EXCEPTION_WITH_SYSTEM_ID(arg0));
+    }
+
+    public static Localizable localizablePARSING_REQUIRED_EXTENSIBILITY_ELEMENT(Object arg0, Object arg1) {
+        return messageFactory.getMessage("parsing.requiredExtensibilityElement", arg0, arg1);
+    }
+
+    /**
+     * unknown required extensibility element "{0}" (in namespace "{1}")
+     *
+     */
+    public static String PARSING_REQUIRED_EXTENSIBILITY_ELEMENT(Object arg0, Object arg1) {
+        return localizer.localize(localizablePARSING_REQUIRED_EXTENSIBILITY_ELEMENT(arg0, arg1));
+    }
+
+    public static Localizable localizableENTITY_NOT_FOUND_BY_ID(Object arg0) {
+        return messageFactory.getMessage("entity.notFoundByID", arg0);
+    }
+
+    /**
+     * invalid entity id: "{0}"
+     *
+     */
+    public static String ENTITY_NOT_FOUND_BY_ID(Object arg0) {
+        return localizer.localize(localizableENTITY_NOT_FOUND_BY_ID(arg0));
+    }
+
+    public static Localizable localizableVALIDATION_EXCLUSIVE_ATTRIBUTES(Object arg0, Object arg1) {
+        return messageFactory.getMessage("validation.exclusiveAttributes", arg0, arg1);
+    }
+
+    /**
+     * exclusive attributes: "{0}", "{1}"
+     *
+     */
+    public static String VALIDATION_EXCLUSIVE_ATTRIBUTES(Object arg0, Object arg1) {
+        return localizer.localize(localizableVALIDATION_EXCLUSIVE_ATTRIBUTES(arg0, arg1));
+    }
+
+    public static Localizable localizableVALIDATION_MISSING_REQUIRED_SUB_ENTITY(Object arg0, Object arg1) {
+        return messageFactory.getMessage("validation.missingRequiredSubEntity", arg0, arg1);
+    }
+
+    /**
+     * missing required sub-entity "{0}" of element "{1}"
+     *
+     */
+    public static String VALIDATION_MISSING_REQUIRED_SUB_ENTITY(Object arg0, Object arg1) {
+        return localizer.localize(localizableVALIDATION_MISSING_REQUIRED_SUB_ENTITY(arg0, arg1));
+    }
+
+    public static Localizable localizableINTERNALIZER_INCORRECT_VERSION() {
+        return messageFactory.getMessage("Internalizer.IncorrectVersion");
+    }
+
+    /**
+     * JAXWS version attribute must be "2.0"
+     *
+     */
+    public static String INTERNALIZER_INCORRECT_VERSION() {
+        return localizer.localize(localizableINTERNALIZER_INCORRECT_VERSION());
+    }
+
+    public static Localizable localizableLOCALIZED_ERROR(Object arg0) {
+        return messageFactory.getMessage("localized.error", arg0);
+    }
+
+    /**
+     * {0}
+     *
+     */
+    public static String LOCALIZED_ERROR(Object arg0) {
+        return localizer.localize(localizableLOCALIZED_ERROR(arg0));
+    }
+
+    public static Localizable localizableENTITY_DUPLICATE_WITH_TYPE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("entity.duplicateWithType", arg0, arg1);
+    }
+
+    /**
+     * duplicate "{0}" entity: "{1}"
+     *
+     */
+    public static String ENTITY_DUPLICATE_WITH_TYPE(Object arg0, Object arg1) {
+        return localizer.localize(localizableENTITY_DUPLICATE_WITH_TYPE(arg0, arg1));
+    }
+
+    public static Localizable localizablePARSING_ONLY_ONE_OF_ELEMENT_OR_TYPE_REQUIRED(Object arg0) {
+        return messageFactory.getMessage("parsing.onlyOneOfElementOrTypeRequired", arg0);
+    }
+
+    /**
+     * only one of the "element" or "type" attributes is allowed in part "{0}"
+     *
+     */
+    public static String PARSING_ONLY_ONE_OF_ELEMENT_OR_TYPE_REQUIRED(Object arg0) {
+        return localizer.localize(localizablePARSING_ONLY_ONE_OF_ELEMENT_OR_TYPE_REQUIRED(arg0));
+    }
+
+    public static Localizable localizablePARSING_INCORRECT_ROOT_ELEMENT(Object arg0, Object arg1, Object arg2, Object arg3) {
+        return messageFactory.getMessage("parsing.incorrectRootElement", arg0, arg1, arg2, arg3);
+    }
+
+    /**
+     * expected root element "{2}" (in namespace "{3}"), found element "{0}" (in namespace "{1}")
+     *
+     */
+    public static String PARSING_INCORRECT_ROOT_ELEMENT(Object arg0, Object arg1, Object arg2, Object arg3) {
+        return localizer.localize(localizablePARSING_INCORRECT_ROOT_ELEMENT(arg0, arg1, arg2, arg3));
+    }
+
+    public static Localizable localizableVALIDATION_MISSING_REQUIRED_ATTRIBUTE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("validation.missingRequiredAttribute", arg0, arg1);
+    }
+
+    /**
+     * missing required attribute "{0}" of element "{1}"
+     *
+     */
+    public static String VALIDATION_MISSING_REQUIRED_ATTRIBUTE(Object arg0, Object arg1) {
+        return localizer.localize(localizableVALIDATION_MISSING_REQUIRED_ATTRIBUTE(arg0, arg1));
+    }
+
+    public static Localizable localizableINTERNALIZER_X_PATH_EVAULATES_TO_TOO_MANY_TARGETS(Object arg0, Object arg1) {
+        return messageFactory.getMessage("internalizer.XPathEvaulatesToTooManyTargets", arg0, arg1);
+    }
+
+    /**
+     * XPath evaluation of "{0}" results in too many ({1}) target nodes
+     *
+     */
+    public static String INTERNALIZER_X_PATH_EVAULATES_TO_TOO_MANY_TARGETS(Object arg0, Object arg1) {
+        return localizer.localize(localizableINTERNALIZER_X_PATH_EVAULATES_TO_TOO_MANY_TARGETS(arg0, arg1));
+    }
+
+    public static Localizable localizablePARSING_IO_EXCEPTION(Object arg0) {
+        return messageFactory.getMessage("parsing.ioException", arg0);
+    }
+
+    /**
+     * parsing failed: {0}
+     *
+     */
+    public static String PARSING_IO_EXCEPTION(Object arg0) {
+        return localizer.localize(localizablePARSING_IO_EXCEPTION(arg0));
+    }
+
+    public static Localizable localizablePARSER_NOT_A_BINDING_FILE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("Parser.NotABindingFile", arg0, arg1);
+    }
+
+    /**
+     * not an external binding file. The root element must be '{'http://java.sun.com/xml/ns/jaxws'}'bindings but it is '{'{0}'}'{1}
+     *
+     */
+    public static String PARSER_NOT_A_BINDING_FILE(Object arg0, Object arg1) {
+        return localizer.localize(localizablePARSER_NOT_A_BINDING_FILE(arg0, arg1));
+    }
+
+    public static Localizable localizablePARSING_UNKNOWN_NAMESPACE_PREFIX(Object arg0) {
+        return messageFactory.getMessage("parsing.unknownNamespacePrefix", arg0);
+    }
+
+    /**
+     * undeclared namespace prefix: "{0}"
+     *
+     */
+    public static String PARSING_UNKNOWN_NAMESPACE_PREFIX(Object arg0) {
+        return localizer.localize(localizablePARSING_UNKNOWN_NAMESPACE_PREFIX(arg0));
+    }
+
+    public static Localizable localizablePARSING_FACTORY_CONFIG_EXCEPTION(Object arg0) {
+        return messageFactory.getMessage("parsing.factoryConfigException", arg0);
+    }
+
+    /**
+     * invalid WSDL file! parsing failed: {0}
+     *
+     */
+    public static String PARSING_FACTORY_CONFIG_EXCEPTION(Object arg0) {
+        return localizer.localize(localizablePARSING_FACTORY_CONFIG_EXCEPTION(arg0));
+    }
+
+    public static Localizable localizableVALIDATION_MISSING_REQUIRED_PROPERTY(Object arg0, Object arg1) {
+        return messageFactory.getMessage("validation.missingRequiredProperty", arg0, arg1);
+    }
+
+    /**
+     * missing required property "{0}" of element "{1}"
+     *
+     */
+    public static String VALIDATION_MISSING_REQUIRED_PROPERTY(Object arg0, Object arg1) {
+        return localizer.localize(localizableVALIDATION_MISSING_REQUIRED_PROPERTY(arg0, arg1));
+    }
+
+    public static Localizable localizablePARSING_INVALID_OPERATION_STYLE(Object arg0) {
+        return messageFactory.getMessage("parsing.invalidOperationStyle", arg0);
+    }
+
+    /**
+     * operation "{0}" has an invalid style
+     *
+     */
+    public static String PARSING_INVALID_OPERATION_STYLE(Object arg0) {
+        return localizer.localize(localizablePARSING_INVALID_OPERATION_STYLE(arg0));
+    }
+
+    public static Localizable localizableINTERNALIZER_X_PATH_EVALUATION_ERROR(Object arg0) {
+        return messageFactory.getMessage("internalizer.XPathEvaluationError", arg0);
+    }
+
+    /**
+     * XPath error: {0}
+     *
+     */
+    public static String INTERNALIZER_X_PATH_EVALUATION_ERROR(Object arg0) {
+        return localizer.localize(localizableINTERNALIZER_X_PATH_EVALUATION_ERROR(arg0));
+    }
+
+    public static Localizable localizableVALIDATION_INVALID_TOKEN(Object arg0) {
+        return messageFactory.getMessage("validation.invalidToken", arg0);
+    }
+
+    /**
+     * invalid token "{0}"
+     *
+     */
+    public static String VALIDATION_INVALID_TOKEN(Object arg0) {
+        return localizer.localize(localizableVALIDATION_INVALID_TOKEN(arg0));
+    }
+
+    public static Localizable localizableVALIDATION_INVALID_SUB_ENTITY(Object arg0, Object arg1) {
+        return messageFactory.getMessage("validation.invalidSubEntity", arg0, arg1);
+    }
+
+    /**
+     * invalid sub-element "{0}" of element "{1}"
+     *
+     */
+    public static String VALIDATION_INVALID_SUB_ENTITY(Object arg0, Object arg1) {
+        return localizer.localize(localizableVALIDATION_INVALID_SUB_ENTITY(arg0, arg1));
+    }
+
+    public static Localizable localizableVALIDATION_SHOULD_NOT_HAPPEN(Object arg0) {
+        return messageFactory.getMessage("validation.shouldNotHappen", arg0);
+    }
+
+    /**
+     * internal error ("{0}")
+     *
+     */
+    public static String VALIDATION_SHOULD_NOT_HAPPEN(Object arg0) {
+        return localizer.localize(localizableVALIDATION_SHOULD_NOT_HAPPEN(arg0));
+    }
+
+    public static Localizable localizableABSTRACT_REFERENCE_FINDER_IMPL_UNABLE_TO_PARSE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("AbstractReferenceFinderImpl.UnableToParse", arg0, arg1);
+    }
+
+    /**
+     * Unable to parse "{0}" : {1}
+     *
+     */
+    public static String ABSTRACT_REFERENCE_FINDER_IMPL_UNABLE_TO_PARSE(Object arg0, Object arg1) {
+        return localizer.localize(localizableABSTRACT_REFERENCE_FINDER_IMPL_UNABLE_TO_PARSE(arg0, arg1));
+    }
+
+    public static Localizable localizableWARNING_FAULT_EMPTY_ACTION(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("warning.faultEmptyAction", arg0, arg1, arg2);
+    }
+
+    /**
+     * ignoring empty Action in "{0}" {1} element of "{2}" operation, using default instead
+     *
+     */
+    public static String WARNING_FAULT_EMPTY_ACTION(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWARNING_FAULT_EMPTY_ACTION(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizablePARSING_INVALID_EXTENSION_ELEMENT(Object arg0, Object arg1) {
+        return messageFactory.getMessage("parsing.invalidExtensionElement", arg0, arg1);
+    }
+
+    /**
+     * invalid extension element: "{0}" (in namespace "{1}")
+     *
+     */
+    public static String PARSING_INVALID_EXTENSION_ELEMENT(Object arg0, Object arg1) {
+        return localizer.localize(localizablePARSING_INVALID_EXTENSION_ELEMENT(arg0, arg1));
+    }
+
+    public static Localizable localizableINTERNALIZER_X_PATH_EVALUATES_TO_NON_ELEMENT(Object arg0) {
+        return messageFactory.getMessage("internalizer.XPathEvaluatesToNonElement", arg0);
+    }
+
+    /**
+     * XPath evaluation of "{0}" needs to result in an element.
+     *
+     */
+    public static String INTERNALIZER_X_PATH_EVALUATES_TO_NON_ELEMENT(Object arg0) {
+        return localizer.localize(localizableINTERNALIZER_X_PATH_EVALUATES_TO_NON_ELEMENT(arg0));
+    }
+
+    public static Localizable localizableINTERNALIZER_X_PATH_EVALUATES_TO_NO_TARGET(Object arg0) {
+        return messageFactory.getMessage("internalizer.XPathEvaluatesToNoTarget", arg0);
+    }
+
+    /**
+     * XPath evaluation of "{0}" results in empty target node
+     *
+     */
+    public static String INTERNALIZER_X_PATH_EVALUATES_TO_NO_TARGET(Object arg0) {
+        return localizer.localize(localizableINTERNALIZER_X_PATH_EVALUATES_TO_NO_TARGET(arg0));
+    }
+
+    public static Localizable localizablePARSING_SAX_EXCEPTION(Object arg0) {
+        return messageFactory.getMessage("parsing.saxException", arg0);
+    }
+
+    /**
+     * invalid WSDL file! parsing failed: {0}
+     *
+     */
+    public static String PARSING_SAX_EXCEPTION(Object arg0) {
+        return localizer.localize(localizablePARSING_SAX_EXCEPTION(arg0));
+    }
+
+    public static Localizable localizableINVALID_CUSTOMIZATION_NAMESPACE(Object arg0) {
+        return messageFactory.getMessage("invalid.customization.namespace", arg0);
+    }
+
+    /**
+     * Ignoring customization: "{0}", it has no namespace. It must belong to the customization namespace.
+     *
+     */
+    public static String INVALID_CUSTOMIZATION_NAMESPACE(Object arg0) {
+        return localizer.localize(localizableINVALID_CUSTOMIZATION_NAMESPACE(arg0));
+    }
+
+    public static Localizable localizableVALIDATION_INVALID_ATTRIBUTE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("validation.invalidAttribute", arg0, arg1);
+    }
+
+    /**
+     * invalid attribute "{0}" of element "{1}"
+     *
+     */
+    public static String VALIDATION_INVALID_ATTRIBUTE(Object arg0, Object arg1) {
+        return localizer.localize(localizableVALIDATION_INVALID_ATTRIBUTE(arg0, arg1));
+    }
+
+    public static Localizable localizablePARSING_PARSER_CONFIG_EXCEPTION(Object arg0) {
+        return messageFactory.getMessage("parsing.parserConfigException", arg0);
+    }
+
+    /**
+     * invalid WSDL file! parsing failed: {0}
+     *
+     */
+    public static String PARSING_PARSER_CONFIG_EXCEPTION(Object arg0) {
+        return localizer.localize(localizablePARSING_PARSER_CONFIG_EXCEPTION(arg0));
+    }
+
+    public static Localizable localizablePARSING_ONLY_ONE_TYPES_ALLOWED(Object arg0) {
+        return messageFactory.getMessage("parsing.onlyOneTypesAllowed", arg0);
+    }
+
+    /**
+     * only one "types" element allowed in "{0}"
+     *
+     */
+    public static String PARSING_ONLY_ONE_TYPES_ALLOWED(Object arg0) {
+        return localizer.localize(localizablePARSING_ONLY_ONE_TYPES_ALLOWED(arg0));
+    }
+
+    public static Localizable localizablePARSING_INVALID_URI(Object arg0) {
+        return messageFactory.getMessage("parsing.invalidURI", arg0);
+    }
+
+    /**
+     * invalid URI: {0}
+     *
+     */
+    public static String PARSING_INVALID_URI(Object arg0) {
+        return localizer.localize(localizablePARSING_INVALID_URI(arg0));
+    }
+
+    public static Localizable localizableVALIDATION_INCORRECT_TARGET_NAMESPACE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("validation.incorrectTargetNamespace", arg0, arg1);
+    }
+
+    /**
+     * target namespace is incorrect (expected: {1}, found: {0})
+     *
+     */
+    public static String VALIDATION_INCORRECT_TARGET_NAMESPACE(Object arg0, Object arg1) {
+        return localizer.localize(localizableVALIDATION_INCORRECT_TARGET_NAMESPACE(arg0, arg1));
+    }
+
+    public static Localizable localizableENTITY_NOT_FOUND_BY_Q_NAME(Object arg0, Object arg1) {
+        return messageFactory.getMessage("entity.notFoundByQName", arg0, arg1);
+    }
+
+    /**
+     * invalid entity name: "{0}" (in namespace: "{1}")
+     *
+     */
+    public static String ENTITY_NOT_FOUND_BY_Q_NAME(Object arg0, Object arg1) {
+        return localizer.localize(localizableENTITY_NOT_FOUND_BY_Q_NAME(arg0, arg1));
+    }
+
+    public static Localizable localizableINVALID_WSDL(Object arg0) {
+        return messageFactory.getMessage("invalid.wsdl", arg0);
+    }
+
+    /**
+     * "{0} does not look like a WSDL document, retrying with MEX..."
+     *
+     */
+    public static String INVALID_WSDL(Object arg0) {
+        return localizer.localize(localizableINVALID_WSDL(arg0));
+    }
+
+    public static Localizable localizableVALIDATION_UNSUPPORTED_SCHEMA_FEATURE(Object arg0) {
+        return messageFactory.getMessage("validation.unsupportedSchemaFeature", arg0);
+    }
+
+    /**
+     * unsupported XML Schema feature: "{0}"
+     *
+     */
+    public static String VALIDATION_UNSUPPORTED_SCHEMA_FEATURE(Object arg0) {
+        return localizer.localize(localizableVALIDATION_UNSUPPORTED_SCHEMA_FEATURE(arg0));
+    }
+
+    public static Localizable localizablePARSING_UNKNOWN_IMPORTED_DOCUMENT_TYPE(Object arg0) {
+        return messageFactory.getMessage("parsing.unknownImportedDocumentType", arg0);
+    }
+
+    /**
+     * imported document is of unknown type: {0}
+     *
+     */
+    public static String PARSING_UNKNOWN_IMPORTED_DOCUMENT_TYPE(Object arg0) {
+        return localizer.localize(localizablePARSING_UNKNOWN_IMPORTED_DOCUMENT_TYPE(arg0));
+    }
+
+    public static Localizable localizablePARSING_IO_EXCEPTION_WITH_SYSTEM_ID(Object arg0) {
+        return messageFactory.getMessage("parsing.ioExceptionWithSystemId", arg0);
+    }
+
+    /**
+     * failed to parse document at "{0}"
+     *
+     */
+    public static String PARSING_IO_EXCEPTION_WITH_SYSTEM_ID(Object arg0) {
+        return localizer.localize(localizablePARSING_IO_EXCEPTION_WITH_SYSTEM_ID(arg0));
+    }
+
+    public static Localizable localizableVALIDATION_AMBIGUOUS_NAME(Object arg0) {
+        return messageFactory.getMessage("validation.ambiguousName", arg0);
+    }
+
+    /**
+     * ambiguous operation name: "{0}"
+     *
+     */
+    public static String VALIDATION_AMBIGUOUS_NAME(Object arg0) {
+        return localizer.localize(localizableVALIDATION_AMBIGUOUS_NAME(arg0));
+    }
+
+    public static Localizable localizablePARSING_WSDL_NOT_DEFAULT_NAMESPACE(Object arg0) {
+        return messageFactory.getMessage("parsing.wsdlNotDefaultNamespace", arg0);
+    }
+
+    /**
+     * default namespace must be "{0}"
+     *
+     */
+    public static String PARSING_WSDL_NOT_DEFAULT_NAMESPACE(Object arg0) {
+        return localizer.localize(localizablePARSING_WSDL_NOT_DEFAULT_NAMESPACE(arg0));
+    }
+
+    public static Localizable localizableVALIDATION_DUPLICATED_ELEMENT(Object arg0) {
+        return messageFactory.getMessage("validation.duplicatedElement", arg0);
+    }
+
+    /**
+     * duplicated element: "{0}"
+     *
+     */
+    public static String VALIDATION_DUPLICATED_ELEMENT(Object arg0) {
+        return localizer.localize(localizableVALIDATION_DUPLICATED_ELEMENT(arg0));
+    }
+
+    public static Localizable localizableINTERNALIZER_TARGET_NOT_AN_ELEMENT() {
+        return messageFactory.getMessage("internalizer.targetNotAnElement");
+    }
+
+    /**
+     * Target node is not an element
+     *
+     */
+    public static String INTERNALIZER_TARGET_NOT_AN_ELEMENT() {
+        return localizer.localize(localizableINTERNALIZER_TARGET_NOT_AN_ELEMENT());
+    }
+
+    public static Localizable localizableWARNING_INPUT_OUTPUT_EMPTY_ACTION(Object arg0, Object arg1) {
+        return messageFactory.getMessage("warning.inputOutputEmptyAction", arg0, arg1);
+    }
+
+    /**
+     * ignoring empty Action in {0} element of "{1}" operation, using default instead
+     *
+     */
+    public static String WARNING_INPUT_OUTPUT_EMPTY_ACTION(Object arg0, Object arg1) {
+        return localizer.localize(localizableWARNING_INPUT_OUTPUT_EMPTY_ACTION(arg0, arg1));
+    }
+
+    public static Localizable localizablePARSING_INVALID_TAG_NS(Object arg0, Object arg1, Object arg2, Object arg3, Object arg4) {
+        return messageFactory.getMessage("parsing.invalidTagNS", arg0, arg1, arg2, arg3, arg4);
+    }
+
+    /**
+     * Invalid WSDL at {4}: expected element "{2}" (in namespace "{3}"), found element "{0}" (in namespace "{1}")
+     *
+     */
+    public static String PARSING_INVALID_TAG_NS(Object arg0, Object arg1, Object arg2, Object arg3, Object arg4) {
+        return localizer.localize(localizablePARSING_INVALID_TAG_NS(arg0, arg1, arg2, arg3, arg4));
+    }
+
+    public static Localizable localizableINVALID_WSDL_WITH_DOOC(Object arg0, Object arg1) {
+        return messageFactory.getMessage("invalid.wsdl.with.dooc", arg0, arg1);
+    }
+
+    /**
+     * "Not a WSDL document: {0}, it gives "{1}", retrying with MEX..."
+     *
+     */
+    public static String INVALID_WSDL_WITH_DOOC(Object arg0, Object arg1) {
+        return localizer.localize(localizableINVALID_WSDL_WITH_DOOC(arg0, arg1));
+    }
+
+    public static Localizable localizablePARSING_NOT_AWSDL(Object arg0) {
+        return messageFactory.getMessage("Parsing.NotAWSDL", arg0);
+    }
+
+    /**
+     * Failed to get WSDL components, probably {0} is not a valid WSDL file.
+     *
+     */
+    public static String PARSING_NOT_AWSDL(Object arg0) {
+        return localizer.localize(localizablePARSING_NOT_AWSDL(arg0));
+    }
+
+    public static Localizable localizableENTITY_DUPLICATE(Object arg0) {
+        return messageFactory.getMessage("entity.duplicate", arg0);
+    }
+
+    /**
+     * duplicate entity: "{0}"
+     *
+     */
+    public static String ENTITY_DUPLICATE(Object arg0) {
+        return localizer.localize(localizableENTITY_DUPLICATE(arg0));
+    }
+
+    public static Localizable localizableWARNING_WSI_R_2004() {
+        return messageFactory.getMessage("warning.wsi.r2004");
+    }
+
+    /**
+     * Not a WSI-BP compliant WSDL (R2001, R2004). xsd:import must not import XML Schema definition emmbedded inline within WSDLDocument.
+     *
+     */
+    public static String WARNING_WSI_R_2004() {
+        return localizer.localize(localizableWARNING_WSI_R_2004());
+    }
+
+    public static Localizable localizableWARNING_WSI_R_2003() {
+        return messageFactory.getMessage("warning.wsi.r2003");
+    }
+
+    /**
+     * Not a WSI-BP compliant WSDL (R2003). xsd:import must only be used inside xsd:schema element.
+     *
+     */
+    public static String WARNING_WSI_R_2003() {
+        return localizer.localize(localizableWARNING_WSI_R_2003());
+    }
+
+    public static Localizable localizableWARNING_WSI_R_2002(Object arg0, Object arg1) {
+        return messageFactory.getMessage("warning.wsi.r2002", arg0, arg1);
+    }
+
+    /**
+     * Not a WSI-BP compliant WSDL (R2002). wsdl:import must not be used to import XML Schema embedded in the WSDL document. Expected wsdl namesapce: {0}, found: {1}
+     *
+     */
+    public static String WARNING_WSI_R_2002(Object arg0, Object arg1) {
+        return localizer.localize(localizableWARNING_WSI_R_2002(arg0, arg1));
+    }
+
+    public static Localizable localizablePARSING_ELEMENT_OR_TYPE_REQUIRED(Object arg0) {
+        return messageFactory.getMessage("parsing.elementOrTypeRequired", arg0);
+    }
+
+    /**
+     * warning: part {0} is ignored, either the "element" or the "type" attribute is required in part "{0}"
+     *
+     */
+    public static String PARSING_ELEMENT_OR_TYPE_REQUIRED(Object arg0) {
+        return localizer.localize(localizablePARSING_ELEMENT_OR_TYPE_REQUIRED(arg0));
+    }
+
+    public static Localizable localizableWARNING_WSI_R_2001(Object arg0) {
+        return messageFactory.getMessage("warning.wsi.r2001", arg0);
+    }
+
+    /**
+     * Not a WSI-BP compliant WSDL (R2001, R2002). wsdl:import must only import WSDL document. Its trying to import: "{0}"
+     *
+     */
+    public static String WARNING_WSI_R_2001(Object arg0) {
+        return localizer.localize(localizableWARNING_WSI_R_2001(arg0));
+    }
+
+    public static Localizable localizableVALIDATION_INVALID_SIMPLE_TYPE_IN_ELEMENT(Object arg0, Object arg1) {
+        return messageFactory.getMessage("validation.invalidSimpleTypeInElement", arg0, arg1);
+    }
+
+    /**
+     * invalid element: "{1}", has named simpleType: "{0}"
+     *
+     */
+    public static String VALIDATION_INVALID_SIMPLE_TYPE_IN_ELEMENT(Object arg0, Object arg1) {
+        return localizer.localize(localizableVALIDATION_INVALID_SIMPLE_TYPE_IN_ELEMENT(arg0, arg1));
+    }
+
+    public static Localizable localizablePARSING_ONLY_ONE_DOCUMENTATION_ALLOWED(Object arg0) {
+        return messageFactory.getMessage("parsing.onlyOneDocumentationAllowed", arg0);
+    }
+
+    /**
+     * only one "documentation" element allowed in "{0}"
+     *
+     */
+    public static String PARSING_ONLY_ONE_DOCUMENTATION_ALLOWED(Object arg0) {
+        return localizer.localize(localizablePARSING_ONLY_ONE_DOCUMENTATION_ALLOWED(arg0));
+    }
+
+    public static Localizable localizableINTERNALIZER_VERSION_NOT_PRESENT() {
+        return messageFactory.getMessage("Internalizer.VersionNotPresent");
+    }
+
+    /**
+     * JAXWS version attribute must be present
+     *
+     */
+    public static String INTERNALIZER_VERSION_NOT_PRESENT() {
+        return localizer.localize(localizableINTERNALIZER_VERSION_NOT_PRESENT());
+    }
+
+    public static Localizable localizablePARSING_TOO_MANY_ELEMENTS(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("parsing.tooManyElements", arg0, arg1, arg2);
+    }
+
+    /**
+     * too many "{0}" elements under "{1}" element "{2}"
+     *
+     */
+    public static String PARSING_TOO_MANY_ELEMENTS(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizablePARSING_TOO_MANY_ELEMENTS(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableINTERNALIZER_INCORRECT_SCHEMA_REFERENCE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("Internalizer.IncorrectSchemaReference", arg0, arg1);
+    }
+
+    /**
+     * "{0}" is not a part of this compilation. Is this a mistake for "{1}"?
+     *
+     */
+    public static String INTERNALIZER_INCORRECT_SCHEMA_REFERENCE(Object arg0, Object arg1) {
+        return localizer.localize(localizableINTERNALIZER_INCORRECT_SCHEMA_REFERENCE(arg0, arg1));
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/configuration.properties b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/configuration.properties
index 7c81f488aa7..56adeb3f9fa 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/configuration.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/configuration.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
 # CA 95054 USA or visit www.sun.com if you need additional information or
 # have any questions.
-# 
+#
 
 configuration.invalidElement=invalid element \"{2}\" in file \"{0}\" (line {1})
 configuration.notBindingFile=Ignoring: binding file "\"{0}\". It is not a jaxws or a jaxb binding file.
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/generator.properties b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/generator.properties
index 1c96d866833..35e5ee4b38c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/generator.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/generator.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
 # CA 95054 USA or visit www.sun.com if you need additional information or
 # have any questions.
-# 
+#
 
 # Generator
 generator.nestedGeneratorError=generator error: {0}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/javacompiler.properties b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/javacompiler.properties
index 281ecf8703a..604da5f327f 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/javacompiler.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/javacompiler.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -21,12 +21,12 @@
 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
 # CA 95054 USA or visit www.sun.com if you need additional information or
 # have any questions.
-# 
+#
 
 #
 # Generic Messages
 #
-javacompiler.classpath.error={0} is not available in the classpath.
-javacompiler.nosuchmethod.error=There is no such method {0} available.
+javacompiler.classpath.error={0} is not available in the classpath, requires Sun's JDK version 5.0 or latter.
+javacompiler.nosuchmethod.error=There is no such method {0} available, requires Sun's JDK version 5.0 or latter.
 javacompiler.error=error : {0}.
  
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/model.properties b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/model.properties
index 2cdeb7d59f3..17076cf822c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/model.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/model.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,8 @@
 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
 # CA 95054 USA or visit www.sun.com if you need additional information or
 # have any questions.
-# 
+#
+
 
 model.nestedModelError=model error: {0}
 model.duplicate.porttype=duplicate PortType added to model: {0}
@@ -31,7 +32,6 @@ model.duplicate.part=duplicate part added to model: {0}
 model.duplicate.property=duplicate property added to model: {0}
 model.duplicate.service=duplicate service added to model: {0}
 model.invalid.message.type=invalid message type: {0}
-model.invalid.processorActionVersion=invalid ProcessorActionVersion: {0}
 
 model.schema.notImplemented=unsupported XML Schema feature ({0})
 model.schema.circularity=circularity detected in schema: \"{0}\"
@@ -57,6 +57,9 @@ model.schema.encoderNotFound=no encoder found for simpleType: \"{0}\"
 model.schema.invalidWildcard.allCompositor=xsd:all compositor not supported for the wildcard in schema type: \"{0}\"
 
 model.uniqueness=uniqueness constraint violation
+model.part.notUnique=parts in wsdl:message \"{0}\", reference \"{1}\", they must reference unique global elements.
+model.parameter.notunique=Failed to generate Java signature: duplicate parameter names {0}. Use JAXWS binding customization to rename the wsdl:part \"{1}\"
+model.exception.notunique=Failed to generate Java signature: duplicate exception names {0}. Use JAXWS binding customization to rename the wsdl:part \"{1}\"
 model.uniqueness.javastructuretype=uniqueness constraint violation, duplicate member \"{0}\" added to JavaStructureType \"{1}\"
 model.parent.type.already.set=parent of type \"{0}\" already set to \"{1}\", new value = \"{2}\"
 model.parent.fault.already.set=parent of fault \"{0}\" already set to \"{1}\", new value = \"{2}\"
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/modeler.properties b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/modeler.properties
index 906ddc40dd3..b4228609f25 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/modeler.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/modeler.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
 # CA 95054 USA or visit www.sun.com if you need additional information or
 # have any questions.
-# 
+#
 
 # general
 modeler.nestedModelError=modeler error: {0}
@@ -62,14 +62,16 @@ wsdlmodeler.unsolvableNamingConflicts=the following naming conflicts occurred: {
 wsdlmodeler.warning.ignoringUnrecognizedSchemaExtension=ignoring schema element (unsupported version): {0}
 wsdlmodeler.warning.searchSchema.unrecognizedTypes=encountered {0} unrecognized type(s)
 wsdlmodeler.warning.noServiceDefinitionsFound=WSDL document does not define any services
-wsdlmodeler.warning.noPortsInService=Service \"{0}\" does not contain any usable ports
+wsdlmodeler.warning.noPortsInService=Service \"{0}\" does not contain any usable ports. try running wsimport with -extension switch.
 wsdlmodeler.warning.noOperationsInPort=Port \"{0}\" does not contain any usable operations
-wsdlmodeler.warning.ignoringNonSOAPPort=ignoring port \"{0}\": not a SOAP port
-wsdlmodeler.warning.ignoringNonSOAPPort.noAddress=ignoring port \"{0}\": no SOAP address specified
-wsdlmodeler.warning.ignoringSOAPBinding.nonHTTPTransport:ignoring SOAP port \"{0}\": unrecognized transport
+wsdlmodeler.warning.ignoringNonSOAPPort=ignoring port \"{0}\": not a standard SOAP port. try running wsimport with -extension switch.
+wsdlmodeler.warning.nonSOAPPort=port \"{0}\": not a standard SOAP port. The generated artifacts may not work with JAXWS runtime. 
+wsdlmodeler.warning.ignoringNonSOAPPort.noAddress=ignoring port \"{0}\": no SOAP address specified. try running wsimport with -extension switch.
+wsdlmodeler.warning.noSOAPAddress=port \"{0}\" is not a SOAP port, it has no soap:address 
+wsdlmodeler.warning.ignoringSOAPBinding.nonHTTPTransport:ignoring SOAP port \"{0}\": unrecognized transport. try running wsimport with -extension switch.
 
 #BP1.1 R2705
-wsdlmodeler.warning.ignoringSOAPBinding.mixedStyle=ignoring SOAP port \"{0}\", its not WS-I BP 1.1 compliant: the wsdl binding has mixed style, it must be rpc-literal or document-literal operation!
+wsdlmodeler.warning.ignoringSOAPBinding.mixedStyle=ignoring port \"{0}\", its not WS-I BP 1.1 compliant: the wsdl binding has mixed style, it must be rpc-literal or document-literal operation. try running wsimport with -extension switch.
 wsdlmodeler.warning.port.SOAPBinding.mixedStyle=not a WS-I BP1.1 compliant SOAP port \"{0}\": the wsdl binding has mixed style, it must be rpc-literal or document-literal operation!
 
 wsdlmodeler.warning.ignoringOperation.notSupportedStyle=ignoring operation \"{0}\": not request-response or one-way
@@ -155,35 +157,35 @@ wsdlmodeler.warning.r2716=R2716 WSI-BasicProfile ver. 1.0, namespace attribute n
 wsdlmodeler.warning.r2716r2726=R2716/R2726 WSI-BasicProfile ver. 1.0, namespace attribute not allowed in doc/lit or rpc/lit for {0}: \"{1}\"
 
 #WSI-BP 1.1 Warning/Errors
-//R2911
+# R2911
 mimemodeler.invalidMimePart.moreThanOneSOAPBody=Ignoring operation \"{0}\". The Multipart/Related structure has invalid root part: more than one soap:body parts found
 
-//R2906
+# R2906
 mimemodeler.warning.IgnoringinvalidHeaderPart.notDeclaredInRootPart=Headers not in root mime:part with soap:body, ignoring headers in operation \"{0}\"
 
-//R2909
+# R2909
 mimemodeler.invalidMimeContent.differentPart=Ignoring the mime:part. Invalid mime:part, the mime:content has different part attribute.
 
 mimemodeler.invalidMimeContent.invalidSchemaType=Ignoring the mime:part. mime part: {0} can not be mapped to schema type: {1}
 
-//Rxxxx A mime:content in a DESCRIPTION MUST refer to a wsdl:part element defined using the type attribute.
+# Rxxxx A mime:content in a DESCRIPTION MUST refer to a wsdl:part element defined using the type attribute.
 mimemodeler.invalidMimeContent.mesagePartElementKind=wsdl:part element referenced by mime:content part attribute: {0} must be defined using type attribute!
 
-//RXXXX RYYYY: In a description, a mime:content element MUST include the part attribute.
+# RXXXX RYYYY: In a description, a mime:content element MUST include the part attribute.
 mimemodeler.invalidMimeContent.missingPartAttribute=Ignoring operation \"{0}\", missing part attribute in mime:content. part attribute must be present in mime:content declaration.
 
 mimemodeler.invalidMimeContent.missingTypeAttribute=Missing type attribute in mime:content in operation \"{0}\". part attribute must be present in mime:content declaration.
 
-//unknown schematype
+# unknown schematype
 mimemodeler.invalidMimeContent.unknownSchemaType=Unknown schema type: {1} for mime:content part: {0}
 mimemodeler.invalidMimeContent.errorLoadingJavaClass=Couldn't find class \"{0}\" for mime type \"{1}\"
 
-//missing wsdl:part referenced by the mime:content
+# missing wsdl:part referenced by the mime:content
 wsdlmodeler.warning.ignoringMimePart.notFound=ignoring mime:part, cannot find part \"{0}\" referenced by the mime:content in the wsdl:operation \"{1}\"
 
 mimemodeler.elementPart.invalidElementMimeType=The mime:content part refers to wsdl:part \"{0}\", defined using element attribute. Please make sure the mime type: \"{1}\" is appropriate to serialize XML.
 
-//R2708 The mime:part element in a DESCRIPTION MUST NOT have a name attribute.
+# R2708 The mime:part element in a DESCRIPTION MUST NOT have a name attribute.
 mimemodeler.invalidMimePart.nameNotAllowed=name attribute on wsdl:part in Operation \"{0}\" is ignored. Its not allowed as per WS-I AP 1.0.
 
 
@@ -205,9 +207,11 @@ wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.operationName=Invalid o
 wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.customizedOperationName=Ignoring operation \"{0}\", can''t generate java method ,customized name \"{1}\" of the wsdl:operation is a java keyword.
 wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.customizedOperationName=Invalid operation \"{0}\", can''t generate java method ,customized name \"{1}\" of the wsdl:operation is a java keyword.
 
-wsdlmodeler.jaxb.javatype.notfound=Schema descriptor {0} in message part {1} could not be bound to Java!
+wsdlmodeler.jaxb.javatype.notfound=Schema descriptor {0} in message part \"{1}\" could not be bound to Java!
 wsdlmodeler.unsupportedBinding.mime=WSDL MIME binding is not currently supported!
 
 wsdlmodeler.nonUnique.body=Non unique body parts! In a port, operations must have unique operation signaure on the wire for successful dispatch. In port {0}, Operations \"{1}\" and \"{2}\" have the same request body block {3}
 wsdlmodeler.rpclit.unkownschematype=XML type \"{0}\" could not be resolved, XML to JAVA binding failed! Please check the wsdl:part \"{1}\" in the wsdl:message \"{2}\".    
+
+wsdlmodeler.responsebean.notfound=wsimport failed to generate async response bean for operation: {0}
  
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/processor.properties b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/processor.properties
index 48cc23a8d6b..65e33bc7c8a 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/processor.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/processor.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
 # CA 95054 USA or visit www.sun.com if you need additional information or
 # have any questions.
-# 
+#
 
 processor.missing.model=model is missing
  
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/util.properties b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/util.properties
index 799bafd4a57..03064e366ba 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/util.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/util.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
 # CA 95054 USA or visit www.sun.com if you need additional information or
 # have any questions.
-# 
+#
 
 holder.valuefield.not.found=Could not find the field in the Holder that contains the Holder''s value: {0}
 null.namespace.found=Encountered error in wsdl. Check namespace of element <{0}>
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/webserviceap.properties b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/webserviceap.properties
index eb73597c2a6..f37386b141f 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/webserviceap.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/webserviceap.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
 # CA 95054 USA or visit www.sun.com if you need additional information or
 # have any questions.
-# 
+#
 
 webserviceap.nestedModelError=modeler error: {0}
 webserviceap.fileNotFound=error: file not found: {0}
@@ -32,7 +32,8 @@ webserviceap.compilationFailed=compilation failed, errors should have been repor
 webserviceap.succeeded: Success
 
 webserviceap.method.not.annotated=The method {0} on class {1} is not annotated.
-webserviceap.rpc.encoded.not.supported=The {0} class has a rpc/encoded SOAPBinding.  Rpc/encoded SOAPBindings are not supported in JAXWS 2.0. 
+webserviceap.rpc.encoded.not.supported=The {0} class has a rpc/encoded SOAPBinding.  Rpc/encoded SOAPBindings are not supported in JAXWS 2.0.
+webservice.encoded.not.supported=The {0} class has invalid SOAPBinding annotation. {1}/encoded SOAPBinding is not supported
 webserviceap.model.already.exists=model already exists
 webserviceap.endpointinterface.on.interface=Service endpointpoint interface\: {0} has cannot have a WebService.endpointInterface annotation\: {1}
 webserviceap.java.typeNotFound=The type: {0} was not found in the mapping
@@ -118,7 +119,9 @@ webserviceap.invalid.sei.annotation.element=The @javax.jws.WebService.{0} elemen
 
 webserviceap.invalid.sei.annotation=The @{0} annotation cannot be used on a service endpoint interface. Class\: {1} 
 
-webserviceap.invalid.webmethod.element.with.exclude=The @javax.jws.WebMethod.{0} element cannot be specified with the @javax.jws.WebMethod.exclude element. Class\: {1} method\: {0} 
+webserviceap.invalid.sei.annotation.element.exclude=The @javax.jws.WebMethod({0}) cannot be used on a service endpoint interface. Class\: {1} method\: {2}
+
+webserviceap.invalid.webmethod.element.with.exclude=The @javax.jws.WebMethod.{0} element cannot be specified with the @javax.jws.WebMethod.exclude element. Class\: {1} method\: {2} 
 
 webserviceap.doc.bare.no.out=Document/literal bare methods with no return type or OUT/INOUT parameters must be annotated as @Oneway. Class\: {0}, method: {1}
 webserviceap.doc.bare.return.and.out=Document/literal bare methods cannot have a return type and out parameters. Class\: {0}, method: {1}
@@ -134,7 +137,7 @@ webserviceap.webservice.class.is.innerclass.not.static=Inner classes annotated w
 
 webserviceap.webservice.method.is.abstract=Classes annotated with @javax.jws.WebService must not have abstract methods. Class\: {0} Method: {1}
 
-webserviceap.doc.bare.return.and.out=Document literal bare methods must not have a return value and an OUT/INOUT parameter.  Class\: {0} Method\: {1} 
+#webserviceap.doc.bare.return.and.out=Document literal bare methods must not have a return value and an OUT/INOUT parameter.  Class\: {0} Method\: {1} 
 
 webserviceap.webservice.no.default.constructor=Classes annotated with @javax.jws.WebService must have a public default constructor. Class\: {0}
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/wscompile.properties b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/wscompile.properties
index f3a6cb1f6a2..6dac1659bf3 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/wscompile.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/wscompile.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -21,15 +21,16 @@
 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
 # CA 95054 USA or visit www.sun.com if you need additional information or
 # have any questions.
-# 
+#
 
 wsimport.usage=Usage: {0} [options] \n\n\
 Use "wsimport -help" for a detailed description of options.
 
 wsimport.help=\nUsage: {0} [options] \n\n\
 \where [options] include:\n\
-\  -b                  specify external jaxws or jaxb binding files\n\
-\                            (Each  must have its own -b)\n\
+\  -b                  specify jaxws/jaxb binding files or additional schemas\n\
+\                            (Each  must have its own -b)\n\
+\  -B            Pass this option to JAXB schema compiler\n\
 \  -catalog            specify catalog file to resolve external entity references\n\
 \                            supports TR9401, XCatalog, and OASIS XML Catalog format.\n\
 \  -d             specify where to place generated output files\n\
@@ -41,10 +42,14 @@ wsimport.help=\nUsage: {0} [options] \n\n\
 \  -httpproxy::  specify a HTTP proxy server (port defaults to 8080)\n\
 \  -keep                     keep generated files\n\
 \  -p                   specifies the target package\n\
+\  -quiet                    suppress wsimport output\n\
 \  -s             specify where to place generated source files\n\
+\  -target          generate code as per the given JAXWS specification version.\n\
+\                            version 2.0 will generate compliant code for JAXWS 2.0 spec.\n\
 \  -verbose                  output messages about what the compiler is doing\n\
 \  -version                  print version information\n\
-\  -wsdllocation   @WebService.wsdlLocation and @WebServiceClient.wsdlLocation value
+\  -wsdllocation   @WebServiceClient.wsdlLocation value\n\
+
 
 wsimport.usage.examples=\n\
 \Examples:\n\
@@ -85,12 +90,26 @@ wsgen.usage.examples=\n\
 \  wsgen -cp . example.Stock\n\
 \  wsgen -cp . example.Stock -wsdl -servicename '{http://mynamespace}MyService'\n\
 
+wrapperTask.needEndorsed=\
+You are running on JDK6 which comes with JAX-WS 2.0 API, but this tool requires JAX-WS 2.1 API. \
+Use the endorsed standards override mechanism (http://java.sun.com/javase/6/docs/technotes/guides/standards/), \
+or set xendorsed="true" on <{0}>. 
+
+wrapperTask.loading20Api=\
+You are loading JAX-WS 2.0 API from {0} but this tool requires JAX-WS 2.1 API.
+
+invoker.needEndorsed=\
+You are running on JDK6 which comes with JAX-WS 2.0 API, but this tool requires JAX-WS 2.1 API. \
+Use the endorsed standards override mechanism (http://java.sun.com/javase/6/docs/technotes/guides/standards/), \
+or use -Xendorsed option.
 
 
 #
 # Generic Messages
 #
-wscompile.invalidOption={0} is an invalid option or argument
+wscompile.invalidOption=unrecognized parameter {0}
+wsimport.noSuchJaxbOption=no such JAXB option: {0}
+
 wscompile.error=error: {0}
 wscompile.warning=warning: {0}
 wscompile.info=info: {0}
@@ -98,7 +117,6 @@ wscompile.duplicateOption=duplicate option: {0}
 wscompile.noSuchDirectory=directory not found: {0}
 wscompile.missingOptionArgument=option \"{0}\" requires an argument
 wscompile.compilationFailed=compilation failed, errors should have been reported
-wscompile.classmodelinfo.expected=Expected a ClassModelInfo but got a {0}.
 
 wsimport.missingFile=Missing WSDL_URI
 
@@ -114,10 +132,36 @@ wsgen.servicename.missing.localname=The service name \"{0}\" is missing a localn
 wsgen.portname.missing.namespace=The port name \"{0}\" is missing a namespace.
 wsgen.portname.missing.localname=The port name \"{0}\" is missing a localname.
 wsgen.class.must.be.implementation.class=The class \"{0}\" is not an endpoint implementation class.
-wsgen.cannot.gen.wsdl.for.non.soap.binding=The -wsdl option cannot be used with non-SOAP bindings. Class \"{0}\" binding: \"{1}\".
-wsgen.cannot.gen.wsdl.for.soap12.binding=The -wsdl option cannot be used with SOAP1.2 bindings.\n\
-Try using \"-wsdl:Xsoap1.2 -extension\".\n\
-Class \"{0}\" binding: \"{1}\".
-wsgen.cannot.gen.wsdl.for.xsoap12.binding.wo.extention=The -wsdl option cannot be used with the SOAP1.2 extension binding without the \"-extension\" option.\n\
-Class \"{0}\" binding: \"{1}\".
+wsimport.NotAFileNorURL = \
+    "{0}" is neither a file name nor an URL
+
+wsgen.cannot.gen.wsdl.for.non.soap.binding=wsgen can not generate WSDL for non-SOAP binding: {0} on Class {1}
+
+wsgen.cannot.gen.wsdl.for.soap12.binding=wsgen can not generate WSDL for SOAP 1.2 binding: {0} on class: {1}.\n
+Please specify \"-extension\" and \"-wsdl:protocol XSoap1.2\" switches. For example:\n\n
+wsgen -wsdl:protocol XSoap1.2 -extenson {1}
+
+wsgen.no.webservices.class=wsgen did not find any class with @WebService annotation. Please specify @WebService annotation on {0}.
+
+wsimport.no.wsdl=Failed to read the WSDL document: {0}, because 1) could not find the document; /\
+  2) the document could not be read; \
+  3) the root element of the document is not .
+
+wsimport.FailedToParse = \
+    Failed to parse "{0}": {1}
+
+wsimport.ParsingWSDL=parsing WSDL...\n\n
+wsimport.GeneratingCode=generating code...
+
+wsimport.ILLEGAL_TARGET_VERSION = \
+    "{0}" is not a valid target version. "2.0" and "2.1" are supported.
+
+wsimport.ErrorMessage = \
+	[ERROR] {0}
+
+wsimport.WarningMessage = \
+	[WARNING] {0}
+
+wsimport.InfoMessage = \
+	[INFO] {0}
  
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/wsdl.properties b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/wsdl.properties
index f84184f1ceb..779d9089356 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/wsdl.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/wsdl.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -21,11 +21,12 @@
 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
 # CA 95054 USA or visit www.sun.com if you need additional information or
 # have any questions.
-# 
+#
 
+localized.error={0}
 parsing.wsdlNotDefaultNamespace=default namespace must be \"{0}\"
 parsing.onlyOneOfElementOrTypeRequired=only one of the \"element\" or \"type\" attributes is allowed in part \"{0}\"
-parsing.elementOrTypeRequired=either the \"element\" or the \"type\" attribute is required in part \"{0}\"
+parsing.elementOrTypeRequired=warning: part {0} is ignored, either the \"element\" or the \"type\" attribute is required in part \"{0}\"
 parsing.invalidElement=invalid element: \"{0}\" (in namespace \"{1}\")
 parsing.invalidAttributeValue=invalid value \"{1}\" for attribute \"{0}\"
 parsing.invalidExtensionElement=invalid extension element: \"{0}\" (in namespace \"{1}\")
@@ -39,9 +40,10 @@ parsing.incorrectRootElement=expected root element \"{2}\" (in namespace \"{3}\"
 parsing.unknownImportedDocumentType=imported document is of unknown type: {0}
 parsing.unknownNamespacePrefix=undeclared namespace prefix: \"{0}\"
 parsing.invalidURI=invalid URI: {0}
-parsing.ioExceptionWithSystemId=failed to parse document at \"{0}\": {1}
+parsing.ioExceptionWithSystemId=failed to parse document at \"{0}\"
+parsing.unableToGetMetadata= Unable to get Metadata from: {0}
 parsing.ioException=parsing failed: {0}
-parsing.saxExceptionWithSystemId=invalid WSDL file! failed to parse document at \"{0}\": {1}
+parsing.saxExceptionWithSystemId=invalid WSDL file! failed to parse document at \"{0}\"
 parsing.saxException=invalid WSDL file! parsing failed: {0}
 parsing.parserConfigException=invalid WSDL file! parsing failed: {0}
 parsing.factoryConfigException=invalid WSDL file! parsing failed: {0}
@@ -49,14 +51,18 @@ parsing.factoryConfigException=invalid WSDL file! parsing failed: {0}
 #
 parsing.missingRequiredAttribute=missing required attribute \"{1}\" of element \"{0}\"
 parsing.invalidTag=expected element \"{1}\", found \"{0}\"
-parsing.invalidTagNS=expected element \"{2}\" (in namespace \"{3}\"), found element \"{0}\" (in namespace \"{1}\")
+parsing.invalidTagNS=Invalid WSDL at {4}: expected element \"{2}\" (in namespace \"{3}\"), found element \"{0}\" (in namespace \"{1}\")
 parsing.nonWhitespaceTextFound=found unexpected non whitespace text: \"{0}\"
 parsing.elementExpected=unexpected non-element found
 #
 entity.duplicate=duplicate entity: \"{0}\"
 entity.duplicateWithType=duplicate \"{0}\" entity: \"{1}\"
-entity.notFoundByQName=invalid entity name: \"{0}\" (in namespace: \"{1}\")
+
 entity.notFoundByID=invalid entity id: \"{0}\"
+entity.notFoundByQName=invalid entity name: \"{0}\" (in namespace: \"{1}\")
+entity.notFound.portType=wsdl:portType \"{0}\" referenced by wsdl:binding \"{1}\", but its not found in the wsdl
+entity.notFound.binding=wsdl:binding \"{0}" referenced by wsdl:port \"{1}\", but its not found in the wsdl
+
 #
 validation.missingRequiredAttribute=missing required attribute \"{0}\" of element \"{1}\"
 validation.missingRequiredProperty=missing required property \"{0}\" of element \"{1}\"
@@ -65,7 +71,7 @@ validation.invalidElement=invalid element: \"{0}\"
 validation.invalidComplexTypeInElement=invalid element: \"{1}\", has named complexType: \"{0}\"
 validation.invalidSimpleTypeInElement=invalid element: \"{1}\", has named simpleType: \"{0}\"
 validation.duplicatedElement=duplicated element: \"{0}\"
-validation.duplicateName=duplicated part name: \"{0}\"
+validation.duplicatePartName=Invalid WSDL, duplicate parts in a wsdl:message is not allowed. \nwsdl:message {0} has duplicated part name: \"{1}\"
 validation.invalidSubEntity=invalid sub-element \"{0}\" of element \"{1}\"
 validation.invalidAttribute=invalid attribute \"{0}\" of element \"{1}\"
 validation.invalidAttributeValue=invalid value \"{1}\" for attribute \"{0}\"
@@ -78,6 +84,8 @@ validation.invalidToken=invalid token \"{0}\"
 validation.notSimpleType=not a simple type: \"{0}\"
 validation.ambiguousName=ambiguous operation name: \"{0}\"
 validation.invalidPrefix=undeclared namespace prefix: \"{0}\"
+warning.faultEmptyAction=ignoring empty Action in \"{0}\" {1} element of \"{2}\" operation, using default instead
+warning.inputOutputEmptyAction=ignoring empty Action in {0} element of \"{1}\" operation, using default instead
 
 #wsi compliant WSDL warnings
 warning.wsi.r2001=Not a WSI-BP compliant WSDL (R2001, R2002). wsdl:import must only import WSDL document. Its trying to import: \"{0}\"
@@ -85,11 +93,36 @@ warning.wsi.r2002=Not a WSI-BP compliant WSDL (R2002). wsdl:import must not be u
 warning.wsi.r2003=Not a WSI-BP compliant WSDL (R2003). xsd:import must only be used inside xsd:schema element.
 warning.wsi.r2004=Not a WSI-BP compliant WSDL (R2001, R2004). xsd:import must not import XML Schema definition emmbedded inline within WSDLDocument.
 
+#Parser
+Parsing.ParseFailed = \
+	Failed to parse the WSDL.
+
+Parsing.NotAWSDL=Failed to get WSDL components, probably {0} is not a valid WSDL file.
+
+AbstractReferenceFinderImpl.UnableToParse = \
+	Unable to parse "{0}" : {1}
+
+Parser.NotABindingFile = \
+	not an external binding file. The root element must be '{'http://java.sun.com/xml/ns/jaxws'}'bindings but it is '{'{0}'}'{1}
+
+
 #Internalizer
+Internalizer.TwoVersionAttributes = \
+	Both jaxws:version and version are present
+Internalizer.IncorrectVersion = \
+	JAXWS version attribute must be "2.0"
+
+Internalizer.VersionNotPresent = \
+	JAXWS version attribute must be present
+
 internalizer.targetNotAnElement= \
     Target node is not an element
 internalizer.targetNotFound= \
     No target found for the wsdlLocation: {0}
+
+Internalizer.IncorrectSchemaReference= \
+	"{0}" is not a part of this compilation. Is this a mistake for "{1}"?
+
 internalizer.XPathEvaluationError = \
     XPath error: {0}
 internalizer.XPathEvaluatesToNoTarget = \
@@ -99,4 +132,7 @@ internalizer.XPathEvaulatesToTooManyTargets = \
 internalizer.XPathEvaluatesToNonElement = \
     XPath evaluation of "{0}" needs to result in an element.
 invalid.customization.namespace=Ignoring customization: \"{0}\", it has no namespace. It must belong to the customization namespace.    
+
+invalid.wsdl.with.dooc="Not a WSDL document: {0}, it gives \"{1}\", retrying with MEX..."
+invalid.wsdl="{0} does not look like a WSDL document, retrying with MEX..."
  
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/spi/WSToolsObjectFactory.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/spi/WSToolsObjectFactory.java
index 73282cdefb1..deae6066fb5 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/spi/WSToolsObjectFactory.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/spi/WSToolsObjectFactory.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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.tools.internal.ws.spi;
 
 import com.sun.tools.internal.ws.util.WSToolsObjectFactoryImpl;
+import com.sun.xml.internal.ws.api.server.Container;
+
 import java.io.OutputStream;
 
 
@@ -35,16 +37,13 @@ import java.io.OutputStream;
  */
 public abstract class WSToolsObjectFactory {
 
-    private static WSToolsObjectFactory factory;
+    private static final WSToolsObjectFactory factory = new WSToolsObjectFactoryImpl();
 
     /**
      * Obtain an instance of a factory. Don't worry about synchronization(at the
      * most, one more factory is created).
      */
     public static WSToolsObjectFactory newInstance() {
-        if (factory == null) {
-            factory = new WSToolsObjectFactoryImpl();
-        }
         return factory;
     }
 
@@ -52,16 +51,49 @@ public abstract class WSToolsObjectFactory {
      * Invokes wsimport on the wsdl URL argument, and generates the necessary
      * portable artifacts like SEI, Service, Bean classes etc.
      *
+     * @param logStream Stream used for reporting log messages like errors, warnings etc
+     * @param container gives an environment for tool if it is run during appserver
+     *                  deployment
+     * @param args arguments with various options and wsdl url
+     *
      * @return true if there is no error, otherwise false
      */
-    public abstract boolean wsimport(OutputStream logStream, String[] args);
+    public abstract boolean wsimport(OutputStream logStream, Container container, String[] args);
+
+    /**
+     * Invokes wsimport on the wsdl URL argument, and generates the necessary
+     * portable artifacts like SEI, Service, Bean classes etc.
+     *
+     * @return true if there is no error, otherwise false
+     *
+     * @see {@link #wsimport(OutputStream, Container, String[])}
+     */
+    public boolean wsimport(OutputStream logStream, String[] args) {
+        return wsimport(logStream, Container.NONE, args);
+    }
+
+    /**
+     * Invokes wsgen on the endpoint implementation, and generates the necessary
+     * artifacts like wrapper, exception bean classes etc.
+     *
+     * @param logStream Stream used for reporting log messages like errors, warnings etc
+     * @param container gives an environment for tool if it is run during appserver
+     *                  deployment
+     * @param args arguments with various options and endpoint class
+     *
+     * @return true if there is no error, otherwise false
+     */
+    public abstract boolean wsgen(OutputStream logStream, Container container, String[] args);
 
     /**
      * Invokes wsgen on the endpoint implementation, and generates the necessary
      * artifacts like wrapper, exception bean classes etc.
      *
      * @return true if there is no error, otherwise false
+     * @see {@link #wsgen(OutputStream, Container, String[])}
      */
-    public abstract boolean wsgen(OutputStream logStream, String[] args);
+    public boolean wsgen(OutputStream logStream, String[] args) {
+        return wsgen(logStream, Container.NONE, args);
+    }
 
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/spi/package-info.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/spi/package-info.java
index 6d9557910fd..a081fd17492 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/spi/package-info.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/spi/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,7 +25,7 @@
 
 /**
  *
- * 
    This document describes the SPI for the JAX-WS 2.0 tools.
+ * 
    This document describes the SPI for the JAX-WS 2.0.1 tools.
  *  The WSToolsObjectFactory is used to create instances of WsGen
  *  and WsImport that other applications can use.
 */
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/util/ClassNameInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/util/ClassNameInfo.java
index 86b1e483e43..f1a7be27907 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/util/ClassNameInfo.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/util/ClassNameInfo.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/util/ForkEntityResolver.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/util/ForkEntityResolver.java
index f79d2deb9a3..6ea6a02fca5 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/util/ForkEntityResolver.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/util/ForkEntityResolver.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,12 +25,12 @@
 
 package com.sun.tools.internal.ws.util;
 
-import java.io.IOException;
-
 import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
+import java.io.IOException;
+
 /**
  * {@link EntityResolver} that delegates to two {@link EntityResolver}s.
  *
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/util/JAXWSClassFactory.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/util/JAXWSClassFactory.java
deleted file mode 100644
index fc0209c50c8..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/util/JAXWSClassFactory.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.tools.internal.ws.util;
-
-import java.util.Properties;
-
-import com.sun.tools.internal.ws.processor.config.WSDLModelInfo;
-import com.sun.tools.internal.ws.processor.generator.Names;
-import com.sun.tools.internal.ws.processor.modeler.wsdl.WSDLModeler;
-import com.sun.tools.internal.ws.processor.modeler.wsdl.WSDLModelerBase;
-import com.sun.tools.internal.ws.wsdl.framework.AbstractDocument;
-import com.sun.xml.internal.ws.util.VersionUtil;
-
-/**
- * Singleton factory class to instantiate concrete classes based on the jaxws version
- * to be used to generate the code.
- *
- * @author WS Development Team
- */
-public class JAXWSClassFactory {
-    private static final JAXWSClassFactory factory = new JAXWSClassFactory();
-
-    private static String classVersion = VersionUtil.JAXWS_VERSION_DEFAULT;
-
-    private JAXWSClassFactory() {
-    }
-
-    /**
-     * Get the factory instance for the default version.
-     * @return        JAXWSClassFactory instance
-     */
-    public static JAXWSClassFactory newInstance() {
-        return factory;
-    }
-
-    /**
-     * Sets the version to a static classVersion
-     * @param version
-     */
-    public void setSourceVersion(String version) {
-        if (version == null)
-            version = VersionUtil.JAXWS_VERSION_DEFAULT;
-
-        if (!VersionUtil.isValidVersion(version)) {
-            // TODO: throw exception
-        } else
-            classVersion = version;
-    }
-
-    /**
-     * Returns the WSDLModeler for specific target version.
-     *
-     * @param modelInfo
-     * @param options
-     * @return the WSDLModeler for specific target version.
-     */
-    public WSDLModelerBase createWSDLModeler(
-        WSDLModelInfo modelInfo,
-        Properties options) {
-        WSDLModelerBase wsdlModeler = null;
-        if (classVersion.equals(VersionUtil.JAXWS_VERSION_20))
-            wsdlModeler = new WSDLModeler(modelInfo, options);
-        else {
-            // TODO: throw exception
-        }
-        return wsdlModeler;
-    }
-
-    /**
-     * Returns the Names for specific target version.
-     * //bug fix:4904604
-     * @return instance of Names
-     */
-    public Names createNames() {
-        Names names = new Names();
-        return names;
-    }
-
-    public String getVersion() {
-        return classVersion;
-    }
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/util/JavaCompilerHelper.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/util/JavaCompilerHelper.java
deleted file mode 100644
index b252e7dd53a..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/util/JavaCompilerHelper.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.tools.internal.ws.util;
-
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import com.sun.xml.internal.ws.util.localization.Localizable;
-
-/**
- * A helper class to invoke javac.
- *
- * @author WS Development Team
- */
-public class JavaCompilerHelper extends ToolBase {
-
-    public JavaCompilerHelper(OutputStream out) {
-        super(out, " ");
-        this.out = out;
-    }
-
-    public boolean compile(String[] args) {
-        return internalCompile(args);
-    }
-
-    protected String getResourceBundleName() {
-        return "com.sun.tools.internal.ws.resources.javacompiler";
-    }
-
-    protected boolean internalCompile(String[] args) {
-        ClassLoader cl = Thread.currentThread().getContextClassLoader();
-        Class comSunToolsJavacMainClass = null;
-        try {
-            /* try to use the new compiler */
-            comSunToolsJavacMainClass =
-                    cl.loadClass("com.sun.tools.javac.Main");
-            try {
-                Method compileMethod =
-                        comSunToolsJavacMainClass.getMethod(
-                                "compile",
-                                compile141MethodSignature);
-                try {
-                    Object result =
-                            compileMethod.invoke(
-                                    null,
-                                    new Object[] { args, new PrintWriter(out)});
-                    if (!(result instanceof Integer)) {
-                        return false;
-                    }
-                    return ((Integer) result).intValue() == 0;
-                } catch (IllegalAccessException e3) {
-                    return false;
-                } catch (IllegalArgumentException e3) {
-                    return false;
-                } catch (InvocationTargetException e3) {
-                    return false;
-                }
-            } catch (NoSuchMethodException e2) {
-                //tryout 1.3.1 signature
-                return internalCompilePre141(args);
-                //onError(getMessage("javacompiler.nosuchmethod.error", "getMethod(\"compile\", compile141MethodSignature)"));
-                //return false;
-            }
-        } catch (ClassNotFoundException e) {
-            onError(
-                    getMessage(
-                            "javacompiler.classpath.error",
-                            "com.sun.tools.javac.Main"));
-            return false;
-        } catch (SecurityException e) {
-            return false;
-        }
-    }
-
-    protected boolean internalCompilePre141(String[] args) {
-            ClassLoader cl = Thread.currentThread().getContextClassLoader();
-            try {
-                    Class sunToolsJavacMainClass = cl.loadClass("sun.tools.javac.Main");
-                    try {
-                            Constructor constructor =
-                                    sunToolsJavacMainClass.getConstructor(constructorSignature);
-                            try {
-                                    Object javacMain =
-                                            constructor.newInstance(new Object[] { out, "javac" });
-                                    Method compileMethod =
-                                            sunToolsJavacMainClass.getMethod(
-                                                    "compile",
-                                                    compileMethodSignature);
-                                    Object result =
-                                            compileMethod.invoke(javacMain, new Object[] { args });
-                                    if (!(result instanceof Boolean)) {
-                                            return false;
-                                    }
-                                    return ((Boolean) result).booleanValue();
-                            } catch (InstantiationException e4) {
-                                    return false;
-                            } catch (IllegalAccessException e4) {
-                                    return false;
-                            } catch (IllegalArgumentException e4) {
-                                    return false;
-                            } catch (InvocationTargetException e4) {
-                                    return false;
-                            }
-
-                    } catch (NoSuchMethodException e3) {
-                            onError(
-                                    getMessage(
-                                            "javacompiler.nosuchmethod.error",
-                                            "getMethod(\"compile\", compileMethodSignature)"));
-                            return false;
-                    }
-            } catch (ClassNotFoundException e2) {
-                    return false;
-            }
-    }
-
-    protected String getGenericErrorMessage() {
-            return "javacompiler.error";
-    }
-
-    protected void run() {
-    }
-
-    protected boolean parseArguments(String[] args) {
-            return false;
-    }
-
-    public void onError(Localizable msg) {
-            report(getMessage("javacompiler.error", localizer.localize(msg)));
-    }
-
-    protected OutputStream out;
-
-    protected static final Class[] compile141MethodSignature;
-    protected static final Class[] constructorSignature;
-    protected static final Class[] compileMethodSignature;
-
-    static {
-            compile141MethodSignature = new Class[2];
-            compile141MethodSignature[0] = (new String[0]).getClass();
-            compile141MethodSignature[1] = PrintWriter.class;
-            //jdk version < 1.4.1 signature
-            constructorSignature = new Class[2];
-            constructorSignature[0] = OutputStream.class;
-            constructorSignature[1] = String.class;
-            compileMethodSignature = new Class[1];
-            compileMethodSignature[0] = compile141MethodSignature[0]; // String[]
-
-    }
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/util/MapBase.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/util/MapBase.java
deleted file mode 100644
index 99debcf1d2e..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/util/MapBase.java
+++ /dev/null
@@ -1,691 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.tools.internal.ws.util;
-
-import java.util.AbstractCollection;
-import java.util.AbstractSet;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-/*
- * This class was lifted from JDK 1.4 (where it's called java.util.AbstractMap)
- * so that we can use it on 1.3.1.
- *
- * @author WS Development Team
- */
-
-/**
- * This class provides a skeletal implementation of the Map
- * interface, to minimize the effort required to implement this interface. 
    
- *
- * To implement an unmodifiable map, the programmer needs only to extend this
- * class and provide an implementation for the entrySet method, which
- * returns a set-view of the map's mappings.  Typically, the returned set
- * will, in turn, be implemented atop AbstractSet.  This set should
- * not support the add or remove methods, and its iterator
- * should not support the remove method.
    
- *
- * To implement a modifiable map, the programmer must additionally override
- * this class's put method (which otherwise throws an
- * UnsupportedOperationException), and the iterator returned by
- * entrySet().iterator() must additionally implement its
- * remove method.
    
- *
- * The programmer should generally provide a void (no argument) and map
- * constructor, as per the recommendation in the Map interface
- * specification.
    
- *
- * The documentation for each non-abstract methods in this class describes its
- * implementation in detail.  Each of these methods may be overridden if the
- * map being implemented admits a more efficient implementation.
- *
- * @author  Josh Bloch
- * @see Map
- * @see Collection
- * @since 1.2
- */
-
-public abstract class MapBase implements Map {
-    /**
-     * Sole constructor.  (For invocation by subclass constructors, typically
-     * implicit.)
-     */
-    protected MapBase() {
-    }
-
-    // Query Operations
-
-    /**
-     * Returns the number of key-value mappings in this map.  If the map
-     * contains more than Integer.MAX_VALUE elements, returns
-     * Integer.MAX_VALUE.
    
-     *
-     * This implementation returns entrySet().size().
-     *
-     * @return the number of key-value mappings in this map.
-     */
-    public int size() {
-        return entrySet().size();
-    }
-
-    /**
-     * Returns true if this map contains no key-value mappings. 
    
-     *
-     * This implementation returns size() == 0.
-     *
-     * @return true if this map contains no key-value mappings.
-     */
-    public boolean isEmpty() {
-        return size() == 0;
-    }
-
-    /**
-     * Returns true if this map maps one or more keys to this value.
-     * More formally, returns true if and only if this map contains
-     * at least one mapping to a value v such that (value==null ?
-     * v==null : value.equals(v)).  This operation will probably require
-     * time linear in the map size for most implementations of map.
    
-     *
-     * This implementation iterates over entrySet() searching for an entry
-     * with the specified value.  If such an entry is found, true is
-     * returned.  If the iteration terminates without finding such an entry,
-     * false is returned.  Note that this implementation requires
-     * linear time in the size of the map.
-     *
-     * @param value value whose presence in this map is to be tested.
-     *
-     * @return true if this map maps one or more keys to this value.
-     */
-    public boolean containsValue(Object value) {
-        Iterator i = entrySet().iterator();
-        if (value == null) {
-            while (i.hasNext()) {
-                Entry e = (Entry) i.next();
-                if (e.getValue() == null)
-                    return true;
-            }
-        } else {
-            while (i.hasNext()) {
-                Entry e = (Entry) i.next();
-                if (value.equals(e.getValue()))
-                    return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Returns true if this map contains a mapping for the specified
-     * key. 
    
-     *
-     * This implementation iterates over entrySet() searching for an
-     * entry with the specified key.  If such an entry is found, true
-     * is returned.  If the iteration terminates without finding such an
-     * entry, false is returned.  Note that this implementation
-     * requires linear time in the size of the map; many implementations will
-     * override this method.
-     *
-     * @param key key whose presence in this map is to be tested.
-     * @return true if this map contains a mapping for the specified
-     *            key.
-     *
-     * @throws NullPointerException key is null and this map does not
-     *            not permit null keys.
-     */
-    public boolean containsKey(Object key) {
-        Iterator i = entrySet().iterator();
-        if (key == null) {
-            while (i.hasNext()) {
-                Entry e = (Entry) i.next();
-                if (e.getKey() == null)
-                    return true;
-            }
-        } else {
-            while (i.hasNext()) {
-                Entry e = (Entry) i.next();
-                if (key.equals(e.getKey()))
-                    return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Returns the value to which this map maps the specified key.  Returns
-     * null if the map contains no mapping for this key.  A return
-     * value of null does not necessarily indicate that the
-     * map contains no mapping for the key; it's also possible that the map
-     * explicitly maps the key to null.  The containsKey operation
-     * may be used to distinguish these two cases. 
    
-     *
-     * This implementation iterates over entrySet() searching for an
-     * entry with the specified key.  If such an entry is found, the entry's
-     * value is returned.  If the iteration terminates without finding such an
-     * entry, null is returned.  Note that this implementation
-     * requires linear time in the size of the map; many implementations will
-     * override this method.
-     *
-     * @param key key whose associated value is to be returned.
-     * @return the value to which this map maps the specified key.
-     *
-     * @throws NullPointerException if the key is null and this map
-     *        does not not permit null keys.
-     *
-     * @see #containsKey(Object)
-     */
-    public Object get(Object key) {
-        Iterator i = entrySet().iterator();
-        if (key == null) {
-            while (i.hasNext()) {
-                Entry e = (Entry) i.next();
-                if (e.getKey() == null)
-                    return e.getValue();
-            }
-        } else {
-            while (i.hasNext()) {
-                Entry e = (Entry) i.next();
-                if (key.equals(e.getKey()))
-                    return e.getValue();
-            }
-        }
-        return null;
-    }
-
-    // Modification Operations
-
-    /**
-     * Associates the specified value with the specified key in this map
-     * (optional operation).  If the map previously contained a mapping for
-     * this key, the old value is replaced.
    
-     *
-     * This implementation always throws an
-     * UnsupportedOperationException.
-     *
-     * @param key key with which the specified value is to be associated.
-     * @param value value to be associated with the specified key.
-     *
-     * @return previous value associated with specified key, or null
-     *         if there was no mapping for key.  (A null return can
-     *         also indicate that the map previously associated null
-     *         with the specified key, if the implementation supports
-     *         null values.)
-     *
-     * @throws UnsupportedOperationException if the put operation is
-     *            not supported by this map.
-     *
-     * @throws ClassCastException if the class of the specified key or value
-     *            prevents it from being stored in this map.
-     *
-     * @throws IllegalArgumentException if some aspect of this key or value *
-     *            prevents it from being stored in this map.
-     *
-     * @throws NullPointerException this map does not permit null
-     *            keys or values, and the specified key or value is
-     *            null.
-     */
-    public Object put(Object key, Object value) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Removes the mapping for this key from this map if present (optional
-     * operation). 
    
-     *
-     * This implementation iterates over entrySet() searching for an
-     * entry with the specified key.  If such an entry is found, its value is
-     * obtained with its getValue operation, the entry is is removed
-     * from the Collection (and the backing map) with the iterator's
-     * remove operation, and the saved value is returned.  If the
-     * iteration terminates without finding such an entry, null is
-     * returned.  Note that this implementation requires linear time in the
-     * size of the map; many implementations will override this method.
    
-     *
-     * Note that this implementation throws an
-     * UnsupportedOperationException if the entrySet iterator
-     * does not support the remove method and this map contains a
-     * mapping for the specified key.
-     *
-     * @param key key whose mapping is to be removed from the map.
-     * @return previous value associated with specified key, or null
-     *         if there was no entry for key.  (A null return can
-     *         also indicate that the map previously associated null
-     *         with the specified key, if the implementation supports
-     *         null values.)
-     * @throws UnsupportedOperationException if the remove operation
-     *        is not supported by this map.
-     */
-    public Object remove(Object key) {
-        Iterator i = entrySet().iterator();
-        Entry correctEntry = null;
-        if (key == null) {
-            while (correctEntry == null && i.hasNext()) {
-                Entry e = (Entry) i.next();
-                if (e.getKey() == null)
-                    correctEntry = e;
-            }
-        } else {
-            while (correctEntry == null && i.hasNext()) {
-                Entry e = (Entry) i.next();
-                if (key.equals(e.getKey()))
-                    correctEntry = e;
-            }
-        }
-
-        Object oldValue = null;
-        if (correctEntry != null) {
-            oldValue = correctEntry.getValue();
-            i.remove();
-        }
-        return oldValue;
-    }
-
-    // Bulk Operations
-
-    /**
-     * Copies all of the mappings from the specified map to this map
-     * (optional operation).  These mappings will replace any mappings that
-     * this map had for any of the keys currently in the specified map.
    
-     *
-     * This implementation iterates over the specified map's
-     * entrySet() collection, and calls this map's put
-     * operation once for each entry returned by the iteration.
    
-     *
-     * Note that this implementation throws an
-     * UnsupportedOperationException if this map does not support
-     * the put operation and the specified map is nonempty.
-     *
-     * @param t mappings to be stored in this map.
-     *
-     * @throws UnsupportedOperationException if the putAll operation
-     *        is not supported by this map.
-     *
-     * @throws ClassCastException if the class of a key or value in the
-     *            specified map prevents it from being stored in this map.
-     *
-     * @throws IllegalArgumentException if some aspect of a key or value in
-     *            the specified map prevents it from being stored in this map.
-     * @throws NullPointerException the specified map is null, or if
-     *         this map does not permit null keys or values, and the
-     *         specified map contains null keys or values.
-     */
-    public void putAll(Map t) {
-        Iterator i = t.entrySet().iterator();
-        while (i.hasNext()) {
-            Entry e = (Entry) i.next();
-            put(e.getKey(), e.getValue());
-        }
-    }
-
-    /**
-     * Removes all mappings from this map (optional operation). 
    
-     *
-     * This implementation calls entrySet().clear().
-     *
-     * Note that this implementation throws an
-     * UnsupportedOperationException if the entrySet
-     * does not support the clear operation.
-     *
-     * @throws    UnsupportedOperationException clear is not supported
-     *        by this map.
-     */
-    public void clear() {
-        entrySet().clear();
-    }
-
-    // Views
-
-    /**
-     * Each of these fields are initialized to contain an instance of the
-     * appropriate view the first time this view is requested.  The views are
-     * stateless, so there's no reason to create more than one of each.
-     */
-    transient volatile Set keySet = null;
-    transient volatile Collection values = null;
-
-    /**
-     * Returns a Set view of the keys contained in this map.  The Set is
-     * backed by the map, so changes to the map are reflected in the Set,
-     * and vice-versa.  (If the map is modified while an iteration over
-     * the Set is in progress, the results of the iteration are undefined.)
-     * The Set supports element removal, which removes the corresponding entry
-     * from the map, via the Iterator.remove, Set.remove,  removeAll
-     * retainAll, and clear operations.  It does not support the add or
-     * addAll operations.
    
-     *
-     * This implementation returns a Set that subclasses
-     * AbstractSet.  The subclass's iterator method returns a "wrapper
-     * object" over this map's entrySet() iterator.  The size method delegates
-     * to this map's size method and the contains method delegates to this
-     * map's containsKey method.
    
-     *
-     * The Set is created the first time this method is called,
-     * and returned in response to all subsequent calls.  No synchronization
-     * is performed, so there is a slight chance that multiple calls to this
-     * method will not all return the same Set.
-     *
-     * @return a Set view of the keys contained in this map.
-     */
-    public Set keySet() {
-        if (keySet == null) {
-            keySet = new AbstractSet() {
-                public Iterator iterator() {
-                    return new Iterator() {
-                        private Iterator i = entrySet().iterator();
-
-                        public boolean hasNext() {
-                            return i.hasNext();
-                        }
-
-                        public Object next() {
-                            return ((Entry) i.next()).getKey();
-                        }
-
-                        public void remove() {
-                            i.remove();
-                        }
-                    };
-                }
-
-                public int size() {
-                    return MapBase.this.size();
-                }
-
-                public boolean contains(Object k) {
-                    return MapBase.this.containsKey(k);
-                }
-            };
-        }
-        return keySet;
-    }
-
-    /**
-     * Returns a collection view of the values contained in this map.  The
-     * collection is backed by the map, so changes to the map are reflected in
-     * the collection, and vice-versa.  (If the map is modified while an
-     * iteration over the collection is in progress, the results of the
-     * iteration are undefined.)  The collection supports element removal,
-     * which removes the corresponding entry from the map, via the
-     * Iterator.remove, Collection.remove,
-     * removeAll, retainAll and clear operations.
-     * It does not support the add or addAll operations.
    
-     *
-     * This implementation returns a collection that subclasses abstract
-     * collection.  The subclass's iterator method returns a "wrapper object"
-     * over this map's entrySet() iterator.  The size method
-     * delegates to this map's size method and the contains method delegates
-     * to this map's containsValue method.
    
-     *
-     * The collection is created the first time this method is called, and
-     * returned in response to all subsequent calls.  No synchronization is
-     * performed, so there is a slight chance that multiple calls to this
-     * method will not all return the same Collection.
-     *
-     * @return a collection view of the values contained in this map.
-     */
-    public Collection values() {
-        if (values == null) {
-            values = new AbstractCollection() {
-                public Iterator iterator() {
-                    return new Iterator() {
-                        private Iterator i = entrySet().iterator();
-
-                        public boolean hasNext() {
-                            return i.hasNext();
-                        }
-
-                        public Object next() {
-                            return ((Entry) i.next()).getValue();
-                        }
-
-                        public void remove() {
-                            i.remove();
-                        }
-                    };
-                }
-
-                public int size() {
-                    return MapBase.this.size();
-                }
-
-                public boolean contains(Object v) {
-                    return MapBase.this.containsValue(v);
-                }
-            };
-        }
-        return values;
-    }
-
-    /**
-     * Returns a set view of the mappings contained in this map.  Each element
-     * in this set is a Map.Entry.  The set is backed by the map, so changes
-     * to the map are reflected in the set, and vice-versa.  (If the map is
-     * modified while an iteration over the set is in progress, the results of
-     * the iteration are undefined.)  The set supports element removal, which
-     * removes the corresponding entry from the map, via the
-     * Iterator.remove, Set.remove, removeAll,
-     * retainAll and clear operations.  It does not support
-     * the add or addAll operations.
-     *
-     * @return a set view of the mappings contained in this map.
-     */
-    public abstract Set entrySet();
-
-    // Comparison and hashing
-
-    /**
-     * Compares the specified object with this map for equality.  Returns
-     * true if the given object is also a map and the two maps
-     * represent the same mappings.  More formally, two maps t1 and
-     * t2 represent the same mappings if
-     * t1.keySet().equals(t2.keySet()) and for every key k
-     * in t1.keySet(),  (t1.get(k)==null ? t2.get(k)==null :
-     * t1.get(k).equals(t2.get(k))) .  This ensures that the
-     * equals method works properly across different implementations
-     * of the map interface.
    
-     *
-     * This implementation first checks if the specified object is this map;
-     * if so it returns true.  Then, it checks if the specified
-     * object is a map whose size is identical to the size of this set; if
-     * not, it it returns false.  If so, it iterates over this map's
-     * entrySet collection, and checks that the specified map
-     * contains each mapping that this map contains.  If the specified map
-     * fails to contain such a mapping, false is returned.  If the
-     * iteration completes, true is returned.
-     *
-     * @param o object to be compared for equality with this map.
-     * @return true if the specified object is equal to this map.
-     */
-    public boolean equals(Object o) {
-        if (o == this)
-            return true;
-
-        if (!(o instanceof Map))
-            return false;
-        Map t = (Map) o;
-        if (t.size() != size())
-            return false;
-
-        try {
-            Iterator i = entrySet().iterator();
-            while (i.hasNext()) {
-                Entry e = (Entry) i.next();
-                Object key = e.getKey();
-                Object value = e.getValue();
-                if (value == null) {
-                    if (!(t.get(key) == null && t.containsKey(key)))
-                        return false;
-                } else {
-                    if (!value.equals(t.get(key)))
-                        return false;
-                }
-            }
-        } catch (ClassCastException unused) {
-            return false;
-        } catch (NullPointerException unused) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns the hash code value for this map.  The hash code of a map is
-     * defined to be the sum of the hash codes of each entry in the map's
-     * entrySet() view.  This ensures that t1.equals(t2)
-     * implies that t1.hashCode()==t2.hashCode() for any two maps
-     * t1 and t2, as required by the general contract of
-     * Object.hashCode.
    
-     *
-     * This implementation iterates over entrySet(), calling
-     * hashCode on each element (entry) in the Collection, and adding
-     * up the results.
-     *
-     * @return the hash code value for this map.
-     * @see java.util.Map.Entry#hashCode()
-     * @see Object#hashCode()
-     * @see Object#equals(Object)
-     * @see Set#equals(Object)
-     */
-    public int hashCode() {
-        int h = 0;
-        Iterator i = entrySet().iterator();
-        while (i.hasNext())
-            h += i.next().hashCode();
-        return h;
-    }
-
-    /**
-     * Returns a string representation of this map.  The string representation
-     * consists of a list of key-value mappings in the order returned by the
-     * map's entrySet view's iterator, enclosed in braces
-     * ("{}").  Adjacent mappings are separated by the characters
-     * ", " (comma and space).  Each key-value mapping is rendered as
-     * the key followed by an equals sign ("=") followed by the
-     * associated value.  Keys and values are converted to strings as by
-     * String.valueOf(Object).
    
-     *
-     * This implementation creates an empty string buffer, appends a left
-     * brace, and iterates over the map's entrySet view, appending
-     * the string representation of each map.entry in turn.  After
-     * appending each entry except the last, the string ", " is
-     * appended.  Finally a right brace is appended.  A string is obtained
-     * from the stringbuffer, and returned.
-     *
-     * @return a String representation of this map.
-     */
-    public String toString() {
-        StringBuffer buf = new StringBuffer();
-        buf.append("{");
-
-        Iterator i = entrySet().iterator();
-        boolean hasNext = i.hasNext();
-        while (hasNext) {
-            Entry e = (Entry) (i.next());
-            Object key = e.getKey();
-            Object value = e.getValue();
-            buf.append(
-                (key == this ? "(this Map)" : key)
-                    + "="
-                    + (value == this ? "(this Map)" : value));
-
-            hasNext = i.hasNext();
-            if (hasNext)
-                buf.append(", ");
-        }
-
-        buf.append("}");
-        return buf.toString();
-    }
-
-    /**
-     * Returns a shallow copy of this MapBase instance: the keys
-     * and values themselves are not cloned.
-     *
-     * @return a shallow copy of this map.
-     */
-    protected Object clone() throws CloneNotSupportedException {
-        MapBase result = (MapBase) super.clone();
-        result.keySet = null;
-        result.values = null;
-        return result;
-    }
-
-    /**
-     * This should be made public as soon as possible.  It greately simplifies
-     * the task of implementing Map.
-     */
-    static class SimpleEntry implements Entry {
-        Object key;
-        Object value;
-
-        public SimpleEntry(Object key, Object value) {
-            this.key = key;
-            this.value = value;
-        }
-
-        public SimpleEntry(Map.Entry e) {
-            this.key = e.getKey();
-            this.value = e.getValue();
-        }
-
-        public Object getKey() {
-            return key;
-        }
-
-        public Object getValue() {
-            return value;
-        }
-
-        public Object setValue(Object value) {
-            Object oldValue = this.value;
-            this.value = value;
-            return oldValue;
-        }
-
-        public boolean equals(Object o) {
-            if (!(o instanceof Map.Entry))
-                return false;
-            Map.Entry e = (Map.Entry) o;
-            return eq(key, e.getKey()) && eq(value, e.getValue());
-        }
-
-        public int hashCode() {
-            Object v;
-            return ((key == null) ? 0 : key.hashCode())
-                ^ ((value == null) ? 0 : value.hashCode());
-        }
-
-        public String toString() {
-            return key + "=" + value;
-        }
-
-        private static boolean eq(Object o1, Object o2) {
-            return (o1 == null ? o2 == null : o1.equals(o2));
-        }
-    }
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/util/ToolBase.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/util/ToolBase.java
deleted file mode 100644
index 4d11c858c8f..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/util/ToolBase.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.tools.internal.ws.util;
-
-import java.io.OutputStream;
-import java.io.PrintStream;
-
-import com.sun.xml.internal.ws.util.localization.Localizable;
-import com.sun.xml.internal.ws.util.localization.LocalizableMessageFactory;
-import com.sun.xml.internal.ws.util.localization.Localizer;
-
-/**
- * A base class for command-line tools.
- *
- * @author WS Development Team
- */
-public abstract class ToolBase {
-
-    public ToolBase(OutputStream out, String program) {
-        this.out = out;
-        this.program = program;
-        initialize();
-    }
-
-    protected void initialize() {
-        messageFactory = new LocalizableMessageFactory(getResourceBundleName());
-        localizer = new Localizer();
-    }
-
-    public boolean run(String[] args) {
-        if (!parseArguments(args)) {
-            return false;
-        }
-
-        try {
-            run();
-            return wasSuccessful();
-        } catch (Exception e) {
-            if (e instanceof Localizable) {
-                report((Localizable) e);
-            } else {
-                report(getMessage(getGenericErrorMessage(), e.toString()));
-            }
-            printStackTrace(e);
-            return false;
-        }
-    }
-
-    public boolean wasSuccessful() {
-        return true;
-    }
-
-    protected abstract boolean parseArguments(String[] args);
-    protected abstract void run() throws Exception;
-    public void runProcessorActions() {}
-    protected abstract String getGenericErrorMessage();
-    protected abstract String getResourceBundleName();
-
-    public void printStackTrace(Throwable t) {
-        PrintStream outstream =
-                out instanceof PrintStream
-                        ? (PrintStream) out
-                        : new PrintStream(out, true);
-        t.printStackTrace(outstream);
-        outstream.flush();
-    }
-
-    protected void report(String msg) {
-        PrintStream outstream =
-                out instanceof PrintStream
-                        ? (PrintStream) out
-                        : new PrintStream(out, true);
-        outstream.println(msg);
-        outstream.flush();
-    }
-
-    protected void report(Localizable msg) {
-        report(localizer.localize(msg));
-    }
-
-    public Localizable getMessage(String key) {
-        return getMessage(key, (Object[]) null);
-    }
-
-    public Localizable getMessage(String key, String arg) {
-        return messageFactory.getMessage(key, new Object[] { arg });
-    }
-
-    public Localizable getMessage(String key, String arg1, String arg2) {
-        return messageFactory.getMessage(key, new Object[] { arg1, arg2 });
-    }
-
-    public Localizable getMessage(
-        String key,
-        String arg1,
-        String arg2,
-        String arg3) {
-        return messageFactory.getMessage(
-                key,
-                new Object[] { arg1, arg2, arg3 });
-    }
-
-    public Localizable getMessage(String key, Localizable localizable) {
-        return messageFactory.getMessage(key, new Object[] { localizable });
-    }
-
-    public Localizable getMessage(String key, Object[] args) {
-        return messageFactory.getMessage(key, args);
-    }
-
-    protected OutputStream out;
-    protected String program;
-    protected Localizer localizer;
-    protected LocalizableMessageFactory messageFactory;
-
-    protected final static String TRUE = "true";
-    protected final static String FALSE = "false";
-
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/util/WSDLParseException.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/util/WSDLParseException.java
index 059f746e864..2cc8c921511 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/util/WSDLParseException.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/util/WSDLParseException.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 package com.sun.tools.internal.ws.util;
 
 import com.sun.xml.internal.ws.util.exception.JAXWSExceptionBase;
-import com.sun.xml.internal.ws.util.localization.Localizable;
 
 /**
   * @author WS Development Team
@@ -41,7 +40,7 @@ public class WSDLParseException extends JAXWSExceptionBase {
         super(throwable);
     }
 
-    public String getResourceBundleName() {
+    public String getDefaultResourceBundleName() {
         return "com.sun.tools.internal.ws.resources.util";
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/util/WSToolsObjectFactoryImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/util/WSToolsObjectFactoryImpl.java
index 42c8bc451dd..7f3ff8e2f04 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/util/WSToolsObjectFactoryImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/util/WSToolsObjectFactoryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,7 +25,10 @@
 package com.sun.tools.internal.ws.util;
 
 import com.sun.tools.internal.ws.spi.WSToolsObjectFactory;
-import com.sun.tools.internal.ws.wscompile.CompileTool;
+import com.sun.tools.internal.ws.wscompile.WsgenTool;
+import com.sun.tools.internal.ws.wscompile.WsimportTool;
+import com.sun.xml.internal.ws.api.server.Container;
+
 import java.io.OutputStream;
 
 /**
@@ -36,14 +39,14 @@ import java.io.OutputStream;
 public class WSToolsObjectFactoryImpl extends WSToolsObjectFactory {
 
     @Override
-    public boolean wsimport(OutputStream logStream, String[] args) {
-        CompileTool tool = new CompileTool(logStream, "wsimport");
+    public boolean wsimport(OutputStream logStream, Container container, String[] args) {
+        WsimportTool tool = new WsimportTool(logStream, container);
         return tool.run(args);
     }
 
     @Override
-    public boolean wsgen(OutputStream logStream, String[] args) {
-        CompileTool tool = new CompileTool(logStream, "wsgen");
+    public boolean wsgen(OutputStream logStream, Container container, String[] args) {
+        WsgenTool tool = new WsgenTool(logStream, container);
         return tool.run(args);
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/util/xml/NodeListIterator.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/util/xml/NodeListIterator.java
deleted file mode 100644
index d7f504ead9c..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/util/xml/NodeListIterator.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.tools.internal.ws.util.xml;
-
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-
-import org.w3c.dom.NodeList;
-
-/**
- * @author WS Development Team
- */
-public class NodeListIterator implements Iterator {
-
-    protected NodeList _list;
-    protected int _index;
-
-    public NodeListIterator(NodeList list) {
-        _list = list;
-        _index = 0;
-    }
-
-    public boolean hasNext() {
-        if (_list == null)
-            return false;
-        return _index < _list.getLength();
-    }
-
-    public Object next() throws NoSuchElementException {
-        if (_list.getLength() == 0)
-            throw new NoSuchElementException();
-        Object obj = _list.item(_index);
-        if (obj != null)
-            ++_index;
-        return obj;
-    }
-
-    public void remove() {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/util/xml/PrettyPrintingXmlWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/util/xml/PrettyPrintingXmlWriter.java
deleted file mode 100644
index d128876de97..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/util/xml/PrettyPrintingXmlWriter.java
+++ /dev/null
@@ -1,646 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.tools.internal.ws.util.xml;
-
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
-
-import com.sun.xml.internal.ws.util.xml.CDATA;
-
-// ## Delay IOExceptions until flush or close
-// ## Need DOM, SAX output
-
-/**
- * A writer of XML output streams.
- *
- * 
     An XML writer knows hardly anything about XML document well-formedness,
- * to say nothing of validity.  It relies upon the invoker to ensure that the
- * generated document is well-formed and, if required, valid.
- *
- *
- * @author WS Development Team
- */
-
-public class PrettyPrintingXmlWriter {
-
-    private static final boolean shouldPrettyprint = true;
-
-    private BufferedWriter out;
-
-    private PrettyPrintingXmlWriter(OutputStreamWriter w, boolean declare)
-        throws IOException {
-        // XXX-NOTE - set the buffer size to 1024 here
-        this.out = new BufferedWriter(w, 1024);
-        String enc = w.getEncoding();
-
-        /* Work around bogus canonical encoding names */
-        if (enc.equals("UTF8"))
-            enc = "UTF-8";
-        else if (enc.equals("ASCII"))
-            enc = "US-ASCII";
-
-        if (declare) {
-            out.write("");
-            out.newLine();
-            needNewline = true;
-        }
-    }
-
-    /**
-     * Creates a new writer that will write to the given byte-output stream
-     * using the given encoding.  An initial XML declaration will optionally be
-     * written to the stream.  
    
-     *
-     * @param  out
-     *         The target byte-output stream
-     *
-     * @param  enc
-     *         The character encoding to be used
-     *
-     * @param  declare
-     *         If true, write the XML declaration to the output stream
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     *
-     * @throws  UnsupportedEncodingException
-     *          If the named encoding is not supported
-     */
-    public PrettyPrintingXmlWriter(
-        OutputStream out,
-        String enc,
-        boolean declare)
-        throws UnsupportedEncodingException, IOException {
-        this(new OutputStreamWriter(out, enc), declare);
-    }
-
-    /**
-     * Creates a new writer that will write to the given byte-output stream
-     * using the given encoding.  An initial XML declaration will be written to
-     * the stream.  
    
-     *
-     * @param  out
-     *         The target byte-output stream
-     *
-     * @param  enc
-     *         The character encoding to be used
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     *
-     * @throws  UnsupportedEncodingException
-     *          If the named encoding is not supported
-     */
-    public PrettyPrintingXmlWriter(OutputStream out, String enc)
-        throws UnsupportedEncodingException, IOException {
-        this(new OutputStreamWriter(out, enc), true);
-    }
-
-    /**
-     * Creates a new writer that will write to the given byte-output stream
-     * using the UTF-8 encoding.  An initial XML declaration will be written to
-     * the stream.  
    
-     *
-     * @param  out
-     *         The target byte-output stream
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     */
-    public PrettyPrintingXmlWriter(OutputStream out) throws IOException {
-        this(new OutputStreamWriter(out, "UTF-8"), true);
-    }
-
-    private char quoteChar = '"';
-
-    /**
-     * Sets the quote character to be used by this writer when writing
-     * attribute values.  
    
-     *
-     * @param  quote  The new quote character, either a
-     *                QUOTATION MARK ('\u0022'),
-     *                or an APOSTROPHE-QUOTE
-     *                ('\u0027')
-     *
-     * @throws  IllegalArgumentException
-     *          If the argument is neither of the above characters
-     */
-    public void setQuote(char quote) {
-        if (quote != '"' && quote != '\'')
-            throw new IllegalArgumentException(
-                "Illegal quote character: " + quote);
-        quoteChar = quote;
-    }
-
-    // Quote a character
-    private void quote(char c) throws IOException {
-        switch (c) {
-            case '&' :
-                out.write("&");
-                break;
-            case '<' :
-                out.write("<");
-                break;
-            case '>' :
-                out.write(">");
-                break;
-            default :
-                out.write(c);
-                break;
-        }
-    }
-
-    // Quote a character in an attribute value
-    private void aquote(char c) throws IOException {
-        switch (c) {
-            case '\'' :
-                if (quoteChar == c)
-                    out.write("'");
-                else
-                    out.write(c);
-                break;
-            case '"' :
-                if (quoteChar == c)
-                    out.write(""");
-                else
-                    out.write(c);
-                break;
-            default :
-                quote(c);
-                break;
-        }
-    }
-
-    //
-    private void nonQuote(char c) throws IOException {
-        out.write(c);
-    }
-
-    // Quote a string containing character data
-    private void quote(String s) throws IOException {
-        for (int i = 0; i < s.length(); i++)
-            quote(s.charAt(i));
-    }
-
-    /* Allowing support for CDATA */
-    private void nonQuote(String s) throws IOException {
-        for (int i = 0; i < s.length(); i++)
-            nonQuote(s.charAt(i));
-    }
-
-    // Quote a string containing an attribute value
-    private void aquote(String s) throws IOException {
-        for (int i = 0; i < s.length(); i++)
-            aquote(s.charAt(i));
-    }
-
-    private void indent(int depth) throws IOException {
-        for (int i = 0; i < depth; i++)
-            out.write("  ");
-    }
-
-    // Formatting state
-    private int depth = 0;
-    private boolean inStart = false;
-    private boolean needNewline = false;
-    private boolean writtenChars = false;
-    private boolean inAttribute = false;
-    private boolean inAttributeValue = false;
-
-    /**
-     * Writes a DOCTYPE declaration.  
    
-     *
-     * @param  root  The name of the root element
-     *
-     * @param  dtd   The URI of the document-type definition
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     */
-    public void doctype(String root, String dtd) throws IOException {
-        if (shouldPrettyprint && needNewline)
-            out.newLine();
-        needNewline = true;
-        out.write("");
-        if (shouldPrettyprint)
-            out.newLine();
-    }
-
-    private void start0(String name) throws IOException {
-        finishStart();
-        if (shouldPrettyprint && !writtenChars) {
-            needNewline = true;
-            indent(depth);
-        }
-        out.write('<');
-        out.write(name);
-        inStart = true;
-        writtenChars = false;
-        depth++;
-    }
-
-    private void start1(String name) throws IOException {
-        finishStart();
-        if (shouldPrettyprint && !writtenChars) {
-            if (needNewline)
-                out.newLine();
-            needNewline = true;
-            indent(depth);
-        }
-        out.write('<');
-        out.write(name);
-        inStart = true;
-        writtenChars = false;
-        depth++;
-    }
-
-    private void finishStart() throws IOException {
-        if (inStart) {
-            if (inAttribute)
-                out.write(quoteChar);
-            out.write('>');
-            inStart = false;
-            inAttribute = false;
-            inAttributeValue = false;
-        }
-    }
-
-    /**
-     * Writes a start tag for the named element.  
    
-     *
-     * @param  name  The name to be used in the start tag
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     */
-    public void start(String name) throws IOException {
-        start1(name);
-    }
-
-    /**
-     * Writes an attribute for the current element.  
    
-     *
-     * @param  name  The attribute's name
-     *
-     * @param  value  The attribute's value
-     *
-     * @throws  IllegalStateException
-     *          If the previous method invoked upon this object was neither
-     *          {@link #start start} nor {@link #attribute attribute}
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     */
-    public void attribute(String name, String value) throws IOException {
-        attributeName(name);
-        attributeValue(value);
-    }
-
-    /**
-     * Writes an attribute (unquoted) for the current element.  
    
-     *
-     * @param  name  The attribute's name
-     *
-     * @param  value  The attribute's value
-     *
-     * @throws  IllegalStateException
-     *          If the previous method invoked upon this object was neither
-     *          {@link #start start} nor {@link #attribute attribute}
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     */
-    public void attributeUnquoted(String name, String value)
-        throws IOException {
-        attributeName(name);
-        attributeValueUnquoted(value);
-    }
-
-    /**
-     * Writes an attribute for the current element.  
    
-     *
-     * @param  prefix  The attribute's prefix
-     *
-     * @param  name  The attribute's name
-     *
-     * @param  value  The attribute's value
-     *
-     * @throws  IllegalStateException
-     *          If the previous method invoked upon this object was neither
-     *          {@link #start start} nor {@link #attribute attribute}
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     */
-    public void attribute(String prefix, String name, String value)
-        throws IOException {
-        attributeName(prefix, name);
-        attributeValue(value);
-    }
-
-    /**
-     * Writes an attribute (unquoted) for the current element.  
    
-     *
-     * @param  prefix  The attribute's prefix
-     *
-     * @param  name  The attribute's name
-     *
-     * @param  value  The attribute's value
-     *
-     * @throws  IllegalStateException
-     *          If the previous method invoked upon this object was neither
-     *          {@link #start start} nor {@link #attribute attribute}
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     */
-    public void attributeUnquoted(String prefix, String name, String value)
-        throws IOException {
-        attributeName(prefix, name);
-        attributeValueUnquoted(value);
-    }
-
-    /**
-     * Writes an attribute name for the current element.  After invoking this
-     * method, invoke the {@link #attributeValue attributeValue} method to
-     * write the attribute value, or invoke the {@link #attributeValueToken
-     * attributeValueToken} method to write one or more space-separated value
-     * tokens.  
    
-     *
-     * @param   name  The attribute's name
-     *
-     * @throws  IllegalStateException
-     *          If the previous method invoked upon this object was neither
-     *          {@link #start start} nor {@link #attribute attribute}
-     */
-    public void attributeName(String name) throws IOException {
-        if (!inStart)
-            throw new IllegalStateException();
-        if (inAttribute) {
-            out.write(quoteChar);
-            inAttribute = false;
-            inAttributeValue = false;
-        }
-        out.write(' ');
-        out.write(name);
-        out.write('=');
-        out.write(quoteChar);
-        inAttribute = true;
-    }
-
-    /**
-     * Writes an attribute name for the current element.  After invoking this
-     * method, invoke the {@link #attributeValue attributeValue} method to
-     * write the attribute value, or invoke the {@link #attributeValueToken
-     * attributeValueToken} method to write one or more space-separated value
-     * tokens.  
    
-     *
-     * @param   prefix The attribute's prefix
-     * @param   name  The attribute's name
-     *
-     * @throws  IllegalStateException
-     *          If the previous method invoked upon this object was neither
-     *          {@link #start start} nor {@link #attribute attribute}
-     */
-    public void attributeName(String prefix, String name) throws IOException {
-        if (!inStart)
-            throw new IllegalStateException();
-        if (inAttribute) {
-            out.write(quoteChar);
-            inAttribute = false;
-            inAttributeValue = false;
-        }
-        out.write(' ');
-        out.write(prefix);
-        out.write(':');
-        out.write(name);
-        out.write('=');
-        out.write(quoteChar);
-        inAttribute = true;
-    }
-
-    /**
-     * Writes a value for the current attribute.  
    
-     *
-     * @param   value  The attribute's value
-     *
-     * @throws  IllegalStateException
-     *          If the previous method invoked upon this object was not
-     *          {@link #attributeName attributeName}
-     */
-    public void attributeValue(String value) throws IOException {
-        if (!inAttribute || inAttributeValue)
-            throw new IllegalStateException();
-        aquote(value);
-        out.write(quoteChar);
-        inAttribute = false;
-    }
-
-    /**
-     * Writes a value (unquoted) for the current attribute.  
    
-     *
-     * @param   value  The attribute's value
-     *
-     * @throws  IllegalStateException
-     *          If the previous method invoked upon this object was not
-     *          {@link #attributeName attributeName}
-     */
-    public void attributeValueUnquoted(String value) throws IOException {
-        if (!inAttribute || inAttributeValue)
-            throw new IllegalStateException();
-        out.write(value, 0, value.length());
-        out.write(quoteChar);
-        inAttribute = false;
-    }
-
-    /**
-     * Writes one token of the current attribute's value.  Adjacent tokens will
-     * be separated by single space characters.  
    
-     *
-     * @param   token  The token to be written
-     *
-     * @throws  IllegalStateException
-     *          If the previous method invoked upon this object was neither
-     *          {@link #attributeName attributeName} nor
-     *          {@link #attributeValueToken attributeValueToken}
-     */
-    public void attributeValueToken(String token) throws IOException {
-        if (!inAttribute)
-            throw new IllegalStateException();
-        if (inAttributeValue)
-            out.write(' ');
-        aquote(token);
-        inAttributeValue = true;
-    }
-
-    /**
-     * Writes an end tag for the named element.  
    
-     *
-     * @param  name  The name to be used in the end tag
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     */
-    public void end(String name) throws IOException {
-        if (inStart) {
-            if (inAttribute)
-                out.write(quoteChar);
-            out.write("/>");
-            inStart = false;
-            inAttribute = false;
-            inAttributeValue = false;
-        } else {
-            out.write("');
-        }
-        depth--;
-        writtenChars = false;
-    }
-
-    /**
-     * Writes some character data.  
    
-     *
-     * @param  chars  The character data to be written
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     */
-    public void chars(String chars) throws IOException {
-        finishStart();
-        quote(chars);
-        writtenChars = true;
-    }
-
-    public void chars(CDATA chars) throws IOException {
-        finishStart();
-        nonQuote(chars.getText());
-        writtenChars = true;
-    }
-
-    /**
-     * Writes some character data, skipping quoting.  
    
-     *
-     * @param  chars  The character data to be written
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     */
-    public void charsUnquoted(String chars) throws IOException {
-        finishStart();
-        out.write(chars, 0, chars.length());
-        writtenChars = true;
-    }
-
-    /**
-     * Writes some character data, skipping quoting.  
    
-     *
-     * @param  buf   Buffer containing the character data to be written
-     * @param  off    The offset of the data to be written
-     * @param  len    The length of the data to be written
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     */
-    public void charsUnquoted(char[] buf, int off, int len)
-        throws IOException {
-        finishStart();
-        out.write(buf, off, len);
-        writtenChars = true;
-    }
-
-    /**
-     * Writes a leaf element with the given character content.  
    
-     *
-     * @param name  ame to be used in the start and end tags
-     *
-     * @param chars  character data to be written
-     *
-     * 
     This method writes a start tag with the given name, followed by the
-     * given character data, followed by an end tag.  If the chars
-     * parameter is null or the empty string then an empty tag is
-     * written.  
    
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     */
-    public void leaf(String name, String chars) throws IOException {
-        start1(name);
-        if ((chars != null) && (chars.length() != 0))
-            chars(chars);
-        end(name);
-    }
-
-    public void inlineLeaf(String name, String chars) throws IOException {
-        start0(name);
-        if ((chars != null) && (chars.length() != 0))
-            chars(chars);
-        end(name);
-    }
-
-    /**
-     * Writes an empty leaf element.  
    
-     *
-     * @param  name name to be used in the empty-element tag
-     */
-    public void leaf(String name) throws IOException {
-        leaf(name, null);
-    }
-
-    public void inlineLeaf(String name) throws IOException {
-        inlineLeaf(name, null);
-    }
-
-    /**
-     * Flushes the writer.  
    
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     */
-    public void flush() throws IOException {
-        if (depth != 0)
-            throw new IllegalStateException("Nonzero depth");
-        // if (shouldPrettyprint)
-        out.newLine();
-        out.flush();
-    }
-
-    /**
-     * Flushes the writer and closes the underlying byte-output stream.  
    
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     */
-    public void close() throws IOException {
-        flush();
-        out.close();
-    }
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/util/xml/XmlUtil.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/util/xml/XmlUtil.java
index b1e40e75255..c4d4ae0108e 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/util/xml/XmlUtil.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/util/xml/XmlUtil.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,32 +25,8 @@
 
 package com.sun.tools.internal.ws.util.xml;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerFactory;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.EntityReference;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-
-import com.sun.xml.internal.messaging.saaj.util.ByteInputStream;
 import com.sun.tools.internal.ws.util.WSDLParseException;
-import com.sun.xml.internal.ws.util.xml.NamedNodeMapIterator;
-import com.sun.xml.internal.ws.util.xml.NodeListIterator;
+import org.w3c.dom.Element;
 
 /**
  * @author WS Development Team
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/util/xml/XmlWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/util/xml/XmlWriter.java
deleted file mode 100644
index e846f0405c0..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/util/xml/XmlWriter.java
+++ /dev/null
@@ -1,643 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.tools.internal.ws.util.xml;
-
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
-
-import com.sun.xml.internal.ws.util.xml.CDATA;
-
-// ## Delay IOExceptions until flush or close
-// ## Need DOM, SAX output
-
-/**
- * A writer of XML output streams.
- *
- * 
     An XML writer knows hardly anything about XML document well-formedness,
- * to say nothing of validity.  It relies upon the invoker to ensure that the
- * generated document is well-formed and, if required, valid.
- *
- *
- * @author WS Development Team
- */
-
-public class XmlWriter {
-
-    private static final boolean shouldPrettyprint = false;
-
-    private BufferedWriter out;
-
-    private XmlWriter(OutputStreamWriter w, boolean declare)
-        throws IOException {
-        // XXX-NOTE - set the buffer size to 1024 here
-        this.out = new BufferedWriter(w, 1024);
-        String enc = w.getEncoding();
-
-        /* Work around bogus canonical encoding names */
-        if (enc.equals("UTF8"))
-            enc = "UTF-8";
-        else if (enc.equals("ASCII"))
-            enc = "US-ASCII";
-
-        if (declare) {
-            out.write("");
-            out.newLine();
-            needNewline = true;
-        }
-    }
-
-    /**
-     * Creates a new writer that will write to the given byte-output stream
-     * using the given encoding.  An initial XML declaration will optionally be
-     * written to the stream.  
    
-     *
-     * @param  out
-     *         The target byte-output stream
-     *
-     * @param  enc
-     *         The character encoding to be used
-     *
-     * @param  declare
-     *         If true, write the XML declaration to the output stream
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     *
-     * @throws  UnsupportedEncodingException
-     *          If the named encoding is not supported
-     */
-    public XmlWriter(OutputStream out, String enc, boolean declare)
-        throws UnsupportedEncodingException, IOException {
-        this(new OutputStreamWriter(out, enc), declare);
-    }
-
-    /**
-     * Creates a new writer that will write to the given byte-output stream
-     * using the given encoding.  An initial XML declaration will be written to
-     * the stream.  
    
-     *
-     * @param  out
-     *         The target byte-output stream
-     *
-     * @param  enc
-     *         The character encoding to be used
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     *
-     * @throws  UnsupportedEncodingException
-     *          If the named encoding is not supported
-     */
-    public XmlWriter(OutputStream out, String enc)
-        throws UnsupportedEncodingException, IOException {
-        this(new OutputStreamWriter(out, enc), true);
-    }
-
-    /**
-     * Creates a new writer that will write to the given byte-output stream
-     * using the UTF-8 encoding.  An initial XML declaration will be written to
-     * the stream.  
    
-     *
-     * @param  out
-     *         The target byte-output stream
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     */
-    public XmlWriter(OutputStream out) throws IOException {
-        this(new OutputStreamWriter(out, "UTF-8"), true);
-    }
-
-    private char quoteChar = '"';
-
-    /**
-     * Sets the quote character to be used by this writer when writing
-     * attribute values.  
    
-     *
-     * @param  quote  The new quote character, either a
-     *                QUOTATION MARK ('\u0022'),
-     *                or an APOSTROPHE-QUOTE
-     *                ('\u0027')
-     *
-     * @throws  IllegalArgumentException
-     *          If the argument is neither of the above characters
-     */
-    public void setQuote(char quote) {
-        if (quote != '"' && quote != '\'')
-            throw new IllegalArgumentException(
-                "Illegal quote character: " + quote);
-        quoteChar = quote;
-    }
-
-    // Quote a character
-    private void quote(char c) throws IOException {
-        switch (c) {
-            case '&' :
-                out.write("&");
-                break;
-            case '<' :
-                out.write("<");
-                break;
-            case '>' :
-                out.write(">");
-                break;
-            default :
-                out.write(c);
-                break;
-        }
-    }
-
-    //
-    private void nonQuote(char c) throws IOException {
-        out.write(c);
-    }
-
-    // Quote a character in an attribute value
-    private void aquote(char c) throws IOException {
-        switch (c) {
-            case '\'' :
-                if (quoteChar == c)
-                    out.write("'");
-                else
-                    out.write(c);
-                break;
-            case '"' :
-                if (quoteChar == c)
-                    out.write(""");
-                else
-                    out.write(c);
-                break;
-            default :
-                quote(c);
-                break;
-        }
-    }
-
-    // Quote a string containing character data
-    private void quote(String s) throws IOException {
-        for (int i = 0; i < s.length(); i++)
-            quote(s.charAt(i));
-    }
-
-    /* Allowing support for CDATA */
-    private void nonQuote(String s) throws IOException {
-        for (int i = 0; i < s.length(); i++)
-            nonQuote(s.charAt(i));
-    }
-
-    // Quote a string containing an attribute value
-    private void aquote(String s) throws IOException {
-        for (int i = 0; i < s.length(); i++)
-            aquote(s.charAt(i));
-    }
-
-    private void indent(int depth) throws IOException {
-        for (int i = 0; i < depth; i++)
-            out.write("  ");
-    }
-
-    // Formatting state
-    private int depth = 0;
-    private boolean inStart = false;
-    private boolean needNewline = false;
-    private boolean writtenChars = false;
-    private boolean inAttribute = false;
-    private boolean inAttributeValue = false;
-
-    /**
-     * Writes a DOCTYPE declaration.  
    
-     *
-     * @param  root  The name of the root element
-     *
-     * @param  dtd   The URI of the document-type definition
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     */
-    public void doctype(String root, String dtd) throws IOException {
-        if (shouldPrettyprint && needNewline)
-            out.newLine();
-        needNewline = true;
-        out.write("");
-        if (shouldPrettyprint)
-            out.newLine();
-    }
-
-    private void start0(String name) throws IOException {
-        finishStart();
-        if (shouldPrettyprint && !writtenChars) {
-            needNewline = true;
-            indent(depth);
-        }
-        out.write('<');
-        out.write(name);
-        inStart = true;
-        writtenChars = false;
-        depth++;
-    }
-
-    private void start1(String name) throws IOException {
-        finishStart();
-        if (shouldPrettyprint && !writtenChars) {
-            if (needNewline)
-                out.newLine();
-            needNewline = true;
-            indent(depth);
-        }
-        out.write('<');
-        out.write(name);
-        inStart = true;
-        writtenChars = false;
-        depth++;
-    }
-
-    private void finishStart() throws IOException {
-        if (inStart) {
-            if (inAttribute)
-                out.write(quoteChar);
-            out.write('>');
-            inStart = false;
-            inAttribute = false;
-            inAttributeValue = false;
-        }
-    }
-
-    /**
-     * Writes a start tag for the named element.  
    
-     *
-     * @param  name  The name to be used in the start tag
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     */
-    public void start(String name) throws IOException {
-        start1(name);
-    }
-
-    /**
-     * Writes an attribute for the current element.  
    
-     *
-     * @param  name  The attribute's name
-     *
-     * @param  value  The attribute's value
-     *
-     * @throws  IllegalStateException
-     *          If the previous method invoked upon this object was neither
-     *          {@link #start start} nor {@link #attribute attribute}
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     */
-    public void attribute(String name, String value) throws IOException {
-        attributeName(name);
-        attributeValue(value);
-    }
-
-    /**
-     * Writes an attribute (unquoted) for the current element.  
    
-     *
-     * @param  name  The attribute's name
-     *
-     * @param  value  The attribute's value
-     *
-     * @throws  IllegalStateException
-     *          If the previous method invoked upon this object was neither
-     *          {@link #start start} nor {@link #attribute attribute}
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     */
-    public void attributeUnquoted(String name, String value)
-        throws IOException {
-        attributeName(name);
-        attributeValueUnquoted(value);
-    }
-
-    /**
-     * Writes an attribute for the current element.  
    
-     *
-     * @param  prefix  The attribute's prefix
-     *
-     * @param  name  The attribute's name
-     *
-     * @param  value  The attribute's value
-     *
-     * @throws  IllegalStateException
-     *          If the previous method invoked upon this object was neither
-     *          {@link #start start} nor {@link #attribute attribute}
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     */
-    public void attribute(String prefix, String name, String value)
-        throws IOException {
-        attributeName(prefix, name);
-        attributeValue(value);
-    }
-
-    /**
-     * Writes an attribute (unquoted) for the current element.  
    
-     *
-     * @param  prefix  The attribute's prefix
-     *
-     * @param  name  The attribute's name
-     *
-     * @param  value  The attribute's value
-     *
-     * @throws  IllegalStateException
-     *          If the previous method invoked upon this object was neither
-     *          {@link #start start} nor {@link #attribute attribute}
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     */
-    public void attributeUnquoted(String prefix, String name, String value)
-        throws IOException {
-        attributeName(prefix, name);
-        attributeValueUnquoted(value);
-    }
-
-    /**
-     * Writes an attribute name for the current element.  After invoking this
-     * method, invoke the {@link #attributeValue attributeValue} method to
-     * write the attribute value, or invoke the {@link #attributeValueToken
-     * attributeValueToken} method to write one or more space-separated value
-     * tokens.  
    
-     *
-     * @param   name  The attribute's name
-     *
-     * @throws  IllegalStateException
-     *          If the previous method invoked upon this object was neither
-     *          {@link #start start} nor {@link #attribute attribute}
-     */
-    public void attributeName(String name) throws IOException {
-        if (!inStart)
-            throw new IllegalStateException();
-        if (inAttribute) {
-            out.write(quoteChar);
-            inAttribute = false;
-            inAttributeValue = false;
-        }
-        out.write(' ');
-        out.write(name);
-        out.write('=');
-        out.write(quoteChar);
-        inAttribute = true;
-    }
-
-    /**
-     * Writes an attribute name for the current element.  After invoking this
-     * method, invoke the {@link #attributeValue attributeValue} method to
-     * write the attribute value, or invoke the {@link #attributeValueToken
-     * attributeValueToken} method to write one or more space-separated value
-     * tokens.  
    
-     *
-     * @param   prefix The attribute's prefix
-     * @param   name  The attribute's name
-     *
-     * @throws  IllegalStateException
-     *          If the previous method invoked upon this object was neither
-     *          {@link #start start} nor {@link #attribute attribute}
-     */
-    public void attributeName(String prefix, String name) throws IOException {
-        if (!inStart)
-            throw new IllegalStateException();
-        if (inAttribute) {
-            out.write(quoteChar);
-            inAttribute = false;
-            inAttributeValue = false;
-        }
-        out.write(' ');
-        out.write(prefix);
-        out.write(':');
-        out.write(name);
-        out.write('=');
-        out.write(quoteChar);
-        inAttribute = true;
-    }
-
-    /**
-     * Writes a value for the current attribute.  
    
-     *
-     * @param   value  The attribute's value
-     *
-     * @throws  IllegalStateException
-     *          If the previous method invoked upon this object was not
-     *          {@link #attributeName attributeName}
-     */
-    public void attributeValue(String value) throws IOException {
-        if (!inAttribute || inAttributeValue)
-            throw new IllegalStateException();
-        aquote(value);
-        out.write(quoteChar);
-        inAttribute = false;
-    }
-
-    /**
-     * Writes a value (unquoted) for the current attribute.  
    
-     *
-     * @param   value  The attribute's value
-     *
-     * @throws  IllegalStateException
-     *          If the previous method invoked upon this object was not
-     *          {@link #attributeName attributeName}
-     */
-    public void attributeValueUnquoted(String value) throws IOException {
-        if (!inAttribute || inAttributeValue)
-            throw new IllegalStateException();
-        out.write(value, 0, value.length());
-        out.write(quoteChar);
-        inAttribute = false;
-    }
-
-    /**
-     * Writes one token of the current attribute's value.  Adjacent tokens will
-     * be separated by single space characters.  
    
-     *
-     * @param   token  The token to be written
-     *
-     * @throws  IllegalStateException
-     *          If the previous method invoked upon this object was neither
-     *          {@link #attributeName attributeName} nor
-     *          {@link #attributeValueToken attributeValueToken}
-     */
-    public void attributeValueToken(String token) throws IOException {
-        if (!inAttribute)
-            throw new IllegalStateException();
-        if (inAttributeValue)
-            out.write(' ');
-        aquote(token);
-        inAttributeValue = true;
-    }
-
-    /**
-     * Writes an end tag for the named element.  
    
-     *
-     * @param  name  The name to be used in the end tag
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     */
-    public void end(String name) throws IOException {
-        if (inStart) {
-            if (inAttribute)
-                out.write(quoteChar);
-            out.write("/>");
-            inStart = false;
-            inAttribute = false;
-            inAttributeValue = false;
-        } else {
-            out.write("');
-        }
-        depth--;
-        writtenChars = false;
-    }
-
-    /**
-     * Writes some character data.  
    
-     *
-     * @param  chars  The character data to be written
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     */
-    public void chars(String chars) throws IOException {
-        finishStart();
-        quote(chars);
-        writtenChars = true;
-    }
-
-    public void chars(CDATA chars) throws IOException {
-        finishStart();
-        nonQuote(chars.getText());
-        writtenChars = true;
-    }
-
-    /**
-     * Writes some character data, skipping quoting.  
    
-     *
-     * @param  chars  The character data to be written
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     */
-    public void charsUnquoted(String chars) throws IOException {
-        finishStart();
-        out.write(chars, 0, chars.length());
-        writtenChars = true;
-    }
-
-    /**
-     * Writes some character data, skipping quoting.  
    
-     *
-     * @param  buf   Buffer containing the character data to be written
-     * @param  off    The offset of the data to be written
-     * @param  len    The length of the data to be written
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     */
-    public void charsUnquoted(char[] buf, int off, int len)
-        throws IOException {
-        finishStart();
-        out.write(buf, off, len);
-        writtenChars = true;
-    }
-
-    /**
-     * Writes a leaf element with the given character content.  
    
-     *
-     * @param  name  The name to be used in the start and end tags
-     *
-     * @param  chars  The character data to be written
-     *
-     * 
     This method writes a start tag with the given name, followed by the
-     * given character data, followed by an end tag.  If the chars
-     * parameter is null or the empty string then an empty tag is
-     * written.  
    
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     */
-    public void leaf(String name, String chars) throws IOException {
-        start1(name);
-        if ((chars != null) && (chars.length() != 0))
-            chars(chars);
-        end(name);
-    }
-
-    public void inlineLeaf(String name, String chars) throws IOException {
-        start0(name);
-        if ((chars != null) && (chars.length() != 0))
-            chars(chars);
-        end(name);
-    }
-
-    /**
-     * Writes an empty leaf element.  
    
-     *
-     * @param name name to be used in the empty-element tag
-     */
-    public void leaf(String name) throws IOException {
-        leaf(name, null);
-    }
-
-    public void inlineLeaf(String name) throws IOException {
-        inlineLeaf(name, null);
-    }
-
-    /**
-     * Flushes the writer.  
    
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     */
-    public void flush() throws IOException {
-        if (depth != 0)
-            // throw new IllegalStateException("Nonzero depth");
-            // if (shouldPrettyprint)
-            out.newLine();
-        out.flush();
-    }
-
-    /**
-     * Flushes the writer and closes the underlying byte-output stream.  
    
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     */
-    public void close() throws IOException {
-        flush();
-        out.close();
-    }
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/version.properties b/jaxws/src/share/classes/com/sun/tools/internal/ws/version.properties
index b269810daa5..27f0f706450 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/version.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/version.properties
@@ -1,3 +1,29 @@
-build-id=b08
-build-version=JAX-WS RI 2.0_02-b08-fcs
-major-version=2.0_02
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
+build-id=JAX-WS RI 2.1.1
+build-version=JAX-WS RI 2.1.1
+major-version=2.1.1
+ 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/ErrorListener.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/AbortException.java
similarity index 73%
rename from jaxws/src/share/classes/com/sun/tools/internal/txw2/ErrorListener.java
rename to jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/AbortException.java
index 0602a269ef8..bc0f896e2b6 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/ErrorListener.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/AbortException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,19 +23,22 @@
  * have any questions.
  */
 
-package com.sun.tools.internal.txw2;
 
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.SAXParseException;
+
+package com.sun.tools.internal.ws.wscompile;
 
 /**
- * Used internally to report errors.
+ * @author Vivek Pandey
+ */
+/**
+ * Signals the abortion of the compilation.
+ * 
    
+ * This exception should be only thrown from {@link ErrorReceiver}
+ * for the consistent error handling.
  *
  * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
  */
-public interface ErrorListener extends ErrorHandler {
-    abstract void error (SAXParseException exception);
-    abstract void fatalError (SAXParseException exception);
-    abstract void warning (SAXParseException exception);
-
+public class AbortException extends RuntimeException {
+    public AbortException() {
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/ActionConstants.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/ActionConstants.java
deleted file mode 100644
index a91f6f7d148..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/ActionConstants.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package com.sun.tools.internal.ws.wscompile;
-
-/**
- * @author WS Development Team
- */
-public interface ActionConstants {
-//    public static final String ACTION_SERVICE_INTERFACE_GENERATOR =
-//        "service.interface.generator";
-    public static final String ACTION_SERVICE_GENERATOR =
-        "service.generator";
-    public static final String ACTION_REMOTE_INTERFACE_GENERATOR  =
-        "remote.interface.impl.generator";
-    public static final String ACTION_REMOTE_INTERFACE_IMPL_GENERATOR  =
-        "remote.interface.impl.generator";
-    public static final String ACTION_JAXB_TYPE_GENERATOR =
-        "jaxb.type.generator";
-    public static final String ACTION_CUSTOM_EXCEPTION_GENERATOR =
-        "custom.exception.generator";
-    public static final String ACTION_WSDL_GENERATOR =
-        "wsdl.generator";
-}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/local/LocalMessage.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/BadCommandLineException.java
similarity index 61%
rename from jaxws/src/share/classes/com/sun/xml/internal/ws/transport/local/LocalMessage.java
rename to jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/BadCommandLineException.java
index be979acaedd..2380ef05b50 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/local/LocalMessage.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/BadCommandLineException.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,38 +23,40 @@
  * have any questions.
  */
 
-package com.sun.xml.internal.ws.transport.local;
 
-import com.sun.xml.internal.ws.util.ByteArrayBuffer;
 
-import java.io.ByteArrayOutputStream;
-import java.util.List;
-import java.util.Map;
+package com.sun.tools.internal.ws.wscompile;
+
+import com.sun.istack.internal.Nullable;
 
 /**
- * @author WS Development Team
+ * @author Vivek Pandey
  */
-public class LocalMessage {
-    ByteArrayBuffer baos;
-    Map> headers;
+public class BadCommandLineException extends Exception {
+    private Options options;
 
-    public LocalMessage () {
+    public BadCommandLineException(String msg) {
+        super(msg);
     }
 
-    public ByteArrayBuffer getOutput() {
-        return baos;
+    public BadCommandLineException(String message, Throwable cause) {
+        super(message, cause);
     }
 
-    public void setOutput(ByteArrayBuffer baos) {
-        this.baos = baos;
+    public BadCommandLineException() {
+        this(null);
     }
 
-    public Map> getHeaders() {
-        return headers;
+    public void initOptions(Options opt) {
+        assert this.options==null;
+        this.options = opt;
     }
 
-    public void setHeaders(Map> headers) {
-        this.headers = headers;
+    /**
+     * Gets the partly parsed option object, if any.
+     */
+    public @Nullable
+    Options getOptions() {
+        return options;
     }
-
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/CompileTool.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/CompileTool.java
deleted file mode 100644
index 9110e8550a4..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/CompileTool.java
+++ /dev/null
@@ -1,967 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package com.sun.tools.internal.ws.wscompile;
-
-import com.sun.mirror.apt.AnnotationProcessor;
-import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-import com.sun.mirror.apt.AnnotationProcessorFactory;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.tools.internal.ws.processor.Processor;
-import com.sun.tools.internal.ws.processor.ProcessorAction;
-import com.sun.tools.internal.ws.processor.ProcessorConstants;
-import com.sun.tools.internal.ws.processor.ProcessorNotificationListener;
-import com.sun.tools.internal.ws.processor.ProcessorOptions;
-import com.sun.tools.internal.ws.processor.config.ClassModelInfo;
-import com.sun.tools.internal.ws.processor.config.Configuration;
-import com.sun.tools.internal.ws.processor.config.WSDLModelInfo;
-import com.sun.tools.internal.ws.processor.config.parser.Reader;
-import com.sun.tools.internal.ws.processor.generator.CustomExceptionGenerator;
-import com.sun.tools.internal.ws.processor.generator.SeiGenerator;
-import com.sun.tools.internal.ws.processor.model.Model;
-import com.sun.tools.internal.ws.processor.modeler.annotation.AnnotationProcessorContext;
-import com.sun.tools.internal.ws.processor.modeler.annotation.WebServiceAP;
-import com.sun.tools.internal.ws.processor.util.ClientProcessorEnvironment;
-import com.sun.tools.internal.ws.processor.util.GeneratedFileInfo;
-import com.sun.tools.internal.ws.processor.util.ProcessorEnvironment;
-import com.sun.tools.internal.ws.processor.util.ProcessorEnvironmentBase;
-import com.sun.xml.internal.ws.util.JAXWSUtils;
-import com.sun.tools.internal.ws.util.JavaCompilerHelper;
-import com.sun.tools.internal.ws.util.ToolBase;
-import com.sun.tools.internal.ws.util.ForkEntityResolver;
-import com.sun.tools.internal.ws.ToolVersion;
-import com.sun.xml.internal.ws.util.VersionUtil;
-import com.sun.xml.internal.ws.util.xml.XmlUtil;
-import com.sun.xml.internal.ws.util.localization.Localizable;
-import com.sun.xml.internal.ws.wsdl.writer.WSDLGenerator;
-import com.sun.xml.internal.ws.binding.BindingImpl;
-import com.sun.xml.internal.ws.binding.soap.SOAPBindingImpl;
-
-
-import javax.xml.namespace.QName;
-import javax.xml.transform.Result;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.ws.BindingType;
-import javax.xml.ws.Holder;
-import javax.xml.ws.soap.SOAPBinding;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import org.xml.sax.EntityResolver;
-
-/**
- *    This is the real implementation class for both WsGen and WsImport.
- *
- *    
    If the program being executed is WsGen, the CompileTool acts as an
- *    {@link com.sun.mirror.apt.AnnotationProcessorFactory AnnotationProcessorFactory}
- *    and uses {@link com.sun.tools.internal.ws.processor.modeler.annotation.WebServiceAP
- *    WebServiceAP} as the {@link com.sun.mirror.apt.AnnotationProcessor
- *    AnnotationProcessor} for the APT framework.  In this case APT takes control
- *    while processing the SEI passed to WsGen.  The APT framework then invokes the
- *    WebServiceAP to process classes that contain javax.jws.* annotations.
- *    WsGen uses the APT reflection library to process the SEI and to generate any
- *    JAX-WS spec mandated Java beans.
- *
- *    
    If the program being executed is WsImport, the CompileTool creates a
- *    {@link com.sun.tools.internal.ws.processor.Processor  Processor} to help with the
- *    processing.  First the {@link com.sun.tools.internal.ws.processor.Processor#runModeler()
- *    Processor.runModeler()} method is called to create an instance of the
- *    {@link com.sun.tools.internal.ws.processor.modeler.wsdl.WSDLModeler WSDLModeler} to
- *    process the WSDL being imported, which intern processes the WSDL and creates
- *    a {@link com.sun.tools.internal.ws.processor.model.Model Model} that is returned to the
- *    Processor.  The CompileTool then registers a number of
- *    {@link com.sun.tools.internal.ws.processor.ProcessorAction ProcessorActions} with the
- *    Processor.  Some of these ProcessorActions include
- *    the {@link com.sun.tools.internal.ws.processor.generator.CustomExceptionGenerator
- *    CustomExceptionGenerator} to generate Exception classes,
- *    the {@link com.sun.tools.internal.ws.processor.generator.JAXBTypeGenerator
- *    JAXBTypeGenerator} to generate JAXB types,
- *    the {@link com.sun.tools.internal.ws.processor.generator.ServiceGenerator
- *    ServiceGenerator} to generate the Service interface, and
- *    the {@link com.sun.tools.internal.ws.processor.generator.SeiGenerator
- *    RemoteInterfaceGenerator} to generate the service endpoint interface.
- *    The CompileTool then invokes the {@link com.sun.tools.internal.ws.processor.Processor#runActions()
- *    Processor.runActions()} method to cause these ProcessorActions to run.
- *    Once the ProcessorActions have been run, the CompileTool will invoke javac
- *    to compile any classes generated by the  ProcessorActions.
- *
- * @author WS Development Team
- *
- */
-public class CompileTool extends ToolBase implements ProcessorNotificationListener,
-        AnnotationProcessorFactory {
-
-    public CompileTool(OutputStream out, String program) {
-        super(out, program);
-        listener = this;
-    }
-
-    protected boolean parseArguments(String[] args) {
-        for (int i = 0; i < args.length; i++) {
-            if (args[i].equals("")) {
-                args[i] = null;
-            } else if (args[i].equals("-g")) {
-                compilerDebug = true;
-                args[i] = null;
-            } /*else if (args[i].equals("-O")) {
-                compilerOptimize = true;
-                args[i] = null;
-            }*/ else if (args[i].equals("-verbose")) {
-                verbose = true;
-                args[i] = null;
-            } else if (args[i].equals("-b")) {
-                if(program.equals(WSGEN)) {
-                    onError(getMessage("wscompile.invalidOption", args[i]));
-                    usage();
-                    return false;
-                }
-                if ((i + 1) < args.length) {
-                    args[i] = null;
-                    String file = args[++i];
-                    args[i] = null;
-                    bindingFiles.add(JAXWSUtils.absolutize(JAXWSUtils.getFileOrURLName(file)));
-                } else {
-                    onError(getMessage("wscompile.missingOptionArgument", "-b"));
-                    usage();
-                    return false;
-                }
-            } else if (args[i].equals("-version")) {
-                report(ToolVersion.VERSION.BUILD_VERSION);
-                doNothing = true;
-                args[i] = null;
-                return true;
-            } else if (args[i].equals("-keep")) {
-                keepGenerated = true;
-                args[i] = null;
-            } else if(args[i].equals("-wsdllocation")){
-                if(program.equals(WSGEN)) {
-                    onError(getMessage("wscompile.invalidOption", args[i]));
-                    usage();
-                    return false;
-                }
-                if ((i + 1) < args.length) {
-                    args[i]=null;
-                    wsdlLocation = args[++i];
-                    args[i]=null;
-                } else {
-                    onError(getMessage("wscompile.missingOptionArgument", args[i]));
-                    usage();
-                    return false;
-                }
-            } else if(args[i].equals("-p")){
-                if(program.equals(WSGEN)) {
-                    onError(getMessage("wscompile.invalidOption", args[i]));
-                    usage();
-                    return false;
-                }
-                if ((i + 1) < args.length) {
-                    args[i]=null;
-                    defaultPackage = args[++i];
-                    args[i]=null;
-                } else {
-                    onError(getMessage("wscompile.missingOptionArgument", args[i]));
-                    usage();
-                    return false;
-                }
-            }else if(args[i].equals("-catalog")){
-                if(program.equals(WSGEN)) {
-                    onError(getMessage("wscompile.invalidOption", args[i]));
-                    usage();
-                    return false;
-                }
-                if ((i + 1) < args.length) {
-                    args[i]=null;
-                    catalog = args[++i];
-                    args[i]=null;
-                } else {
-                    onError(getMessage("wscompile.missingOptionArgument", args[i]));
-                    usage();
-                    return false;
-                }
-            }else if (args[i].equals(SERVICENAME_OPTION)) {
-                if(program.equals(WSIMPORT)) {
-                    onError(getMessage("wscompile.invalidOption", args[i]));
-                    usage();
-                    return false;
-                }
-                if ((i + 1) < args.length) {
-                    args[i] = null;
-                    serviceName = QName.valueOf(args[++i]);
-                    if (serviceName.getNamespaceURI() == null || serviceName.getNamespaceURI().length() == 0) {
-                        onError(getMessage("wsgen.servicename.missing.namespace", args[i]));
-                        usage();
-                        return false;
-                    }
-                    if (serviceName.getLocalPart() == null || serviceName.getLocalPart().length() == 0) {
-                        onError(getMessage("wsgen.servicename.missing.localname", args[i]));
-                        usage();
-                        return false;
-                    }
-                    args[i] = null;
-                } else {
-                    onError(getMessage("wscompile.missingOptionArgument", args[i]));
-                    usage();
-                    return false;
-                }
-            } else if (args[i].equals(PORTNAME_OPTION)) {
-                if(program.equals(WSIMPORT)) {
-                    onError(getMessage("wscompile.invalidOption", args[i]));
-                    usage();
-                    return false;
-                }
-                if ((i + 1) < args.length) {
-                    args[i] = null;
-                    portName = QName.valueOf(args[++i]);
-                    if (portName.getNamespaceURI() == null || portName.getNamespaceURI().length() == 0) {
-                        onError(getMessage("wsgen.portname.missing.namespace", args[i]));
-                        usage();
-                        return false;
-                    }
-                    if (portName.getLocalPart() == null || portName.getLocalPart().length() == 0) {
-                        onError(getMessage("wsgen.portname.missing.localname", args[i]));
-                        usage();
-                        return false;
-                    }
-                    args[i] = null;
-                } else {
-                    onError(getMessage("wscompile.missingOptionArgument", args[i]));
-                    usage();
-                    return false;
-                }
-            } else if (args[i].equals("-d")) {
-                if ((i + 1) < args.length) {
-                    if (destDir != null) {
-                        onError(getMessage("wscompile.duplicateOption", "-d"));
-                        usage();
-                        return false;
-                    }
-                    args[i] = null;
-                    destDir = new File(args[++i]);
-                    args[i] = null;
-                    if (!destDir.exists()) {
-                        onError(getMessage("wscompile.noSuchDirectory", destDir.getPath()));
-                        usage();
-                        return false;
-                    }
-                } else {
-                    onError(getMessage("wscompile.missingOptionArgument", "-d"));
-                    usage();
-                    return false;
-                }
-            } else if (args[i].equals("-r")) {
-                if (program.equals(WSIMPORT)) {
-                    onError(getMessage("wscompile.invalidOption", args[i]));
-                    usage();
-                    return false;
-                }
-                if ((i + 1) < args.length) {
-                    if (nonclassDestDir != null) {
-                        onError(getMessage("wscompile.duplicateOption", "-r"));
-                        usage();
-                        return false;
-                    }
-                    args[i] = null;
-                    nonclassDestDir = new File(args[++i]);
-                    args[i] = null;
-                    if (!nonclassDestDir.exists()) {
-                        onError(getMessage("wscompile.noSuchDirectory", nonclassDestDir.getPath()));
-                        usage();
-                        return false;
-                    }
-                } else {
-                onError(getMessage("wscompile.missingOptionArgument", "-r"));
-                    usage();
-                    return false;
-                }
-            } else if (args[i].equals("-s")) {
-                if ((i + 1) < args.length) {
-                    if (sourceDir != null) {
-                        onError(getMessage("wscompile.duplicateOption", "-s"));
-                        usage();
-                        return false;
-                    }
-                    args[i] = null;
-                    sourceDir = new File(args[++i]);
-                    args[i] = null;
-                    if (!sourceDir.exists()) {
-                        onError(getMessage("wscompile.noSuchDirectory", sourceDir.getPath()));
-                        usage();
-                        return false;
-                    }
-                    keepGenerated = true;
-                } else {
-                    onError(getMessage("wscompile.missingOptionArgument", "-s"));
-                    usage();
-                    return false;
-                }
-            } else if (args[i].equals("-classpath") || args[i].equals("-cp")) {
-                if (program.equals(WSIMPORT)) {
-                    onError(getMessage("wscompile.invalidOption", args[i]));
-                    usage();
-                    return false;
-                }
-                if ((i + 1) < args.length) {
-                    if (userClasspath != null) {
-                        onError(getMessage("wscompile.duplicateOption", args[i]));
-                        usage();
-                        return false;
-                    }
-                    args[i] = null;
-                    userClasspath = args[++i];
-                    args[i] = null;
-                } else {
-                    onError(getMessage("wscompile.missingOptionArgument", args[i]));
-                    usage();
-                    return false;
-                }
-
-            } else if (args[i].startsWith("-httpproxy:")) {
-                if(program.equals(WSGEN)) {
-                    onError(getMessage("wscompile.invalidOption", args[i]));
-                    usage();
-                    return false;
-                }
-                String value = args[i].substring(11);
-                if (value.length() == 0) {
-                    onError(getMessage("wscompile.invalidOption", args[i]));
-                    usage();
-                    return false;
-                }
-                int index = value.indexOf(':');
-                if (index == -1) {
-                    System.setProperty("proxySet", TRUE);
-                    System.setProperty("proxyHost", value);
-                    System.setProperty("proxyPort", "8080");
-                } else {
-                    System.setProperty("proxySet", TRUE);
-                    System.setProperty("proxyHost", value.substring(0, index));
-                    System.setProperty("proxyPort", value.substring(index + 1));
-                }
-                args[i] = null;
-            } else if (args[i].startsWith("-wsdl")) {
-                if (program.equals(WSIMPORT)) {
-                    onError(getMessage("wscompile.invalidOption", args[i]));
-                    usage();
-                    return false;
-                }
-                genWsdl = true;
-                String value = args[i].substring(5);
-                int index = value.indexOf(':');
-                if (index == 0) {
-                    value = value.substring(1);
-                    index = value.indexOf('/');
-                    if (index == -1) {
-                        protocol = value;
-                        transport = HTTP;
-                    } else {
-                        protocol = value.substring(0, index);
-                        transport = value.substring(index + 1);
-                    }
-                    if (!isValidProtocol(protocol)) {
-                        onError(getMessage("wsgen.invalid.protocol", protocol, VALID_PROTOCOLS));
-                    }
-                    protocolSet = true;
-                    if (!isValidTransport(transport)) {
-                        onError(getMessage("wsgen.invalid.transport", transport, VALID_TRANSPORTS));
-                    }
-                }
-                args[i] = null;
-            } else if (args[i].equals("-extension")) {
-                extensions = true;
-                args[i] = null;
-            } else if (args[i].startsWith("-help")) {
-                help();
-                return false;
-            } else if (args[i].equals("-Xdonotoverwrite")) {
-                if(program.equals(WSIMPORT)) {
-                    onError(getMessage("wscompile.invalidOption", args[i]));
-                    usage();
-                    return false;
-                }
-                doNotOverWrite = true;
-                args[i] = null;
-            }
-        }
-
-        for (String arg : args) {
-            if (arg != null) {
-                if (arg.startsWith("-")) {
-                    onError(getMessage("wscompile.invalidOption", arg));
-                    usage();
-                    return false;
-                }
-
-                // the input source could be a local file or a URL,get the
-                // abolutized URL string
-                String fileName = arg;
-                if (program.equals(WSGEN)) {
-                    if (!isValidWSGenClass(fileName))
-                        return false;
-                }
-                inputFiles.add(fileName);
-            }
-        }
-
-        if (inputFiles.isEmpty()) {
-            onError(getMessage(program+".missingFile"));
-            usage();
-            return false;
-        }
-        if (!extensions && hasExtensions())
-            return false;
-
-        // put jaxws and jaxb binding files
-        properties.put(ProcessorOptions.BINDING_FILES, bindingFiles);
-        if (!validateArguments()) {
-            usage();
-            return false;
-        }
-        return true;
-    }
-
-    protected boolean isValidWSGenClass(String className) {
-        Class clazz = getClass(className);
-        if (clazz == null) {
-            onError(getMessage("wsgen.class.not.found", className));
-            return false;
-        }
-        if (clazz.isEnum() || clazz.isInterface() ||
-            clazz.isPrimitive()) {
-            onError(getMessage("wsgen.class.must.be.implementation.class", className));
-            return false;
-        }
-        if (genWsdl) {
-            BindingImpl binding = (BindingImpl)BindingImpl.getBinding(null, clazz, null, false);
-            if (!(binding instanceof SOAPBinding)) {
-                onError(getMessage("wsgen.cannot.gen.wsdl.for.non.soap.binding",
-                        new Object[] {className, binding.getBindingId()}));
-                return false;
-            }
-            SOAPBindingImpl soapBinding = (SOAPBindingImpl)binding;
-            if ((soapBinding.getActualBindingId().equals(SOAPBinding.SOAP12HTTP_BINDING) ||
-                soapBinding.getActualBindingId().equals(SOAPBinding.SOAP12HTTP_MTOM_BINDING)) &&
-                    !(protocol.equals(X_SOAP12) && extensions)) {
-                onError(getMessage("wsgen.cannot.gen.wsdl.for.soap12.binding",
-                        new Object[] {className, binding.getBindingId()}));
-                return false;
-            }
-            if (soapBinding.getActualBindingId().equals(SOAPBindingImpl.X_SOAP12HTTP_BINDING) &&
-                !extensions) {
-                onError(getMessage("wsgen.cannot.gen.wsdl.for.xsoap12.binding.wo.extention",
-                        new Object[] {className, binding.getBindingId()}));
-                return false;
-            }
-        }
-        return true;
-    }
-
-    protected boolean validateArguments() {
-        if (!genWsdl) {
-            if (serviceName != null) {
-                onError(getMessage("wsgen.wsdl.arg.no.genwsdl", SERVICENAME_OPTION));
-                return false;
-            }
-            if (portName != null) {
-                onError(getMessage("wsgen.wsdl.arg.no.genwsdl", PORTNAME_OPTION));
-                return false;
-            }
-        }
-        return true;
-    }
-
-    protected boolean hasExtensions() {
-        if (protocol.equalsIgnoreCase(X_SOAP12)) {
-            onError(getMessage("wsgen.soap12.without.extension"));
-            return true;
-        }
-        return false;
-    }
-
-
-    static public boolean isValidProtocol(String protocol) {
-        return (protocol.equalsIgnoreCase(SOAP11) ||
-                protocol.equalsIgnoreCase(X_SOAP12));
-    }
-
-    static public boolean isValidTransport(String transport) {
-        return (transport.equalsIgnoreCase(HTTP));
-    }
-
-    protected void run() throws Exception {
-        if (doNothing) {
-            return;
-        }
-        try {
-            beforeHook();
-            if(entityResolver == null){
-                if(catalog != null && catalog.length() > 0)
-                    entityResolver = XmlUtil.createEntityResolver(JAXWSUtils.getFileOrURL(catalog));
-            }else if(catalog != null && catalog.length() > 0){
-                EntityResolver er = XmlUtil.createEntityResolver(JAXWSUtils.getFileOrURL(catalog));
-                entityResolver =  new ForkEntityResolver(er, entityResolver);
-            }
-            environment = createEnvironment();
-            configuration = createConfiguration();
-            setEnvironmentValues(environment);
-            if (configuration.getModelInfo() instanceof ClassModelInfo) {
-                buildModel(((ClassModelInfo) configuration.getModelInfo()).getClassName());
-            } else {
-                processor = new Processor(configuration, properties);
-                configuration.getModelInfo().setEntityResolver(entityResolver);
-                configuration.getModelInfo().setDefaultJavaPackage(defaultPackage);
-                processor.runModeler();
-                withModelHook();
-                registerProcessorActions(processor);
-                processor.runActions();
-                if (environment.getErrorCount() == 0) {
-                    compileGeneratedClasses();
-                }
-            }
-            afterHook();
-        } finally {
-            if (!keepGenerated) {
-                removeGeneratedFiles();
-            }
-            if (environment != null) {
-                environment.shutdown();
-            }
-        }
-    }
-
-    protected void setEnvironmentValues(ProcessorEnvironment env) {
-        int envFlags = env.getFlags();
-        envFlags |= ProcessorEnvironment.F_WARNINGS;
-        if (verbose) {
-            envFlags |= ProcessorEnvironment.F_VERBOSE;
-        }
-        env.setFlags(envFlags);
-    }
-
-    protected void initialize() {
-        super.initialize();
-        properties = new Properties();
-        actions = new HashMap();
-        actions.put(ActionConstants.ACTION_SERVICE_GENERATOR,
-                new com.sun.tools.internal.ws.processor.generator.ServiceGenerator());
-        actions.put(ActionConstants.ACTION_REMOTE_INTERFACE_GENERATOR,
-                new SeiGenerator());
-        actions.put(ActionConstants.ACTION_CUSTOM_EXCEPTION_GENERATOR,
-                new CustomExceptionGenerator());
-        actions.put(ActionConstants.ACTION_JAXB_TYPE_GENERATOR,
-                new com.sun.tools.internal.ws.processor.generator.JAXBTypeGenerator());
-    }
-
-    public void removeGeneratedFiles() {
-        environment.deleteGeneratedFiles();
-    }
-
-    public void buildModel(String endpoint) {
-        context = new AnnotationProcessorContext();
-        webServiceAP = new WebServiceAP(this, environment, properties, context);
-
-        String classpath = environment.getClassPath();
-
-        String[] args = new String[8];
-        args[0] = "-d";
-        args[1] = destDir.getAbsolutePath();
-        args[2] = "-classpath";
-        args[3] = classpath;
-        args[4] = "-s";
-        args[5] = sourceDir.getAbsolutePath();
-        args[6] = "-XclassesAsDecls";
-        args[7] = endpoint;
-
-        int result = com.sun.tools.apt.Main.process(this, args);
-        if (result != 0) {
-            environment.error(getMessage("wscompile.compilationFailed"));
-            return;
-        }
-        if (genWsdl) {
-            String tmpPath = destDir.getAbsolutePath()+File.pathSeparator+classpath;
-            ClassLoader classLoader = new URLClassLoader(ProcessorEnvironmentBase.pathToURLs(tmpPath),
-                    this.getClass().getClassLoader());
-            Class endpointClass = null;
-
-            try {
-                endpointClass = classLoader.loadClass(endpoint);
-            } catch (ClassNotFoundException e) {
-                // this should never happen
-                environment.error(getMessage("wsgen.class.not.found", endpoint));
-            }
-            String bindingID = getBindingID(protocol);
-            if (!protocolSet) {
-                BindingImpl binding = (BindingImpl)BindingImpl.getBinding(null,
-                                                    endpointClass, null, false);
-                bindingID = binding.getBindingId();
-            }
-            com.sun.xml.internal.ws.modeler.RuntimeModeler rtModeler =
-                    new com.sun.xml.internal.ws.modeler.RuntimeModeler(endpointClass, serviceName, bindingID);
-            rtModeler.setClassLoader(classLoader);
-            if (portName != null)
-                rtModeler.setPortName(portName);
-            com.sun.xml.internal.ws.model.RuntimeModel rtModel = rtModeler.buildRuntimeModel();
-            WSDLGenerator wsdlGenerator = new WSDLGenerator(rtModel,
-                    new com.sun.xml.internal.ws.wsdl.writer.WSDLOutputResolver() {
-                        public Result getWSDLOutput(String suggestedFilename) {
-                            File wsdlFile =
-                                new File(nonclassDestDir, suggestedFilename);
-
-                            Result result = new StreamResult();
-                            try {
-                                result = new StreamResult(new FileOutputStream(wsdlFile));
-                                result.setSystemId(wsdlFile.toString().replace('\\', '/'));
-                            } catch (FileNotFoundException e) {
-                                environment.error(getMessage("wsgen.could.not.create.file", wsdlFile.toString()));
-                            }
-                            return result;
-                        }
-                        public Result getSchemaOutput(String namespace, String suggestedFilename) {
-                            if (namespace.equals(""))
-                                return null;
-                            return getWSDLOutput(suggestedFilename);
-                        }
-                        public Result getAbstractWSDLOutput(Holder filename) {
-                            return getWSDLOutput(filename.value);
-                        }
-                        public Result getSchemaOutput(String namespace, Holder filename) {
-                            return getSchemaOutput(namespace, filename.value);
-                        }
-                    }, bindingID);
-            wsdlGenerator.doGeneration();
-        }
-    }
-
-    static public String getBindingID(String protocol) {
-        if (protocol.equals(SOAP11))
-            return SOAP11_ID;
-        if (protocol.equals(X_SOAP12))
-            return SOAP12_ID;
-        return null;
-    }
-
-    public void runProcessorActions() {
-        if (!(configuration.getModelInfo() instanceof ClassModelInfo)) {
-            onError(getMessage("wscompile.classmodelinfo.expected", new Object[] { configuration
-                    .getModelInfo() }));
-            return;
-        }
-        Model model = context.getSEIContext(
-                ((ClassModelInfo) configuration.getModelInfo()).getClassName()).getModel();
-        processor = new Processor(configuration, properties, model);
-        withModelHook();
-        registerProcessorActions(processor);
-        processor.runActions();
-       // TODO throw an error
-//        if (environment.getErrorCount() != 0) {
-//        }
-
-    }
-    /**
-     * @return the SourceVersion string
-     */
-    protected String getSourceVersion() {
-        if (targetVersion == null) {
-
-            /* no target specified, defaulting to the default version,
-             * which is the latest version
-             */
-            return VersionUtil.JAXWS_VERSION_DEFAULT;
-        }
-        return targetVersion;
-    }
-
-    protected void withModelHook() {
-    }
-
-    protected void afterHook() {
-    }
-
-    protected void compileGeneratedClasses() {
-        List sourceFiles = new ArrayList();
-
-        for (Iterator iter = environment.getGeneratedFiles(); iter.hasNext();) {
-            GeneratedFileInfo fileInfo = (GeneratedFileInfo) iter.next();
-            File f = fileInfo.getFile();
-            if (f.exists() && f.getName().endsWith(".java")) {
-                sourceFiles.add(f.getAbsolutePath());
-            }
-        }
-
-        if (sourceFiles.size() > 0) {
-            String classDir = destDir.getAbsolutePath();
-            String classpathString = createClasspathString();
-            String[] args = new String[4 + (compilerDebug ? 1 : 0)
-                    + (compilerOptimize ? 1 : 0) + sourceFiles.size()];
-            args[0] = "-d";
-            args[1] = classDir;
-            args[2] = "-classpath";
-            args[3] = classpathString;
-            int baseIndex = 4;
-            if (compilerDebug) {
-                args[baseIndex++] = "-g";
-            }
-            if (compilerOptimize) {
-                args[baseIndex++] = "-O";
-            }
-            for (int i = 0; i < sourceFiles.size(); ++i) {
-                args[baseIndex + i] = sourceFiles.get(i);
-            }
-
-            // ByteArrayOutputStream javacOutput = new ByteArrayOutputStream();
-            JavaCompilerHelper compilerHelper = new JavaCompilerHelper(out);
-            boolean result = compilerHelper.compile(args);
-            if (!result) {
-                environment.error(getMessage("wscompile.compilationFailed"));
-            }
-        }
-    }
-
-    protected ProcessorAction getAction(String name) {
-        return actions.get(name);
-    }
-
-    protected String createClasspathString() {
-        if (userClasspath == null) {
-            userClasspath = "";
-        }
-        return userClasspath + File.pathSeparator + System.getProperty("java.class.path");
-    }
-
-    protected void registerProcessorActions(Processor processor) {
-        register(processor);
-    }
-
-    protected void register(Processor processor) {
-        boolean genServiceInterface = false;
-        boolean genInterface = false;
-        boolean genCustomClasses = false;
-
-        if (configuration.getModelInfo() instanceof WSDLModelInfo) {
-            genInterface = true;
-            //genInterfaceTemplate = true;
-            genServiceInterface = true;
-            genCustomClasses = true;
-        }
-
-        if (genServiceInterface) {
-            processor.add(getAction(ActionConstants.ACTION_SERVICE_GENERATOR));
-        }
-
-        if (genCustomClasses) {
-            processor.add(getAction(ActionConstants.ACTION_JAXB_TYPE_GENERATOR));
-        }
-
-        if (genInterface) {
-            processor.add(getAction(ActionConstants.ACTION_CUSTOM_EXCEPTION_GENERATOR));
-            processor.add(getAction(ActionConstants.ACTION_REMOTE_INTERFACE_GENERATOR));
-        }
-    }
-
-    protected Configuration createConfiguration() throws Exception {
-        if (environment == null)
-            environment = createEnvironment();
-        Reader reader = new Reader(environment, properties);
-        return reader.parse(entityResolver, inputFiles);
-    }
-
-    protected void beforeHook() {
-        if (destDir == null) {
-            destDir = new File(".");
-        }
-        if (sourceDir == null) {
-            sourceDir = destDir;
-        }
-        if (nonclassDestDir == null) {
-            nonclassDestDir = destDir;
-        }
-
-        properties.setProperty(ProcessorOptions.SOURCE_DIRECTORY_PROPERTY, sourceDir
-                .getAbsolutePath());
-        properties.setProperty(ProcessorOptions.DESTINATION_DIRECTORY_PROPERTY, destDir
-                .getAbsolutePath());
-        properties.setProperty(ProcessorOptions.NONCLASS_DESTINATION_DIRECTORY_PROPERTY,
-                nonclassDestDir.getAbsolutePath());
-        properties.setProperty(ProcessorOptions.EXTENSION, (extensions ? "true" : "false"));
-        properties.setProperty(ProcessorOptions.PRINT_STACK_TRACE_PROPERTY,
-                (verbose ? TRUE : FALSE));
-        properties.setProperty(ProcessorOptions.PROTOCOL, protocol);
-        properties.setProperty(ProcessorOptions.TRANSPORT, transport);
-        properties.setProperty(ProcessorOptions.JAXWS_SOURCE_VERSION, getSourceVersion());
-        if(wsdlLocation != null)
-            properties.setProperty(ProcessorOptions.WSDL_LOCATION, wsdlLocation);
-        if(defaultPackage != null)
-            properties.setProperty(ProcessorOptions.DEFAULT_PACKAGE, defaultPackage);
-        properties.setProperty(ProcessorOptions.DONOT_OVERWRITE_CLASSES, (doNotOverWrite ? TRUE : FALSE));
-    }
-
-    protected String getGenericErrorMessage() {
-        return "wscompile.error";
-    }
-
-    protected String getResourceBundleName() {
-        return "com.sun.tools.internal.ws.resources.wscompile";
-    }
-
-    public Collection supportedOptions() {
-        return supportedOptions;
-    }
-
-    public Collection supportedAnnotationTypes() {
-        return supportedAnnotations;
-    }
-
-    public void onError(Localizable msg) {
-        report(getMessage("wscompile.error", localizer.localize(msg)));
-    }
-
-    public void onWarning(Localizable msg) {
-        report(getMessage("wscompile.warning", localizer.localize(msg)));
-    }
-
-    public void onInfo(Localizable msg) {
-        report(getMessage("wscompile.info", localizer.localize(msg)));
-    }
-
-    public AnnotationProcessor getProcessorFor(Set atds,
-            AnnotationProcessorEnvironment apEnv) {
-        if (verbose)
-            apEnv.getMessager().printNotice("\tap round: " + ++round);
-        webServiceAP.init(apEnv);
-        return webServiceAP;
-    }
-
-    private Class getClass(String className) {
-        try {
-            ProcessorEnvironment env = createEnvironment();
-            return env.getClassLoader().loadClass(className);
-        } catch (ClassNotFoundException e) {
-            return null;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    private ProcessorEnvironment createEnvironment() throws Exception {
-        String cpath = userClasspath + File.pathSeparator + System.getProperty("java.class.path");
-        ProcessorEnvironment env = new ClientProcessorEnvironment(System.out, cpath, listener);
-        return env;
-    }
-
-    protected void usage() {
-        help();
-        //report(getMessage(program+".usage", program));
-    }
-
-    protected void help() {
-        report(getMessage(program+".help", program));
-        report(getMessage(program+".usage.examples"));
-    }
-
-    public void setEntityResolver(EntityResolver entityResolver) {
-        this.entityResolver = entityResolver;
-    }
-
-    /*
-     * Processor doesn't examine any options.
-     */
-    static final Collection supportedOptions = Collections
-            .unmodifiableSet(new HashSet());
-
-    /*
-     * All annotation types are supported.
-     */
-    static Collection supportedAnnotations;
-    static {
-        Collection types = new HashSet();
-        types.add("*");
-        types.add("javax.jws.*");
-        types.add("javax.jws.soap.*");
-        supportedAnnotations = Collections.unmodifiableCollection(types);
-    }
-
-    private AnnotationProcessorContext context;
-
-    private WebServiceAP webServiceAP;
-
-    private int round = 0;
-
-    // End AnnotationProcessorFactory stuff
-    // -----------------------------------------------------------------------------
-
-    protected Properties properties;
-    protected ProcessorEnvironment environment;
-    protected Configuration configuration;
-    protected ProcessorNotificationListener listener;
-    protected Processor processor;
-    protected Map actions;
-    protected List inputFiles = new ArrayList();
-    protected File sourceDir;
-    protected File destDir;
-    protected File nonclassDestDir;
-    protected boolean doNothing = false;
-    protected boolean compilerDebug = false;
-    protected boolean compilerOptimize = false;
-    protected boolean verbose = false;
-    protected boolean keepGenerated = false;
-    protected boolean doNotOverWrite = false;
-    protected boolean extensions = false;
-    protected String userClasspath = null;
-    protected Set bindingFiles = new HashSet();
-    protected boolean genWsdl = false;
-    protected String protocol = SOAP11;
-    protected boolean protocolSet = false;
-    protected String transport = HTTP;
-    protected static final String SOAP11 = "soap1.1";
-    protected static final String X_SOAP12 = "Xsoap1.2";
-    protected static final String HTTP   = "http";
-    protected static final String WSIMPORT = "wsimport";
-    protected static final String WSGEN    = "wsgen";
-    protected static final String SOAP11_ID = javax.xml.ws.soap.SOAPBinding.SOAP11HTTP_BINDING;
-    protected static final String SOAP12_ID = javax.xml.ws.soap.SOAPBinding.SOAP12HTTP_BINDING;
-    protected static final String VALID_PROTOCOLS = SOAP11 +", "+X_SOAP12;
-    protected static final String VALID_TRANSPORTS = "http";
-    protected String  targetVersion = null;
-    protected String wsdlLocation;
-    protected String defaultPackage;
-    protected String catalog;
-    protected QName serviceName;
-    protected QName portName;
-    protected static final String PORTNAME_OPTION = "-portname";
-    protected static final String SERVICENAME_OPTION = "-servicename";
-    protected EntityResolver entityResolver;
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiver.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiver.java
new file mode 100644
index 00000000000..5798f950c0a
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiver.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+
+
+package com.sun.tools.internal.ws.wscompile;
+
+import com.sun.istack.internal.Nullable;
+import com.sun.istack.internal.SAXParseException2;
+import com.sun.tools.internal.ws.resources.ModelMessages;
+import com.sun.tools.internal.xjc.api.ErrorListener;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXParseException;
+
+/**
+ * Implemented by the driver of the compiler engine to handle
+ * errors found during the compiliation.
+ *
+ * 
    
+ * This class implements {@link org.xml.sax.ErrorHandler} so it can be
+ * passed to anywhere where {@link org.xml.sax.ErrorHandler} is expected.
+ *
+ * 
    
+ * However, to make the error handling easy (and make it work
+ * with visitor patterns nicely),
+ * none of the methods on thi class throws {@link org.xml.sax.SAXException}.
+ * Instead, when the compilation needs to be aborted,
+ * it throws {@link AbortException}, which is unchecked.
+ *
+ * 
    
+ * This also implements the externally visible {@link com.sun.tools.internal.xjc.api.ErrorListener}
+ * so that we can reuse our internal implementation for testing and such.
+ *
+ * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @author Vivek Pandey
+ */
+public abstract class ErrorReceiver  implements ErrorHandler, ErrorListener {
+
+//
+//
+// convenience methods for callers
+//
+//
+    /**
+     * @param loc
+     *      can be null if the location is unknown
+     */
+    public final void error( Locator loc, String msg ) {
+        error( new SAXParseException2(msg,loc) );
+    }
+
+    public final void error( Locator loc, String msg, Exception e ) {
+        error( new SAXParseException2(msg,loc,e) );
+    }
+
+    public final void error( String msg, Exception e ) {
+        error( new SAXParseException2(msg,null,e) );
+    }
+
+    public void error(Exception e) {
+        error(e.getMessage(),e);
+    }
+
+    /**
+     * Reports a warning.
+     */
+    public final void warning( @Nullable Locator loc, String msg ) {
+        warning( new SAXParseException(msg,loc) );
+    }
+
+//
+//
+// ErrorHandler implementation, but can't throw SAXException
+//
+//
+    public abstract void error(SAXParseException exception) throws AbortException;
+    public abstract void fatalError(SAXParseException exception) throws AbortException;
+    public abstract void warning(SAXParseException exception) throws AbortException;
+
+    /**
+     * This method will be invoked periodically to allow {@link com.sun.tools.internal.xjc.AbortException}
+     * to be thrown, especially when this is driven by some kind of GUI.
+     */
+    public void pollAbort() throws AbortException {
+    }
+
+
+    /**
+     * Reports verbose messages to users.
+     *
+     * This method can be used to report additional non-essential
+     * messages. The implementation usually discards them
+     * unless some specific debug option is turned on.
+     */
+    public abstract void info(SAXParseException exception) /*REVISIT:throws AbortException*/;
+
+    /**
+     * Reports a debug message to users.
+     *
+     * @see #info(SAXParseException)
+     */
+    public final void debug( String msg ) {
+        info( new SAXParseException(msg,null) );
+    }
+
+//
+//
+// convenience methods for derived classes
+//
+//
+
+  /**
+   * Returns the human readable string representation of the
+   * {@link org.xml.sax.Locator} part of the specified
+   * {@link SAXParseException}.
+   *
+   * @return  non-null valid object.
+   */
+  protected final String getLocationString( SAXParseException e ) {
+      if(e.getLineNumber()!=-1 || e.getSystemId()!=null) {
+          int line = e.getLineNumber();
+          return ModelMessages.CONSOLE_ERROR_REPORTER_LINE_X_OF_Y(line==-1?"?":Integer.toString( line ),
+              getShortName( e.getSystemId()));
+      } else {
+          return ModelMessages.CONSOLE_ERROR_REPORTER_UNKNOWN_LOCATION();
+      }
+  }
+
+  /** Computes a short name of a given URL for display. */
+  private String getShortName( String url ) {
+      if(url==null)
+          return ModelMessages.CONSOLE_ERROR_REPORTER_UNKNOWN_LOCATION();
+      return url;
+  }
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/ConsoleErrorReporter.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiverFilter.java
similarity index 55%
rename from jaxws/src/share/classes/com/sun/tools/internal/txw2/ConsoleErrorReporter.java
rename to jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiverFilter.java
index 6798506d65c..e5516e19d80 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/ConsoleErrorReporter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiverFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,48 +23,61 @@
  * have any questions.
  */
 
-package com.sun.tools.internal.txw2;
 
+
+package com.sun.tools.internal.ws.wscompile;
+
+import com.sun.tools.internal.xjc.api.ErrorListener;
 import org.xml.sax.SAXParseException;
 
-import java.io.PrintStream;
-import java.text.MessageFormat;
-
 /**
- * Prints the error to a stream.
+ * Filter implementation of the ErrorReceiver.
+ *
+ * If an error is encountered, this filter sets a flag.
  *
  * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @author Vivek Pandey
  */
-public class ConsoleErrorReporter implements ErrorListener {
-    private final PrintStream out;
+public class ErrorReceiverFilter extends ErrorReceiver {
 
-    public ConsoleErrorReporter(PrintStream out) {
-        this.out = out;
+    public ErrorReceiverFilter() {}
+
+    public ErrorReceiverFilter( ErrorListener h ) {
+        setErrorReceiver(h);
     }
 
-    public void error(SAXParseException exception) {
-        out.print("[ERROR]   ");
-        print(exception);
+    private ErrorListener core;
+    public void setErrorReceiver( ErrorListener handler ) {
+        core = handler;
     }
 
-    public void fatalError(SAXParseException exception) {
-        out.print("[FATAL]   ");
-        print(exception);
+    private boolean hadError = false;
+    public final boolean hadError() { return hadError; }
+
+    /**
+     * Resets the error state its currently in. It allows to ignore the error reported by
+     * any sub-system.
+     */
+    public void reset(){
+        hadError = false;
+    }
+
+    public void info(SAXParseException exception) {
+        if(core!=null)  core.info(exception);
     }
 
     public void warning(SAXParseException exception) {
-        out.print("[WARNING] ");
-        print(exception);
+        if(core!=null)  core.warning(exception);
     }
 
-    private void print(SAXParseException e) {
-        out.println(e.getMessage());
-        out.println(MessageFormat.format("  {0}:{1} of {2}",
-            new Object[]{
-                String.valueOf(e.getLineNumber()),
-                String.valueOf(e.getColumnNumber()),
-                e.getSystemId()}));
+    public void error(SAXParseException exception) {
+        hadError = true;
+        if(core!=null)  core.error(exception);
     }
 
+    public void fatalError(SAXParseException exception) {
+        hadError = true;
+        if(core!=null)  core.fatalError(exception);
+    }
 
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/FilerCodeWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/FilerCodeWriter.java
index c6bbcca902f..de57d828fba 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/FilerCodeWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/FilerCodeWriter.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,19 +24,13 @@
  */
 package com.sun.tools.internal.ws.wscompile;
 
-import com.sun.tools.internal.ws.processor.util.ProcessorEnvironment;
-import java.io.File;
-import java.io.FileOutputStream;
-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 java.io.BufferedOutputStream;
-
 import com.sun.mirror.apt.Filer;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.Writer;
+
 /**
  * Writes all the source files using the specified Filer.
  *
@@ -49,9 +43,9 @@ public class FilerCodeWriter extends WSCodeWriter {
 
     private Writer w;
 
-    public FilerCodeWriter(File outDir, ProcessorEnvironment env ) throws IOException {
-        super(outDir, env);
-        this.filer = env.getFiler();
+    public FilerCodeWriter(File outDir, WsgenOptions options) throws IOException {
+        super(outDir, options);
+        this.filer = options.filer;
     }
 
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/JavaCompilerHelper.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/JavaCompilerHelper.java
new file mode 100644
index 00000000000..ea7a3dcb6d5
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/JavaCompilerHelper.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.tools.internal.ws.wscompile;
+
+import com.sun.istack.internal.tools.ParallelWorldClassLoader;
+import com.sun.tools.internal.ws.resources.JavacompilerMessages;
+
+import java.io.File;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+/**
+ * A helper class to invoke javac.
+ *
+ * @author WS Development Team
+ */
+class JavaCompilerHelper{
+    static File getJarFile(Class clazz) {
+        try {
+            URL url = ParallelWorldClassLoader.toJarUrl(clazz.getResource('/'+clazz.getName().replace('.','/')+".class"));
+            return new File(url.getPath());   // this code is assuming that url is a file URL
+        } catch (ClassNotFoundException e) {
+            // if we can't figure out where JAXB/JAX-WS API are, we couldn't have been executing this code.
+            throw new Error(e);
+        } catch (MalformedURLException e) {
+            // if we can't figure out where JAXB/JAX-WS API are, we couldn't have been executing this code.
+            throw new Error(e);
+        }
+    }
+
+    static boolean compile(String[] args, OutputStream out, ErrorReceiver receiver){
+        ClassLoader cl = Thread.currentThread().getContextClassLoader();
+        try {
+            /* try to use the new compiler */
+            Class comSunToolsJavacMainClass =
+                    cl.loadClass("com.sun.tools.javac.Main");
+            try {
+                Method compileMethod =
+                        comSunToolsJavacMainClass.getMethod(
+                                "compile",
+                                compileMethodSignature);
+                    Object result =
+                            compileMethod.invoke(
+                                    null, args, new PrintWriter(out));
+                    return result instanceof Integer && (Integer) result == 0;
+            } catch (NoSuchMethodException e2) {
+                receiver.error(JavacompilerMessages.JAVACOMPILER_NOSUCHMETHOD_ERROR("getMethod(\"compile\", Class[])"), e2);
+            } catch (IllegalAccessException e) {
+                receiver.error(e);
+            } catch (InvocationTargetException e) {
+                receiver.error(e);
+            }
+        } catch (ClassNotFoundException e) {
+            receiver.error(JavacompilerMessages.JAVACOMPILER_CLASSPATH_ERROR("com.sun.tools.javac.Main"), e);
+        } catch (SecurityException e) {
+            receiver.error(e);
+        }
+        return false;
+    }
+
+    private static final Class[] compileMethodSignature = {String[].class, PrintWriter.class};
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/Options.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/Options.java
new file mode 100644
index 00000000000..6cf05499ced
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/Options.java
@@ -0,0 +1,385 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+
+
+package com.sun.tools.internal.ws.wscompile;
+
+import com.sun.tools.internal.ws.resources.WscompileMessages;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
+
+/**
+ * Provide common jaxws tool options.
+ *
+ * @author Vivek Pandey
+ */
+public class Options {
+    /**
+     * -verbose
+     */
+    public boolean verbose;
+
+    /**
+     * - quite
+     */
+    public boolean quiet;
+
+    /**
+     * -keep
+     */
+    public boolean keep;
+
+
+
+    /**
+     * -d
+     */
+    public File destDir = new File(".");
+
+
+    /**
+     * -s
+     */
+    public File sourceDir;
+
+    public String classpath = System.getProperty("java.class.path");
+
+
+    /**
+     * -Xnocompile
+     */
+    public boolean nocompile;
+
+    public enum Target {
+        V2_0, V2_1;
+
+        /**
+         * Returns true if this version is equal or later than the given one.
+         */
+        public boolean isLaterThan(Target t) {
+            return this.ordinal() >= t.ordinal();
+        }
+
+        /**
+         * Parses "2.0" and "2.1" into the {@link Target} object.
+         *
+         * @return null for parsing failure.
+         */
+        public static Target parse(String token) {
+            if (token.equals("2.0"))
+                return Target.V2_0;
+            else if (token.equals("2.1"))
+                return Target.V2_1;
+            return null;
+        }
+
+        /**
+         * Gives the String representation of the {@link Target}
+         */
+        public String getVersion(){
+            switch(this){
+            case V2_0:
+                return "2.0";
+            case V2_1:
+                return "2.1";
+            default:
+                return null;
+            }
+        }
+    }
+
+    public Target target = Target.V2_1;
+
+    /**
+     * strictly follow the compatibility rules specified in JAXWS spec
+     */
+    public static final int STRICT = 1;
+
+    /**
+     * loosely follow the compatibility rules and allow the use of vendor
+     * binding extensions
+     */
+    public static final int EXTENSION = 2;
+
+    /**
+     * this switch determines how carefully the compiler will follow
+     * the compatibility rules in the spec. Either STRICT
+     * or EXTENSION.
+     */
+    public int compatibilityMode = STRICT;
+
+    public boolean isExtensionMode() {
+        return compatibilityMode == EXTENSION;
+    }
+
+    /**
+     * Target direcoty when producing files.
+     */
+    public File targetDir = new File(".");
+
+
+
+    public boolean debug = false;
+    public boolean debugMode = false;
+
+
+    private final List generatedFiles = new ArrayList();
+    private ClassLoader classLoader;
+
+
+    /**
+     * Remember info on  generated source file generated so that it
+     * can be removed later, if appropriate.
+     */
+    public void addGeneratedFile(File file) {
+        generatedFiles.add(file);
+    }
+
+    /**
+     * Remove generated files
+     */
+    public void removeGeneratedFiles(){
+        for(File file : generatedFiles){
+            if (file.getName().endsWith(".java")) {
+                file.delete();
+            }
+        }
+        generatedFiles.clear();
+    }
+
+    /**
+     * Return all the generated files and its types.
+     */
+    public Iterable getGeneratedFiles() {
+        return generatedFiles;
+    }
+
+    /**
+     * Delete all the generated source files made during the execution
+     * of this environment (those that have been registered with the
+     * "addGeneratedFile" method).
+     */
+    public void deleteGeneratedFiles() {
+        synchronized (generatedFiles) {
+            for (File file : generatedFiles) {
+                if (file.getName().endsWith(".java")) {
+                    file.delete();
+                }
+            }
+            generatedFiles.clear();
+        }
+    }
+
+    /**
+     * Parses arguments and fill fields of this object.
+     *
+     * @exception BadCommandLineException
+     *      thrown when there's a problem in the command-line arguments
+     */
+    public final void parseArguments( String[] args ) throws BadCommandLineException {
+
+        for (int i = 0; i < args.length; i++) {
+            if(args[i].length()==0)
+                throw new BadCommandLineException();
+            if (args[i].charAt(0) == '-') {
+                int j = parseArguments(args,i);
+                if(j==0)
+                    throw new BadCommandLineException(WscompileMessages.WSCOMPILE_INVALID_OPTION(args[i]));
+                i += (j-1);
+            } else {
+                addFile(args[i]);
+            }
+        }
+        if(destDir == null)
+            destDir = new File(".");
+        if(sourceDir == null)
+            sourceDir = destDir;
+    }
+
+
+    /**
+     * Adds a file from the argume
+     *
+     * @param arg a file, could be a wsdl or xsd or a Class
+     */
+    protected void addFile(String arg) throws BadCommandLineException {}
+
+    /**
+     * Parses an option args[i] and return
+     * the number of tokens consumed.
+     *
+     * @return
+     *      0 if the argument is not understood. Returning 0
+     *      will let the caller report an error.
+     * @exception BadCommandLineException
+     *      If the callee wants to provide a custom message for an error.
+     */
+    protected int parseArguments(String[] args, int i) throws BadCommandLineException {
+        if (args[i].equals("-g")) {
+            debug = true;
+            return 1;
+        } else if (args[i].equals("-Xdebug")) {
+            debugMode = true;
+            return 1;
+        } else if (args[i].equals("-Xendorsed")) {
+            // this option is processed much earlier, so just ignore.
+            return 1;
+        } else if (args[i].equals("-verbose")) {
+            verbose = true;
+            return 1;
+        } else if (args[i].equals("-quiet")) {
+            quiet = true;
+            return 1;
+        } else if (args[i].equals("-keep")) {
+            keep = true;
+            return 1;
+        }  else if (args[i].equals("-target")) {
+            String token = requireArgument("-target", args, ++i);
+            target = Target.parse(token);
+            if(target == null)
+                throw new BadCommandLineException(WscompileMessages.WSIMPORT_ILLEGAL_TARGET_VERSION(token));
+            return 2;
+        }else if (args[i].equals("-d")) {
+            destDir = new File(requireArgument("-d", args, ++i));
+            if (!destDir.exists())
+                throw new BadCommandLineException(WscompileMessages.WSCOMPILE_NO_SUCH_DIRECTORY(destDir.getPath()));
+            return 2;
+        } else if (args[i].equals("-s")) {
+            sourceDir = new File(requireArgument("-s", args, ++i));
+            keep = true;
+            if (!sourceDir.exists()) {
+                throw new BadCommandLineException(WscompileMessages.WSCOMPILE_NO_SUCH_DIRECTORY(sourceDir.getPath()));
+            }
+            return 2;
+        } else if (args[i].equals("-extension")) {
+            compatibilityMode = EXTENSION;
+            return 1;
+        } else if (args[i].startsWith("-help")) {
+            WeAreDone done = new WeAreDone();
+            done.initOptions(this);
+            throw done;
+        } else if (args[i].equals("-Xnocompile")) {
+            // -nocompile implies -keep. this is undocumented switch.
+            nocompile = true;
+            keep = true;
+            return 1;
+        }
+        return 0;
+    }
+
+    /**
+     * Obtains an operand and reports an error if it's not there.
+     */
+    public String requireArgument(String optionName, String[] args, int i) throws BadCommandLineException {
+        //if (i == args.length || args[i].startsWith("-")) {
+        if (args[i].startsWith("-")) {
+            throw new BadCommandLineException(WscompileMessages.WSCOMPILE_MISSING_OPTION_ARGUMENT(optionName));
+        }
+        return args[i];
+    }
+
+
+
+    /**
+     * Used to signal that we've finished processing.
+     */
+    public static final class WeAreDone extends BadCommandLineException {}
+
+    /**
+     * Get a URLClassLoader from using the classpath
+     */
+    public ClassLoader getClassLoader() {
+        if (classLoader == null) {
+            classLoader =
+                new URLClassLoader(pathToURLs(classpath),
+                    this.getClass().getClassLoader());
+        }
+        return classLoader;
+    }
+
+    /**
+     * Utility method for converting a search path string to an array
+     * of directory and JAR file URLs.
+     *
+     * @param path the search path string
+     * @return the resulting array of directory and JAR file URLs
+     */
+    public static URL[] pathToURLs(String path) {
+        StringTokenizer st = new StringTokenizer(path, File.pathSeparator);
+        URL[] urls = new URL[st.countTokens()];
+        int count = 0;
+        while (st.hasMoreTokens()) {
+            URL url = fileToURL(new File(st.nextToken()));
+            if (url != null) {
+                urls[count++] = url;
+            }
+        }
+        if (urls.length != count) {
+            URL[] tmp = new URL[count];
+            System.arraycopy(urls, 0, tmp, 0, count);
+            urls = tmp;
+        }
+        return urls;
+    }
+
+    /**
+     * Returns the directory or JAR file URL corresponding to the specified
+     * local file name.
+     *
+     * @param file the File object
+     * @return the resulting directory or JAR file URL, or null if unknown
+     */
+    public static URL fileToURL(File file) {
+        String name;
+        try {
+            name = file.getCanonicalPath();
+        } catch (IOException e) {
+            name = file.getAbsolutePath();
+        }
+        name = name.replace(File.separatorChar, '/');
+        if (!name.startsWith("/")) {
+            name = "/" + name;
+        }
+
+        // If the file does not exist, then assume that it's a directory
+        if (!file.isFile()) {
+            name = name + "/";
+        }
+        try {
+            return new URL("file", "", name);
+        } catch (MalformedURLException e) {
+            throw new IllegalArgumentException("file");
+        }
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WSCodeWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WSCodeWriter.java
index 0a116a33751..68ccb94e454 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WSCodeWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WSCodeWriter.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,13 +24,11 @@
  */
 package com.sun.tools.internal.ws.wscompile;
 
-import java.io.File;
-import java.io.IOException;
-
 import com.sun.codemodel.internal.JPackage;
 import com.sun.codemodel.internal.writer.FileCodeWriter;
-import com.sun.tools.internal.ws.processor.util.GeneratedFileInfo;
-import com.sun.tools.internal.ws.processor.util.ProcessorEnvironment;
+
+import java.io.File;
+import java.io.IOException;
 
 /**
  * {@link FileCodeWriter} implementation that notifies
@@ -40,21 +38,17 @@ import com.sun.tools.internal.ws.processor.util.ProcessorEnvironment;
  *     Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
  */
 public class WSCodeWriter extends FileCodeWriter {
-    private final ProcessorEnvironment env;
+    private final Options options;
 
-    public WSCodeWriter( File outDir, ProcessorEnvironment _env ) throws IOException {
+    public WSCodeWriter( File outDir, Options options) throws IOException {
         super(outDir);
-        this.env = _env;
+        this.options = options;
     }
 
     protected File getFile(JPackage pkg, String fileName ) throws IOException {
         File f = super.getFile(pkg, fileName);
 
-        // notify JAX-WS RI
-        GeneratedFileInfo fi = new GeneratedFileInfo();
-        fi.setType("JAXB"/*GeneratorConstants.FILE_TYPE_VALUETYPE*/);
-        fi.setFile(f);
-        env.addGeneratedFile(fi);
+        options.addGeneratedFile(f);
         // we can't really tell the file type, for we don't know
         // what this file is used for. Fortunately,
         // FILE_TYPE doesn't seem to be used, so it doesn't really
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsgenOptions.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsgenOptions.java
new file mode 100644
index 00000000000..820688bbeae
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsgenOptions.java
@@ -0,0 +1,265 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+
+
+package com.sun.tools.internal.ws.wscompile;
+
+import com.sun.mirror.apt.Filer;
+import com.sun.tools.internal.ws.resources.WscompileMessages;
+import com.sun.xml.internal.ws.api.BindingID;
+
+import javax.jws.WebService;
+import javax.xml.namespace.QName;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Vivek Pandey
+ */
+public class WsgenOptions extends Options {
+    /**
+     * -servicename
+     */
+    public QName serviceName;
+
+    /**
+     * -portname
+     */
+    public QName portName;
+
+    /**
+     * -r
+     */
+    public File nonclassDestDir;
+
+
+    /**
+     * -wsdl
+     */
+    public boolean genWsdl;
+
+    /**
+     * protocol value
+     */
+    public String protocol = "soap1.1";
+    public String transport;
+
+    /**
+     * -XwsgenReport
+     */
+    public File wsgenReport;
+
+    /**
+     * -Xdonotoverwrite
+     */
+    public boolean doNotOverWrite;
+
+    public Filer filer;
+
+
+    /**
+     * Tells if user specified a specific protocol
+     */
+    public boolean protocolSet = false;
+
+    private static final String SERVICENAME_OPTION = "-servicename";
+    private static final String PORTNAME_OPTION = "-portname";
+    private static final String HTTP   = "http";
+    private static final String SOAP11 = "soap1.1";
+    public static final String X_SOAP12 = "Xsoap1.2";
+
+    @Override
+    protected int parseArguments(String[] args, int i) throws BadCommandLineException {
+        int j = super.parseArguments(args, i);
+        if (args[i].equals(SERVICENAME_OPTION)) {
+            serviceName = QName.valueOf(requireArgument(SERVICENAME_OPTION, args, ++i));
+            if (serviceName.getNamespaceURI() == null || serviceName.getNamespaceURI().length() == 0) {
+                throw new BadCommandLineException(WscompileMessages.WSGEN_SERVICENAME_MISSING_NAMESPACE(args[i]));
+            }
+            if (serviceName.getLocalPart() == null || serviceName.getLocalPart().length() == 0) {
+                throw new BadCommandLineException(WscompileMessages.WSGEN_SERVICENAME_MISSING_LOCALNAME(args[i]));
+            }
+            return 2;
+        } else if (args[i].equals(PORTNAME_OPTION)) {
+            portName = QName.valueOf(requireArgument(PORTNAME_OPTION, args, ++i));
+            if (portName.getNamespaceURI() == null || portName.getNamespaceURI().length() == 0) {
+                throw new BadCommandLineException(WscompileMessages.WSGEN_PORTNAME_MISSING_NAMESPACE(args[i]));
+            }
+            if (portName.getLocalPart() == null || portName.getLocalPart().length() == 0) {
+                throw new BadCommandLineException(WscompileMessages.WSGEN_PORTNAME_MISSING_LOCALNAME(args[i]));
+            }
+            return 2;
+        } else if (args[i].equals("-r")) {
+            nonclassDestDir = new File(requireArgument("-r", args, ++i));
+            if (!nonclassDestDir.exists()) {
+                throw new BadCommandLineException(WscompileMessages.WSCOMPILE_NO_SUCH_DIRECTORY(nonclassDestDir.getPath()));
+            }
+            return 2;
+        } else if (args[i].equals("-classpath") || args[i].equals("-cp")) {
+            classpath = requireArgument("-classpath", args, ++i) + File.pathSeparator + System.getProperty("java.class.path");
+            return 2;
+        } else if (args[i].startsWith("-wsdl")) {
+            genWsdl = true;
+            //String value = requireArgument("-wsdl", args, ++i).substring(5);
+            String value = args[i].substring(5);
+            int index = value.indexOf(':');
+            if (index == 0) {
+                value = value.substring(1);
+                index = value.indexOf('/');
+                if (index == -1) {
+                    protocol = value;
+                    transport = HTTP;
+                } else {
+                    protocol = value.substring(0, index);
+                    transport = value.substring(index + 1);
+                }
+                protocolSet = true;
+            }
+            return 1;
+        } else if (args[i].equals("-XwsgenReport")) {
+            // undocumented switch for the test harness
+            wsgenReport = new File(requireArgument("-XwsgenReport", args, ++i));
+            return 2;
+        } else if (args[i].equals("-Xdonotoverwrite")) {
+            doNotOverWrite = true;
+            return 1;
+        }
+        return j;
+    }
+
+
+    @Override
+    protected void addFile(String arg) {
+        endpoints.add(arg);
+    }
+
+    List endpoints = new ArrayList();
+
+    public Class endpoint;
+
+
+    private boolean isImplClass;
+    private boolean noWebServiceEndpoint;
+
+    public void validate() throws BadCommandLineException {
+        if(nonclassDestDir == null)
+            nonclassDestDir = destDir;
+        if (!protocol.equalsIgnoreCase(SOAP11) &&
+                !protocol.equalsIgnoreCase(X_SOAP12)) {
+            throw new BadCommandLineException(WscompileMessages.WSGEN_INVALID_PROTOCOL(protocol, SOAP11 + ", " + X_SOAP12));
+        }
+
+        if (transport != null && !transport.equalsIgnoreCase(HTTP)) {
+            throw new BadCommandLineException(WscompileMessages.WSGEN_INVALID_TRANSPORT(transport, HTTP));
+        }
+
+        if (endpoints.isEmpty()) {
+            throw new BadCommandLineException(WscompileMessages.WSGEN_MISSING_FILE());
+        }
+        if (protocol == null || protocol.equalsIgnoreCase(X_SOAP12) && !isExtensionMode()) {
+            throw new BadCommandLineException(WscompileMessages.WSGEN_SOAP_12_WITHOUT_EXTENSION());
+        }
+
+        validateEndpointClass();
+        validateArguments();
+    }
+    /**
+     * Get an implementation class annotated with @WebService annotation.
+     */
+    private void validateEndpointClass() throws BadCommandLineException {
+        Class clazz = null;
+        for(String cls : endpoints){
+            clazz = getClass(cls);
+            if (clazz == null)
+                continue;
+
+            if (clazz.isEnum() || clazz.isInterface() ||
+                clazz.isPrimitive()) {
+                continue;
+            }
+            isImplClass = true;
+            WebService webService = (WebService) clazz.getAnnotation(WebService.class);
+            if(webService == null)
+                continue;
+            break;
+        }
+        if(clazz == null){
+            throw new BadCommandLineException(WscompileMessages.WSGEN_CLASS_NOT_FOUND(endpoints.get(0)));
+        }
+        if(!isImplClass){
+            throw new BadCommandLineException(WscompileMessages.WSGEN_CLASS_MUST_BE_IMPLEMENTATION_CLASS(clazz.getName()));
+        }
+        if(noWebServiceEndpoint){
+            throw new BadCommandLineException(WscompileMessages.WSGEN_NO_WEBSERVICES_CLASS(clazz.getName()));
+        }
+        endpoint = clazz;
+        validateBinding();
+    }
+
+    private void validateBinding() throws BadCommandLineException {
+        if (genWsdl) {
+            BindingID binding = BindingID.parse(endpoint);
+            if ((binding.equals(BindingID.SOAP12_HTTP) ||
+                 binding.equals(BindingID.SOAP12_HTTP_MTOM)) &&
+                    !(protocol.equals(X_SOAP12) && isExtensionMode())) {
+                throw new BadCommandLineException(WscompileMessages.WSGEN_CANNOT_GEN_WSDL_FOR_SOAP_12_BINDING(binding.toString(), endpoint.getName()));
+            }
+            if (binding.equals(BindingID.XML_HTTP)) {
+                throw new BadCommandLineException(WscompileMessages.WSGEN_CANNOT_GEN_WSDL_FOR_NON_SOAP_BINDING(binding.toString(), endpoint.getName()));
+            }
+        }
+    }
+
+    private void validateArguments() throws BadCommandLineException {
+        if (!genWsdl) {
+            if (serviceName != null) {
+                throw new BadCommandLineException(WscompileMessages.WSGEN_WSDL_ARG_NO_GENWSDL(SERVICENAME_OPTION));
+            }
+            if (portName != null) {
+                throw new BadCommandLineException(WscompileMessages.WSGEN_WSDL_ARG_NO_GENWSDL(PORTNAME_OPTION));
+            }
+        }
+    }
+
+    public static BindingID getBindingID(String protocol) {
+        if (protocol.equals(SOAP11))
+            return BindingID.SOAP11_HTTP;
+        if (protocol.equals(X_SOAP12))
+            return BindingID.SOAP12_HTTP;
+        return null;
+    }
+
+
+    private Class getClass(String className) {
+        try {
+            return getClassLoader().loadClass(className);
+        } catch (ClassNotFoundException e) {
+            return null;
+        }
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java
new file mode 100644
index 00000000000..a7372a66f9c
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java
@@ -0,0 +1,401 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+
+
+package com.sun.tools.internal.ws.wscompile;
+
+import com.sun.mirror.apt.AnnotationProcessor;
+import com.sun.mirror.apt.AnnotationProcessorEnvironment;
+import com.sun.mirror.apt.AnnotationProcessorFactory;
+import com.sun.mirror.declaration.AnnotationTypeDeclaration;
+import com.sun.tools.internal.ws.ToolVersion;
+import com.sun.tools.internal.ws.processor.modeler.annotation.AnnotationProcessorContext;
+import com.sun.tools.internal.ws.processor.modeler.annotation.WebServiceAP;
+import com.sun.tools.internal.ws.processor.modeler.wsdl.ConsoleErrorReporter;
+import com.sun.tools.internal.ws.resources.WscompileMessages;
+import com.sun.tools.internal.xjc.util.NullStream;
+import com.sun.xml.internal.txw2.TXW;
+import com.sun.xml.internal.txw2.TypedXmlWriter;
+import com.sun.xml.internal.txw2.annotation.XmlAttribute;
+import com.sun.xml.internal.txw2.annotation.XmlElement;
+import com.sun.xml.internal.txw2.output.StreamSerializer;
+import com.sun.xml.internal.ws.api.BindingID;
+import com.sun.xml.internal.ws.api.server.Container;
+import com.sun.xml.internal.ws.api.wsdl.writer.WSDLGeneratorExtension;
+import com.sun.xml.internal.ws.binding.WebServiceFeatureList;
+import com.sun.xml.internal.ws.model.AbstractSEIModelImpl;
+import com.sun.xml.internal.ws.model.RuntimeModeler;
+import com.sun.xml.internal.ws.util.ServiceFinder;
+import com.sun.xml.internal.ws.wsdl.writer.WSDLGenerator;
+import com.sun.xml.internal.ws.wsdl.writer.WSDLResolver;
+import org.xml.sax.SAXParseException;
+
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.namespace.QName;
+import javax.xml.transform.Result;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.ws.EndpointReference;
+import javax.xml.ws.Holder;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.lang.reflect.Field;
+import java.net.URLClassLoader;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author Vivek Pandey
+ */
+public class WsgenTool implements AnnotationProcessorFactory {
+    private final PrintStream out;
+    private final WsgenOptions options = new WsgenOptions();
+
+
+    public WsgenTool(OutputStream out, Container container) {
+        this.out = (out instanceof PrintStream)?(PrintStream)out:new PrintStream(out);
+        this.container = container;
+    }
+
+
+    public WsgenTool(OutputStream out) {
+        this(out, null);
+    }
+
+    public boolean run(String[] args){
+        final Listener listener = new Listener();
+        for (String arg : args) {
+            if (arg.equals("-version")) {
+                listener.message(ToolVersion.VERSION.BUILD_VERSION);
+                return true;
+            }
+        }
+        try {
+            options.parseArguments(args);
+            options.validate();
+            if(!buildModel(options.endpoint.getName(), listener)){
+                return false;
+            }
+        }catch (Options.WeAreDone done){
+            usage(done.getOptions());
+        }catch (BadCommandLineException e) {
+            if(e.getMessage()!=null) {
+                System.out.println(e.getMessage());
+                System.out.println();
+            }
+            usage(e.getOptions());
+            return false;
+        }finally{
+            if(!options.keep){
+                options.removeGeneratedFiles();
+            }
+        }
+        return true;
+    }
+
+    private AnnotationProcessorContext context;
+    private final Container container;
+
+    private WebServiceAP webServiceAP;
+
+    private int round = 0;
+
+    // Workaround for bug 6499165 on jax-ws,
+    // Original bug with JDK 6500594 , 6500594 when compiled with debug option,
+    private void workAroundJavacDebug() {
+        ClassLoader cl = Thread.currentThread().getContextClassLoader();
+        try {
+            final Class aptMain = cl.loadClass("com.sun.tools.apt.main.Main");
+            AccessController.doPrivileged(new PrivilegedAction() {
+                public Void run() {
+                    try {
+                        Field forcedOpts = aptMain.getDeclaredField("forcedOpts");
+                        forcedOpts.setAccessible(true);
+                        forcedOpts.set(null, new String[]{});
+                    } catch (NoSuchFieldException e) {
+                        if(options.verbose)
+                            e.printStackTrace();
+                    } catch (IllegalAccessException e) {
+                        if(options.verbose)
+                            e.printStackTrace();
+                    }
+                    return null;
+                }
+            });
+        } catch (ClassNotFoundException e) {
+            if(options.verbose)
+                e.printStackTrace();
+        }
+    }
+
+    public boolean buildModel(String endpoint, Listener listener) throws BadCommandLineException {
+        final ErrorReceiverFilter errReceiver = new ErrorReceiverFilter(listener);
+        context = new AnnotationProcessorContext();
+        webServiceAP = new WebServiceAP(options, context, errReceiver, out);
+
+        String[] args = new String[9];
+        args[0] = "-d";
+        args[1] = options.destDir.getAbsolutePath();
+        args[2] = "-classpath";
+        args[3] = options.classpath;
+        args[4] = "-s";
+        args[5] = options.sourceDir.getAbsolutePath();
+        args[6] = "-XclassesAsDecls";
+        args[7] = endpoint;
+        args[8] = "-Xbootclasspath/p:"+JavaCompilerHelper.getJarFile(EndpointReference.class)+File.pathSeparator+JavaCompilerHelper.getJarFile(XmlSeeAlso.class);
+
+        // Workaround for bug 6499165: issue with javac debug option
+        workAroundJavacDebug();
+        int result = com.sun.tools.apt.Main.process(this, args);
+        if (result != 0) {
+            out.println(WscompileMessages.WSCOMPILE_ERROR(WscompileMessages.WSCOMPILE_COMPILATION_FAILED()));
+            return false;
+        }
+        if (options.genWsdl) {
+            String tmpPath = options.destDir.getAbsolutePath()+ File.pathSeparator+options.classpath;
+            ClassLoader classLoader = new URLClassLoader(Options.pathToURLs(tmpPath),
+                    this.getClass().getClassLoader());
+            Class endpointClass;
+            try {
+                endpointClass = classLoader.loadClass(endpoint);
+            } catch (ClassNotFoundException e) {
+                throw new BadCommandLineException(WscompileMessages.WSGEN_CLASS_NOT_FOUND(endpoint));
+            }
+
+            BindingID bindingID = WsgenOptions.getBindingID(options.protocol);
+            if (!options.protocolSet) {
+                bindingID = BindingID.parse(endpointClass);
+            }
+            RuntimeModeler rtModeler = new RuntimeModeler(endpointClass, options.serviceName, bindingID);
+            rtModeler.setClassLoader(classLoader);
+            if (options.portName != null)
+                rtModeler.setPortName(options.portName);
+            AbstractSEIModelImpl rtModel = rtModeler.buildRuntimeModel();
+
+            final File[] wsdlFileName = new File[1]; // used to capture the generated WSDL file.
+            final Map schemaFiles = new HashMap();
+            WebServiceFeatureList wsfeatures = new WebServiceFeatureList(endpointClass);
+            WSDLGenerator wsdlGenerator = new WSDLGenerator(rtModel,
+                    new WSDLResolver() {
+                        private File toFile(String suggestedFilename) {
+                            return new File(options.nonclassDestDir, suggestedFilename);
+                        }
+                        private Result toResult(File file) {
+                            Result result;
+                            try {
+                                result = new StreamResult(new FileOutputStream(file));
+                                result.setSystemId(file.getPath().replace('\\', '/'));
+                            } catch (FileNotFoundException e) {
+                                errReceiver.error(e);
+                                return null;
+                            }
+                            return result;
+                        }
+
+                        public Result getWSDL(String suggestedFilename) {
+                            File f = toFile(suggestedFilename);
+                            wsdlFileName[0] = f;
+                            return toResult(f);
+                        }
+                        public Result getSchemaOutput(String namespace, String suggestedFilename) {
+                            if (namespace.equals(""))
+                                return null;
+                            File f = toFile(suggestedFilename);
+                            schemaFiles.put(namespace,f);
+                            return toResult(f);
+                        }
+                        public Result getAbstractWSDL(Holder filename) {
+                            return toResult(toFile(filename.value));
+                        }
+                        public Result getSchemaOutput(String namespace, Holder filename) {
+                            return getSchemaOutput(namespace, filename.value);
+                        }
+                        // TODO pass correct impl's class name
+                    }, bindingID.createBinding(wsfeatures.toArray()), container, endpointClass, ServiceFinder.find(WSDLGeneratorExtension.class).toArray());
+            wsdlGenerator.doGeneration();
+
+            if(options.wsgenReport!=null)
+                generateWsgenReport(endpointClass,rtModel,wsdlFileName[0],schemaFiles);
+        }
+        return true;
+    }
+
+    /**
+     * Generates a small XML file that captures the key activity of wsgen,
+     * so that test harness can pick up artifacts.
+     */
+    private void generateWsgenReport(Class endpointClass, AbstractSEIModelImpl rtModel, File wsdlFile, Map schemaFiles) {
+        try {
+            ReportOutput.Report report = TXW.create(ReportOutput.Report.class,
+                new StreamSerializer(new BufferedOutputStream(new FileOutputStream(options.wsgenReport))));
+
+            report.wsdl(wsdlFile.getAbsolutePath());
+            ReportOutput.writeQName(rtModel.getServiceQName(), report.service());
+            ReportOutput.writeQName(rtModel.getPortName(), report.port());
+            ReportOutput.writeQName(rtModel.getPortTypeName(), report.portType());
+
+            report.implClass(endpointClass.getName());
+
+            for (Map.Entry e : schemaFiles.entrySet()) {
+                ReportOutput.Schema s = report.schema();
+                s.ns(e.getKey());
+                s.location(e.getValue().getAbsolutePath());
+            }
+
+            report.commit();
+        } catch (IOException e) {
+            // this is code for the test, so we can be lousy in the error handling
+            throw new Error(e);
+        }
+    }
+
+    /**
+     * "Namespace" for code needed to generate the report file.
+     */
+    static class ReportOutput {
+        @XmlElement("report")
+        interface Report extends TypedXmlWriter {
+            @XmlElement
+            void wsdl(String file); // location of WSDL
+            @XmlElement
+            QualifiedName portType();
+            @XmlElement
+            QualifiedName service();
+            @XmlElement
+            QualifiedName port();
+
+            /**
+             * Name of the class that has {@link javax.jws.WebService}.
+             */
+            @XmlElement
+            void implClass(String name);
+
+            @XmlElement
+            Schema schema();
+        }
+
+        interface QualifiedName extends TypedXmlWriter {
+            @XmlAttribute
+            void uri(String ns);
+            @XmlAttribute
+            void localName(String localName);
+        }
+
+        interface Schema extends TypedXmlWriter {
+            @XmlAttribute
+            void ns(String ns);
+            @XmlAttribute
+            void location(String filePath);
+        }
+
+        private static void writeQName( QName n, QualifiedName w ) {
+            w.uri(n.getNamespaceURI());
+            w.localName(n.getLocalPart());
+        }
+    }
+
+    protected void usage(Options options) {
+        System.out.println(WscompileMessages.WSGEN_HELP("WSGEN"));
+        System.out.println(WscompileMessages.WSGEN_USAGE_EXAMPLES());
+    }
+
+    public Collection supportedOptions() {
+        return supportedOptions;
+    }
+
+    public Collection supportedAnnotationTypes() {
+        return supportedAnnotations;
+    }
+
+    public AnnotationProcessor getProcessorFor(Set set, AnnotationProcessorEnvironment apEnv) {
+        if (options.verbose)
+            apEnv.getMessager().printNotice("\tap round: " + ++round);
+        webServiceAP.init(apEnv);
+        return webServiceAP;
+    }
+
+    class Listener extends WsimportListener {
+        ConsoleErrorReporter cer = new ConsoleErrorReporter(out == null ? new PrintStream(new NullStream()) : out);
+
+        @Override
+        public void generatedFile(String fileName) {
+            message(fileName);
+        }
+
+        @Override
+        public void message(String msg) {
+            out.println(msg);
+        }
+
+        @Override
+        public void error(SAXParseException exception) {
+            cer.error(exception);
+        }
+
+        @Override
+        public void fatalError(SAXParseException exception) {
+            cer.fatalError(exception);
+        }
+
+        @Override
+        public void warning(SAXParseException exception) {
+            cer.warning(exception);
+        }
+
+        @Override
+        public void info(SAXParseException exception) {
+            cer.info(exception);
+        }
+    }
+
+    /*
+     * Processor doesn't examine any options.
+     */
+    static final Collection supportedOptions = Collections
+            .unmodifiableSet(new HashSet());
+
+    /*
+     * All annotation types are supported.
+     */
+    static final Collection supportedAnnotations;
+    static {
+        Collection types = new HashSet();
+        types.add("*");
+        types.add("javax.jws.*");
+        types.add("javax.jws.soap.*");
+        supportedAnnotations = Collections.unmodifiableCollection(types);
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportListener.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportListener.java
new file mode 100644
index 00000000000..fcb8c8ffc2d
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportListener.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+
+
+package com.sun.tools.internal.ws.wscompile;
+
+import com.sun.tools.internal.xjc.api.ErrorListener;
+import org.xml.sax.SAXParseException;
+
+/**
+ * @author Vivek Pandey
+ */
+public class WsimportListener implements ErrorListener {
+    /**
+     * Called for each file generated by wsimport or wsgen.
+     *
+     * 
    
+     * The file name includes the path portions that correspond with the package name.
+     *
+     * 
    
+     * When generating files into a directory, file names will be relative to the
+     * output directory.
+     *
+     * @param fileName
+     *      file names like "org/acme/foo/Foo.java"
+     *
+     */
+    public void generatedFile(String fileName) {}
+
+    /**
+     * Other miscellenous messages that do not have structures
+     * will be reported through this method.
+     *
+     * This method is used like {@link java.io.PrintStream#println(String)}.
+     * The callee is expected to add '\n'.
+     */
+    public void message(String msg) {}
+
+    public void error(SAXParseException exception) {
+
+    }
+
+    public void fatalError(SAXParseException exception) {
+
+    }
+
+    public void warning(SAXParseException exception) {
+
+    }
+
+    public void info(SAXParseException exception) {
+
+    }
+
+    /**
+     * wsimport will periodically invoke this method to see if it should cancel a compilation.
+     *
+     * @return
+     *      true if the {@link com.sun.tools.internal.ws.wscompile.WsimportListener} wants to abort the processing.
+     * @since 2.1
+     */
+    public boolean isCanceled() {
+        return false;
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportOptions.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportOptions.java
new file mode 100644
index 00000000000..477bf92dc34
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportOptions.java
@@ -0,0 +1,364 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+
+
+package com.sun.tools.internal.ws.wscompile;
+
+import com.sun.codemodel.internal.JCodeModel;
+import com.sun.tools.internal.ws.resources.ConfigurationMessages;
+import com.sun.tools.internal.ws.resources.WscompileMessages;
+import com.sun.tools.internal.ws.util.ForkEntityResolver;
+import com.sun.tools.internal.ws.wsdl.document.jaxws.JAXWSBindingsConstants;
+import com.sun.tools.internal.ws.wsdl.document.schema.SchemaConstants;
+import com.sun.tools.internal.xjc.api.SchemaCompiler;
+import com.sun.tools.internal.xjc.api.SpecVersion;
+import com.sun.tools.internal.xjc.api.XJC;
+import com.sun.tools.internal.xjc.reader.Util;
+import com.sun.xml.internal.ws.api.streaming.XMLStreamReaderFactory;
+import com.sun.xml.internal.ws.streaming.XMLStreamReaderUtil;
+import com.sun.xml.internal.ws.util.JAXWSUtils;
+import com.sun.xml.internal.ws.util.xml.XmlUtil;
+import org.w3c.dom.Element;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+import org.xml.sax.helpers.LocatorImpl;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamReader;
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Vivek Pandey
+ */
+public class WsimportOptions extends Options {
+    /**
+     * -wsdlLocation
+     */
+    public String wsdlLocation;
+
+    /**
+     * Actually stores {@link com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver}, but the field
+     * type is made to {@link org.xml.sax.EntityResolver} so that XJC can be
+     * used even if resolver.jar is not available in the classpath.
+     */
+    public EntityResolver entityResolver = null;
+
+    /**
+     * The -p option that should control the default Java package that
+     * will contain the generated code. Null if unspecified.
+     */
+    public String defaultPackage = null;
+
+    /**
+     * JAXB's {@link SchemaCompiler} to be used for handling the schema portion.
+     * This object is also configured through options.
+     */
+    private SchemaCompiler schemaCompiler = XJC.createSchemaCompiler();
+
+    public JCodeModel getCodeModel() {
+        if(codeModel == null)
+            codeModel = new JCodeModel();
+        return codeModel;
+    }
+
+    public SchemaCompiler getSchemaCompiler() {
+        schemaCompiler.setTargetVersion(SpecVersion.parse(target.getVersion()));
+        schemaCompiler.setEntityResolver(entityResolver);
+        return schemaCompiler;
+    }
+
+    public void setCodeModel(JCodeModel codeModel) {
+        this.codeModel = codeModel;
+    }
+
+    private JCodeModel codeModel;
+
+    /** -Xno-addressing-databinding option to disable addressing namespace data binding. This is
+     * experimental switch and will be working as a temporary workaround till
+     * jaxb can provide a better way to selelctively disable compiling of an
+     * schema component.
+     * **/
+    public boolean noAddressingBbinding;
+
+    @Override
+    public int parseArguments(String[] args, int i) throws BadCommandLineException {
+        int j = super.parseArguments(args ,i);
+        if(j>0) return j;   // understood by the super class
+
+        if (args[i].equals("-b")) {
+            addBindings(requireArgument("-b", args, ++i));
+            return 2;
+        } else if (args[i].equals("-wsdllocation")) {
+            wsdlLocation = requireArgument("-wsdllocation", args, ++i);
+            return 2;
+        } else if (args[i].equals("-p")) {
+            defaultPackage = requireArgument("-p", args, ++i);
+            return 2;
+        } else if (args[i].equals("-catalog")) {
+            String catalog = requireArgument("-catalog", args, ++i);
+            try {
+                if (entityResolver == null) {
+                    if (catalog != null && catalog.length() > 0)
+                        entityResolver = XmlUtil.createEntityResolver(JAXWSUtils.getFileOrURL(JAXWSUtils.absolutize(Util.escapeSpace(catalog))));
+                } else if (catalog != null && catalog.length() > 0) {
+                    EntityResolver er = XmlUtil.createEntityResolver(JAXWSUtils.getFileOrURL(JAXWSUtils.absolutize(Util.escapeSpace(catalog))));
+                    entityResolver = new ForkEntityResolver(er, entityResolver);
+                }
+            } catch (IOException e) {
+                throw new BadCommandLineException(WscompileMessages.WSIMPORT_FAILED_TO_PARSE(catalog, e.getMessage()));
+            }
+            return 2;
+        } else if (args[i].startsWith("-httpproxy:")) {
+            String value = args[i].substring(11);
+            if (value.length() == 0) {
+                throw new BadCommandLineException(WscompileMessages.WSCOMPILE_INVALID_OPTION(args[i]));
+            }
+            int index = value.indexOf(':');
+            if (index == -1) {
+                System.setProperty("proxySet", "true");
+                System.setProperty("proxyHost", value);
+                System.setProperty("proxyPort", "8080");
+            } else {
+                System.setProperty("proxySet", "true");
+                System.setProperty("proxyHost", value.substring(0, index));
+                System.setProperty("proxyPort", value.substring(index + 1));
+            }
+            return 1;
+        } else if (args[i].equals("-Xno-addressing-databinding")) {
+            noAddressingBbinding = true;
+            return 1;
+        } else if (args[i].startsWith("-B")) {
+            // JAXB option pass through.
+            String[] subCmd = new String[args.length-i];
+            System.arraycopy(args,i,subCmd,0,subCmd.length);
+            subCmd[0] = subCmd[0].substring(2); // trim off the first "-B"
+
+            com.sun.tools.internal.xjc.Options jaxbOptions = schemaCompiler.getOptions();
+            try {
+                int r = jaxbOptions.parseArgument(subCmd, 0);
+                if(r==0) {
+                    //Driver.usage(jaxbOptions,false);
+                    throw new BadCommandLineException(WscompileMessages.WSIMPORT_NO_SUCH_JAXB_OPTION(subCmd[0]));
+                }
+                return r;
+            } catch (com.sun.tools.internal.xjc.BadCommandLineException e) {
+                //Driver.usage(jaxbOptions,false);
+                throw new BadCommandLineException(e.getMessage(),e);
+            }
+        }
+
+        return 0; // what's this option?
+    }
+
+    public void validate() throws BadCommandLineException {
+        if (wsdls.isEmpty()) {
+            throw new BadCommandLineException(WscompileMessages.WSIMPORT_MISSING_FILE());
+        }
+        if(wsdlLocation == null){
+            wsdlLocation = wsdls.get(0).getSystemId();
+        }
+    }
+
+
+    @Override
+    protected void addFile(String arg) throws BadCommandLineException {
+        addFile(arg, wsdls, "*.wsdl");
+    }
+
+    private final List wsdls = new ArrayList();
+    private final List schemas = new ArrayList();
+    private final List bindingFiles = new ArrayList();
+    private final List jaxwsCustomBindings = new ArrayList();
+    private final List jaxbCustomBindings = new ArrayList();
+    private final List handlerConfigs = new ArrayList();
+
+    /**
+     * There is supposed to be one handler chain per generated SEI.
+     * TODO: There is possible bug, how to associate a @HandlerChain
+     * with each port on the generated SEI. For now lets preserve the JAXWS 2.0 FCS
+     * behaviour and generate only one @HandlerChain on the SEI
+     */
+    public Element getHandlerChainConfiguration(){
+        if(handlerConfigs.size() > 0)
+            return handlerConfigs.get(0);
+        return null;
+    }
+
+    public void addHandlerChainConfiguration(Element config){
+        handlerConfigs.add(config);
+    }
+
+    public InputSource[] getWSDLs() {
+        return wsdls.toArray(new InputSource[wsdls.size()]);
+    }
+
+    public InputSource[] getSchemas() {
+        return schemas.toArray(new InputSource[schemas.size()]);
+    }
+
+    public InputSource[] getWSDLBindings() {
+        return jaxwsCustomBindings.toArray(new InputSource[jaxwsCustomBindings.size()]);
+    }
+
+    public InputSource[] getSchemaBindings() {
+        return jaxbCustomBindings.toArray(new InputSource[jaxbCustomBindings.size()]);
+    }
+
+    public void addWSDL(File source) {
+        addWSDL(fileToInputSource(source));
+    }
+
+    public void addWSDL(InputSource is) {
+        wsdls.add(absolutize(is));
+    }
+
+    public void addSchema(File source) {
+        addSchema(fileToInputSource(source));
+    }
+
+    public void addSchema(InputSource is) {
+        schemas.add(is);
+    }
+
+    private InputSource fileToInputSource(File source) {
+        try {
+            String url = source.toURL().toExternalForm();
+            return new InputSource(Util.escapeSpace(url));
+        } catch (MalformedURLException e) {
+            return new InputSource(source.getPath());
+        }
+    }
+
+    /**
+     * Recursively scan directories and add all XSD files in it.
+     */
+    public void addGrammarRecursive(File dir) {
+        addRecursive(dir, ".wsdl", wsdls);
+        addRecursive(dir, ".xsd", schemas);
+    }
+
+    /**
+     * Adds a new input schema.
+     */
+    public void addWSDLBindFile(InputSource is) {
+        jaxwsCustomBindings.add(absolutize(is));
+    }
+
+    public void addSchemmaBindFile(InputSource is) {
+        jaxbCustomBindings.add(absolutize(is));
+    }
+
+    private void addRecursive(File dir, String suffix, List result) {
+        File[] files = dir.listFiles();
+        if (files == null) return; // work defensively
+
+        for (File f : files) {
+            if (f.isDirectory())
+                addRecursive(f, suffix, result);
+            else if (f.getPath().endsWith(suffix))
+                result.add(absolutize(fileToInputSource(f)));
+        }
+    }
+
+    private InputSource absolutize(InputSource is) {
+        // absolutize all the system IDs in the input,
+        // so that we can map system IDs to DOM trees.
+        try {
+            URL baseURL = new File(".").getCanonicalFile().toURL();
+            is.setSystemId(new URL(baseURL, is.getSystemId()).toExternalForm());
+        } catch (IOException e) {
+            // ignore
+        }
+        return is;
+    }
+
+    public void addBindings(String name) throws BadCommandLineException {
+        addFile(name, bindingFiles, null);
+    }
+
+    /**
+     * Parses a token to a file (or a set of files)
+     * and add them as {@link InputSource} to the specified list.
+     *
+     * @param suffix If the given token is a directory name, we do a recusive search
+     *               and find all files that have the given suffix.
+     */
+    private void addFile(String name, List target, String suffix) throws BadCommandLineException {
+        Object src;
+        try {
+            src = Util.getFileOrURL(name);
+        } catch (IOException e) {
+            throw new BadCommandLineException(WscompileMessages.WSIMPORT_NOT_A_FILE_NOR_URL(name));
+        }
+        if (src instanceof URL) {
+            target.add(absolutize(new InputSource(Util.escapeSpace(((URL) src).toExternalForm()))));
+        } else {
+            File fsrc = (File) src;
+            if (fsrc.isDirectory()) {
+                addRecursive(fsrc, suffix, target);
+            } else {
+                target.add(absolutize(fileToInputSource(fsrc)));
+            }
+        }
+    }
+
+
+    /**
+     * Exposing it as a public method to allow external tools such as NB to read from wsdl model and work on it.
+     * TODO: WSDL model needs to be exposed - basically at tool time we need to use the runtimw wsdl model
+     *
+     * Binding files could be jaxws or jaxb. This method identifies jaxws and jaxb binding files and keeps them separately. jaxb binding files are given separately
+     * to JAXB in {@link com.sun.tools.internal.ws.processor.modeler.wsdl.JAXBModelBuilder}
+     *
+     * @param receiver {@link ErrorReceiver}
+     */
+    public final void parseBindings(ErrorReceiver receiver){
+        for (InputSource is : bindingFiles) {
+            XMLStreamReader reader =
+                    XMLStreamReaderFactory.create(is,true);
+            XMLStreamReaderUtil.nextElementContent(reader);
+            if (reader.getName().equals(JAXWSBindingsConstants.JAXWS_BINDINGS)) {
+                jaxwsCustomBindings.add(is);
+            } else if (reader.getName().equals(JAXWSBindingsConstants.JAXB_BINDINGS) ||
+                    reader.getName().equals(new QName(SchemaConstants.NS_XSD, "schema"))) {
+                jaxbCustomBindings.add(is);
+            } else {
+                LocatorImpl locator = new LocatorImpl();
+                locator.setSystemId(reader.getLocation().getSystemId());
+                locator.setPublicId(reader.getLocation().getPublicId());
+                locator.setLineNumber(reader.getLocation().getLineNumber());
+                locator.setColumnNumber(reader.getLocation().getColumnNumber());
+                receiver.warning(locator, ConfigurationMessages.CONFIGURATION_NOT_BINDING_FILE(is.getSystemId()));
+            }
+        }
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java
new file mode 100644
index 00000000000..602bb94c994
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java
@@ -0,0 +1,248 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+
+
+package com.sun.tools.internal.ws.wscompile;
+
+import com.sun.codemodel.internal.CodeWriter;
+import com.sun.codemodel.internal.writer.ProgressCodeWriter;
+import com.sun.tools.internal.ws.ToolVersion;
+import com.sun.tools.internal.ws.api.TJavaGeneratorExtension;
+import com.sun.tools.internal.ws.processor.generator.CustomExceptionGenerator;
+import com.sun.tools.internal.ws.processor.generator.SeiGenerator;
+import com.sun.tools.internal.ws.processor.generator.ServiceGenerator;
+import com.sun.tools.internal.ws.processor.model.Model;
+import com.sun.tools.internal.ws.processor.modeler.wsdl.ConsoleErrorReporter;
+import com.sun.tools.internal.ws.processor.modeler.wsdl.WSDLModeler;
+import com.sun.tools.internal.ws.resources.WscompileMessages;
+import com.sun.tools.internal.ws.resources.WsdlMessages;
+import com.sun.tools.internal.xjc.util.NullStream;
+import com.sun.xml.internal.ws.api.server.Container;
+import com.sun.xml.internal.ws.util.ServiceFinder;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.SAXParseException;
+
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.ws.EndpointReference;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Vivek Pandey
+ */
+public class WsimportTool {
+    private static final String WSIMPORT = "wsimport";
+    private final PrintStream out;
+    private final Container container;
+
+    /**
+     * Wsimport specific options
+     */
+    private final WsimportOptions options = new WsimportOptions();
+
+    public WsimportTool(OutputStream out) {
+        this(out, null);
+    }
+
+    public WsimportTool(OutputStream logStream, Container container) {
+        this.out = (logStream instanceof PrintStream)?(PrintStream)logStream:new PrintStream(logStream);
+        this.container = container;
+    }
+
+
+    public boolean run(String[] args) {
+        class Listener extends WsimportListener {
+            ConsoleErrorReporter cer = new ConsoleErrorReporter(out == null ? new PrintStream(new NullStream()) : out);
+
+            @Override
+            public void generatedFile(String fileName) {
+                message(fileName);
+            }
+
+            @Override
+            public void message(String msg) {
+                out.println(msg);
+            }
+
+            @Override
+            public void error(SAXParseException exception) {
+                cer.error(exception);
+            }
+
+            @Override
+            public void fatalError(SAXParseException exception) {
+                cer.fatalError(exception);
+            }
+
+            @Override
+            public void warning(SAXParseException exception) {
+                cer.warning(exception);
+            }
+
+            @Override
+            public void info(SAXParseException exception) {
+                cer.info(exception);
+            }
+
+            public void enableDebugging(){
+                cer.enableDebugging();
+            }
+        }
+        final Listener listener = new Listener();
+        ErrorReceiverFilter receiver = new ErrorReceiverFilter(listener) {
+            public void info(SAXParseException exception) {
+                if (options.verbose)
+                    super.info(exception);
+            }
+
+            public void warning(SAXParseException exception) {
+                if (!options.quiet)
+                    super.warning(exception);
+            }
+
+            @Override
+            public void pollAbort() throws AbortException {
+                if (listener.isCanceled())
+                    throw new AbortException();
+            }
+        };
+
+        for (String arg : args) {
+            if (arg.equals("-version")) {
+                listener.message(ToolVersion.VERSION.BUILD_VERSION);
+                return true;
+            }
+        }
+        try {
+            options.parseArguments(args);
+            options.validate();
+            if(options.debugMode)
+                listener.enableDebugging();
+            options.parseBindings(receiver);
+
+            try {
+                if( !options.quiet )
+                    listener.message(WscompileMessages.WSIMPORT_PARSING_WSDL());
+
+                WSDLModeler wsdlModeler = new WSDLModeler(options, receiver);
+                Model wsdlModel = wsdlModeler.buildModel();
+                if (wsdlModel == null) {
+                    listener.message(WsdlMessages.PARSING_PARSE_FAILED());
+                    return false;
+                }
+
+                //generated code
+                if( !options.quiet )
+                    listener.message(WscompileMessages.WSIMPORT_GENERATING_CODE());
+
+                TJavaGeneratorExtension[] genExtn = ServiceFinder.find(TJavaGeneratorExtension.class).toArray();
+                CustomExceptionGenerator.generate(wsdlModel,  options, receiver);
+                SeiGenerator.generate(wsdlModel, options, receiver, genExtn);
+                ServiceGenerator.generate(wsdlModel, options, receiver);
+                CodeWriter cw = new WSCodeWriter(options.sourceDir, options);
+                if (options.verbose)
+                    cw = new ProgressCodeWriter(cw, System.out);
+                options.getCodeModel().build(cw);
+            } catch(AbortException e){
+                //error might have been reported
+            }catch (IOException e) {
+                receiver.error(e);
+            }
+
+            if (!options.nocompile){
+                if(!compileGeneratedClasses(receiver)){
+                    listener.message(WscompileMessages.WSCOMPILE_COMPILATION_FAILED());
+                    return false;
+                }
+            }
+
+        } catch (Options.WeAreDone done) {
+            usage(done.getOptions());
+        } catch (BadCommandLineException e) {
+            if (e.getMessage() != null) {
+                System.out.println(e.getMessage());
+                System.out.println();
+            }
+            usage(e.getOptions());
+            return false;
+        } finally{
+            if(!options.keep){
+                options.removeGeneratedFiles();
+            }
+        }
+        return true;
+    }
+
+    public void setEntityResolver(EntityResolver resolver){
+        this.options.entityResolver = resolver;
+    }
+
+    protected boolean compileGeneratedClasses(ErrorReceiver receiver){
+        List sourceFiles = new ArrayList();
+
+        for (File f : options.getGeneratedFiles()) {
+            if (f.exists() && f.getName().endsWith(".java")) {
+                sourceFiles.add(f.getAbsolutePath());
+            }
+        }
+
+        if (sourceFiles.size() > 0) {
+            String classDir = options.destDir.getAbsolutePath();
+            String classpathString = createClasspathString();
+            String[] args = new String[5 + (options.debug ? 1 : 0)
+                    + sourceFiles.size()];
+            args[0] = "-d";
+            args[1] = classDir;
+            args[2] = "-classpath";
+            args[3] = classpathString;
+            args[4] = "-Xbootclasspath/p:"+JavaCompilerHelper.getJarFile(EndpointReference.class)+File.pathSeparator+JavaCompilerHelper.getJarFile(XmlSeeAlso.class);
+            int baseIndex = 5;
+            if (options.debug) {
+                args[baseIndex++] = "-g";
+            }
+            for (int i = 0; i < sourceFiles.size(); ++i) {
+                args[baseIndex + i] = sourceFiles.get(i);
+            }
+
+            return JavaCompilerHelper.compile(args, out, receiver);
+        }
+        //there are no files to compile, so return true?
+        return true;
+    }
+
+    private String createClasspathString() {
+        return System.getProperty("java.class.path");
+    }
+
+    protected void usage(Options options) {
+        System.out.println(WscompileMessages.WSIMPORT_HELP(WSIMPORT));
+        System.out.println(WscompileMessages.WSIMPORT_USAGE_EXAMPLES());
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Binding.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Binding.java
index 28b2f3bfa1b..acecc1abad2 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Binding.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Binding.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,28 @@
 
 package com.sun.tools.internal.ws.wsdl.document;
 
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtensible;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtension;
+import com.sun.tools.internal.ws.wsdl.framework.*;
+import com.sun.tools.internal.ws.resources.WsdlMessages;
+import com.sun.tools.internal.ws.wscompile.AbortException;
+import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
+import org.xml.sax.Locator;
+
+import javax.xml.namespace.QName;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import javax.xml.namespace.QName;
-
-import com.sun.tools.internal.ws.wsdl.framework.AbstractDocument;
-import com.sun.tools.internal.ws.wsdl.framework.Defining;
-import com.sun.tools.internal.ws.wsdl.framework.Entity;
-import com.sun.tools.internal.ws.wsdl.framework.EntityAction;
-import com.sun.tools.internal.ws.wsdl.framework.EntityReferenceAction;
-import com.sun.tools.internal.ws.wsdl.framework.ExtensibilityHelper;
-import com.sun.tools.internal.ws.wsdl.framework.Extensible;
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
-import com.sun.tools.internal.ws.wsdl.framework.GlobalEntity;
-import com.sun.tools.internal.ws.wsdl.framework.Kind;
-import com.sun.tools.internal.ws.wsdl.framework.QNameAction;
-
 /**
  * Entity corresponding to the "binding" WSDL element.
  *
  * @author WS Development Team
  */
-public class Binding extends GlobalEntity implements Extensible {
+public class Binding extends GlobalEntity implements TWSDLExtensible {
 
-    public Binding(Defining defining) {
-        super(defining);
+    public Binding(Defining defining, Locator locator, ErrorReceiver receiver) {
+        super(defining, locator, receiver);
         _operations = new ArrayList();
         _helper = new ExtensibilityHelper();
     }
@@ -73,7 +68,12 @@ public class Binding extends GlobalEntity implements Extensible {
     }
 
     public PortType resolvePortType(AbstractDocument document) {
-        return (PortType) document.find(Kinds.PORT_TYPE, _portType);
+        try {
+            return (PortType) document.find(Kinds.PORT_TYPE, _portType);
+        } catch (NoSuchEntityException e) {
+            errorReceiver.error(getLocator(), WsdlMessages.ENTITY_NOT_FOUND_PORT_TYPE(_portType, new QName(getNamespaceURI(), getName())));
+            throw new AbortException();
+        }
     }
 
     public Kind getKind() {
@@ -133,16 +133,38 @@ public class Binding extends GlobalEntity implements Extensible {
         }
     }
 
-    public void addExtension(Extension e) {
+    public String getNameValue() {
+        return getName();
+    }
+
+    public String getNamespaceURI() {
+        return getDefining().getTargetNamespaceURI();
+    }
+
+    public QName getWSDLElementName() {
+        return getElementName();
+    }
+
+    public void addExtension(TWSDLExtension e) {
         _helper.addExtension(e);
     }
 
-    public Iterator extensions() {
+    public Iterable extensions() {
         return _helper.extensions();
     }
 
+    public TWSDLExtensible getParent() {
+        return parent;
+    }
+
     private ExtensibilityHelper _helper;
     private Documentation _documentation;
     private QName _portType;
     private List _operations;
+
+    public void setParent(TWSDLExtensible parent) {
+        this.parent = parent;
+    }
+
+    private TWSDLExtensible parent;
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingFault.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingFault.java
index 65c1ba95372..d8aaaf8d2cd 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingFault.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingFault.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,24 +25,24 @@
 
 package com.sun.tools.internal.ws.wsdl.document;
 
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtensible;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtension;
 import com.sun.tools.internal.ws.wsdl.framework.Entity;
 import com.sun.tools.internal.ws.wsdl.framework.EntityAction;
 import com.sun.tools.internal.ws.wsdl.framework.ExtensibilityHelper;
-import com.sun.tools.internal.ws.wsdl.framework.Extensible;
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
+import org.xml.sax.Locator;
+
+import javax.xml.namespace.QName;
 
 /**
  * Entity corresponding to the "fault" child element of a binding operation.
  *
  * @author WS Development Team
  */
-public class BindingFault extends Entity implements Extensible {
+public class BindingFault extends Entity implements TWSDLExtensible {
 
-    public BindingFault() {
+    public BindingFault(Locator locator) {
+        super(locator);
         _helper = new ExtensibilityHelper();
     }
 
@@ -66,14 +66,30 @@ public class BindingFault extends Entity implements Extensible {
         _documentation = d;
     }
 
-    public void addExtension(Extension e) {
+    public String getNameValue() {
+        return getName();
+    }
+
+    public String getNamespaceURI() {
+        return getParent().getNamespaceURI();
+    }
+
+    public QName getWSDLElementName() {
+        return getElementName();
+    }
+
+    public void addExtension(TWSDLExtension e) {
         _helper.addExtension(e);
     }
 
-    public Iterator extensions() {
+    public Iterable extensions() {
         return _helper.extensions();
     }
 
+    public TWSDLExtensible getParent() {
+        return parent;
+    }
+
     public void withAllSubEntitiesDo(EntityAction action) {
         _helper.withAllSubEntitiesDo(action);
     }
@@ -93,4 +109,10 @@ public class BindingFault extends Entity implements Extensible {
     private ExtensibilityHelper _helper;
     private Documentation _documentation;
     private String _name;
+
+    public void setParent(TWSDLExtensible parent) {
+        this.parent = parent;
+    }
+
+    private TWSDLExtensible parent;
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingInput.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingInput.java
index 5aca9570f70..175e491bfa0 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingInput.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingInput.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,24 @@
 
 package com.sun.tools.internal.ws.wsdl.document;
 
-import java.util.Iterator;
-import javax.xml.namespace.QName;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtensible;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtension;
+import com.sun.tools.internal.ws.wsdl.framework.Entity;
 import com.sun.tools.internal.ws.wsdl.framework.EntityAction;
 import com.sun.tools.internal.ws.wsdl.framework.ExtensibilityHelper;
-import com.sun.tools.internal.ws.wsdl.framework.Extensible;
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
-import com.sun.tools.internal.ws.wsdl.framework.Entity;
+import org.xml.sax.Locator;
+
+import javax.xml.namespace.QName;
 
 /**
  * Entity corresponding to the "input" child element of a binding operation.
  *
  * @author WS Development Team
  */
-public class BindingInput extends Entity implements Extensible {
+public class BindingInput extends Entity implements TWSDLExtensible {
 
-    public BindingInput() {
+    public BindingInput(Locator locator) {
+        super(locator);
         _helper = new ExtensibilityHelper();
     }
 
@@ -64,14 +66,30 @@ public class BindingInput extends Entity implements Extensible {
         _documentation = d;
     }
 
-    public void addExtension(Extension e) {
+    public String getNameValue() {
+        return getName();
+    }
+
+    public String getNamespaceURI() {
+        return getParent().getNamespaceURI();
+    }
+
+    public QName getWSDLElementName() {
+        return getElementName();
+    }
+
+    public void addExtension(TWSDLExtension e) {
         _helper.addExtension(e);
     }
 
-    public Iterator extensions() {
+    public Iterable extensions() {
         return _helper.extensions();
     }
 
+    public TWSDLExtensible getParent() {
+        return parent;
+    }
+
     public void withAllSubEntitiesDo(EntityAction action) {
         _helper.withAllSubEntitiesDo(action);
     }
@@ -88,4 +106,10 @@ public class BindingInput extends Entity implements Extensible {
     private ExtensibilityHelper _helper;
     private Documentation _documentation;
     private String _name;
+
+    public void setParent(TWSDLExtensible parent) {
+        this.parent = parent;
+    }
+
+    private TWSDLExtensible parent;
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingOperation.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingOperation.java
index 272784b2f33..2de06846124 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingOperation.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingOperation.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,27 +25,27 @@
 
 package com.sun.tools.internal.ws.wsdl.document;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtensible;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtension;
 import com.sun.tools.internal.ws.wsdl.framework.Entity;
 import com.sun.tools.internal.ws.wsdl.framework.EntityAction;
 import com.sun.tools.internal.ws.wsdl.framework.ExtensibilityHelper;
-import com.sun.tools.internal.ws.wsdl.framework.Extensible;
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
+import org.xml.sax.Locator;
+
+import javax.xml.namespace.QName;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Entity corresponding to the "operation" child element of a WSDL "binding" element.
  *
  * @author WS Development Team
  */
-public class BindingOperation extends Entity implements Extensible {
+public class BindingOperation extends Entity implements TWSDLExtensible {
 
-    public BindingOperation() {
-        _faults = new ArrayList();
+    public BindingOperation(Locator locator) {
+        super(locator);
+        _faults = new ArrayList();
         _helper = new ExtensibilityHelper();
     }
 
@@ -117,8 +117,8 @@ public class BindingOperation extends Entity implements Extensible {
         _faults.add(f);
     }
 
-    public Iterator faults() {
-        return _faults.iterator();
+    public Iterable faults() {
+        return _faults;
     }
 
     public QName getElementName() {
@@ -133,14 +133,30 @@ public class BindingOperation extends Entity implements Extensible {
         _documentation = d;
     }
 
-    public void addExtension(Extension e) {
+    public String getNameValue() {
+        return getName();
+    }
+
+    public String getNamespaceURI() {
+        return parent.getNamespaceURI();
+    }
+
+    public QName getWSDLElementName() {
+        return getElementName();
+    }
+
+    public void addExtension(TWSDLExtension e) {
         _helper.addExtension(e);
     }
 
-    public Iterator extensions() {
+    public Iterable extensions() {
         return _helper.extensions();
     }
 
+    public TWSDLExtensible getParent() {
+        return parent;
+    }
+
     public void withAllSubEntitiesDo(EntityAction action) {
         if (_input != null) {
             action.perform(_input);
@@ -148,8 +164,8 @@ public class BindingOperation extends Entity implements Extensible {
         if (_output != null) {
             action.perform(_output);
         }
-        for (Iterator iter = _faults.iterator(); iter.hasNext();) {
-            action.perform((Entity) iter.next());
+        for (BindingFault _fault : _faults) {
+            action.perform(_fault);
         }
         _helper.withAllSubEntitiesDo(action);
     }
@@ -164,8 +180,8 @@ public class BindingOperation extends Entity implements Extensible {
         if (_output != null) {
             _output.accept(visitor);
         }
-        for (Iterator iter = _faults.iterator(); iter.hasNext();) {
-            ((BindingFault) iter.next()).accept(visitor);
+        for (BindingFault _fault : _faults) {
+            _fault.accept(visitor);
         }
         visitor.postVisit(this);
     }
@@ -197,7 +213,13 @@ public class BindingOperation extends Entity implements Extensible {
     private String _name;
     private BindingInput _input;
     private BindingOutput _output;
-    private List _faults;
+    private List _faults;
     private OperationStyle _style;
     private String _uniqueKey;
+
+    public void setParent(TWSDLExtensible parent) {
+        this.parent = parent;
+    }
+
+    private TWSDLExtensible parent;
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingOutput.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingOutput.java
index 2bf4757d0a9..70482a7cfcd 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingOutput.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingOutput.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,24 +25,24 @@
 
 package com.sun.tools.internal.ws.wsdl.document;
 
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtensible;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtension;
 import com.sun.tools.internal.ws.wsdl.framework.Entity;
 import com.sun.tools.internal.ws.wsdl.framework.EntityAction;
 import com.sun.tools.internal.ws.wsdl.framework.ExtensibilityHelper;
-import com.sun.tools.internal.ws.wsdl.framework.Extensible;
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
+import org.xml.sax.Locator;
+
+import javax.xml.namespace.QName;
 
 /**
  * Entity corresponding to the "output" child element of a binding operation.
  *
  * @author WS Development Team
  */
-public class BindingOutput extends Entity implements Extensible {
+public class BindingOutput extends Entity implements TWSDLExtensible {
 
-    public BindingOutput() {
+    public BindingOutput(Locator locator) {
+        super(locator);
         _helper = new ExtensibilityHelper();
     }
 
@@ -66,14 +66,30 @@ public class BindingOutput extends Entity implements Extensible {
         _documentation = d;
     }
 
-    public void addExtension(Extension e) {
+    public String getNameValue() {
+        return getName();
+    }
+
+    public String getNamespaceURI() {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public QName getWSDLElementName() {
+        return getElementName();
+    }
+
+    public void addExtension(TWSDLExtension e) {
         _helper.addExtension(e);
     }
 
-    public Iterator extensions() {
+    public Iterable extensions() {
         return _helper.extensions();
     }
 
+    public TWSDLExtensible getParent() {
+        return parent;
+    }
+
     public void withAllSubEntitiesDo(EntityAction action) {
         _helper.withAllSubEntitiesDo(action);
     }
@@ -87,6 +103,12 @@ public class BindingOutput extends Entity implements Extensible {
     public void validateThis() {
     }
 
+
+    public void setParent(TWSDLExtensible parent) {
+        this.parent = parent;
+    }
+
+    private TWSDLExtensible parent;
     private ExtensibilityHelper _helper;
     private Documentation _documentation;
     private String _name;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Definitions.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Definitions.java
index 64d19dfcbcd..8fd70787d33 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Definitions.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Definitions.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,31 +25,23 @@
 
 package com.sun.tools.internal.ws.wsdl.document;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtensible;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtension;
+import com.sun.tools.internal.ws.wsdl.framework.*;
+import org.xml.sax.Locator;
 
 import javax.xml.namespace.QName;
-
-import com.sun.tools.internal.ws.wsdl.framework.AbstractDocument;
-import com.sun.tools.internal.ws.wsdl.framework.Defining;
-import com.sun.tools.internal.ws.wsdl.framework.DuplicateEntityException;
-import com.sun.tools.internal.ws.wsdl.framework.Entity;
-import com.sun.tools.internal.ws.wsdl.framework.EntityAction;
-import com.sun.tools.internal.ws.wsdl.framework.ExtensibilityHelper;
-import com.sun.tools.internal.ws.wsdl.framework.Extensible;
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
+import java.util.*;
 
 /**
  * Entity corresponding to the "definitions" WSDL element.
  *
  * @author WS Development Team
  */
-public class Definitions extends Entity implements Defining, Extensible {
+public class Definitions extends Entity implements Defining, TWSDLExtensible {
 
-    public Definitions(AbstractDocument document) {
+    public Definitions(AbstractDocument document, Locator locator) {
+        super(locator);
         _document = document;
         _bindings = new ArrayList();
         _imports = new ArrayList();
@@ -133,7 +125,15 @@ public class Definitions extends Entity implements Defining, Extensible {
         return _services.iterator();
     }
 
-    public QName getElementName() {
+    public String getNameValue() {
+        return getName();
+    }
+
+    public String getNamespaceURI() {
+        return getTargetNamespaceURI();
+    }
+
+    public QName getWSDLElementName() {
         return WSDLConstants.QNAME_DEFINITIONS;
     }
 
@@ -145,14 +145,21 @@ public class Definitions extends Entity implements Defining, Extensible {
         _documentation = d;
     }
 
-    public void addExtension(Extension e) {
+    public void addExtension(TWSDLExtension e) {
         _helper.addExtension(e);
     }
 
-    public Iterator extensions() {
+    public Iterable extensions() {
         return _helper.extensions();
     }
 
+    /**
+     * wsdl:definition is the root hence no parent so return null.
+     */
+    public TWSDLExtensible getParent() {
+        return null;
+    }
+
     public void withAllSubEntitiesDo(EntityAction action) {
         if (_types != null) {
             action.perform(_types);
@@ -218,4 +225,8 @@ public class Definitions extends Entity implements Defining, Extensible {
     private List _services;
     private List _imports;
     private Set _importedNamespaces;
+
+    public QName getElementName() {
+        return getWSDLElementName();
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Documentation.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Documentation.java
index b49779fa71f..820a8b904c2 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Documentation.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Documentation.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Fault.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Fault.java
index d280d89330e..a6d1a3dcd53 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Fault.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Fault.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,26 +25,22 @@
 
 package com.sun.tools.internal.ws.wsdl.document;
 
-import java.util.Iterator;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtensible;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtension;
+import com.sun.tools.internal.ws.wsdl.framework.*;
+import org.xml.sax.Locator;
 
 import javax.xml.namespace.QName;
 
-import com.sun.tools.internal.ws.wsdl.framework.AbstractDocument;
-import com.sun.tools.internal.ws.wsdl.framework.Entity;
-import com.sun.tools.internal.ws.wsdl.framework.EntityReferenceAction;
-import com.sun.tools.internal.ws.wsdl.framework.ExtensibilityHelper;
-import com.sun.tools.internal.ws.wsdl.framework.Extensible;
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
-import com.sun.tools.internal.ws.wsdl.framework.QNameAction;
-
 /**
  * Entity corresponding to the "fault" child element of a port type operation.
  *
  * @author WS Development Team
  */
-public class Fault extends Entity implements Extensible{
+public class Fault extends Entity implements TWSDLExtensible {
 
-    public Fault() {
+    public Fault(Locator locator) {
+        super(locator);
         _helper = new ExtensibilityHelper();
     }
 
@@ -110,20 +106,52 @@ public class Fault extends Entity implements Extensible{
     private Documentation _documentation;
     private String _name;
     private QName _message;
+    private String _action;
     private ExtensibilityHelper _helper;
 
+    public String getNameValue() {
+        return getName();
+    }
+
+    public String getNamespaceURI() {
+        return parent.getNamespaceURI();
+    }
+
+    public QName getWSDLElementName() {
+        return getElementName();
+    }
+
     /* (non-Javadoc)
-     * @see Extensible#addExtension(Extension)
-     */
-    public void addExtension(Extension e) {
+    * @see TWSDLExtensible#addExtension(ExtensionImpl)
+    */
+    public void addExtension(TWSDLExtension e) {
         _helper.addExtension(e);
 
     }
 
     /* (non-Javadoc)
-     * @see Extensible#extensions()
+     * @see TWSDLExtensible#extensions()
      */
-    public Iterator extensions() {
+    public Iterable extensions() {
         return _helper.extensions();
     }
+
+    public TWSDLExtensible getParent() {
+        return parent;
+    }
+
+
+    public void setParent(TWSDLExtensible parent) {
+        this.parent = parent;
+    }
+
+    private TWSDLExtensible parent;
+
+    public String getAction() {
+        return _action;
+    }
+
+    public void setAction(String _action) {
+        this._action = _action;
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Import.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Import.java
index 349dd3f5d3f..c5b862e0829 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Import.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Import.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,9 +25,10 @@
 
 package com.sun.tools.internal.ws.wsdl.document;
 
-import javax.xml.namespace.QName;
-
 import com.sun.tools.internal.ws.wsdl.framework.Entity;
+import org.xml.sax.Locator;
+
+import javax.xml.namespace.QName;
 
 /**
  * Entity corresponding to the "import" WSDL element.
@@ -36,7 +37,8 @@ import com.sun.tools.internal.ws.wsdl.framework.Entity;
  */
 public class Import extends Entity{
 
-    public Import() {
+    public Import(Locator locator) {
+        super(locator);
     }
 
     public String getNamespace() {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Input.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Input.java
index ff98b996372..5e3324b3a82 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Input.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Input.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,21 +25,27 @@
 
 package com.sun.tools.internal.ws.wsdl.document;
 
-import javax.xml.namespace.QName;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtensible;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtension;
+import com.sun.tools.internal.ws.wsdl.framework.*;
+import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
+import com.sun.tools.internal.ws.wscompile.AbortException;
+import com.sun.tools.internal.ws.resources.WsdlMessages;
+import org.xml.sax.Locator;
 
-import com.sun.tools.internal.ws.wsdl.framework.AbstractDocument;
-import com.sun.tools.internal.ws.wsdl.framework.Entity;
-import com.sun.tools.internal.ws.wsdl.framework.EntityReferenceAction;
-import com.sun.tools.internal.ws.wsdl.framework.QNameAction;
+import javax.xml.namespace.QName;
 
 /**
  * Entity corresponding to the "input" child element of a port type operation.
  *
  * @author WS Development Team
  */
-public class Input extends Entity {
+public class Input extends Entity implements TWSDLExtensible {
 
-    public Input() {
+    public Input(Locator locator, ErrorReceiver errReceiver) {
+        super(locator);
+        this.errorReceiver = errReceiver;
+        _helper = new ExtensibilityHelper();
     }
 
     public String getName() {
@@ -94,11 +100,51 @@ public class Input extends Entity {
 
     public void validateThis() {
         if (_message == null) {
-            failValidation("validation.missingRequiredAttribute", "message");
+            errorReceiver.error(getLocator(), WsdlMessages.VALIDATION_MISSING_REQUIRED_ATTRIBUTE("name", "wsdl:message"));
+            throw new AbortException();
         }
     }
 
     private Documentation _documentation;
     private String _name;
     private QName _message;
+    private String _action;
+    private ExtensibilityHelper _helper;
+    private TWSDLExtensible parent;
+
+    public void addExtension(TWSDLExtension e) {
+        _helper.addExtension(e);
+    }
+
+    public QName getWSDLElementName() {
+        return getElementName();
+    }
+
+    public TWSDLExtensible getParent() {
+        return parent;
+    }
+
+    public void setParent(TWSDLExtensible parent) {
+        this.parent = parent;
+    }
+
+    public String getNamespaceURI() {
+        return getElementName().getNamespaceURI();
+    }
+
+    public String getNameValue() {
+        return null;
+    }
+
+    public Iterable extensions() {
+        return _helper.extensions();
+    }
+
+    public String getAction() {
+        return _action;
+    }
+
+    public void setAction(String _action) {
+        this._action = _action;
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Kinds.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Kinds.java
index 8a4435a2a31..78ec56f1b41 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Kinds.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Kinds.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Message.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Message.java
index 00331221869..3edea397cf1 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Message.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Message.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,20 +25,14 @@
 
 package com.sun.tools.internal.ws.wsdl.document;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import com.sun.tools.internal.ws.wsdl.framework.*;
+import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
+import com.sun.tools.internal.ws.wscompile.AbortException;
+import com.sun.tools.internal.ws.resources.WsdlMessages;
+import org.xml.sax.Locator;
 
 import javax.xml.namespace.QName;
-
-import com.sun.tools.internal.ws.wsdl.framework.Defining;
-import com.sun.tools.internal.ws.wsdl.framework.Entity;
-import com.sun.tools.internal.ws.wsdl.framework.EntityAction;
-import com.sun.tools.internal.ws.wsdl.framework.GlobalEntity;
-import com.sun.tools.internal.ws.wsdl.framework.Kind;
-import com.sun.tools.internal.ws.wsdl.framework.ValidationException;
+import java.util.*;
 
 /**
  * Entity corresponding to the "message" WSDL element.
@@ -47,17 +41,18 @@ import com.sun.tools.internal.ws.wsdl.framework.ValidationException;
  */
 public class Message extends GlobalEntity {
 
-    public Message(Defining defining) {
-        super(defining);
+    public Message(Defining defining, Locator locator, ErrorReceiver errReceiver) {
+        super(defining, locator, errReceiver);
         _parts = new ArrayList();
         _partsByName = new HashMap();
     }
 
     public void add(MessagePart part) {
-        if (_partsByName.get(part.getName()) != null)
-            throw new ValidationException(
-                "validation.duplicateName",
-                part.getName());
+        if (_partsByName.get(part.getName()) != null){
+            errorReceiver.error(part.getLocator(), WsdlMessages.VALIDATION_DUPLICATE_PART_NAME(getName(), part.getName()));
+            throw new AbortException();
+        }
+
         _partsByName.put(part.getName(), part);
         _parts.add(part);
     }
@@ -112,7 +107,8 @@ public class Message extends GlobalEntity {
 
     public void validateThis() {
         if (getName() == null) {
-            failValidation("validation.missingRequiredAttribute", "name");
+            errorReceiver.error(getLocator(), WsdlMessages.VALIDATION_MISSING_REQUIRED_ATTRIBUTE("name", "wsdl:message"));
+            throw new AbortException();
         }
     }
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/MessagePart.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/MessagePart.java
index 665be327ebd..f7900511ec4 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/MessagePart.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/MessagePart.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,13 +25,14 @@
 
 package com.sun.tools.internal.ws.wsdl.document;
 
-import javax.xml.namespace.QName;
-
 import com.sun.tools.internal.ws.wsdl.framework.Entity;
 import com.sun.tools.internal.ws.wsdl.framework.EntityReferenceAction;
 import com.sun.tools.internal.ws.wsdl.framework.Kind;
 import com.sun.tools.internal.ws.wsdl.framework.QNameAction;
-import com.sun.xml.internal.ws.model.Mode;
+import org.xml.sax.Locator;
+
+import javax.jws.WebParam.Mode;
+import javax.xml.namespace.QName;
 
 /**
  * Entity corresponding to a WSDL message part.
@@ -47,7 +48,8 @@ public class MessagePart extends Entity {
     public static final int WSDL_MIME_BINDING = 5;
     public static final int PART_NOT_BOUNDED = -1;
 
-    public MessagePart() {
+    public MessagePart(Locator locator) {
+        super(locator);
     }
 
     public String getName() {
@@ -104,9 +106,7 @@ public class MessagePart extends Entity {
     }
 
     public void validateThis() {
-        if (_descriptorKind == null || _descriptor == null) {
-            failValidation("validation.missingRequiredProperty", "descriptor");
-        }else if(_descriptor.getLocalPart().equals("")){
+        if(_descriptor != null && _descriptor.getLocalPart().equals("")){
             failValidation("validation.invalidElement", _descriptor.toString());
         }
     }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Operation.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Operation.java
index 5219efa74e7..51e1cd192ce 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Operation.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Operation.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,27 +25,28 @@
 
 package com.sun.tools.internal.ws.wsdl.document;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
+import com.sun.codemodel.internal.JClass;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtensible;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtension;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLOperation;
 import com.sun.tools.internal.ws.wsdl.framework.Entity;
 import com.sun.tools.internal.ws.wsdl.framework.EntityAction;
 import com.sun.tools.internal.ws.wsdl.framework.ExtensibilityHelper;
-import com.sun.tools.internal.ws.wsdl.framework.Extensible;
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
+import org.xml.sax.Locator;
+
+import javax.xml.namespace.QName;
+import java.util.*;
 
 /**
  * Entity corresponding to the "operation" child element of a "portType" WSDL element.
  *
  * @author WS Development Team
  */
-public class Operation extends Entity implements Extensible{
+public class Operation extends Entity implements TWSDLOperation {
 
-    public Operation() {
-        _faults = new ArrayList();
+    public Operation(Locator locator) {
+        super(locator);
+        _faults = new ArrayList();
         _helper = new ExtensibilityHelper();
     }
 
@@ -117,8 +118,8 @@ public class Operation extends Entity implements Extensible{
         _faults.add(f);
     }
 
-    public Iterator faults() {
-        return _faults.iterator();
+    public Iterable faults() {
+        return _faults;
     }
 
     public String getParameterOrder() {
@@ -150,8 +151,8 @@ public class Operation extends Entity implements Extensible{
         if (_output != null) {
             action.perform(_output);
         }
-        for (Iterator iter = _faults.iterator(); iter.hasNext();) {
-            action.perform((Entity) iter.next());
+        for (Fault _fault : _faults) {
+            action.perform(_fault);
         }
         _helper.withAllSubEntitiesDo(action);
     }
@@ -164,8 +165,8 @@ public class Operation extends Entity implements Extensible{
         if (_output != null) {
             _output.accept(visitor);
         }
-        for (Iterator iter = _faults.iterator(); iter.hasNext();) {
-            ((Fault) iter.next()).accept(visitor);
+        for (Fault _fault : _faults) {
+            _fault.accept(visitor);
         }
         visitor.postVisit(this);
     }
@@ -189,9 +190,6 @@ public class Operation extends Entity implements Extensible{
             if (_faults != null && _faults.size() != 0) {
                 failValidation("validation.invalidSubEntity", "fault");
             }
-            if (_parameterOrder != null) {
-                failValidation("validation.invalidAttribute", "parameterOrder");
-            }
         } else if (_style == OperationStyle.NOTIFICATION) {
             if (_parameterOrder != null) {
                 failValidation("validation.invalidAttribute", "parameterOrder");
@@ -199,29 +197,59 @@ public class Operation extends Entity implements Extensible{
         }
     }
 
+    public String getNameValue() {
+        return getName();
+    }
+
+    public String getNamespaceURI() {
+        return parent.getNamespaceURI();
+    }
+
+    public QName getWSDLElementName() {
+        return getElementName();
+    }
+
     /* (non-Javadoc)
-     * @see Extensible#addExtension(Extension)
-     */
-    public void addExtension(Extension e) {
+    * @see TWSDLExtensible#addExtension(ExtensionImpl)
+    */
+    public void addExtension(TWSDLExtension e) {
         _helper.addExtension(e);
 
     }
 
     /* (non-Javadoc)
-     * @see Extensible#extensions()
+     * @see TWSDLExtensible#extensions()
      */
-    public Iterator extensions() {
+    public Iterable extensions() {
         return _helper.extensions();
     }
 
+    public TWSDLExtensible getParent() {
+        return parent;
+    }
 
+    public void setParent(TWSDLExtensible parent) {
+        this.parent = parent;
+    }
+
+    public Map getFaults() {
+        return unmodifiableFaultClassMap;
+    }
+
+    public void putFault(String faultName, JClass exception){
+        faultClassMap.put(faultName, exception);
+    }
+
+    private TWSDLExtensible parent;
     private Documentation _documentation;
     private String _name;
     private Input _input;
     private Output _output;
-    private List _faults;
+    private List _faults;
     private OperationStyle _style;
     private String _parameterOrder;
     private String _uniqueKey;
     private ExtensibilityHelper _helper;
+    private final Map faultClassMap = new HashMap();
+    private final Map unmodifiableFaultClassMap = Collections.unmodifiableMap(faultClassMap);
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/OperationStyle.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/OperationStyle.java
index 00cdab333e5..897c1523c35 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/OperationStyle.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/OperationStyle.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Output.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Output.java
index 8842227ce30..22f09cbc838 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Output.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Output.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,21 +25,26 @@
 
 package com.sun.tools.internal.ws.wsdl.document;
 
-import javax.xml.namespace.QName;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtensible;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtension;
+import com.sun.tools.internal.ws.wsdl.framework.*;
+import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
+import com.sun.tools.internal.ws.wscompile.AbortException;
+import com.sun.tools.internal.ws.resources.WsdlMessages;
+import org.xml.sax.Locator;
 
-import com.sun.tools.internal.ws.wsdl.framework.AbstractDocument;
-import com.sun.tools.internal.ws.wsdl.framework.Entity;
-import com.sun.tools.internal.ws.wsdl.framework.EntityReferenceAction;
-import com.sun.tools.internal.ws.wsdl.framework.QNameAction;
+import javax.xml.namespace.QName;
 
 /**
  * Entity corresponding to the "output" child element of a port type operation.
  *
  * @author WS Development Team
  */
-public class Output extends Entity {
+public class Output extends Entity implements TWSDLExtensible {
 
-    public Output() {
+    public Output(Locator locator, ErrorReceiver errReceiver) {
+        super(locator);
+        this.errorReceiver = errReceiver;
     }
 
     public String getName() {
@@ -94,11 +99,51 @@ public class Output extends Entity {
 
     public void validateThis() {
         if (_message == null) {
-            failValidation("validation.missingRequiredAttribute", "message");
+            errorReceiver.error(getLocator(), WsdlMessages.VALIDATION_MISSING_REQUIRED_ATTRIBUTE("name", "wsdl:message"));
+            throw new AbortException();
         }
     }
 
     private Documentation _documentation;
     private String _name;
     private QName _message;
+    private String _action;
+    private ExtensibilityHelper _helper;
+    private TWSDLExtensible parent;
+
+    public void addExtension(TWSDLExtension e) {
+        _helper.addExtension(e);
+    }
+
+    public QName getWSDLElementName() {
+        return getElementName();
+    }
+
+    public TWSDLExtensible getParent() {
+        return parent;
+    }
+
+    public void setParent(TWSDLExtensible parent) {
+        this.parent = parent;
+    }
+
+    public String getNamespaceURI() {
+        return getElementName().getNamespaceURI();
+    }
+
+    public String getNameValue() {
+        return null;
+    }
+
+    public Iterable extensions() {
+        return _helper.extensions();
+    }
+
+    public String getAction() {
+        return _action;
+    }
+
+    public void setAction(String _action) {
+        this._action = _action;
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Port.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Port.java
index b37a666a2b3..ee6e52dc8e2 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Port.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Port.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,30 +25,25 @@
 
 package com.sun.tools.internal.ws.wsdl.document;
 
-import java.util.Iterator;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtensible;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtension;
+import com.sun.tools.internal.ws.wsdl.framework.*;
+import com.sun.tools.internal.ws.resources.WsdlMessages;
+import com.sun.tools.internal.ws.wscompile.AbortException;
+import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
+import org.xml.sax.Locator;
 
 import javax.xml.namespace.QName;
 
-import com.sun.tools.internal.ws.wsdl.framework.AbstractDocument;
-import com.sun.tools.internal.ws.wsdl.framework.Defining;
-import com.sun.tools.internal.ws.wsdl.framework.EntityAction;
-import com.sun.tools.internal.ws.wsdl.framework.EntityReferenceAction;
-import com.sun.tools.internal.ws.wsdl.framework.ExtensibilityHelper;
-import com.sun.tools.internal.ws.wsdl.framework.Extensible;
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
-import com.sun.tools.internal.ws.wsdl.framework.GlobalEntity;
-import com.sun.tools.internal.ws.wsdl.framework.Kind;
-import com.sun.tools.internal.ws.wsdl.framework.QNameAction;
-
 /**
  * Entity corresponding to the "port" WSDL element.
  *
  * @author WS Development Team
  */
-public class Port extends GlobalEntity implements Extensible {
+public class Port extends GlobalEntity implements TWSDLExtensible {
 
-    public Port(Defining defining) {
-        super(defining);
+    public Port(Defining defining, Locator locator, ErrorReceiver errReceiver) {
+        super(defining, locator, errReceiver);
         _helper = new ExtensibilityHelper();
     }
 
@@ -69,14 +64,27 @@ public class Port extends GlobalEntity implements Extensible {
     }
 
     public Binding resolveBinding(AbstractDocument document) {
-        return (Binding) document.find(Kinds.BINDING, _binding);
+        try{
+            return (Binding) document.find(Kinds.BINDING, _binding);
+        } catch (NoSuchEntityException e) {
+            errorReceiver.error(getLocator(), WsdlMessages.ENTITY_NOT_FOUND_BINDING(_binding, new QName(getNamespaceURI(), getName())));
+            throw new AbortException();
+        }
     }
 
     public Kind getKind() {
         return Kinds.PORT;
     }
 
-    public QName getElementName() {
+    public String getNameValue() {
+        return getName();
+    }
+
+    public String getNamespaceURI() {
+        return getDefining().getTargetNamespaceURI();
+    }
+
+    public QName getWSDLElementName() {
         return WSDLConstants.QNAME_PORT;
     }
 
@@ -118,14 +126,22 @@ public class Port extends GlobalEntity implements Extensible {
         }
     }
 
-    public void addExtension(Extension e) {
+    public void addExtension(TWSDLExtension e) {
         _helper.addExtension(e);
     }
 
-    public Iterator extensions() {
+    public Iterable extensions() {
         return _helper.extensions();
     }
 
+    public TWSDLExtensible getParent() {
+        return parent;
+    }
+
+    public void setParent(TWSDLExtensible parent) {
+        this.parent = parent;
+    }
+
     public void withAllSubEntitiesDo(EntityAction action) {
         _helper.withAllSubEntitiesDo(action);
     }
@@ -134,4 +150,10 @@ public class Port extends GlobalEntity implements Extensible {
     private Documentation _documentation;
     private Service _service;
     private QName _binding;
+
+    public QName getElementName() {
+        return getWSDLElementName();
+    }
+
+    private TWSDLExtensible parent;
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/PortType.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/PortType.java
index 8d6deebe434..31c46fc46a1 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/PortType.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/PortType.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,24 @@
 
 package com.sun.tools.internal.ws.wsdl.document;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtensible;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtension;
+import com.sun.tools.internal.ws.wsdl.framework.*;
+import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
+import org.xml.sax.Locator;
 
 import javax.xml.namespace.QName;
-
-import com.sun.tools.internal.ws.wsdl.framework.Defining;
-import com.sun.tools.internal.ws.wsdl.framework.Entity;
-import com.sun.tools.internal.ws.wsdl.framework.EntityAction;
-import com.sun.tools.internal.ws.wsdl.framework.ExtensibilityHelper;
-import com.sun.tools.internal.ws.wsdl.framework.Extensible;
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
-import com.sun.tools.internal.ws.wsdl.framework.GlobalEntity;
-import com.sun.tools.internal.ws.wsdl.framework.Kind;
-import com.sun.tools.internal.ws.wsdl.framework.ValidationException;
+import java.util.*;
 
 /**
  * Entity corresponding to the "portType" WSDL element.
  *
  * @author WS Development Team
  */
-public class PortType extends GlobalEntity implements Extensible{
+public class PortType extends GlobalEntity implements TWSDLExtensible {
 
-    public PortType(Defining defining) {
-        super(defining);
+    public PortType(Defining defining, Locator locator, ErrorReceiver errReceiver) {
+        super(defining, locator, errReceiver);
         _operations = new ArrayList();
         _operationKeys = new HashSet();
         _helper = new ExtensibilityHelper();
@@ -122,21 +113,42 @@ public class PortType extends GlobalEntity implements Extensible{
         }
     }
 
+    public String getNameValue() {
+        return getName();
+    }
+
+    public String getNamespaceURI() {
+        return getDefining().getTargetNamespaceURI();
+    }
+
+    public QName getWSDLElementName() {
+        return getElementName();
+    }
+
     /* (non-Javadoc)
-     * @see Extensible#addExtension(Extension)
-     */
-    public void addExtension(Extension e) {
+    * @see TWSDLExtensible#addExtension(ExtensionImpl)
+    */
+    public void addExtension(TWSDLExtension e) {
         _helper.addExtension(e);
 
     }
 
     /* (non-Javadoc)
-     * @see Extensible#extensions()
+     * @see TWSDLExtensible#extensions()
      */
-    public Iterator extensions() {
+    public Iterable extensions() {
         return _helper.extensions();
     }
 
+    public TWSDLExtensible getParent() {
+        return parent;
+    }
+
+    public void setParent(TWSDLExtensible parent) {
+        this.parent = parent;
+    }
+
+    private TWSDLExtensible parent;
     private Documentation _documentation;
     private List _operations;
     private Set _operationKeys;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Service.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Service.java
index 87925c34b7b..c866328581e 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Service.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Service.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,30 +25,26 @@
 
 package com.sun.tools.internal.ws.wsdl.document;
 
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtensible;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtension;
+import com.sun.tools.internal.ws.wsdl.framework.*;
+import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
+import org.xml.sax.Locator;
+
+import javax.xml.namespace.QName;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import javax.xml.namespace.QName;
-
-import com.sun.tools.internal.ws.wsdl.framework.Defining;
-import com.sun.tools.internal.ws.wsdl.framework.Entity;
-import com.sun.tools.internal.ws.wsdl.framework.EntityAction;
-import com.sun.tools.internal.ws.wsdl.framework.ExtensibilityHelper;
-import com.sun.tools.internal.ws.wsdl.framework.Extensible;
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
-import com.sun.tools.internal.ws.wsdl.framework.GlobalEntity;
-import com.sun.tools.internal.ws.wsdl.framework.Kind;
-
 /**
  * Entity corresponding to the "service" WSDL element.
  *
  * @author WS Development Team
  */
-public class Service extends GlobalEntity implements Extensible {
+public class Service extends GlobalEntity implements TWSDLExtensible {
 
-    public Service(Defining defining) {
-        super(defining);
+    public Service(Defining defining, Locator locator, ErrorReceiver errReceiver) {
+        super(defining, locator, errReceiver);
         _ports = new ArrayList();
         _helper = new ExtensibilityHelper();
     }
@@ -100,14 +96,30 @@ public class Service extends GlobalEntity implements Extensible {
         }
     }
 
-    public void addExtension(Extension e) {
+    public String getNameValue() {
+        return getName();
+    }
+
+    public String getNamespaceURI() {
+        return getDefining().getTargetNamespaceURI();
+    }
+
+    public QName getWSDLElementName() {
+        return getElementName();
+    }
+
+    public void addExtension(TWSDLExtension e) {
         _helper.addExtension(e);
     }
 
-    public Iterator extensions() {
+    public Iterable extensions() {
         return _helper.extensions();
     }
 
+    public TWSDLExtensible getParent() {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
     private ExtensibilityHelper _helper;
     private Documentation _documentation;
     private List  _ports;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Types.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Types.java
index 98762e02fb3..142ba1a674b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Types.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Types.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,25 +25,25 @@
 
 package com.sun.tools.internal.ws.wsdl.document;
 
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtensible;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtension;
 import com.sun.tools.internal.ws.wsdl.framework.Entity;
 import com.sun.tools.internal.ws.wsdl.framework.EntityAction;
 import com.sun.tools.internal.ws.wsdl.framework.ExtensibilityHelper;
-import com.sun.tools.internal.ws.wsdl.framework.Extensible;
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
 import com.sun.tools.internal.ws.wsdl.framework.ExtensionVisitor;
+import org.xml.sax.Locator;
+
+import javax.xml.namespace.QName;
 
 /**
  * Entity corresponding to the "types" WSDL element.
  *
  * @author WS Development Team
  */
-public class Types extends Entity implements Extensible {
+public class Types extends Entity implements TWSDLExtensible {
 
-    public Types() {
+    public Types(Locator locator) {
+        super(locator);
         _helper = new ExtensibilityHelper();
     }
 
@@ -68,14 +68,37 @@ public class Types extends Entity implements Extensible {
     public void validateThis() {
     }
 
-    public void addExtension(Extension e) {
+    /**
+     * wsdl:type does not have any name attribute
+     */
+    public String getNameValue() {
+        return null;
+    }
+
+    public String getNamespaceURI() {
+        return parent.getNamespaceURI();
+    }
+
+    public QName getWSDLElementName() {
+        return getElementName();
+    }
+
+    public void addExtension(TWSDLExtension e) {
         _helper.addExtension(e);
     }
 
-    public Iterator extensions() {
+    public Iterable extensions() {
         return _helper.extensions();
     }
 
+    public TWSDLExtensible getParent() {
+        return parent;
+    }
+
+    public void setParent(TWSDLExtensible parent) {
+        this.parent = parent;
+    }
+
     public void withAllSubEntitiesDo(EntityAction action) {
         _helper.withAllSubEntitiesDo(action);
     }
@@ -84,6 +107,7 @@ public class Types extends Entity implements Extensible {
         _helper.accept(visitor);
     }
 
+    private TWSDLExtensible parent;
     private ExtensibilityHelper _helper;
     private Documentation _documentation;
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLConstants.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLConstants.java
index 660933e396d..3974f2d9f49 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLConstants.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLConstants.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocument.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocument.java
index 251cc3e2f9b..4db0b5ec676 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocument.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocument.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 @@
 
 package com.sun.tools.internal.ws.wsdl.document;
 
+import com.sun.tools.internal.ws.wsdl.framework.*;
+import com.sun.tools.internal.ws.wsdl.parser.MetadataFinder;
+import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
+
+import javax.xml.namespace.QName;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Set;
 
-import javax.xml.namespace.QName;
-
-import com.sun.tools.internal.ws.wsdl.framework.AbstractDocument;
-import com.sun.tools.internal.ws.wsdl.framework.Entity;
-import com.sun.tools.internal.ws.wsdl.framework.EntityAction;
-import com.sun.tools.internal.ws.wsdl.framework.EntityReferenceAction;
-import com.sun.tools.internal.ws.wsdl.framework.EntityReferenceValidator;
-import com.sun.tools.internal.ws.wsdl.framework.GloballyKnown;
-import com.sun.tools.internal.ws.wsdl.framework.Kind;
-import com.sun.tools.internal.ws.wsdl.framework.NoSuchEntityException;
-import com.sun.tools.internal.ws.wsdl.framework.ValidationException;
-
 /**
  * A WSDL document.
  *
@@ -48,7 +41,8 @@ import com.sun.tools.internal.ws.wsdl.framework.ValidationException;
  */
 public class WSDLDocument extends AbstractDocument{
 
-    public WSDLDocument() {
+    public WSDLDocument(MetadataFinder forest, ErrorReceiver errReceiver) {
+        super(forest, errReceiver);
     }
 
     public Definitions getDefinitions() {
@@ -59,14 +53,6 @@ public class WSDLDocument extends AbstractDocument{
         _definitions = d;
     }
 
-    public Set collectAllNamespaces() {
-        Set result = super.collectAllNamespaces();
-        if (_definitions.getTargetNamespaceURI() != null) {
-            result.add(_definitions.getTargetNamespaceURI());
-        }
-        return result;
-    }
-
     public QName[] getAllServiceQNames() {
 
         ArrayList serviceQNames = new ArrayList();
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitor.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitor.java
index 99d7d9a2b38..b5ebdb3531c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitor.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitorBase.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitorBase.java
index f8cf2e5e85c..b7e3d8ae34e 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitorBase.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitorBase.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPAddress.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPAddress.java
index 693c53a816e..3c072e7d4af 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPAddress.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPAddress.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,18 +25,20 @@
 
 package com.sun.tools.internal.ws.wsdl.document.http;
 
-import javax.xml.namespace.QName;
+import com.sun.tools.internal.ws.wsdl.framework.ExtensionImpl;
+import org.xml.sax.Locator;
 
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
+import javax.xml.namespace.QName;
 
 /**
  * A HTTP address extension.
  *
  * @author WS Development Team
  */
-public class HTTPAddress extends Extension {
+public class HTTPAddress extends ExtensionImpl {
 
-    public HTTPAddress() {
+    public HTTPAddress(Locator locator) {
+        super(locator);
     }
 
     public QName getElementName() {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPBinding.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPBinding.java
index a81fad3fdcf..38aaae8b187 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPBinding.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPBinding.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,18 +25,20 @@
 
 package com.sun.tools.internal.ws.wsdl.document.http;
 
-import javax.xml.namespace.QName;
+import com.sun.tools.internal.ws.wsdl.framework.ExtensionImpl;
+import org.xml.sax.Locator;
 
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
+import javax.xml.namespace.QName;
 
 /**
  * A HTTP binding extension.
  *
  * @author WS Development Team
  */
-public class HTTPBinding extends Extension {
+public class HTTPBinding extends ExtensionImpl {
 
-    public HTTPBinding() {
+    public HTTPBinding(Locator locator) {
+        super(locator);
     }
 
     public QName getElementName() {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPConstants.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPConstants.java
index 1ec64a2ee0a..a1c075329e7 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPConstants.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPConstants.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPOperation.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPOperation.java
index a56297eea76..076415ad9cb 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPOperation.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPOperation.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,18 +25,20 @@
 
 package com.sun.tools.internal.ws.wsdl.document.http;
 
-import javax.xml.namespace.QName;
+import com.sun.tools.internal.ws.wsdl.framework.ExtensionImpl;
+import org.xml.sax.Locator;
 
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
+import javax.xml.namespace.QName;
 
 /**
  * A HTTP operation extension.
  *
  * @author WS Development Team
  */
-public class HTTPOperation extends Extension {
+public class HTTPOperation extends ExtensionImpl {
 
-    public HTTPOperation() {
+    public HTTPOperation(Locator locator) {
+        super(locator);
     }
 
     public QName getElementName() {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlEncoded.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlEncoded.java
index 3e7e8470f17..6f5226f65de 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlEncoded.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlEncoded.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,18 +25,21 @@
 
 package com.sun.tools.internal.ws.wsdl.document.http;
 
-import javax.xml.namespace.QName;
+import com.sun.tools.internal.ws.wsdl.framework.ExtensionImpl;
+import org.xml.sax.Locator;
 
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
+import javax.xml.namespace.QName;
 
 /**
  * A HTTP urlEncoded extension.
  *
  * @author WS Development Team
  */
-public class HTTPUrlEncoded extends Extension {
+public class HTTPUrlEncoded extends ExtensionImpl {
 
-    public HTTPUrlEncoded() {}
+    public HTTPUrlEncoded(Locator locator) {
+        super(locator);
+    }
 
     public QName getElementName() {
         return HTTPConstants.QNAME_URL_ENCODED;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlReplacement.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlReplacement.java
index 876a4e534d4..e32541a2b80 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlReplacement.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlReplacement.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,18 +25,20 @@
 
 package com.sun.tools.internal.ws.wsdl.document.http;
 
-import javax.xml.namespace.QName;
+import com.sun.tools.internal.ws.wsdl.framework.ExtensionImpl;
+import org.xml.sax.Locator;
 
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
+import javax.xml.namespace.QName;
 
 /**
  * A HTTP urlReplacement extension.
  *
  * @author WS Development Team
  */
-public class HTTPUrlReplacement extends Extension {
+public class HTTPUrlReplacement extends ExtensionImpl {
 
-    public HTTPUrlReplacement() {
+    public HTTPUrlReplacement(Locator locator) {
+        super(locator);
     }
 
     public QName getElementName() {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/CustomName.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/CustomName.java
index f5fa01389ef..e4fcca01d16 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/CustomName.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/CustomName.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/Exception.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/Exception.java
index b7417883a1a..797e4192dd3 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/Exception.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/Exception.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBinding.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBinding.java
index a8f48f9c58b..6930f301a09 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBinding.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBinding.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,18 +24,12 @@
  */
 package com.sun.tools.internal.ws.wsdl.document.jaxws;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
+import com.sun.tools.internal.ws.wsdl.framework.ExtensionImpl;
+import org.w3c.dom.Element;
+import org.xml.sax.Locator;
 
 import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-import com.sun.tools.internal.ws.wsdl.framework.Extensible;
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
+import java.util.*;
 
 
 /**
@@ -44,13 +38,13 @@ import com.sun.tools.internal.ws.wsdl.framework.Extension;
  * To change the template for this generated type comment go to
  * Window>Preferences>Java>Code Generation>Code and Comments
  */
-public class JAXWSBinding extends Extension implements Extensible {
+public class JAXWSBinding extends ExtensionImpl {
 
     /**
      *
      */
-    public JAXWSBinding(){
-        super();
+    public JAXWSBinding(Locator locator){
+        super(locator);
         jaxbBindings = new HashSet();
         // TODO Auto-generated constructor stub
     }
@@ -72,18 +66,22 @@ public class JAXWSBinding extends Extension implements Extensible {
         return JAXWSBindingsConstants.JAXWS_BINDINGS;
     }
 
+    public QName getWSDLElementName() {
+        return getElementName();
+    }
+
     /* (non-Javadoc)
-     * @see Extensible#addExtension(Extension)
-     */
-    public void addExtension(Extension e) {
+    * @see TWSDLExtensible#addExtension(ExtensionImpl)
+    */
+    public void addExtension(ExtensionImpl e) {
         // TODO Auto-generated method stub
 
     }
 
     /* (non-Javadoc)
-     * @see Extensible#extensions()
+     * @see TWSDLExtensible#extensions()
      */
-    public Iterator extensions() {
+    public Iterable extensions() {
         // TODO Auto-generated method stub
         return null;
     }
@@ -333,6 +331,6 @@ public class JAXWSBinding extends Extension implements Extensible {
     // portType className
     private CustomName className;
 
-    //portType Operation
+    //portType WSDLOperation
     private CustomName methodName;
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBindingsConstants.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBindingsConstants.java
index 4ada7dbae08..efcdd70e70a 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBindingsConstants.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBindingsConstants.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,10 @@
 
 package com.sun.tools.internal.ws.wsdl.document.jaxws;
 
-import javax.xml.namespace.QName;
-
 import com.sun.tools.internal.ws.wsdl.parser.Constants;
 
+import javax.xml.namespace.QName;
+
 /**
  * @author Vivek Pandey
  *
@@ -37,6 +37,7 @@ public interface JAXWSBindingsConstants {
 
     public static String NS_JAXWS_BINDINGS = "http://java.sun.com/xml/ns/jaxws";
     public static String NS_JAXB_BINDINGS = "http://java.sun.com/xml/ns/jaxb";
+    public static String NS_XJC_BINDINGS = "http://java.sun.com/xml/ns/jaxb/xjc";
 
     /**
      * jaxws:bindings schema component
@@ -120,7 +121,7 @@ public interface JAXWSBindingsConstants {
     public static QName CLASS = new QName(NS_JAXWS_BINDINGS, "class");
 
     /*
-     * PortType Operation
+     * PortType WSDLOperation
      *
      * ?
      *   xs:string?
@@ -159,7 +160,7 @@ public interface JAXWSBindingsConstants {
      */
 
     /*
-     * BindingOperation
+     * WSDLBoundOperation
      *
      * 
      *  xs:boolean
@@ -187,7 +188,7 @@ public interface JAXWSBindingsConstants {
      * jaxb:bindgs QName
      */
     public static QName JAXB_BINDINGS = new QName(NS_JAXB_BINDINGS, "bindings");
-    public static String JAXB_BINDING_VERSION = "1.0";
+    public static String JAXB_BINDING_VERSION = "2.0";
     public static QName XSD_APPINFO = new QName(Constants.NS_XSD, "appinfo");
     public static QName XSD_ANNOTATION = new QName(Constants.NS_XSD, "annotation");
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/Parameter.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/Parameter.java
index 74588ea61b8..02a7b225df1 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/Parameter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/Parameter.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEConstants.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEConstants.java
index 401dd80ac55..77d7607a7d4 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEConstants.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEConstants.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEContent.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEContent.java
index 24e6fcf4e7c..c13ba572622 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEContent.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEContent.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,18 +25,20 @@
 
 package com.sun.tools.internal.ws.wsdl.document.mime;
 
-import javax.xml.namespace.QName;
+import com.sun.tools.internal.ws.wsdl.framework.ExtensionImpl;
+import org.xml.sax.Locator;
 
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
+import javax.xml.namespace.QName;
 
 /**
  * A MIME content extension.
  *
  * @author WS Development Team
  */
-public class MIMEContent extends Extension {
+public class MIMEContent extends ExtensionImpl {
 
-    public MIMEContent() {
+    public MIMEContent(Locator locator) {
+        super(locator);
     }
 
     public QName getElementName() {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEMultipartRelated.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEMultipartRelated.java
index 4d0877746da..5e1246bb864 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEMultipartRelated.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEMultipartRelated.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,25 +25,26 @@
 
 package com.sun.tools.internal.ws.wsdl.document.mime;
 
+import com.sun.tools.internal.ws.wsdl.framework.Entity;
+import com.sun.tools.internal.ws.wsdl.framework.EntityAction;
+import com.sun.tools.internal.ws.wsdl.framework.ExtensionImpl;
+import com.sun.tools.internal.ws.wsdl.framework.ExtensionVisitor;
+import org.xml.sax.Locator;
+
+import javax.xml.namespace.QName;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import javax.xml.namespace.QName;
-
-import com.sun.tools.internal.ws.wsdl.framework.Entity;
-import com.sun.tools.internal.ws.wsdl.framework.EntityAction;
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
-import com.sun.tools.internal.ws.wsdl.framework.ExtensionVisitor;
-
 /**
  * A MIME multipartRelated extension.
  *
  * @author WS Development Team
  */
-public class MIMEMultipartRelated extends Extension {
+public class MIMEMultipartRelated extends ExtensionImpl {
 
-    public MIMEMultipartRelated() {
+    public MIMEMultipartRelated(Locator locator) {
+        super(locator);
         _parts = new ArrayList();
     }
 
@@ -55,8 +56,8 @@ public class MIMEMultipartRelated extends Extension {
         _parts.add(part);
     }
 
-    public Iterator getParts() {
-        return _parts.iterator();
+    public Iterable getParts() {
+        return _parts;
     }
 
     public void withAllSubEntitiesDo(EntityAction action) {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEPart.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEPart.java
index 7eecfe0e409..a8bd08c04d8 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEPart.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEPart.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,23 +25,24 @@
 
 package com.sun.tools.internal.ws.wsdl.document.mime;
 
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtensible;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtension;
 import com.sun.tools.internal.ws.wsdl.framework.EntityAction;
 import com.sun.tools.internal.ws.wsdl.framework.ExtensibilityHelper;
-import com.sun.tools.internal.ws.wsdl.framework.Extensible;
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
+import com.sun.tools.internal.ws.wsdl.framework.ExtensionImpl;
+import org.xml.sax.Locator;
+
+import javax.xml.namespace.QName;
 
 /**
  * A MIME part extension.
  *
  * @author WS Development Team
  */
-public class MIMEPart extends Extension implements Extensible {
+public class MIMEPart extends ExtensionImpl implements TWSDLExtensible {
 
-    public MIMEPart() {
+    public MIMEPart(Locator locator) {
+        super(locator);
         _helper = new ExtensibilityHelper();
     }
 
@@ -57,11 +58,23 @@ public class MIMEPart extends Extension implements Extensible {
         _name = s;
     }
 
-    public void addExtension(Extension e) {
+    public String getNameValue() {
+        return getName();
+    }
+
+    public String getNamespaceURI() {
+        return getParent().getNamespaceURI();
+    }
+
+    public QName getWSDLElementName() {
+        return getElementName();
+    }
+
+    public void addExtension(TWSDLExtension e) {
         _helper.addExtension(e);
     }
 
-    public Iterator extensions() {
+    public Iterable extensions() {
         return _helper.extensions();
     }
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEXml.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEXml.java
index 439597d032d..7a444ba41ed 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEXml.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEXml.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,18 +25,20 @@
 
 package com.sun.tools.internal.ws.wsdl.document.mime;
 
-import javax.xml.namespace.QName;
+import com.sun.tools.internal.ws.wsdl.framework.ExtensionImpl;
+import org.xml.sax.Locator;
 
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
+import javax.xml.namespace.QName;
 
 /**
  * A MIME mimeXml extension.
  *
  * @author WS Development Team
  */
-public class MIMEXml extends Extension {
+public class MIMEXml extends ExtensionImpl {
 
-    public MIMEXml() {
+    public MIMEXml(Locator locator) {
+        super(locator);
     }
 
     public QName getElementName() {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/BuiltInTypes.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/BuiltInTypes.java
deleted file mode 100644
index 56f97ed04dc..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/BuiltInTypes.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.tools.internal.ws.wsdl.document.schema;
-
-import javax.xml.namespace.QName;
-
-/**
- *
- * @author WS Development Team
- */
-public interface BuiltInTypes {
-    public QName STRING = SchemaConstants.QNAME_TYPE_STRING;
-    public QName NORMALIZED_STRING =
-        SchemaConstants.QNAME_TYPE_NORMALIZED_STRING;
-    public QName TOKEN = SchemaConstants.QNAME_TYPE_TOKEN;
-    public QName BYTE = SchemaConstants.QNAME_TYPE_BYTE;
-    public QName UNSIGNED_BYTE = SchemaConstants.QNAME_TYPE_UNSIGNED_BYTE;
-    public QName BASE64_BINARY = SchemaConstants.QNAME_TYPE_BASE64_BINARY;
-    public QName HEX_BINARY = SchemaConstants.QNAME_TYPE_HEX_BINARY;
-    public QName INTEGER = SchemaConstants.QNAME_TYPE_INTEGER;
-    public QName POSITIVE_INTEGER = SchemaConstants.QNAME_TYPE_POSITIVE_INTEGER;
-    public QName NEGATIVE_INTEGER = SchemaConstants.QNAME_TYPE_NEGATIVE_INTEGER;
-    public QName NON_NEGATIVE_INTEGER =
-        SchemaConstants.QNAME_TYPE_NON_NEGATIVE_INTEGER;
-    public QName NON_POSITIVE_INTEGER =
-        SchemaConstants.QNAME_TYPE_NON_POSITIVE_INTEGER;
-    public QName INT = SchemaConstants.QNAME_TYPE_INT;
-    public QName UNSIGNED_INT = SchemaConstants.QNAME_TYPE_UNSIGNED_INT;
-    public QName LONG = SchemaConstants.QNAME_TYPE_LONG;
-    public QName UNSIGNED_LONG = SchemaConstants.QNAME_TYPE_UNSIGNED_LONG;
-    public QName SHORT = SchemaConstants.QNAME_TYPE_SHORT;
-    public QName UNSIGNED_SHORT = SchemaConstants.QNAME_TYPE_UNSIGNED_SHORT;
-    public QName DECIMAL = SchemaConstants.QNAME_TYPE_DECIMAL;
-    public QName FLOAT = SchemaConstants.QNAME_TYPE_FLOAT;
-    public QName DOUBLE = SchemaConstants.QNAME_TYPE_DOUBLE;
-    public QName BOOLEAN = SchemaConstants.QNAME_TYPE_BOOLEAN;
-    public QName TIME = SchemaConstants.QNAME_TYPE_TIME;
-    public QName DATE_TIME = SchemaConstants.QNAME_TYPE_DATE_TIME;
-    public QName DURATION = SchemaConstants.QNAME_TYPE_DURATION;
-    public QName DATE = SchemaConstants.QNAME_TYPE_DATE;
-    public QName G_MONTH = SchemaConstants.QNAME_TYPE_G_MONTH;
-    public QName G_YEAR = SchemaConstants.QNAME_TYPE_G_YEAR;
-    public QName G_YEAR_MONTH = SchemaConstants.QNAME_TYPE_G_YEAR_MONTH;
-    public QName G_DAY = SchemaConstants.QNAME_TYPE_G_DAY;
-    public QName G_MONTH_DAY = SchemaConstants.QNAME_TYPE_G_MONTH_DAY;
-    public QName NAME = SchemaConstants.QNAME_TYPE_NAME;
-    public QName QNAME = SchemaConstants.QNAME_TYPE_QNAME;
-    public QName NCNAME = SchemaConstants.QNAME_TYPE_NCNAME;
-    public QName ANY_URI = SchemaConstants.QNAME_TYPE_ANY_URI;
-    public QName ID = SchemaConstants.QNAME_TYPE_ID;
-    public QName IDREF = SchemaConstants.QNAME_TYPE_IDREF;
-    public QName IDREFS = SchemaConstants.QNAME_TYPE_IDREFS;
-    public QName ENTITY = SchemaConstants.QNAME_TYPE_ENTITY;
-    public QName ENTITIES = SchemaConstants.QNAME_TYPE_ENTITIES;
-    public QName NOTATION = SchemaConstants.QNAME_TYPE_NOTATION;
-    public QName NMTOKEN = SchemaConstants.QNAME_TYPE_NMTOKEN;
-    public QName NMTOKENS = SchemaConstants.QNAME_TYPE_NMTOKENS;
-    public QName LANGUAGE = SchemaConstants.QNAME_TYPE_LANGUAGE;
-    public QName ANY_SIMPLE_URTYPE = SchemaConstants.QNAME_TYPE_SIMPLE_URTYPE;
-
-    //xsd:list
-    public QName LIST = SchemaConstants.QNAME_LIST;
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/Schema.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/Schema.java
deleted file mode 100644
index 8f302bd0e4a..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/Schema.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.tools.internal.ws.wsdl.document.schema;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import com.sun.tools.internal.ws.wsdl.framework.AbstractDocument;
-import com.sun.tools.internal.ws.wsdl.framework.Defining;
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
-import com.sun.tools.internal.ws.wsdl.framework.Kind;
-import com.sun.tools.internal.ws.wsdl.framework.ValidationException;
-import com.sun.tools.internal.ws.wsdl.parser.Constants;
-
-/**
- *
- * @author WS Development Team
- */
-public class Schema extends Extension implements Defining {
-
-    public Schema(AbstractDocument document) {
-        _document = document;
-        _nsPrefixes = new HashMap();
-        _definedEntities = new ArrayList();
-    }
-
-    public QName getElementName() {
-        return SchemaConstants.QNAME_SCHEMA;
-    }
-
-    public SchemaElement getContent() {
-        return _content;
-    }
-
-    public void setContent(SchemaElement entity) {
-        _content = entity;
-        _content.setSchema(this);
-    }
-
-    public void setTargetNamespaceURI(String uri) {
-        _targetNamespaceURI = uri;
-    }
-
-    public String getTargetNamespaceURI() {
-        return _targetNamespaceURI;
-    }
-
-    public void addPrefix(String prefix, String uri) {
-        _nsPrefixes.put(prefix, uri);
-    }
-
-    public String getURIForPrefix(String prefix) {
-        return (String) _nsPrefixes.get(prefix);
-    }
-
-    public Iterator prefixes() {
-        return _nsPrefixes.keySet().iterator();
-    }
-
-    public void defineAllEntities() {
-        if (_content == null) {
-            throw new ValidationException(
-                "validation.shouldNotHappen",
-                "missing schema content");
-        }
-
-        for (Iterator iter = _content.children(); iter.hasNext();) {
-            SchemaElement child = (SchemaElement) iter.next();
-            if (child.getQName().equals(SchemaConstants.QNAME_ATTRIBUTE)) {
-                QName name =
-                    new QName(
-                        _targetNamespaceURI,
-                        child.getValueOfMandatoryAttribute(
-                            Constants.ATTR_NAME));
-                defineEntity(child, SchemaKinds.XSD_ATTRIBUTE, name);
-            } else if (
-                child.getQName().equals(
-                    SchemaConstants.QNAME_ATTRIBUTE_GROUP)) {
-                QName name =
-                    new QName(
-                        _targetNamespaceURI,
-                        child.getValueOfMandatoryAttribute(
-                            Constants.ATTR_NAME));
-                defineEntity(child, SchemaKinds.XSD_ATTRIBUTE_GROUP, name);
-            } else if (
-                child.getQName().equals(SchemaConstants.QNAME_ELEMENT)) {
-                QName name =
-                    new QName(
-                        _targetNamespaceURI,
-                        child.getValueOfMandatoryAttribute(
-                            Constants.ATTR_NAME));
-                defineEntity(child, SchemaKinds.XSD_ELEMENT, name);
-            } else if (child.getQName().equals(SchemaConstants.QNAME_GROUP)) {
-                QName name =
-                    new QName(
-                        _targetNamespaceURI,
-                        child.getValueOfMandatoryAttribute(
-                            Constants.ATTR_NAME));
-                defineEntity(child, SchemaKinds.XSD_GROUP, name);
-            } else if (
-                child.getQName().equals(SchemaConstants.QNAME_COMPLEX_TYPE)) {
-                QName name =
-                    new QName(
-                        _targetNamespaceURI,
-                        child.getValueOfMandatoryAttribute(
-                            Constants.ATTR_NAME));
-                defineEntity(child, SchemaKinds.XSD_TYPE, name);
-            } else if (
-                child.getQName().equals(SchemaConstants.QNAME_SIMPLE_TYPE)) {
-                QName name =
-                    new QName(
-                        _targetNamespaceURI,
-                        child.getValueOfMandatoryAttribute(
-                            Constants.ATTR_NAME));
-                defineEntity(child, SchemaKinds.XSD_TYPE, name);
-            }
-        }
-    }
-
-    public void defineEntity(SchemaElement element, Kind kind, QName name) {
-        SchemaEntity entity = new SchemaEntity(this, element, kind, name);
-        _document.define(entity);
-        _definedEntities.add(entity);
-    }
-
-    public Iterator definedEntities() {
-        return _definedEntities.iterator();
-    }
-
-    public void validateThis() {
-        if (_content == null) {
-            throw new ValidationException(
-                "validation.shouldNotHappen",
-                "missing schema content");
-        }
-    }
-
-    public String asString(QName name) {
-        if (name.getNamespaceURI().equals("")) {
-            return name.getLocalPart();
-        } else {
-            // look for a prefix
-            for (Iterator iter = prefixes(); iter.hasNext();) {
-                String prefix = (String) iter.next();
-                if (prefix.equals(name.getNamespaceURI())) {
-                    return prefix + ":" + name.getLocalPart();
-                }
-            }
-
-            // not found
-            return null;
-        }
-    }
-
-    private AbstractDocument _document;
-    private String _targetNamespaceURI;
-    private SchemaElement _content;
-    private List _definedEntities;
-    private Map _nsPrefixes;
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaAttribute.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaAttribute.java
deleted file mode 100644
index 5da73a677cb..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaAttribute.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.tools.internal.ws.wsdl.document.schema;
-
-import javax.xml.namespace.QName;
-
-import com.sun.tools.internal.ws.wsdl.framework.WriterContext;
-
-/**
- *
- * @author WS Development Team
- */
-public class SchemaAttribute {
-
-    public SchemaAttribute() {
-    }
-
-    public SchemaAttribute(String localName) {
-        _localName = localName;
-    }
-
-    public String getNamespaceURI() {
-        return _nsURI;
-    }
-
-    public void setNamespaceURI(String s) {
-        _nsURI = s;
-    }
-
-    public String getLocalName() {
-        return _localName;
-    }
-
-    public void setLocalName(String s) {
-        _localName = s;
-    }
-
-    public QName getQName() {
-        return new QName(_nsURI, _localName);
-    }
-
-    public String getValue() {
-        if (_qnameValue != null) {
-            if (_parent == null) {
-                throw new IllegalStateException();
-            } else {
-                return _parent.asString(_qnameValue);
-            }
-        } else {
-            return _value;
-        }
-    }
-
-    public String getValue(WriterContext context) {
-        if (_qnameValue != null) {
-            return context.getQNameString(_qnameValue);
-        } else {
-            return _value;
-        }
-    }
-
-    public void setValue(String s) {
-        _value = s;
-    }
-
-    public void setValue(QName name) {
-        _qnameValue = name;
-    }
-
-    public SchemaElement getParent() {
-        return _parent;
-    }
-
-    public void setParent(SchemaElement e) {
-        _parent = e;
-    }
-
-    private String _nsURI;
-    private String _localName;
-    private String _value;
-    private QName _qnameValue;
-    private SchemaElement _parent;
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaConstants.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaConstants.java
index 381ae62432f..3d51906bf84 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaConstants.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaConstants.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaDocument.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaDocument.java
deleted file mode 100644
index 25d002e7c42..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaDocument.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.tools.internal.ws.wsdl.document.schema;
-
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-
-import com.sun.tools.internal.ws.wsdl.framework.AbstractDocument;
-import com.sun.tools.internal.ws.wsdl.framework.Entity;
-import com.sun.tools.internal.ws.wsdl.framework.EntityAction;
-import com.sun.tools.internal.ws.wsdl.framework.EntityReferenceAction;
-import com.sun.tools.internal.ws.wsdl.framework.EntityReferenceValidator;
-import com.sun.tools.internal.ws.wsdl.framework.GloballyKnown;
-import com.sun.tools.internal.ws.wsdl.framework.Kind;
-import com.sun.tools.internal.ws.wsdl.framework.NoSuchEntityException;
-import com.sun.tools.internal.ws.wsdl.framework.ValidationException;
-
-/**
- * A XML Schema document.
- *
- * @author WS Development Team
- */
-public class SchemaDocument extends AbstractDocument {
-
-    public SchemaDocument() {
-    }
-
-    public Schema getSchema() {
-        return _schema;
-    }
-
-    public void setSchema(Schema s) {
-        _schema = s;
-    }
-
-    public Set collectAllNamespaces() {
-        Set result = super.collectAllNamespaces();
-        if (_schema.getTargetNamespaceURI() != null) {
-            result.add(_schema.getTargetNamespaceURI());
-        }
-        return result;
-    }
-
-    public void validate(EntityReferenceValidator validator) {
-        GloballyValidatingAction action =
-            new GloballyValidatingAction(this, validator);
-        withAllSubEntitiesDo(action);
-        if (action.getException() != null) {
-            throw action.getException();
-        }
-    }
-
-    protected Entity getRoot() {
-        return _schema;
-    }
-
-    private Schema _schema;
-
-    private class GloballyValidatingAction
-        implements EntityAction, EntityReferenceAction {
-        public GloballyValidatingAction(
-            AbstractDocument document,
-            EntityReferenceValidator validator) {
-            _document = document;
-            _validator = validator;
-        }
-
-        public void perform(Entity entity) {
-            try {
-                entity.validateThis();
-                entity.withAllEntityReferencesDo(this);
-                entity.withAllSubEntitiesDo(this);
-            } catch (ValidationException e) {
-                if (_exception == null) {
-                    _exception = e;
-                }
-            }
-        }
-
-        public void perform(Kind kind, QName name) {
-            try {
-                GloballyKnown entity = _document.find(kind, name);
-            } catch (NoSuchEntityException e) {
-                // failed to resolve, check with the validator
-                if (_exception == null) {
-                    if (_validator == null
-                        || !_validator.isValid(kind, name)) {
-                        _exception = e;
-                    }
-                }
-            }
-        }
-
-        public ValidationException getException() {
-            return _exception;
-        }
-
-        private ValidationException _exception;
-        private AbstractDocument _document;
-        private EntityReferenceValidator _validator;
-    }
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaElement.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaElement.java
deleted file mode 100644
index 11934050b8a..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaElement.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.tools.internal.ws.wsdl.document.schema;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import com.sun.tools.internal.ws.wsdl.framework.ValidationException;
-import com.sun.xml.internal.ws.util.NullIterator;
-import com.sun.xml.internal.ws.util.xml.XmlUtil;
-
-/**
- *
- * @author WS Development Team
- */
-public class SchemaElement {
-
-    public SchemaElement() {
-    }
-
-    public SchemaElement(String localName) {
-        _localName = localName;
-    }
-
-    public SchemaElement(QName name) {
-        _qname = name;
-        _localName = name.getLocalPart();
-        _nsURI = name.getNamespaceURI();
-    }
-
-    public String getNamespaceURI() {
-        return _nsURI;
-    }
-
-    public void setNamespaceURI(String s) {
-        _nsURI = s;
-    }
-
-    public String getLocalName() {
-        return _localName;
-    }
-
-    public void setLocalName(String s) {
-        _localName = s;
-    }
-
-    public QName getQName() {
-        if (_qname == null) {
-            _qname = new QName(_nsURI, _localName);
-        }
-        return _qname;
-    }
-
-    public SchemaElement getParent() {
-        return _parent;
-    }
-
-    public void setParent(SchemaElement e) {
-        _parent = e;
-    }
-
-    public SchemaElement getRoot() {
-        return _parent == null ? this : _parent.getRoot();
-    }
-
-    public Schema getSchema() {
-        return _parent == null ? _schema : _parent.getSchema();
-    }
-
-    public void setSchema(Schema s) {
-        _schema = s;
-    }
-
-    public void addChild(SchemaElement e) {
-        if (_children == null) {
-            _children = new ArrayList();
-        }
-
-        _children.add(e);
-        e.setParent(this);
-    }
-
-    public void insertChildAtTop(SchemaElement e) {
-        if (_children == null) {
-            _children = new ArrayList();
-        }
-
-        _children.add(0, e);
-        e.setParent(this);
-    }
-
-    public Iterator children() {
-        if (_children == null) {
-            return NullIterator.getInstance();
-        } else {
-            return _children.iterator();
-        }
-    }
-
-    public void addAttribute(SchemaAttribute a) {
-        if (_attributes == null) {
-            _attributes = new ArrayList();
-        }
-
-        _attributes.add(a);
-        a.setParent(this);
-        a.getValue();
-        // this is a hack to force namespace declarations to be added, if needed
-    }
-
-    public void addAttribute(String name, String value) {
-        SchemaAttribute attr = new SchemaAttribute();
-        attr.setLocalName(name);
-        attr.setValue(value);
-        addAttribute(attr);
-    }
-
-    public void addAttribute(String name, QName value) {
-        SchemaAttribute attr = new SchemaAttribute();
-        attr.setLocalName(name);
-        attr.setValue(value);
-        addAttribute(attr);
-    }
-
-    public Iterator attributes() {
-        if (_attributes == null) {
-            return NullIterator.getInstance();
-        } else {
-            return _attributes.iterator();
-        }
-    }
-
-    public SchemaAttribute getAttribute(String localName) {
-        if (_attributes != null) {
-            for (Iterator iter = _attributes.iterator(); iter.hasNext();) {
-                SchemaAttribute attr = (SchemaAttribute) iter.next();
-                if (localName.equals(attr.getLocalName())) {
-                    return attr;
-                }
-            }
-        }
-        return null;
-    }
-
-    public String getValueOfMandatoryAttribute(String localName) {
-        SchemaAttribute attr = getAttribute(localName);
-        if (attr == null) {
-            throw new ValidationException(
-                "validation.missingRequiredAttribute",
-                new Object[] { localName, _localName });
-        }
-        return attr.getValue();
-    }
-
-    public String getValueOfAttributeOrNull(String localName) {
-        SchemaAttribute attr = getAttribute(localName);
-        if (attr == null) {
-            return null;
-        } else {
-            return attr.getValue();
-        }
-    }
-
-    public boolean getValueOfBooleanAttributeOrDefault(
-        String localName,
-        boolean defaultValue) {
-        String stringValue = getValueOfAttributeOrNull(localName);
-        if (stringValue == null) {
-            return defaultValue;
-        }
-        if (stringValue.equals("true") || stringValue.equals("1")) {
-            return true;
-        } else if (stringValue.equals("false") || stringValue.equals("0")) {
-            return false;
-        } else {
-            throw new ValidationException(
-                "validation.invalidAttributeValue",
-                new Object[] { localName, stringValue });
-        }
-    }
-
-    public int getValueOfIntegerAttributeOrDefault(
-        String localName,
-        int defaultValue) {
-        String stringValue = getValueOfAttributeOrNull(localName);
-        if (stringValue == null) {
-            return defaultValue;
-        }
-        try {
-            return Integer.parseInt(stringValue);
-        } catch (NumberFormatException e) {
-            throw new ValidationException(
-                "validation.invalidAttributeValue",
-                new Object[] { localName, stringValue });
-        }
-    }
-
-    public QName getValueOfQNameAttributeOrNull(String localName) {
-        String stringValue = getValueOfAttributeOrNull(localName);
-        if (stringValue == null)
-            return null;
-
-        String prefix = XmlUtil.getPrefix(stringValue);
-        String uri =
-            (prefix == null ? getURIForPrefix("") : getURIForPrefix(prefix));
-        if (uri == null) {
-            throw new ValidationException(
-                "validation.invalidAttributeValue",
-                new Object[] { localName, stringValue });
-        }
-        return new QName(uri, XmlUtil.getLocalPart(stringValue));
-    }
-
-    public void addPrefix(String prefix, String uri) {
-        if (_nsPrefixes == null) {
-            _nsPrefixes = new HashMap();
-        }
-
-        _nsPrefixes.put(prefix, uri);
-    }
-
-    public String getURIForPrefix(String prefix) {
-        if (_nsPrefixes != null) {
-            String result = (String) _nsPrefixes.get(prefix);
-            if (result != null)
-                return result;
-        }
-        if (_parent != null) {
-            return _parent.getURIForPrefix(prefix);
-        }
-        if (_schema != null) {
-            return _schema.getURIForPrefix(prefix);
-        }
-        // give up
-        return null;
-    }
-
-    public boolean declaresPrefixes() {
-        return _nsPrefixes != null;
-    }
-
-    public Iterator prefixes() {
-        if (_nsPrefixes == null) {
-            return NullIterator.getInstance();
-        } else {
-            return _nsPrefixes.keySet().iterator();
-        }
-    }
-
-    public QName asQName(String s) {
-        String prefix = XmlUtil.getPrefix(s);
-        if (prefix == null) {
-            prefix = "";
-        }
-        String uri = getURIForPrefix(prefix);
-        if (uri == null) {
-            throw new ValidationException("validation.invalidPrefix", prefix);
-        }
-        String localPart = XmlUtil.getLocalPart(s);
-        return new QName(uri, localPart);
-    }
-
-    public String asString(QName name) {
-        if (name.getNamespaceURI().equals("")) {
-            return name.getLocalPart();
-        } else {
-            // look for a prefix
-            for (Iterator iter = prefixes(); iter.hasNext();) {
-                String prefix = (String) iter.next();
-                String uri = getURIForPrefix(prefix);
-                if (uri.equals(name.getNamespaceURI())) {
-                    if (prefix.equals("")) {
-                        return name.getLocalPart();
-                    } else {
-                        return prefix + ":" + name.getLocalPart();
-                    }
-                }
-            }
-
-            // not found
-            if (_parent != null) {
-                return _parent.asString(name);
-            }
-            if (_schema != null) {
-                String result = _schema.asString(name);
-                if (result != null) {
-                    return result;
-                }
-            }
-
-            // not found and no parent
-            String prefix = getNewPrefix();
-            addPrefix(prefix, name.getNamespaceURI());
-            return asString(name);
-        }
-    }
-
-    protected String getNewPrefix() {
-        String base = NEW_NS_PREFIX_BASE;
-        int count = 2;
-        String prefix = null;
-        for (boolean needNewOne = true; needNewOne; ++count) {
-            prefix = base + Integer.toString(count);
-            needNewOne = getURIForPrefix(prefix) != null;
-        }
-        return prefix;
-    }
-
-    private String _nsURI;
-    private String _localName;
-    private List _children;
-    private List _attributes;
-    private Map _nsPrefixes;
-    private SchemaElement _parent;
-    private QName _qname;
-    private Schema _schema;
-
-    private static final String NEW_NS_PREFIX_BASE = "ns";
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaEntity.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaEntity.java
deleted file mode 100644
index acfcb8a26c0..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaEntity.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.tools.internal.ws.wsdl.document.schema;
-
-import javax.xml.namespace.QName;
-
-import com.sun.tools.internal.ws.wsdl.framework.Defining;
-import com.sun.tools.internal.ws.wsdl.framework.Entity;
-import com.sun.tools.internal.ws.wsdl.framework.GloballyKnown;
-import com.sun.tools.internal.ws.wsdl.framework.Kind;
-
-/**
- *
- * @author WS Development Team
- */
-public class SchemaEntity extends Entity implements GloballyKnown {
-
-    public SchemaEntity(
-        Schema parent,
-        SchemaElement element,
-        Kind kind,
-        QName name) {
-        _parent = parent;
-        _element = element;
-        _kind = kind;
-        _name = name;
-    }
-
-    public SchemaElement getElement() {
-        return _element;
-    }
-
-    public QName getElementName() {
-        return _element.getQName();
-    }
-
-    public String getName() {
-        return _name.getLocalPart();
-    }
-
-    public Kind getKind() {
-        return _kind;
-    }
-
-    public Schema getSchema() {
-        return _parent;
-    }
-
-    public Defining getDefining() {
-        return _parent;
-    }
-
-    public void validateThis() {
-        // do nothing
-    }
-
-    private Schema _parent;
-    private SchemaElement _element;
-    private Kind _kind;
-    private QName _name;
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaKinds.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaKinds.java
index e43a57747e3..131aa266551 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaKinds.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaKinds.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Binding.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Binding.java
index 0cae48699b1..36c982ff85a 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Binding.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Binding.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,9 +24,15 @@
  */
 package com.sun.tools.internal.ws.wsdl.document.soap;
 
+import org.xml.sax.Locator;
+
 import javax.xml.namespace.QName;
 
 public class SOAP12Binding extends SOAPBinding{
+    public SOAP12Binding(Locator locator) {
+        super(locator);
+    }
+
     @Override public QName getElementName() {
         return SOAP12Constants.QNAME_BINDING;
     }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Constants.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Constants.java
index e8738d438e1..a5ba97fa9b7 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Constants.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Constants.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPAddress.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPAddress.java
index 95a2bfac70a..89808a85fa4 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPAddress.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPAddress.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,18 +25,20 @@
 
 package com.sun.tools.internal.ws.wsdl.document.soap;
 
-import javax.xml.namespace.QName;
+import com.sun.tools.internal.ws.wsdl.framework.ExtensionImpl;
+import org.xml.sax.Locator;
 
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
+import javax.xml.namespace.QName;
 
 /**
  * A SOAP address extension.
  *
  * @author WS Development Team
  */
-public class SOAPAddress extends Extension {
+public class SOAPAddress extends ExtensionImpl {
 
-    public SOAPAddress() {
+    public SOAPAddress(Locator locator) {
+        super(locator);
     }
 
     public QName getElementName() {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBinding.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBinding.java
index be2fe890cb9..41ee6a20723 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBinding.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBinding.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,18 +25,20 @@
 
 package com.sun.tools.internal.ws.wsdl.document.soap;
 
-import javax.xml.namespace.QName;
+import com.sun.tools.internal.ws.wsdl.framework.ExtensionImpl;
+import org.xml.sax.Locator;
 
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
+import javax.xml.namespace.QName;
 
 /**
  * A SOAP binding extension.
  *
  * @author WS Development Team
  */
-public class SOAPBinding extends Extension {
+public class SOAPBinding extends ExtensionImpl {
 
-    public SOAPBinding() {
+    public SOAPBinding(Locator locator) {
+        super(locator);
         _style = SOAPStyle.DOCUMENT;
     }
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBody.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBody.java
index 0bae750ceca..6f78fa4c96b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBody.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBody.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,18 +25,20 @@
 
 package com.sun.tools.internal.ws.wsdl.document.soap;
 
-import javax.xml.namespace.QName;
+import com.sun.tools.internal.ws.wsdl.framework.ExtensionImpl;
+import org.xml.sax.Locator;
 
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
+import javax.xml.namespace.QName;
 
 /**
  * A SOAP body extension.
  *
  * @author WS Development Team
  */
-public class SOAPBody extends Extension {
+public class SOAPBody extends ExtensionImpl {
 
-    public SOAPBody() {
+    public SOAPBody(Locator locator) {
+        super(locator);
     }
 
     public QName getElementName() {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPConstants.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPConstants.java
index d8ac0cf523f..11a179a8439 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPConstants.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPConstants.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,10 @@
 
 package com.sun.tools.internal.ws.wsdl.document.soap;
 
-import javax.xml.namespace.QName;
-
 import com.sun.xml.internal.ws.encoding.soap.streaming.SOAPNamespaceConstants;
 
+import javax.xml.namespace.QName;
+
 /**
  * Interface defining SOAP-related constants.
  *
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPFault.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPFault.java
index b12cf35cf5e..452e00516f2 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPFault.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPFault.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,18 +25,20 @@
 
 package com.sun.tools.internal.ws.wsdl.document.soap;
 
-import javax.xml.namespace.QName;
+import com.sun.tools.internal.ws.wsdl.framework.ExtensionImpl;
+import org.xml.sax.Locator;
 
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
+import javax.xml.namespace.QName;
 
 /**
  * A SOAP fault extension.
  *
  * @author WS Development Team
  */
-public class SOAPFault extends Extension {
+public class SOAPFault extends ExtensionImpl {
 
-    public SOAPFault() {
+    public SOAPFault(Locator locator) {
+        super(locator);
         _use = SOAPUse.LITERAL;
     }
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeader.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeader.java
index c75e758a0f3..d8e586b8dbb 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeader.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeader.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,26 +25,23 @@
 
 package com.sun.tools.internal.ws.wsdl.document.soap;
 
+import com.sun.tools.internal.ws.wsdl.framework.*;
+import org.xml.sax.Locator;
+
+import javax.xml.namespace.QName;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import javax.xml.namespace.QName;
-
-import com.sun.tools.internal.ws.wsdl.framework.Entity;
-import com.sun.tools.internal.ws.wsdl.framework.EntityAction;
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
-import com.sun.tools.internal.ws.wsdl.framework.ExtensionVisitor;
-import com.sun.tools.internal.ws.wsdl.framework.QNameAction;
-
 /**
  * A SOAP header extension.
  *
  * @author WS Development Team
  */
-public class SOAPHeader extends Extension {
+public class SOAPHeader extends ExtensionImpl {
 
-    public SOAPHeader() {
+    public SOAPHeader(Locator locator) {
+        super(locator);
         _faults = new ArrayList();
     }
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeaderFault.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeaderFault.java
index fa0e1fc1f66..f30e94f4421 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeaderFault.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeaderFault.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,19 +25,21 @@
 
 package com.sun.tools.internal.ws.wsdl.document.soap;
 
-import javax.xml.namespace.QName;
-
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
+import com.sun.tools.internal.ws.wsdl.framework.ExtensionImpl;
 import com.sun.tools.internal.ws.wsdl.framework.QNameAction;
+import org.xml.sax.Locator;
+
+import javax.xml.namespace.QName;
 
 /**
  * A SOAP header fault extension.
  *
  * @author WS Development Team
  */
-public class SOAPHeaderFault extends Extension {
+public class SOAPHeaderFault extends ExtensionImpl {
 
-    public SOAPHeaderFault() {
+    public SOAPHeaderFault(Locator locator) {
+        super(locator);
     }
 
     public QName getElementName() {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPOperation.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPOperation.java
index c519deb9c24..f056317d129 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPOperation.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPOperation.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,18 +25,21 @@
 
 package com.sun.tools.internal.ws.wsdl.document.soap;
 
-import javax.xml.namespace.QName;
+import com.sun.tools.internal.ws.wsdl.framework.ExtensionImpl;
+import org.xml.sax.Locator;
 
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
+import javax.xml.namespace.QName;
 
 /**
  * A SOAP operation extension.
  *
  * @author WS Development Team
  */
-public class SOAPOperation extends Extension {
+public class SOAPOperation extends ExtensionImpl {
+
+    public SOAPOperation(Locator locator) {
+        super(locator);
 
-    public SOAPOperation() {
     }
 
     public QName getElementName() {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPStyle.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPStyle.java
index cd5d407d779..4dc852eed8d 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPStyle.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPStyle.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPUse.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPUse.java
index b07e038a5cb..793a0d43302 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPUse.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPUse.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/AbstractDocument.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/AbstractDocument.java
index 334aa002c8b..a48380871da 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/AbstractDocument.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/AbstractDocument.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,15 +25,16 @@
 
 package com.sun.tools.internal.ws.wsdl.framework;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import com.sun.tools.internal.ws.wsdl.parser.MetadataFinder;
+import com.sun.tools.internal.ws.wsdl.parser.DOMForest;
+import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
+import com.sun.tools.internal.ws.wscompile.AbortException;
+import com.sun.tools.internal.ws.resources.WsdlMessages;
 
 import javax.xml.namespace.QName;
+import java.util.*;
+
+import org.xml.sax.helpers.LocatorImpl;
 
 /**
  * An abstract class for documents containing entities.
@@ -42,13 +43,17 @@ import javax.xml.namespace.QName;
  */
 public abstract class AbstractDocument {
 
-    protected AbstractDocument() {
-        _kinds = new HashMap();
-        _identifiables = new HashMap();
-        _importedEntities = new ArrayList();
-        _importedDocuments = new HashSet();
-        _includedEntities = new ArrayList();
-        _includedDocuments = new HashSet();
+    protected final DOMForest forest;
+    protected final ErrorReceiver errReceiver;
+
+    protected AbstractDocument(MetadataFinder forest, ErrorReceiver errReceiver) {
+        this.forest = forest;
+        this.errReceiver = errReceiver;
+        kinds = new HashMap();
+        importedEntities = new ArrayList();
+        importedDocuments = new HashSet();
+        includedEntities = new ArrayList();
+        includedDocuments = new HashSet();
     }
 
     public String getSystemId() {
@@ -63,32 +68,32 @@ public abstract class AbstractDocument {
 
         _systemId = s;
         if (s != null) {
-            _importedDocuments.add(s);
+            importedDocuments.add(s);
         }
     }
 
     public void addIncludedDocument(String systemId) {
-        _includedDocuments.add(systemId);
+        includedDocuments.add(systemId);
     }
 
     public boolean isIncludedDocument(String systemId) {
-        return _includedDocuments.contains(systemId);
+        return includedDocuments.contains(systemId);
     }
 
     public void addIncludedEntity(Entity entity) {
-        _includedEntities.add(entity);
+        includedEntities.add(entity);
     }
 
     public void addImportedDocument(String systemId) {
-        _importedDocuments.add(systemId);
+        importedDocuments.add(systemId);
     }
 
     public boolean isImportedDocument(String systemId) {
-        return _importedDocuments.contains(systemId);
+        return importedDocuments.contains(systemId);
     }
 
     public void addImportedEntity(Entity entity) {
-        _importedEntities.add(entity);
+        importedEntities.add(entity);
     }
 
     public void withAllSubEntitiesDo(EntityAction action) {
@@ -96,20 +101,20 @@ public abstract class AbstractDocument {
             action.perform(getRoot());
         }
 
-        for (Iterator iter = _importedEntities.iterator(); iter.hasNext();) {
+        for (Iterator iter = importedEntities.iterator(); iter.hasNext();) {
             action.perform((Entity) iter.next());
         }
 
-        for (Iterator iter = _includedEntities.iterator(); iter.hasNext();) {
+        for (Iterator iter = includedEntities.iterator(); iter.hasNext();) {
             action.perform((Entity) iter.next());
         }
     }
 
     public Map getMap(Kind k) {
-        Map m = (Map) _kinds.get(k.getName());
+        Map m = (Map) kinds.get(k.getName());
         if (m == null) {
             m = new HashMap();
-            _kinds.put(k.getName(), m);
+            kinds.put(k.getName(), m);
         }
         return m;
     }
@@ -121,10 +126,12 @@ public abstract class AbstractDocument {
         QName name =
             new QName(e.getDefining().getTargetNamespaceURI(), e.getName());
 
-        if (map.containsKey(name))
-            throw new DuplicateEntityException(e);
-        else
+        if (map.containsKey(name)){
+            errReceiver.error(e.getLocator(), WsdlMessages.ENTITY_DUPLICATE_WITH_TYPE(e.getElementName().getLocalPart(), e.getName()));
+            throw new AbortException();
+        }else{
             map.put(name, e);
+        }
     }
 
     public void undefine(GloballyKnown e) {
@@ -134,84 +141,24 @@ public abstract class AbstractDocument {
         QName name =
             new QName(e.getDefining().getTargetNamespaceURI(), e.getName());
 
-        if (map.containsKey(name))
-            throw new NoSuchEntityException(name);
-        else
+        if (map.containsKey(name)){
+            errReceiver.error(e.getLocator(), WsdlMessages.ENTITY_NOT_FOUND_BY_Q_NAME(e.getElementName().getLocalPart(), e.getElementName().getNamespaceURI()));
+            throw new AbortException();
+        } else{
             map.remove(name);
+        }
     }
 
     public GloballyKnown find(Kind k, QName name) {
         Map map = getMap(k);
         Object result = map.get(name);
-        if (result == null)
-            throw new NoSuchEntityException(name);
+        if (result == null){
+            errReceiver.error(new LocatorImpl(), WsdlMessages.ENTITY_NOT_FOUND_BY_Q_NAME(name.getLocalPart(), name.getNamespaceURI()));
+            throw new AbortException();
+        }
         return (GloballyKnown) result;
     }
 
-    public void defineID(Identifiable e) {
-        String id = e.getID();
-        if (id == null)
-            return;
-
-        if (_identifiables.containsKey(id))
-            throw new DuplicateEntityException(e);
-        else
-            _identifiables.put(id, e);
-    }
-
-    public void undefineID(Identifiable e) {
-        String id = e.getID();
-
-        if (id == null)
-            return;
-
-        if (_identifiables.containsKey(id))
-            throw new NoSuchEntityException(id);
-        else
-            _identifiables.remove(id);
-    }
-
-    public Identifiable findByID(String id) {
-        Object result = _identifiables.get(id);
-        if (result == null)
-            throw new NoSuchEntityException(id);
-        return (Identifiable) result;
-    }
-
-    public Set collectAllQNames() {
-        final Set result = new HashSet();
-        EntityAction action = new EntityAction() {
-            public void perform(Entity entity) {
-                entity.withAllQNamesDo(new QNameAction() {
-                    public void perform(QName name) {
-                        result.add(name);
-                    }
-                });
-                entity.withAllSubEntitiesDo(this);
-            }
-        };
-        withAllSubEntitiesDo(action);
-        return result;
-    }
-
-    public Set collectAllNamespaces() {
-        final Set result = new HashSet();
-
-        EntityAction action = new EntityAction() {
-            public void perform(Entity entity) {
-                entity.withAllQNamesDo(new QNameAction() {
-                    public void perform(QName name) {
-                        result.add(name.getNamespaceURI());
-                    }
-                });
-
-                entity.withAllSubEntitiesDo(this);
-            }
-        };
-        withAllSubEntitiesDo(action);
-        return result;
-    }
-
     public void validateLocally() {
         LocallyValidatingAction action = new LocallyValidatingAction();
         withAllSubEntitiesDo(action);
@@ -220,21 +167,16 @@ public abstract class AbstractDocument {
         }
     }
 
-    public void validate() {
-        validate(null);
-    }
-
     public abstract void validate(EntityReferenceValidator validator);
 
     protected abstract Entity getRoot();
 
-    private Map _kinds;
-    private Map _identifiables;
+    private final Map kinds;
     private String _systemId;
-    private Set _importedDocuments;
-    private List _importedEntities;
-    private Set _includedDocuments;
-    private List _includedEntities;
+    private final Set importedDocuments;
+    private final List importedEntities;
+    private final Set includedDocuments;
+    private final List includedEntities;
 
     private class LocallyValidatingAction implements EntityAction {
         public LocallyValidatingAction() {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Defining.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Defining.java
index b61ad7cef4e..11a9b9f6f03 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Defining.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Defining.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/DuplicateEntityException.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/DuplicateEntityException.java
index b2da2b79205..e9516a71cbf 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/DuplicateEntityException.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/DuplicateEntityException.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,7 +52,7 @@ public class DuplicateEntityException extends ValidationException {
                 entity.getElementName().getLocalPart(), name);
     }
 
-    public String getResourceBundleName() {
+    public String getDefaultResourceBundleName() {
         return "com.sun.tools.internal.ws.resources.wsdl";
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Elemental.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Elemental.java
index 1ba065384d3..8dfe14c0413 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Elemental.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Elemental.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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.tools.internal.ws.wsdl.framework;
 
+import org.xml.sax.Locator;
+
 import javax.xml.namespace.QName;
 
 /**
@@ -34,4 +36,5 @@ import javax.xml.namespace.QName;
  */
 public interface Elemental {
     public QName getElementName();
+    public Locator getLocator();
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Entity.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Entity.java
index c568122e0ac..dd3752a154c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Entity.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Entity.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,9 +25,13 @@
 
 package com.sun.tools.internal.ws.wsdl.framework;
 
+import org.xml.sax.Locator;
+
 import java.util.HashMap;
 import java.util.Map;
 
+import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
+
 /**
  * An entity, typically corresponding to an XML element.
  *
@@ -35,7 +39,18 @@ import java.util.Map;
  */
 public abstract class Entity implements Elemental {
 
-    public Entity() {
+    private final Locator locator;
+    protected ErrorReceiver errorReceiver;
+    public Entity(Locator locator) {
+        this.locator = locator;
+    }
+
+    public void setErrorReceiver(ErrorReceiver errorReceiver) {
+        this.errorReceiver = errorReceiver;
+    }
+
+    public Locator getLocator() {
+        return locator;
     }
 
     public Object getProperty(String key) {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityAction.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityAction.java
index 0b1f948ce4e..f81991d6da5 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityAction.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityAction.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceAction.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceAction.java
index 715eaa18633..43d5bd6c7b3 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceAction.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceAction.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceValidator.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceValidator.java
index a09ce9495b3..cf1fbceeb99 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceValidator.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceValidator.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensibilityHelper.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensibilityHelper.java
index 71452cbc5db..98c481df440 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensibilityHelper.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensibilityHelper.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,11 @@
 
 package com.sun.tools.internal.ws.wsdl.framework;
 
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtension;
+
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import java.util.NoSuchElementException;
 
 /**
  * A helper class for extensible entities.
@@ -40,48 +41,36 @@ public class ExtensibilityHelper {
     public ExtensibilityHelper() {
     }
 
-    public void addExtension(Extension e) {
+    public void addExtension(TWSDLExtension e) {
         if (_extensions == null) {
             _extensions = new ArrayList();
         }
         _extensions.add(e);
     }
 
-    public Iterator extensions() {
+    public Iterable extensions() {
         if (_extensions == null) {
-            return new Iterator() {
-                public boolean hasNext() {
-                    return false;
-                }
-
-                public Object next() {
-                    throw new NoSuchElementException();
-                }
-
-                public void remove() {
-                    throw new UnsupportedOperationException();
-                }
-            };
+            return new ArrayList();
         } else {
-            return _extensions.iterator();
+            return _extensions;
         }
     }
 
     public void withAllSubEntitiesDo(EntityAction action) {
-        if (_extensions != null) {
-            for (Iterator iter = _extensions.iterator(); iter.hasNext();) {
-                action.perform((Entity) iter.next());
-            }
-        }
+//        if (_extensions != null) {
+//            for (Iterator iter = _extensions.iterator(); iter.hasNext();) {
+//                action.perform((Entity) iter.next());
+//            }
+//        }
     }
 
     public void accept(ExtensionVisitor visitor) throws Exception {
         if (_extensions != null) {
             for (Iterator iter = _extensions.iterator(); iter.hasNext();) {
-                ((Extension) iter.next()).accept(visitor);
+                ((ExtensionImpl) iter.next()).accept(visitor);
             }
         }
     }
 
-    private List _extensions;
+    private List _extensions;
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Extensible.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Extensible.java
deleted file mode 100644
index 1a0a6bec48a..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Extensible.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.tools.internal.ws.wsdl.framework;
-
-import java.util.Iterator;
-
-/**
- * An entity that can be extended.
- *
- * @author WS Development Team
- */
-public interface Extensible extends Elemental {
-    public void addExtension(Extension e);
-    public Iterator extensions();
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Extension.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionImpl.java
similarity index 75%
rename from jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Extension.java
rename to jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionImpl.java
index 2d3d643d3a9..68447c700c4 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Extension.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,21 +25,26 @@
 
 package com.sun.tools.internal.ws.wsdl.framework;
 
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtensible;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtension;
+import org.xml.sax.Locator;
+
 /**
  * An entity extending another entity.
  *
  * @author WS Development Team
  */
-public abstract class Extension extends Entity {
+public abstract class ExtensionImpl extends Entity implements TWSDLExtension {
 
-    public Extension() {
+    public ExtensionImpl(Locator locator) {
+        super(locator);
     }
 
-    public Extensible getParent() {
+    public TWSDLExtensible getParent() {
         return _parent;
     }
 
-    public void setParent(Extensible parent) {
+    public void setParent(TWSDLExtensible parent) {
         _parent = parent;
     }
 
@@ -48,5 +53,5 @@ public abstract class Extension extends Entity {
         visitor.postVisit(this);
     }
 
-    private Extensible _parent;
+    private TWSDLExtensible _parent;
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitor.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitor.java
index 7676a7835a3..1663cc5b655 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitor.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,12 +25,14 @@
 
 package com.sun.tools.internal.ws.wsdl.framework;
 
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtension;
+
 /**
  * A visitor working on extension entities.
  *
  * @author WS Development Team
  */
 public interface ExtensionVisitor {
-    public void preVisit(Extension extension) throws Exception;
-    public void postVisit(Extension extension) throws Exception;
+    public void preVisit(TWSDLExtension extension) throws Exception;
+    public void postVisit(TWSDLExtension extension) throws Exception;
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitorBase.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitorBase.java
index e570b71be49..6a2f2109e5a 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitorBase.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitorBase.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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.tools.internal.ws.wsdl.framework;
 
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtension;
+
 /**
  * A base class for extension visitors.
  *
@@ -34,8 +36,8 @@ public class ExtensionVisitorBase implements ExtensionVisitor {
     public ExtensionVisitorBase() {
     }
 
-    public void preVisit(Extension extension) throws Exception {
+    public void preVisit(TWSDLExtension extension) throws Exception {
     }
-    public void postVisit(Extension extension) throws Exception {
+    public void postVisit(TWSDLExtension extension) throws Exception {
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExternalEntityReference.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExternalEntityReference.java
index e4370a33224..a77e3715af4 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExternalEntityReference.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExternalEntityReference.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/GlobalEntity.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/GlobalEntity.java
index fda729142f4..952c3a78445 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/GlobalEntity.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/GlobalEntity.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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.tools.internal.ws.wsdl.framework;
 
+import org.xml.sax.Locator;
+import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
+
 /**
  * An entity that can be defined in a target namespace.
  *
@@ -32,8 +35,10 @@ package com.sun.tools.internal.ws.wsdl.framework;
  */
 public abstract class GlobalEntity extends Entity implements GloballyKnown {
 
-    public GlobalEntity(Defining defining) {
+    public GlobalEntity(Defining defining, Locator locator, ErrorReceiver errorReceiver) {
+        super(locator);
         _defining = defining;
+        this.errorReceiver = errorReceiver;
     }
 
     public String getName() {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/GloballyKnown.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/GloballyKnown.java
index b59dc23c817..925d5fd6f3a 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/GloballyKnown.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/GloballyKnown.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Identifiable.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Identifiable.java
index 0f70935ba97..b46f3682ea6 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Identifiable.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Identifiable.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Kind.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Kind.java
index f20d0df8f74..501b04c0423 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Kind.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Kind.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/NoSuchEntityException.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/NoSuchEntityException.java
index 87ac0a07650..6ef81fa6fd4 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/NoSuchEntityException.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/NoSuchEntityException.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 NoSuchEntityException extends ValidationException {
         super("entity.notFoundByID", id);
     }
 
-    public String getResourceBundleName() {
+    public String getDefaultResourceBundleName() {
         return "com.sun.tools.internal.ws.resources.wsdl";
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ParseException.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ParseException.java
index 5841e2cf6e8..2aefe27c950 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ParseException.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ParseException.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,11 +39,15 @@ public class ParseException extends JAXWSExceptionBase {
         super(key, args);
     }
 
+    public ParseException(Localizable message){
+        super("localized.error", message);
+    }
+
     public ParseException(Throwable throwable) {
         super(throwable);
     }
 
-    public String getResourceBundleName() {
+    public String getDefaultResourceBundleName() {
         return "com.sun.tools.internal.ws.resources.wsdl";
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ParserListener.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ParserListener.java
index b857bf081bb..87a1148801f 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ParserListener.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ParserListener.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,6 @@ import javax.xml.namespace.QName;
  * @author WS Development Team
  */
 public interface ParserListener {
-    public void ignoringExtension(QName name, QName parent);
+    public void ignoringExtension(Entity entity, QName name, QName parent);
     public void doneParsingEntity(QName element, Entity entity);
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/QNameAction.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/QNameAction.java
index 1588cdefca8..988cdab3f5a 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/QNameAction.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/QNameAction.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ParserContext.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/TWSDLParserContextImpl.java
similarity index 74%
rename from jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ParserContext.java
rename to jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/TWSDLParserContextImpl.java
index 2781c080446..87bbfeeb5d6 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ParserContext.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/TWSDLParserContextImpl.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,32 +25,44 @@
 
 package com.sun.tools.internal.ws.wsdl.framework;
 
+import com.sun.tools.internal.ws.api.wsdl.TWSDLParserContext;
+import com.sun.tools.internal.ws.wsdl.parser.DOMForest;
+import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
+import com.sun.tools.internal.ws.resources.WsdlMessages;
+import com.sun.xml.internal.ws.util.NamespaceSupport;
+import com.sun.xml.internal.ws.util.xml.XmlUtil;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Element;
+import org.xml.sax.Locator;
+
+import javax.xml.namespace.QName;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-
-import com.sun.xml.internal.ws.util.NamespaceSupport;
-import com.sun.xml.internal.ws.util.xml.XmlUtil;
-
 /**
  * The context used by parser classes.
  *
  * @author WS Development Team
  */
-public class ParserContext {
+public class TWSDLParserContextImpl implements TWSDLParserContext {
 
     private final static String PREFIX_XMLNS = "xmlns";
+    private boolean _followImports;
+    private final AbstractDocument _document;
+    private final NamespaceSupport _nsSupport;
+    private final ArrayList _listeners;
+    private final WSDLLocation _wsdlLocation;
+    private final DOMForest forest;
+    private final ErrorReceiver errorReceiver;
 
-    public ParserContext(AbstractDocument doc, ArrayList listeners) {
-        _document = doc;
-        _listeners = listeners;
-        _nsSupport = new NamespaceSupport();
-        _wsdlLocation = new WSDLLocation();
+    public TWSDLParserContextImpl(DOMForest forest, AbstractDocument doc, ArrayList listeners, ErrorReceiver errReceiver) {
+        this._document = doc;
+        this._listeners = listeners;
+        this._nsSupport = new NamespaceSupport();
+        this._wsdlLocation = new WSDLLocation();
+        this.forest = forest;
+        this.errorReceiver = errReceiver;
     }
 
     public AbstractDocument getDocument() {
@@ -77,7 +89,7 @@ public class ParserContext {
         return _nsSupport.getURI(prefix);
     }
 
-    public Iterator getPrefixes() {
+    public Iterable getPrefixes() {
         return _nsSupport.getPrefixes();
     }
 
@@ -102,7 +114,11 @@ public class ParserContext {
         }
     }
 
-    public QName translateQualifiedName(String s) {
+    public Locator getLocation(Element e) {
+        return forest.locatorTable.getStartLocation(e);
+    }
+
+    public QName translateQualifiedName(Locator locator, String s) {
         if (s == null)
             return null;
 
@@ -114,16 +130,16 @@ public class ParserContext {
         } else {
             uri = getNamespaceURI(prefix);
             if (uri == null) {
-                throw new ParseException(
-                    "parsing.unknownNamespacePrefix",
-                    prefix);
+                errorReceiver.error(locator, WsdlMessages.PARSING_UNKNOWN_NAMESPACE_PREFIX(prefix));
             }
         }
 
         return new QName(uri, XmlUtil.getLocalPart(s));
     }
 
-    public void fireIgnoringExtension(QName name, QName parent) {
+    public void fireIgnoringExtension(Element e, Entity entity) {
+        QName name = new QName(e.getNamespaceURI(), e.getLocalName());
+        QName parent = entity.getElementName();
         List _targets = null;
 
         synchronized (this) {
@@ -135,7 +151,7 @@ public class ParserContext {
         if (_targets != null) {
             for (Iterator iter = _targets.iterator(); iter.hasNext();) {
                 ParserListener l = (ParserListener) iter.next();
-                l.ignoringExtension(name, parent);
+                l.ignoringExtension(entity, name, parent);
             }
         }
     }
@@ -174,12 +190,4 @@ public class ParserContext {
     public String getWSDLLocation() {
         return _wsdlLocation.getLocation();
     }
-
-    private boolean _followImports;
-    private AbstractDocument _document;
-    private NamespaceSupport _nsSupport;
-    private ArrayList _listeners;
-    //bug fix:4856674
-    private WSDLLocation _wsdlLocation;
-
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ValidationException.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ValidationException.java
index 8b2d51fa9ca..d4cd8fbad9f 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ValidationException.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ValidationException.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 package com.sun.tools.internal.ws.wsdl.framework;
 
 import com.sun.xml.internal.ws.util.exception.JAXWSExceptionBase;
-import com.sun.xml.internal.ws.util.localization.Localizable;
 
 /**
  * An exception signalling that validation of an entity failed.
@@ -43,7 +42,7 @@ public class ValidationException extends JAXWSExceptionBase {
         super(throwable);
     }
 
-    public String getResourceBundleName() {
+    public String getDefaultResourceBundleName() {
         return "com.sun.tools.internal.ws.resources.wsdl";
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/WSDLLocation.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/WSDLLocation.java
index 3e4c03e2c94..800a2a4b3f5 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/WSDLLocation.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/WSDLLocation.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,8 +27,7 @@ package com.sun.tools.internal.ws.wsdl.framework;
 /**
  *
  * Maintains wsdl:location context. This is used with
- * ParserContext, where one each WSDL being imported its location is pushed, this will be used
- * latter to resolve relative imports of schema in SchemaParser.
+ * TWSDLParserContextImpl, where one each WSDL being imported its location is pushed.
  *
  * @author WS Development Team
  */
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/WriterContext.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/WriterContext.java
deleted file mode 100644
index cb5217d21b4..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/WriterContext.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.tools.internal.ws.wsdl.framework;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import com.sun.xml.internal.ws.util.NamespaceSupport;
-import com.sun.tools.internal.ws.util.xml.PrettyPrintingXmlWriter;
-
-/**
- * The context used by writer classes.
- *
- * @author WS Development Team
- */
-public class WriterContext {
-
-    public WriterContext(OutputStream os) throws IOException {
-        _writer = new PrettyPrintingXmlWriter(os);
-        _nsSupport = new NamespaceSupport();
-        _newPrefixCount = 2;
-    }
-
-    public void flush() throws IOException {
-        _writer.flush();
-    }
-
-    public void close() throws IOException {
-        _writer.close();
-    }
-
-    public void push() {
-        if (_pendingNamespaceDeclarations != null) {
-            throw new IllegalStateException("prefix declarations are pending");
-        }
-        _nsSupport.pushContext();
-    }
-
-    public void pop() {
-        _nsSupport.popContext();
-        _pendingNamespaceDeclarations = null;
-    }
-
-    public String getNamespaceURI(String prefix) {
-        return _nsSupport.getURI(prefix);
-    }
-
-    public Iterator getPrefixes() {
-        return _nsSupport.getPrefixes();
-    }
-
-    public String getDefaultNamespaceURI() {
-        return getNamespaceURI("");
-    }
-
-    public void declarePrefix(String prefix, String uri) {
-        _nsSupport.declarePrefix(prefix, uri);
-        if (_pendingNamespaceDeclarations == null) {
-            _pendingNamespaceDeclarations = new ArrayList();
-        }
-        _pendingNamespaceDeclarations.add(new String[] { prefix, uri });
-    }
-
-    public String getPrefixFor(String uri) {
-        if ((getDefaultNamespaceURI() != null && getDefaultNamespaceURI().equals(uri))
-            || uri.equals("")) {
-            return "";
-        } else {
-            return _nsSupport.getPrefix(uri);
-        }
-    }
-
-    public String findNewPrefix(String base) {
-        return base + Integer.toString(_newPrefixCount++);
-    }
-
-    public String getTargetNamespaceURI() {
-        return _targetNamespaceURI;
-    }
-
-    public void setTargetNamespaceURI(String uri) {
-        _targetNamespaceURI = uri;
-    }
-
-    public void writeStartTag(QName name) throws IOException {
-        _writer.start(getQNameString(name));
-    }
-
-    public void writeEndTag(QName name) throws IOException {
-        _writer.end(getQNameString(name));
-    }
-
-    public void writeAttribute(String name, String value) throws IOException {
-        if (value != null) {
-            _writer.attribute(name, value);
-        }
-    }
-
-    public void writeAttribute(String name, QName value) throws IOException {
-        if (value != null) {
-            _writer.attribute(name, getQNameString(value));
-        }
-    }
-
-    public void writeAttribute(String name, boolean value) throws IOException {
-        writeAttribute(name, value ? "true" : "false");
-    }
-
-    public void writeAttribute(String name, Boolean value) throws IOException {
-        if (value != null) {
-            writeAttribute(name, value.booleanValue());
-        }
-    }
-
-    public void writeAttribute(String name, int value) throws IOException {
-        writeAttribute(name, Integer.toString(value));
-    }
-
-    public void writeAttribute(String name, Object value, Map valueToXmlMap)
-        throws IOException {
-        String actualValue = (String) valueToXmlMap.get(value);
-        writeAttribute(name, actualValue);
-    }
-
-    public void writeNamespaceDeclaration(String prefix, String uri)
-        throws IOException {
-        _writer.attribute(getNamespaceDeclarationAttributeName(prefix), uri);
-    }
-
-    public void writeAllPendingNamespaceDeclarations() throws IOException {
-        if (_pendingNamespaceDeclarations != null) {
-            for (Iterator iter = _pendingNamespaceDeclarations.iterator();
-                iter.hasNext();
-                ) {
-                String[] pair = (String[]) iter.next();
-                writeNamespaceDeclaration(pair[0], pair[1]);
-            }
-        }
-        _pendingNamespaceDeclarations = null;
-    }
-
-    private String getNamespaceDeclarationAttributeName(String prefix) {
-        if (prefix.equals("")) {
-            return "xmlns";
-        } else {
-            return "xmlns:" + prefix;
-        }
-    }
-
-    public void writeTag(QName name, String value) throws IOException {
-        _writer.leaf(getQNameString(name), value);
-    }
-
-    public String getQNameString(QName name) {
-        String nsURI = name.getNamespaceURI();
-        String prefix = getPrefixFor(nsURI);
-        if (prefix == null) {
-            throw new IllegalArgumentException();
-        } else if (prefix.equals("")) {
-            return name.getLocalPart();
-        } else {
-            return prefix + ":" + name.getLocalPart();
-        }
-    }
-
-    public String getQNameStringWithTargetNamespaceCheck(QName name) {
-        if (name.getNamespaceURI().equals(_targetNamespaceURI)) {
-            return name.getLocalPart();
-        } else {
-            return getQNameString(name);
-        }
-    }
-
-    public void writeChars(String chars) throws IOException {
-        _writer.chars(chars);
-    }
-
-    private PrettyPrintingXmlWriter _writer;
-    private NamespaceSupport _nsSupport;
-    private String _targetNamespaceURI;
-    private int _newPrefixCount;
-    private List _pendingNamespaceDeclarations;
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/AbstractExtensionHandler.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/AbstractExtensionHandler.java
new file mode 100644
index 00000000000..e7956d42a76
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/AbstractExtensionHandler.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.tools.internal.ws.wsdl.parser;
+
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtensible;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtensionHandler;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLParserContext;
+import com.sun.tools.internal.ws.wsdl.document.mime.MIMEConstants;
+import org.w3c.dom.Element;
+
+import java.util.Collections;
+import java.util.Map;
+
+/**
+ * An abstract implementation class of {@link TWSDLExtensionHandler}
+ *
+ * @author Vivek Pandey
+ */
+public abstract class AbstractExtensionHandler extends TWSDLExtensionHandler {
+    private final Map extensionHandlers;
+    private final Map unmodExtenHandlers;
+
+    public AbstractExtensionHandler(Map extensionHandlerMap) {
+        this.extensionHandlers = extensionHandlerMap;
+        this.unmodExtenHandlers = Collections.unmodifiableMap(extensionHandlers);
+    }
+
+    public Map getExtensionHandlers(){
+        return unmodExtenHandlers;
+    }
+
+    /**
+     * Callback that gets called by the WSDL parser or any other extension handler on finding an extensibility element
+     * that it can't understand.
+     *
+     * @param parent  The Parent element within which the extensibility element is defined
+     * @param e       The extensibility elemenet
+     * @return false if there was some error during the extension handling otherwise returns true. If returned false
+     *         then the WSDL parser can abort if the wsdl extensibility element had required attribute set to true
+     */
+    public boolean doHandleExtension(TWSDLParserContext context, TWSDLExtensible parent, Element e) {
+        if (parent.getWSDLElementName().equals(MIMEConstants.QNAME_PART)) {
+            return handleMIMEPartExtension(context, parent, e);
+        } else {
+            return super.doHandleExtension(context, parent, e);
+        }
+    }
+
+    /**
+     * Callback for wsdl:mime
+     *
+     * @param context Parser context that will be passed on by the wsdl parser
+     * @param parent  The Parent element within which the extensibility element is defined
+     * @param e       The extensibility elemenet
+     * @return false if there was some error during the extension handling otherwise returns true. If returned false
+     *         then the WSDL parser can abort if the wsdl extensibility element had required attribute set to true
+     */
+    protected boolean handleMIMEPartExtension(TWSDLParserContext context, TWSDLExtensible parent, Element e){
+        return false;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/AbstractReferenceFinderImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/AbstractReferenceFinderImpl.java
new file mode 100644
index 00000000000..83da2aad6ae
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/AbstractReferenceFinderImpl.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+
+
+package com.sun.tools.internal.ws.wsdl.parser;
+
+import com.sun.istack.internal.SAXParseException2;
+import com.sun.tools.internal.ws.resources.WsdlMessages;
+import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.helpers.XMLFilterImpl;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+/**
+ * XMLFilter that finds references to other schema files from
+ * SAX events.
+ *
+ * This implementation is a base implementation for typical case
+ * where we just need to look for a particular attribute which
+ * contains an URL to another schema file.
+ *
+ * @author
+ *  Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ *  Vivek Pandey
+ */
+public abstract class AbstractReferenceFinderImpl extends XMLFilterImpl {
+    protected final DOMForest parent;
+
+    protected AbstractReferenceFinderImpl( DOMForest _parent ) {
+        this.parent = _parent;
+    }
+
+    /**
+     * IF the given element contains a reference to an external resource,
+     * return its URL.
+     *
+     * @param nsURI
+     *      Namespace URI of the current element
+     * @param localName
+     *      Local name of the current element
+     * @return
+     *      It's OK to return a relative URL.
+     */
+    protected abstract String findExternalResource( String nsURI, String localName, Attributes atts);
+
+    public void startElement(String namespaceURI, String localName, String qName, Attributes atts)
+        throws SAXException {
+        super.startElement(namespaceURI, localName, qName, atts);
+
+        String relativeRef = findExternalResource(namespaceURI,localName,atts);
+        if(relativeRef==null)   return; // non found
+
+        try {
+            // absolutize URL.
+            String ref = new URI(locator.getSystemId()).resolve(new URI(relativeRef)).toString();
+
+            // then parse this schema as well,
+            // but don't mark this document as a root.
+            parent.parse(ref,false);
+        } catch( URISyntaxException e ) {
+            SAXParseException spe = new SAXParseException2(
+                    WsdlMessages.ABSTRACT_REFERENCE_FINDER_IMPL_UNABLE_TO_PARSE(relativeRef,e.getMessage()),
+                locator, e );
+
+            fatalError(spe);
+            throw spe;
+        } catch( IOException e ) {
+            SAXParseException spe = new SAXParseException2(
+                WsdlMessages.ABSTRACT_REFERENCE_FINDER_IMPL_UNABLE_TO_PARSE(relativeRef,e.getMessage()),
+                locator, e );
+
+            fatalError(spe);
+            throw spe;
+        }
+    }
+
+    private Locator locator;
+
+    public void setDocumentLocator(Locator locator) {
+        super.setDocumentLocator(locator);
+        this.locator = locator;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/Constants.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/Constants.java
index a59d0ab08c0..8cc8c5832a5 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/Constants.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/Constants.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMBuilder.java
new file mode 100644
index 00000000000..8814ec649f9
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMBuilder.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+
+
+package com.sun.tools.internal.ws.wsdl.parser;
+
+import com.sun.tools.internal.ws.wsdl.document.jaxws.JAXWSBindingsConstants;
+import com.sun.tools.internal.xjc.reader.internalizer.LocatorTable;
+import com.sun.xml.internal.bind.marshaller.SAX2DOMEx;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
+
+import java.util.Set;
+
+/**
+ * Builds DOM while keeping the location information.
+ *
+ * 
    
+ * This class also looks for outer most <jaxws:bindings>
+ * customizations.
+ *
+ * @author
+ *     Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ *     Vivek Pandey
+ */
+class DOMBuilder extends SAX2DOMEx {
+    /**
+     * Grows a DOM tree under the given document, and
+     * stores location information to the given table.
+     *
+     * @param outerMostBindings
+     *      This set will receive newly found outermost
+     *      jaxb:bindings customizations.
+     */
+    public DOMBuilder( Document dom, LocatorTable ltable, Set outerMostBindings ) {
+        super( dom );
+        this.locatorTable = ltable;
+        this.outerMostBindings = outerMostBindings;
+    }
+
+    /** Location information will be stored into this object. */
+    private final LocatorTable locatorTable;
+
+    private final Set outerMostBindings;
+
+    private Locator locator;
+
+    public void setDocumentLocator(Locator locator) {
+        this.locator = locator;
+        super.setDocumentLocator(locator);
+    }
+
+
+    public void startElement(String namespaceURI, String localName, String qName, Attributes atts) {
+        super.startElement(namespaceURI, localName, qName, atts);
+
+        Element e = getCurrentElement();
+        locatorTable.storeStartLocation( e, locator );
+
+        // check if this element is an outer-most 
+        if( JAXWSBindingsConstants.JAXWS_BINDINGS.getNamespaceURI().equals(e.getNamespaceURI())
+        &&  "bindings".equals(e.getLocalName()) ) {
+
+            // if this is the root node (meaning that this file is an
+            // external binding file) or if the parent is XML Schema element
+            // (meaning that this is an "inlined" external binding)
+            Node p = e.getParentNode();
+            if( p instanceof Document) {
+                outerMostBindings.add(e);   // remember this value
+            }
+        }
+    }
+
+    public void endElement(String namespaceURI, String localName, String qName) {
+        locatorTable.storeEndLocation( getCurrentElement(), locator );
+        super.endElement(namespaceURI, localName, qName);
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java
new file mode 100644
index 00000000000..9659de4add0
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java
@@ -0,0 +1,417 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+
+
+package com.sun.tools.internal.ws.wsdl.parser;
+
+import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
+import com.sun.tools.internal.ws.wscompile.WsimportOptions;
+import com.sun.tools.internal.ws.wsdl.document.schema.SchemaConstants;
+import com.sun.tools.internal.ws.resources.WscompileMessages;
+import com.sun.tools.internal.xjc.reader.internalizer.LocatorTable;
+import com.sun.xml.internal.bind.marshaller.DataWriter;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.XMLFilterImpl;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXResult;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author Vivek Pandey
+ */
+public class DOMForest {
+    /**
+     * To correctly feed documents to a schema parser, we need to remember
+     * which documents (of the forest) were given as the root
+     * documents, and which of them are read as included/imported
+     * documents.
+     * 
    
+     * 
    
+     * Set of system ids as strings.
+     */
+    protected final Set rootDocuments = new HashSet();
+
+    /**
+     * Contains wsdl:import(s)
+     */
+    protected final Set externalReferences = new HashSet();
+
+    /**
+     * actual data storage map<SystemId,Document>.
+     */
+    protected final Map core = new HashMap();
+    protected final WsimportOptions options;
+    protected final ErrorReceiver errorReceiver;
+
+    private final DocumentBuilder documentBuilder;
+    private final SAXParserFactory parserFactory;
+
+    /**
+     * inlined schema elements inside wsdl:type section
+     */
+    protected final List inlinedSchemaElements = new ArrayList();
+
+
+    /**
+     * Stores location information for all the trees in this forest.
+     */
+    public final LocatorTable locatorTable = new LocatorTable();
+
+    /**
+     * Stores all the outer-most <jaxb:bindings> customizations.
+     */
+    public final Set outerMostBindings = new HashSet();
+
+    /**
+     * Schema language dependent part of the processing.
+     */
+    protected final InternalizationLogic logic;
+
+    public DOMForest(InternalizationLogic logic, WsimportOptions options, ErrorReceiver errReceiver) {
+        this.options = options;
+        this.errorReceiver = errReceiver;
+        this.logic = logic;
+        try {
+            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+            dbf.setNamespaceAware(true);
+            this.documentBuilder = dbf.newDocumentBuilder();
+
+            this.parserFactory = SAXParserFactory.newInstance();
+            this.parserFactory.setNamespaceAware(true);
+        } catch (ParserConfigurationException e) {
+            throw new AssertionError(e);
+        }
+    }
+
+    public List getInlinedSchemaElement() {
+        return inlinedSchemaElements;
+    }
+
+    public Document parse(InputSource source, boolean root) throws SAXException {
+        if (source.getSystemId() == null)
+            throw new IllegalArgumentException();
+
+        return parse(source.getSystemId(), source, root);
+    }
+
+    /**
+     * Parses an XML at the given location (
+     * and XMLs referenced by it) into DOM trees
+     * and stores them to this forest.
+     *
+     * @return the parsed DOM document object.
+     */
+    public Document parse(String systemId, boolean root) throws SAXException, IOException {
+
+        systemId = normalizeSystemId(systemId);
+
+        InputSource is = null;
+
+        // allow entity resolver to find the actual byte stream.
+        if (options.entityResolver != null)
+            is = options.entityResolver.resolveEntity(null, systemId);
+        if (is == null)
+            is = new InputSource(systemId);
+        else
+            systemId=is.getSystemId();
+
+        if (core.containsKey(systemId)) {
+            // this document has already been parsed. Just ignore.
+            return core.get(systemId);
+        }
+
+        if(!root)
+            addExternalReferences(systemId);
+
+        // but we still use the original system Id as the key.
+        return parse(systemId, is, root);
+    }
+
+    /**
+     * Parses the given document and add it to the DOM forest.
+     *
+     * @return null if there was a parse error. otherwise non-null.
+     */
+    public Document parse(String systemId, InputSource inputSource, boolean root) throws SAXException {
+        Document dom = documentBuilder.newDocument();
+
+        systemId = normalizeSystemId(systemId);
+
+        boolean retryMex = false;
+        Exception exception = null;
+        // put into the map before growing a tree, to
+        // prevent recursive reference from causing infinite loop.
+        core.put(systemId, dom);
+
+        dom.setDocumentURI(systemId);
+        if (root)
+            rootDocuments.add(systemId);
+
+        try {
+            XMLReader reader = parserFactory.newSAXParser().getXMLReader();
+            reader.setContentHandler(getParserHandler(dom));
+            if (errorReceiver != null)
+                reader.setErrorHandler(errorReceiver);
+            if (options.entityResolver != null)
+                reader.setEntityResolver(options.entityResolver);
+            reader.parse(inputSource);
+             Element doc = dom.getDocumentElement();
+            if (doc == null) {
+                return null;
+            }
+            NodeList schemas = doc.getElementsByTagNameNS(SchemaConstants.NS_XSD, "schema");
+            for (int i = 0; i < schemas.getLength(); i++) {
+                inlinedSchemaElements.add((Element) schemas.item(i));
+            }
+        } catch (ParserConfigurationException e) {
+            exception = e;
+        } catch (IOException e) {
+            exception = e;
+        } catch (SAXException e) {
+            exception = e;
+        }
+
+        if (exception != null) {
+            errorReceiver.error(WscompileMessages.WSIMPORT_NO_WSDL(systemId), exception);
+            core.remove(systemId);
+            rootDocuments.remove(systemId);
+        }
+        return dom;
+    }
+
+    public void addExternalReferences(String ref) {
+        if (!externalReferences.contains(ref))
+            externalReferences.add(ref);
+    }
+
+
+    public Set getExternalReferences() {
+        return externalReferences;
+    }
+
+    public interface Handler extends ContentHandler {
+        /**
+         * Gets the DOM that was built.
+         */
+        public Document getDocument();
+    }
+
+    private static abstract class HandlerImpl extends XMLFilterImpl implements Handler {
+    }
+
+    /**
+     * Returns a {@link ContentHandler} to feed SAX events into.
+     * 
    
+     * The client of this class can feed SAX events into the handler
+     * to parse a document into this DOM forest.
+     */
+    public Handler getParserHandler(String systemId, boolean root) {
+        final Document dom = documentBuilder.newDocument();
+        core.put(systemId, dom);
+        if (root)
+            rootDocuments.add(systemId);
+
+        ContentHandler handler = getParserHandler(dom);
+
+        // we will register the DOM to the map once the system ID becomes available.
+        // but the SAX allows the event source to not to provide that information,
+        // so be prepared for such case.
+        HandlerImpl x = new HandlerImpl() {
+            public Document getDocument() {
+                return dom;
+            }
+        };
+        x.setContentHandler(handler);
+
+        return x;
+    }
+
+    /**
+     * Returns a {@link org.xml.sax.ContentHandler} to feed SAX events into.
+     * 
    
+     * 
    
+     * The client of this class can feed SAX events into the handler
+     * to parse a document into this DOM forest.
+     * 
    
+     * This version requires that the DOM object to be created and registered
+     * to the map beforehand.
+     */
+    private ContentHandler getParserHandler(Document dom) {
+        ContentHandler handler = new DOMBuilder(dom, locatorTable, outerMostBindings);
+        handler = new WhitespaceStripper(handler, errorReceiver, options.entityResolver);
+        handler = new VersionChecker(handler, errorReceiver, options.entityResolver);
+
+        // insert the reference finder so that
+        // included/imported schemas will be also parsed
+        XMLFilterImpl f = logic.createExternalReferenceFinder(this);
+        f.setContentHandler(handler);
+
+        if (errorReceiver != null)
+            f.setErrorHandler(errorReceiver);
+        if (options.entityResolver != null)
+            f.setEntityResolver(options.entityResolver);
+
+        return f;
+    }
+
+    private String normalizeSystemId(String systemId) {
+        try {
+            systemId = new URI(systemId).normalize().toString();
+        } catch (URISyntaxException e) {
+            // leave the system ID untouched. In my experience URI is often too strict
+        }
+        return systemId;
+    }
+
+    boolean isExtensionMode() {
+        return options.isExtensionMode();
+    }
+
+
+    /**
+     * Gets the DOM tree associated with the specified system ID,
+     * or null if none is found.
+     */
+    public Document get(String systemId) {
+        Document doc = core.get(systemId);
+
+        if (doc == null && systemId.startsWith("file:/") && !systemId.startsWith("file://")) {
+            // As of JDK1.4, java.net.URL.toExternal method returns URLs like
+            // "file:/abc/def/ghi" which is an incorrect file protocol URL according to RFC1738.
+            // Some other correctly functioning parts return the correct URLs ("file:///abc/def/ghi"),
+            // and this descripancy breaks DOM look up by system ID.
+
+            // this extra check solves this problem.
+            doc = core.get("file://" + systemId.substring(5));
+        }
+
+        if (doc == null && systemId.startsWith("file:")) {
+            // on Windows, filenames are case insensitive.
+            // perform case-insensitive search for improved user experience
+            String systemPath = getPath(systemId);
+            for (String key : core.keySet()) {
+                if (key.startsWith("file:") && getPath(key).equalsIgnoreCase(systemPath)) {
+                    doc = core.get(key);
+                    break;
+                }
+            }
+        }
+
+        return doc;
+    }
+
+    /**
+     * Strips off the leading 'file:///' portion from an URL.
+     */
+    private String getPath(String key) {
+        key = key.substring(5); // skip 'file:'
+        while (key.length() > 0 && key.charAt(0) == '/')
+            key = key.substring(1);
+        return key;
+    }
+
+    /**
+     * Gets all the system IDs of the documents.
+     */
+    public String[] listSystemIDs() {
+        return core.keySet().toArray(new String[core.keySet().size()]);
+    }
+
+    /**
+     * Gets the system ID from which the given DOM is parsed.
+     * 
    
+     * Poor-man's base URI.
+     */
+    public String getSystemId(Document dom) {
+        for (Map.Entry e : core.entrySet()) {
+            if (e.getValue() == dom)
+                return e.getKey();
+        }
+        return null;
+    }
+
+    /**
+     * Gets the first one (which is more or less random) in {@link #rootDocuments}.
+     */
+    public String getFirstRootDocument() {
+        if(rootDocuments.isEmpty()) return null;
+        return rootDocuments.iterator().next();
+    }
+
+    public Set getRootDocuments() {
+        return rootDocuments;
+    }
+
+    /**
+     * Dumps the contents of the forest to the specified stream.
+     * 
    
+     * This is a debug method. As such, error handling is sloppy.
+     */
+    public void dump(OutputStream out) throws IOException {
+        try {
+            // create identity transformer
+            Transformer it = TransformerFactory.newInstance().newTransformer();
+
+            for (Map.Entry e : core.entrySet()) {
+                out.write(("---<< " + e.getKey() + '\n').getBytes());
+
+                DataWriter dw = new DataWriter(new OutputStreamWriter(out), null);
+                dw.setIndentStep("  ");
+                it.transform(new DOMSource(e.getValue()),
+                        new SAXResult(dw));
+
+                out.write("\n\n\n".getBytes());
+            }
+        } catch (TransformerException e) {
+            e.printStackTrace();
+        }
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestScanner.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestScanner.java
new file mode 100644
index 00000000000..4638163f24d
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestScanner.java
@@ -0,0 +1,178 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+
+
+package com.sun.tools.internal.ws.wsdl.parser;
+
+import com.sun.xml.internal.bind.unmarshaller.DOMScanner;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.XMLFilterImpl;
+
+/**
+ * Produces a complete series of SAX events from any DOM node
+ * in the DOMForest.
+ *
+ * 
    
+ * This class hides a logic of re-associating {@link org.xml.sax.Locator}
+ * to the generated SAX event stream.
+ *
+ * @author
+ *     Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ */
+public class DOMForestScanner {
+
+    private final DOMForest forest;
+
+    /**
+     * Scans DOM nodes of the given forest.
+     *
+     * DOM node parameters to the scan method must be a part of
+     * this forest.
+     */
+    public DOMForestScanner( DOMForest _forest ) {
+        this.forest = _forest;
+    }
+
+    /**
+     * Generates the whole set of SAX events by treating
+     * element e as if it's a root element.
+     */
+    public void scan( Element e, ContentHandler contentHandler ) throws SAXException {
+        DOMScanner scanner = new DOMScanner();
+
+        // insert the location resolver into the pipe line
+        LocationResolver resolver = new LocationResolver(scanner);
+        resolver.setContentHandler(contentHandler);
+
+        // parse this DOM.
+        scanner.setContentHandler(resolver);
+        scanner.scan(e);
+    }
+
+    /**
+     * Generates the whole set of SAX events from the given Document
+     * in the DOMForest.
+     */
+    public void scan( Document d, ContentHandler contentHandler ) throws SAXException {
+        scan( d.getDocumentElement(), contentHandler );
+    }
+
+    /**
+     * Intercepts the invocation of the setDocumentLocator method
+     * and passes itself as the locator.
+     *
+     * If the client calls one of the methods on the Locator interface,
+     * use the LocatorTable to resolve the source location.
+     */
+    private class LocationResolver extends XMLFilterImpl implements Locator {
+        LocationResolver( DOMScanner _parent ) {
+            this.parent = _parent;
+        }
+
+        private final DOMScanner parent;
+
+        /**
+         * Flag that tells us whether we are processing a start element event
+         * or an end element event.
+         *
+         * DOMScanner's getCurrentLocation method doesn't tell us which, but
+         * this information is necessary to return the correct source line information.
+         *
+         * Thus we set this flag appropriately before we pass an event to
+         * the next ContentHandler, thereby making it possible to figure
+         * out which location to return.
+         */
+        private boolean inStart = false;
+
+        public void setDocumentLocator(Locator locator) {
+            // ignore one set by the parent.
+
+            super.setDocumentLocator(this);
+        }
+
+        public void endElement(String namespaceURI, String localName, String qName) throws SAXException {
+            inStart = false;
+            super.endElement(namespaceURI, localName, qName);
+        }
+
+        public void startElement(String namespaceURI, String localName, String qName, Attributes atts)
+            throws SAXException {
+            inStart = true;
+            super.startElement(namespaceURI, localName, qName, atts);
+        }
+
+
+
+
+        private Locator findLocator() {
+            Node n = parent.getCurrentLocation();
+            if( n instanceof Element ) {
+                Element e = (Element)n;
+                if( inStart )
+                    return forest.locatorTable.getStartLocation( e );
+                else
+                    return forest.locatorTable.getEndLocation( e );
+            }
+            return null;
+        }
+
+        //
+        //
+        // Locator methods
+        //
+        //
+        public int getColumnNumber() {
+            Locator l = findLocator();
+            if(l!=null)     return l.getColumnNumber();
+            return          -1;
+        }
+
+        public int getLineNumber() {
+            Locator l = findLocator();
+            if(l!=null)     return l.getLineNumber();
+            return          -1;
+        }
+
+        public String getPublicId() {
+            Locator l = findLocator();
+            if(l!=null)     return l.getPublicId();
+            return          null;
+        }
+
+        public String getSystemId() {
+            Locator l = findLocator();
+            if(l!=null)     return l.getSystemId();
+            return          null;
+        }
+
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/ExtensionHandlerBase.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/ExtensionHandlerBase.java
deleted file mode 100644
index 0e2ffa5d5ae..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/ExtensionHandlerBase.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.tools.internal.ws.wsdl.parser;
-
-import org.w3c.dom.Element;
-
-import com.sun.tools.internal.ws.wsdl.document.WSDLConstants;
-import com.sun.tools.internal.ws.wsdl.document.mime.MIMEConstants;
-import com.sun.tools.internal.ws.wsdl.framework.Extensible;
-import com.sun.tools.internal.ws.wsdl.framework.ParserContext;
-/**
- * A base class for WSDL extension handlers.
- *
- * @author WS Development Team
- */
-public abstract class ExtensionHandlerBase extends ExtensionHandler {
-
-    protected ExtensionHandlerBase() {
-    }
-
-    public boolean doHandleExtension(
-        ParserContext context,
-        Extensible parent,
-        Element e) {
-        if (parent.getElementName().equals(WSDLConstants.QNAME_DEFINITIONS)) {
-            return handleDefinitionsExtension(context, parent, e);
-        } else if (parent.getElementName().equals(WSDLConstants.QNAME_TYPES)) {
-            return handleTypesExtension(context, parent, e);
-        } else if (parent.getElementName().equals(WSDLConstants.QNAME_PORT_TYPE)) {
-            return handlePortTypeExtension(context, parent, e);
-        } else if (
-            parent.getElementName().equals(WSDLConstants.QNAME_BINDING)) {
-            return handleBindingExtension(context, parent, e);
-        } else if (
-            parent.getElementName().equals(WSDLConstants.QNAME_OPERATION)) {
-            return handleOperationExtension(context, parent, e);
-        } else if (parent.getElementName().equals(WSDLConstants.QNAME_INPUT)) {
-            return handleInputExtension(context, parent, e);
-        } else if (
-            parent.getElementName().equals(WSDLConstants.QNAME_OUTPUT)) {
-            return handleOutputExtension(context, parent, e);
-        } else if (parent.getElementName().equals(WSDLConstants.QNAME_FAULT)) {
-            return handleFaultExtension(context, parent, e);
-        } else if (
-            parent.getElementName().equals(WSDLConstants.QNAME_SERVICE)) {
-            return handleServiceExtension(context, parent, e);
-        } else if (parent.getElementName().equals(WSDLConstants.QNAME_PORT)) {
-            return handlePortExtension(context, parent, e);
-        } else if (parent.getElementName().equals(MIMEConstants.QNAME_PART)) {
-            return handleMIMEPartExtension(context, parent, e);
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * @param context
-     * @param parent
-     * @param e
-     * @return true if the PortTypeExtension should be handled
-     */
-    protected abstract boolean handlePortTypeExtension(
-        ParserContext context,
-        Extensible parent,
-        Element e);
-
-    protected abstract boolean handleDefinitionsExtension(
-        ParserContext context,
-        Extensible parent,
-        Element e);
-    protected abstract boolean handleTypesExtension(
-        ParserContext context,
-        Extensible parent,
-        Element e);
-    protected abstract boolean handleBindingExtension(
-        ParserContext context,
-        Extensible parent,
-        Element e);
-    protected abstract boolean handleOperationExtension(
-        ParserContext context,
-        Extensible parent,
-        Element e);
-    protected abstract boolean handleInputExtension(
-        ParserContext context,
-        Extensible parent,
-        Element e);
-    protected abstract boolean handleOutputExtension(
-        ParserContext context,
-        Extensible parent,
-        Element e);
-    protected abstract boolean handleFaultExtension(
-        ParserContext context,
-        Extensible parent,
-        Element e);
-    protected abstract boolean handleServiceExtension(
-        ParserContext context,
-        Extensible parent,
-        Element e);
-    protected abstract boolean handlePortExtension(
-        ParserContext context,
-        Extensible parent,
-        Element e);
-    protected abstract boolean handleMIMEPartExtension(
-        ParserContext context,
-        Extensible parent,
-        Element e);
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/HTTPExtensionHandler.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/HTTPExtensionHandler.java
index bce6c4ceaf3..2bfa370403f 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/HTTPExtensionHandler.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/HTTPExtensionHandler.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,93 +25,87 @@
 
 package com.sun.tools.internal.ws.wsdl.parser;
 
-import java.io.IOException;
-
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtensible;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLParserContext;
+import com.sun.tools.internal.ws.util.xml.XmlUtil;
+import com.sun.tools.internal.ws.wsdl.document.http.*;
 import org.w3c.dom.Element;
 
-import com.sun.tools.internal.ws.wsdl.document.http.HTTPAddress;
-import com.sun.tools.internal.ws.wsdl.document.http.HTTPBinding;
-import com.sun.tools.internal.ws.wsdl.document.http.HTTPConstants;
-import com.sun.tools.internal.ws.wsdl.document.http.HTTPOperation;
-import com.sun.tools.internal.ws.wsdl.document.http.HTTPUrlEncoded;
-import com.sun.tools.internal.ws.wsdl.document.http.HTTPUrlReplacement;
-import com.sun.tools.internal.ws.wsdl.framework.Extensible;
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
-import com.sun.tools.internal.ws.wsdl.framework.ParserContext;
-import com.sun.tools.internal.ws.wsdl.framework.WriterContext;
-import com.sun.tools.internal.ws.util.xml.XmlUtil;
+import java.util.Map;
 
 /**
  * The HTTP extension handler for WSDL.
  *
  * @author WS Development Team
  */
-public class HTTPExtensionHandler extends ExtensionHandlerBase {
+public class HTTPExtensionHandler extends AbstractExtensionHandler {
 
-    public HTTPExtensionHandler() {
+
+    public HTTPExtensionHandler(Map extensionHandlerMap) {
+        super(extensionHandlerMap);
     }
 
     public String getNamespaceURI() {
         return Constants.NS_WSDL_HTTP;
     }
 
-    protected boolean handleDefinitionsExtension(
-        ParserContext context,
-        Extensible parent,
+    public boolean handleDefinitionsExtension(
+        TWSDLParserContext context,
+        TWSDLExtensible parent,
         Element e) {
         Util.fail(
             "parsing.invalidExtensionElement",
             e.getTagName(),
             e.getNamespaceURI());
-        return false; // keep compiler happy
+        return false;
     }
 
-    protected boolean handleTypesExtension(
-        ParserContext context,
-        Extensible parent,
+    public boolean handleTypesExtension(
+        com.sun.tools.internal.ws.api.wsdl.TWSDLParserContext context,
+        TWSDLExtensible parent,
         Element e) {
         Util.fail(
             "parsing.invalidExtensionElement",
             e.getTagName(),
             e.getNamespaceURI());
-        return false; // keep compiler happy
+        return false;
     }
 
-    protected boolean handleBindingExtension(
-        ParserContext context,
-        Extensible parent,
+    public boolean handleBindingExtension(
+        TWSDLParserContext context,
+        TWSDLExtensible parent,
         Element e) {
         if (XmlUtil.matchesTagNS(e, HTTPConstants.QNAME_BINDING)) {
             context.push();
             context.registerNamespaces(e);
 
-            HTTPBinding binding = new HTTPBinding();
+            HTTPBinding binding = new HTTPBinding(context.getLocation(e));
 
             String verb = Util.getRequiredAttribute(e, Constants.ATTR_VERB);
             binding.setVerb(verb);
 
             parent.addExtension(binding);
             context.pop();
-            context.fireDoneParsingEntity(HTTPConstants.QNAME_BINDING, binding);
+//            context.fireDoneParsingEntity(HTTPConstants.QNAME_BINDING, binding);
             return true;
         } else {
             Util.fail(
                 "parsing.invalidExtensionElement",
                 e.getTagName(),
                 e.getNamespaceURI());
-            return false; // keep compiler happy
+            return false;
         }
     }
 
-    protected boolean handleOperationExtension(
-        ParserContext context,
-        Extensible parent,
+    public boolean handleOperationExtension(
+        TWSDLParserContext context,
+        TWSDLExtensible parent,
         Element e) {
         if (XmlUtil.matchesTagNS(e, HTTPConstants.QNAME_OPERATION)) {
             context.push();
             context.registerNamespaces(e);
 
-            HTTPOperation operation = new HTTPOperation();
+            HTTPOperation operation = new HTTPOperation(context.getLocation(e));
 
             String location =
                 Util.getRequiredAttribute(e, Constants.ATTR_LOCATION);
@@ -119,81 +113,81 @@ public class HTTPExtensionHandler extends ExtensionHandlerBase {
 
             parent.addExtension(operation);
             context.pop();
-            context.fireDoneParsingEntity(
-                HTTPConstants.QNAME_OPERATION,
-                operation);
+//            context.fireDoneParsingEntity(
+//                HTTPConstants.QNAME_OPERATION,
+//                operation);
             return true;
         } else {
             Util.fail(
                 "parsing.invalidExtensionElement",
                 e.getTagName(),
                 e.getNamespaceURI());
-            return false; // keep compiler happy
+            return false;
         }
     }
 
-    protected boolean handleInputExtension(
-        ParserContext context,
-        Extensible parent,
+    public boolean handleInputExtension(
+        TWSDLParserContext context,
+        TWSDLExtensible parent,
         Element e) {
         if (XmlUtil.matchesTagNS(e, HTTPConstants.QNAME_URL_ENCODED)) {
-            parent.addExtension(new HTTPUrlEncoded());
+            parent.addExtension(new HTTPUrlEncoded(context.getLocation(e)));
             return true;
         } else if (
             XmlUtil.matchesTagNS(e, HTTPConstants.QNAME_URL_REPLACEMENT)) {
-            parent.addExtension(new HTTPUrlReplacement());
+            parent.addExtension(new HTTPUrlReplacement(context.getLocation(e)));
             return true;
         } else {
             Util.fail(
                 "parsing.invalidExtensionElement",
                 e.getTagName(),
                 e.getNamespaceURI());
-            return false; // keep compiler happy
+            return false;
         }
     }
 
-    protected boolean handleOutputExtension(
-        ParserContext context,
-        Extensible parent,
+    public boolean handleOutputExtension(
+        TWSDLParserContext context,
+        TWSDLExtensible parent,
         Element e) {
         Util.fail(
             "parsing.invalidExtensionElement",
             e.getTagName(),
             e.getNamespaceURI());
-        return false; // keep compiler happy
+        return false;
     }
 
-    protected boolean handleFaultExtension(
-        ParserContext context,
-        Extensible parent,
+    public boolean handleFaultExtension(
+        TWSDLParserContext context,
+        TWSDLExtensible parent,
         Element e) {
         Util.fail(
             "parsing.invalidExtensionElement",
             e.getTagName(),
             e.getNamespaceURI());
-        return false; // keep compiler happy
+        return false;
     }
 
-    protected boolean handleServiceExtension(
-        ParserContext context,
-        Extensible parent,
+    public boolean handleServiceExtension(
+        TWSDLParserContext context,
+        TWSDLExtensible parent,
         Element e) {
         Util.fail(
             "parsing.invalidExtensionElement",
             e.getTagName(),
             e.getNamespaceURI());
-        return false; // keep compiler happy
+        return false;
     }
 
-    protected boolean handlePortExtension(
-        ParserContext context,
-        Extensible parent,
+    public boolean handlePortExtension(
+        TWSDLParserContext context,
+        TWSDLExtensible parent,
         Element e) {
         if (XmlUtil.matchesTagNS(e, HTTPConstants.QNAME_ADDRESS)) {
             context.push();
             context.registerNamespaces(e);
 
-            HTTPAddress address = new HTTPAddress();
+            HTTPAddress address = new HTTPAddress(context.getLocation(e));
 
             String location =
                 Util.getRequiredAttribute(e, Constants.ATTR_LOCATION);
@@ -201,68 +195,22 @@ public class HTTPExtensionHandler extends ExtensionHandlerBase {
 
             parent.addExtension(address);
             context.pop();
-            context.fireDoneParsingEntity(HTTPConstants.QNAME_ADDRESS, address);
+//            context.fireDoneParsingEntity(HTTPConstants.QNAME_ADDRESS, address);
             return true;
         } else {
             Util.fail(
                 "parsing.invalidExtensionElement",
                 e.getTagName(),
                 e.getNamespaceURI());
-            return false; // keep compiler happy
+            return false;
         }
     }
 
-    protected boolean handleMIMEPartExtension(
-        ParserContext context,
-        Extensible parent,
-        Element e) {
+    public boolean handlePortTypeExtension(TWSDLParserContext context, TWSDLExtensible parent, Element e) {
         Util.fail(
             "parsing.invalidExtensionElement",
             e.getTagName(),
             e.getNamespaceURI());
-        return false; // keep compiler happy
-    }
-
-    public void doHandleExtension(WriterContext context, Extension extension)
-        throws IOException {
-        if (extension instanceof HTTPAddress) {
-            HTTPAddress address = (HTTPAddress) extension;
-            context.writeStartTag(address.getElementName());
-            context.writeAttribute(
-                Constants.ATTR_LOCATION,
-                address.getLocation());
-            context.writeEndTag(address.getElementName());
-        } else if (extension instanceof HTTPBinding) {
-            HTTPBinding binding = (HTTPBinding) extension;
-            context.writeStartTag(binding.getElementName());
-            context.writeAttribute(Constants.ATTR_VERB, binding.getVerb());
-            context.writeEndTag(binding.getElementName());
-        } else if (extension instanceof HTTPOperation) {
-            HTTPOperation operation = (HTTPOperation) extension;
-            context.writeStartTag(operation.getElementName());
-            context.writeAttribute(
-                Constants.ATTR_LOCATION,
-                operation.getLocation());
-            context.writeEndTag(operation.getElementName());
-        } else if (extension instanceof HTTPUrlEncoded) {
-            context.writeStartTag(extension.getElementName());
-            context.writeEndTag(extension.getElementName());
-        } else if (extension instanceof HTTPUrlReplacement) {
-            context.writeStartTag(extension.getElementName());
-            context.writeEndTag(extension.getElementName());
-        } else {
-            throw new IllegalArgumentException();
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see ExtensionHandlerBase#handlePortTypeExtension(ParserContext, Extensible, org.w3c.dom.Element)
-     */
-    protected boolean handlePortTypeExtension(ParserContext context, Extensible parent, Element e) {
-        Util.fail(
-            "parsing.invalidExtensionElement",
-            e.getTagName(),
-            e.getNamespaceURI());
-        return false; // keep compiler happy
+        return false;
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/InternalizationLogic.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/InternalizationLogic.java
new file mode 100644
index 00000000000..f3d5c7516e9
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/InternalizationLogic.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+
+
+package com.sun.tools.internal.ws.wsdl.parser;
+
+import org.w3c.dom.Element;
+import org.xml.sax.helpers.XMLFilterImpl;
+
+/**
+ * Encapsulates schema-language dependent internalization logic.
+ *
+ * {@link com.sun.tools.internal.xjc.reader.internalizer.Internalizer} and {@link DOMForest} are responsible for
+ * doing schema language independent part, and this object is responsible
+ * for schema language dependent part.
+ *
+ * @author
+ *     Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ *     Vivek Pandey
+ */
+public interface InternalizationLogic {
+    /**
+     * Creates a new instance of XMLFilter that can be used to
+     * find references to external schemas.
+     *
+     * 
    
+     * Schemas that are included/imported need to be a part of
+     * {@link DOMForest}, and this filter will be expected to
+     * find such references.
+     *
+     * 
    
+     * Once such a reference is found, the filter is expected to
+     * call the parse method of DOMForest.
+     *
+     * 
    
+     * {@link DOMForest} will register ErrorHandler to the returned
+     * object, so any error should be sent to that error handler.
+     *
+     * @return
+     *      This method returns {@link org.xml.sax.helpers.XMLFilterImpl} because
+     *      the filter has to be usable for two directions
+     *      (wrapping a reader and wrapping a ContentHandler)
+     */
+    XMLFilterImpl createExternalReferenceFinder( DOMForest parent );
+
+    /**
+     * Checks if the specified element is a valid target node
+     * to attach a customization.
+     *
+     * @param parent
+     *      The owner DOMForest object. Probably useful only
+     *      to obtain context information, such as error handler.
+     * @param bindings
+     *      <jaxb:bindings> element or a customization element.
+     * @return
+     *      true if it's OK, false if not.
+     */
+    boolean checkIfValidTargetNode( DOMForest parent, Element bindings, Element target );
+
+    /**
+     * Prepares an element that actually receives customizations.
+     *
+     * 
    
+     * For example, in XML Schema, target nodes can be any schema
+     * element but it is always the <xsd:appinfo> element that
+     * receives customization.
+     *
+     * @param target
+     *      The target node designated by the customization.
+     * @return
+     *      Always return non-null valid object
+     */
+    Element refineSchemaTarget( Element target );
+
+    /**
+     * Prepares a WSDL element that actually receives customizations.
+     *
+     *
+     * @param target
+     *      The target node designated by the customization.
+     * @return
+     *      Always return non-null valid object
+     */
+    Element refineWSDLTarget( Element target );
+
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java
index bf85b29b2b4..ec65482bd63 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,39 +24,28 @@
  */
 package com.sun.tools.internal.ws.wsdl.parser;
 
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.io.UnsupportedEncodingException;
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.istack.internal.SAXParseException2;
+import com.sun.tools.internal.ws.resources.WsdlMessages;
+import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
+import com.sun.tools.internal.ws.wscompile.WsimportOptions;
+import com.sun.tools.internal.ws.wsdl.document.jaxws.JAXWSBindingsConstants;
+import com.sun.tools.internal.xjc.util.DOMUtils;
+import com.sun.xml.internal.bind.v2.util.EditDistance;
+import com.sun.xml.internal.ws.util.JAXWSUtils;
+import com.sun.xml.internal.ws.util.DOMUtil;
+import org.w3c.dom.*;
+import org.xml.sax.SAXParseException;
 
-import javax.xml.namespace.QName;
 import javax.xml.namespace.NamespaceContext;
 import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import com.sun.tools.internal.xjc.util.DOMUtils;
-import com.sun.tools.internal.ws.processor.util.ProcessorEnvironment;
-import com.sun.xml.internal.ws.util.JAXWSUtils;
-import com.sun.xml.internal.ws.util.JAXWSUtils;
-import com.sun.xml.internal.ws.util.localization.Localizable;
-import com.sun.xml.internal.ws.util.localization.LocalizableMessageFactory;
-import com.sun.tools.internal.ws.wsdl.document.jaxws.JAXWSBindingsConstants;
-import com.sun.tools.internal.ws.util.xml.XmlUtil;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.*;
 
 
 /**
@@ -64,33 +53,27 @@ import com.sun.tools.internal.ws.util.xml.XmlUtil;
  * @author Vivek Pandey
  */
 public class Internalizer {
-    private Map wsdlDocuments;
-    private Map jaxwsBindings;
     private static final XPathFactory xpf = XPathFactory.newInstance();
     private final XPath xpath = xpf.newXPath();
-    private final  LocalizableMessageFactory messageFactory = new LocalizableMessageFactory("com.sun.tools.internal.ws.resources.wsdl");;
-    private ProcessorEnvironment env;
-    public  void transform(Map jaxwsBindings, Map wsdlDocuments, ProcessorEnvironment env) {
-        if(jaxwsBindings == null)
-            return;
-        this.env = env;
-        this.wsdlDocuments = wsdlDocuments;
-        this.jaxwsBindings = jaxwsBindings;
-        Map targetNodes = new HashMap();
+    private final WsimportOptions options;
+    private final DOMForest forest;
+    private final ErrorReceiver errorReceiver;
 
-        // identify target nodes for all 
-        for(Map.Entry jaxwsBinding : jaxwsBindings.entrySet()) {
-            Element e = jaxwsBinding.getValue().getDocumentElement();
-            // initially, the inherited context is itself
-            buildTargetNodeMap( e, e, targetNodes );
+
+    public Internalizer(DOMForest forest, WsimportOptions options, ErrorReceiver errorReceiver) {
+        this.forest = forest;
+        this.options = options;
+        this.errorReceiver = errorReceiver;
+    }
+
+    public void transform(){
+        Map targetNodes = new HashMap();
+        for(Element jaxwsBinding : forest.outerMostBindings){
+            buildTargetNodeMap(jaxwsBinding, jaxwsBinding, targetNodes );
         }
-
-        // then move them to their respective positions.
-        for(Map.Entry jaxwsBinding : jaxwsBindings.entrySet()) {
-            Element e = jaxwsBinding.getValue().getDocumentElement();
-            move( e, targetNodes );
+        for(Element jaxwsBinding : forest.outerMostBindings){
+            move(jaxwsBinding, targetNodes );
         }
-
     }
 
     /**
@@ -111,47 +94,6 @@ public class Internalizer {
         }
     }
 
-    /**
-     * Gets the DOM tree associated with the specified system ID,
-     * or null if none is found.
-     */
-    public Document get( String systemId ) {
-        Document doc = wsdlDocuments.get(systemId);
-
-        if( doc==null && systemId.startsWith("file:/") && !systemId.startsWith("file://") ) {
-            // As of JDK1.4, java.net.URL.toExternal method returns URLs like
-            // "file:/abc/def/ghi" which is an incorrect file protocol URL according to RFC1738.
-            // Some other correctly functioning parts return the correct URLs ("file:///abc/def/ghi"),
-            // and this descripancy breaks DOM look up by system ID.
-
-            // this extra check solves this problem.
-            doc = wsdlDocuments.get( "file://"+systemId.substring(5) );
-        }
-
-        if( doc==null && systemId.startsWith("file:") ) {
-            // on Windows, filenames are case insensitive.
-            // perform case-insensitive search for improved user experience
-            String systemPath = getPath(systemId);
-            for (String key : wsdlDocuments.keySet()) {
-                if(key.startsWith("file:") && getPath(key).equalsIgnoreCase(systemPath)) {
-                    doc = wsdlDocuments.get(key);
-                    break;
-                }
-            }
-        }
-        return doc;
-    }
-
-    /**
-     * Strips off the leading 'file:///' portion from an URL.
-     */
-    private String getPath(String key) {
-        key = key.substring(5); // skip 'file:'
-        while(key.length()>0 && key.charAt(0)=='/')
-            key = key.substring(1);
-        return key;
-    }
-
     /**
      * Determines the target node of the "bindings" element
      * by using the inherited target node, then put
@@ -171,26 +113,49 @@ public class Internalizer {
                 // absolutize this URI.
                 // TODO: use the URI class
                 // TODO: honor xml:base
-                wsdlLocation = new URL(new URL(getSystemId(bindings.getOwnerDocument())),
+                wsdlLocation = new URL(new URL(forest.getSystemId(bindings.getOwnerDocument())),
                         wsdlLocation ).toExternalForm();
             } catch( MalformedURLException e ) {
                 wsdlLocation = JAXWSUtils.absolutize(JAXWSUtils.getFileOrURLName(wsdlLocation));
             }
 
-            target = get(wsdlLocation);
+            //target = wsdlDocuments.get(wsdlLocation);
+            target = forest.get(wsdlLocation);
             if(target==null) {
-                error("internalizer.targetNotFound", new Object[]{wsdlLocation});
+                reportError(bindings, WsdlMessages.INTERNALIZER_INCORRECT_SCHEMA_REFERENCE(wsdlLocation, EditDistance.findNearest(wsdlLocation, forest.listSystemIDs())));
                 return; // abort processing this 
             }
         }
 
+        //if the target node is xs:schema, declare the jaxb version on it as latter on it will be
+        //required by the inlined schema bindings
+
+        Element element = DOMUtil.getFirstElementChild(target);
+        if (element != null && element.getNamespaceURI().equals(Constants.NS_WSDL) && element.getLocalName().equals("definitions")) {
+            //get all schema elements
+            Element type = DOMUtils.getFirstChildElement(element, Constants.NS_WSDL, "types");
+            if(type != null){
+                for (Element schemaElement : DOMUtils.getChildElements(type, Constants.NS_XSD, "schema")) {
+                    if (!schemaElement.hasAttributeNS(Constants.NS_XMLNS, "jaxb")) {
+                        schemaElement.setAttributeNS(Constants.NS_XMLNS, "xmlns:jaxb", JAXWSBindingsConstants.NS_JAXB_BINDINGS);
+                    }
+
+                    //add jaxb:bindings version info. Lets put it to 1.0, may need to change latter
+                    if (!schemaElement.hasAttributeNS(JAXWSBindingsConstants.NS_JAXB_BINDINGS, "version")) {
+                        schemaElement.setAttributeNS(JAXWSBindingsConstants.NS_JAXB_BINDINGS, "jaxb:version", JAXWSBindingsConstants.JAXB_BINDING_VERSION);
+                    }
+                }
+            }
+        }
+
+
         boolean hasNode = true;
-        if(isJAXWSBindings(bindings) && bindings.getAttributeNode("node")!=null ) {
-            target = evaluateXPathNode(target, bindings.getAttribute("node"), new NamespaceContextImpl(bindings));
+        if((isJAXWSBindings(bindings) || isJAXBBindings(bindings)) && bindings.getAttributeNode("node")!=null ) {
+            target = evaluateXPathNode(bindings, target, bindings.getAttribute("node"), new NamespaceContextImpl(bindings));
         }else if(isJAXWSBindings(bindings) && (bindings.getAttributeNode("node")==null) && !isTopLevelBinding(bindings)) {
             hasNode = false;
         }else if(isGlobalBinding(bindings) && !isWSDLDefinition(target) && isTopLevelBinding(bindings.getParentNode())){
-            target = getWSDLDefintionNode(target);
+            target = getWSDLDefintionNode(bindings, target);
         }
 
         //if target is null it means the xpath evaluation has some problem,
@@ -203,14 +168,14 @@ public class Internalizer {
             result.put( bindings, target );
 
         // look for child  and process them recursively
-        Element[] children = getChildElements( bindings, JAXWSBindingsConstants.NS_JAXWS_BINDINGS);
-        for( int i=0; i a = new ArrayList();
         NodeList children = parent.getChildNodes();
         for( int i=0; i
         }
 
         if( nlst.getLength()==0 ) {
-            error("internalizer.XPathEvaluatesToNoTarget", new Object[]{expression});
+            reportError((Element) bindings, WsdlMessages.INTERNALIZER_X_PATH_EVALUATES_TO_NO_TARGET(expression));
             return null; // abort
         }
 
         if( nlst.getLength()!=1 ) {
-            error("internalizer.XPathEvaulatesToTooManyTargets", new Object[]{expression, nlst.getLength()});
+            reportError((Element) bindings, WsdlMessages.INTERNALIZER_X_PATH_EVAULATES_TO_TOO_MANY_TARGETS(expression, nlst.getLength()));
             return null; // abort
         }
 
         Node rnode = nlst.item(0);
         if(!(rnode instanceof Element )) {
-            error("internalizer.XPathEvaluatesToNonElement", new Object[]{expression});
+            reportError((Element) bindings, WsdlMessages.INTERNALIZER_X_PATH_EVALUATES_TO_NON_ELEMENT(expression));
             return null; // abort
         }
-        return (Element)rnode;
+        return rnode;
     }
 
     /**
@@ -330,15 +294,11 @@ public class Internalizer {
     }
 
     private boolean isJAXBBindingElement(Element e){
-        if((e.getNamespaceURI() != null ) && e.getNamespaceURI().equals(JAXWSBindingsConstants.NS_JAXB_BINDINGS))
-            return true;
-        return false;
+        return fixNull(e.getNamespaceURI()).equals(JAXWSBindingsConstants.NS_JAXB_BINDINGS);
     }
 
     private boolean isJAXWSBindingElement(Element e){
-        if((e.getNamespaceURI() != null ) && e.getNamespaceURI().equals(JAXWSBindingsConstants.NS_JAXWS_BINDINGS))
-            return true;
-        return false;
+        return fixNull(e.getNamespaceURI()).equals(JAXWSBindingsConstants.NS_JAXWS_BINDINGS);
     }
 
     /**
@@ -366,6 +326,19 @@ public class Internalizer {
                 target.setAttributeNS(JAXWSBindingsConstants.NS_JAXB_BINDINGS, "jaxb:version", JAXWSBindingsConstants.JAXB_BINDING_VERSION);
             }
 
+            // HACK: allow XJC extension all the time. This allows people to specify
+            // the  in the external bindings. Otherwise users lack the ability
+            // to specify jaxb:extensionBindingPrefixes, so it won't work.
+            //
+            // the current workaround is still problematic in the sense that
+            // it can't support user-defined extensions. This needs more careful thought.
+
+            //JAXB doesn't allow writing jaxb:extensionbindingPrefix anywhere other than root element so lets write only on 
+            if(target.getLocalName().equals("schema") && target.getNamespaceURI().equals(Constants.NS_XSD)&& !target.hasAttributeNS(JAXWSBindingsConstants.NS_JAXB_BINDINGS, "extensionBindingPrefixes")){
+                target.setAttributeNS(JAXWSBindingsConstants.NS_JAXB_BINDINGS, "jaxb:extensionBindingPrefixes", "xjc");
+                target.setAttributeNS(Constants.NS_XMLNS, "xmlns:xjc", JAXWSBindingsConstants.NS_XJC_BINDINGS);
+            }
+
             //insert xs:annotation/xs:appinfo where in jaxb:binding will be put
             target = refineSchemaTarget(target);
             copyInscopeNSAttributes(decl);
@@ -385,7 +358,6 @@ public class Internalizer {
         // finally move the declaration to the target node.
         if( target.getOwnerDocument()!=decl.getOwnerDocument() ) {
             // if they belong to different DOM documents, we need to clone them
-            Element original = decl;
             decl = (Element)target.getOwnerDocument().importNode(decl,true);
 
         }
@@ -400,7 +372,7 @@ public class Internalizer {
      */
     private void copyInscopeNSAttributes(Element e){
         Element p = e;
-        Set inscopes = new HashSet();
+        Set inscopes = new HashSet();
         while(true) {
             NamedNodeMap atts = p.getAttributes();
             for( int i=0; i e:jaxwsBindings.entrySet()){
-            if (e.getValue() == doc)
-                return e.getKey();
-        }
-        return null;
-    }
-
-    protected void warn(Localizable msg) {
-        env.warn(msg);
+    private static @NotNull String fixNull(@Nullable String s) {
+        if(s==null) return "";
+        else        return s;
     }
 
 
-    protected void error(String key, Object[] args) {
-        env.error(messageFactory.getMessage(key, args));
+    private void reportError( Element errorSource, String formattedMsg ) {
+        reportError( errorSource, formattedMsg, null );
     }
 
-    protected void warn(String key) {
-        env.warn(messageFactory.getMessage(key));
+    private void reportError( Element errorSource,
+        String formattedMsg, Exception nestedException ) {
+
+        SAXParseException e = new SAXParseException2( formattedMsg,
+            forest.locatorTable.getStartLocation(errorSource),
+            nestedException );
+        errorReceiver.error(e);
     }
 
-    protected void warn(String key, Object[] args) {
-        env.warn(messageFactory.getMessage(key, args));
-    }
 
-    protected void info(String key) {
-        env.info(messageFactory.getMessage(key));
-    }
-
-    protected void info(String key, String arg) {
-        env.info(messageFactory.getMessage(key, arg));
-    }
 
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/JAXWSBindingExtensionHandler.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/JAXWSBindingExtensionHandler.java
index 775a2e8b935..58c605b7e55 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/JAXWSBindingExtensionHandler.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/JAXWSBindingExtensionHandler.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,31 +24,27 @@
  */
 package com.sun.tools.internal.ws.wsdl.parser;
 
-import java.util.Iterator;
-import java.io.IOException;
-
-import javax.xml.namespace.QName;
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.xpath.XPathFactory;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpressionException;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtensible;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtension;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLParserContext;
+import com.sun.tools.internal.ws.util.xml.XmlUtil;
 import com.sun.tools.internal.ws.wsdl.document.*;
 import com.sun.tools.internal.ws.wsdl.document.jaxws.CustomName;
 import com.sun.tools.internal.ws.wsdl.document.jaxws.JAXWSBinding;
 import com.sun.tools.internal.ws.wsdl.document.jaxws.JAXWSBindingsConstants;
 import com.sun.tools.internal.ws.wsdl.document.jaxws.Parameter;
-import com.sun.tools.internal.ws.wsdl.document.schema.SchemaKinds;
-import com.sun.tools.internal.ws.wsdl.framework.Extensible;
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
-import com.sun.tools.internal.ws.wsdl.framework.ParserContext;
-import com.sun.tools.internal.ws.wsdl.framework.WriterContext;
-import com.sun.tools.internal.ws.util.xml.XmlUtil;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import javax.xml.namespace.NamespaceContext;
+import javax.xml.namespace.QName;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
+import java.util.Iterator;
+import java.util.Map;
 
 
 /**
@@ -57,19 +53,17 @@ import com.sun.tools.internal.ws.util.xml.XmlUtil;
  * jaxws:bindings exension handler.
  *
  */
-public class JAXWSBindingExtensionHandler extends ExtensionHandlerBase {
+public class JAXWSBindingExtensionHandler extends AbstractExtensionHandler {
 
     private static final XPathFactory xpf = XPathFactory.newInstance();
     private final XPath xpath = xpf.newXPath();
 
-    /**
-     *
-     */
-    public JAXWSBindingExtensionHandler() {
+    public JAXWSBindingExtensionHandler(Map extensionHandlerMap) {
+        super(extensionHandlerMap);
     }
 
     /* (non-Javadoc)
-     * @see ExtensionHandler#getNamespaceURI()
+     * @see AbstractExtensionHandler#getNamespaceURI()
      */
     public String getNamespaceURI() {
         return JAXWSBindingsConstants.NS_JAXWS_BINDINGS;
@@ -80,13 +74,13 @@ public class JAXWSBindingExtensionHandler extends ExtensionHandlerBase {
      * @param parent
      * @param e
      */
-    private boolean parseGlobalJAXWSBindings(ParserContext context, Extensible parent, Element e) {
+    private boolean parseGlobalJAXWSBindings(TWSDLParserContext context, TWSDLExtensible parent, Element e) {
         context.push();
         context.registerNamespaces(e);
 
         JAXWSBinding jaxwsBinding =  getJAXWSExtension(parent);
         if(jaxwsBinding == null)
-            jaxwsBinding = new JAXWSBinding();
+            jaxwsBinding = new JAXWSBinding(context.getLocation(e));
         String attr = XmlUtil.getAttributeOrNull(e, JAXWSBindingsConstants.WSDL_LOCATION_ATTR);
         if (attr != null) {
             jaxwsBinding.setWsdlLocation(attr);
@@ -132,15 +126,14 @@ public class JAXWSBindingExtensionHandler extends ExtensionHandlerBase {
         }
         parent.addExtension(jaxwsBinding);
         context.pop();
-        context.fireDoneParsingEntity(
-                JAXWSBindingsConstants.JAXWS_BINDINGS,
-                jaxwsBinding);
+//        context.fireDoneParsingEntity(
+//                JAXWSBindingsConstants.JAXWS_BINDINGS,
+//                jaxwsBinding);
         return true;
     }
 
-    private static JAXWSBinding getJAXWSExtension(Extensible extensible) {
-        for (Iterator iter = extensible.extensions(); iter.hasNext();) {
-            Extension extension = (Extension)iter.next();
+    private static JAXWSBinding getJAXWSExtension(TWSDLExtensible extensible) {
+        for (TWSDLExtension extension:extensible.extensions()) {
             if (extension.getClass().equals(JAXWSBinding.class)) {
                 return (JAXWSBinding)extension;
             }
@@ -154,7 +147,7 @@ public class JAXWSBindingExtensionHandler extends ExtensionHandlerBase {
      * @param parent
      * @param e
      */
-    private void parseProvider(ParserContext context, Extensible parent, Element e) {
+    private void parseProvider(com.sun.tools.internal.ws.api.wsdl.TWSDLParserContext context, JAXWSBinding parent, Element e) {
         String val = e.getTextContent();
         if(val == null)
             return;
@@ -172,7 +165,7 @@ public class JAXWSBindingExtensionHandler extends ExtensionHandlerBase {
      * @param parent
      * @param e
      */
-    private void parseJAXBBindings(ParserContext context, Extensible parent, Element e) {
+    private void parseJAXBBindings(com.sun.tools.internal.ws.api.wsdl.TWSDLParserContext context, TWSDLExtensible parent, Element e) {
         JAXWSBinding binding = (JAXWSBinding)parent;
         binding.addJaxbBindings(e);
     }
@@ -182,7 +175,7 @@ public class JAXWSBindingExtensionHandler extends ExtensionHandlerBase {
      * @param parent
      * @param e
      */
-    private void parsePackage(ParserContext context, Extensible parent, Element e) {
+    private void parsePackage(com.sun.tools.internal.ws.api.wsdl.TWSDLParserContext context, JAXWSBinding parent, Element e) {
         //System.out.println("In handlePackageExtension: " + e.getNodeName());
         String packageName = XmlUtil.getAttributeOrNull(e, JAXWSBindingsConstants.NAME_ATTR);
         JAXWSBinding binding = (JAXWSBinding)parent;
@@ -194,7 +187,7 @@ public class JAXWSBindingExtensionHandler extends ExtensionHandlerBase {
      * @param parent
      * @param e
      */
-    private void parseWrapperStyle(ParserContext context, Extensible parent, Element e) {
+    private void parseWrapperStyle(com.sun.tools.internal.ws.api.wsdl.TWSDLParserContext context, JAXWSBinding parent, Element e) {
         //System.out.println("In handleWrapperStyleExtension: " + e.getNodeName());
         String val = e.getTextContent();
         if(val == null)
@@ -211,7 +204,7 @@ public class JAXWSBindingExtensionHandler extends ExtensionHandlerBase {
      * @param parent
      * @param e
      */
-//    private void parseAdditionalSOAPHeaderMapping(ParserContext context, Extensible parent, Element e) {
+//    private void parseAdditionalSOAPHeaderMapping(TWSDLParserContextImpl context, TWSDLExtensible parent, Element e) {
 //        //System.out.println("In handleAdditionalSOAPHeaderExtension: " + e.getNodeName());
 //        String val = e.getTextContent();
 //        if(val == null)
@@ -228,7 +221,7 @@ public class JAXWSBindingExtensionHandler extends ExtensionHandlerBase {
      * @param parent
      * @param e
      */
-    private void parseAsynMapping(ParserContext context, Extensible parent, Element e) {
+    private void parseAsynMapping(com.sun.tools.internal.ws.api.wsdl.TWSDLParserContext context, JAXWSBinding parent, Element e) {
         //System.out.println("In handleAsynMappingExtension: " + e.getNodeName());
         String val = e.getTextContent();
         if(val == null)
@@ -245,7 +238,7 @@ public class JAXWSBindingExtensionHandler extends ExtensionHandlerBase {
      * @param parent
      * @param e
      */
-    private void parseMimeContent(ParserContext context, Extensible parent, Element e) {
+    private void parseMimeContent(com.sun.tools.internal.ws.api.wsdl.TWSDLParserContext context, JAXWSBinding parent, Element e) {
         //System.out.println("In handleMimeContentExtension: " + e.getNodeName());
         String val = e.getTextContent();
         if(val == null)
@@ -262,7 +255,7 @@ public class JAXWSBindingExtensionHandler extends ExtensionHandlerBase {
      * @param jaxwsBinding
      * @param e
      */
-    private void parseMethod(ParserContext context, JAXWSBinding jaxwsBinding, Element e) {
+    private void parseMethod(com.sun.tools.internal.ws.api.wsdl.TWSDLParserContext context, JAXWSBinding jaxwsBinding, Element e) {
         String methodName = XmlUtil.getAttributeOrNull(e, JAXWSBindingsConstants.NAME_ATTR);
         String javaDoc = getJavaDoc(e);
         CustomName name = new CustomName(methodName, javaDoc);
@@ -274,7 +267,7 @@ public class JAXWSBindingExtensionHandler extends ExtensionHandlerBase {
      * @param jaxwsBinding
      * @param e
      */
-    private void parseParameter(ParserContext context, JAXWSBinding jaxwsBinding, Element e) {
+    private void parseParameter(com.sun.tools.internal.ws.api.wsdl.TWSDLParserContext context, JAXWSBinding jaxwsBinding, Element e) {
         String part = XmlUtil.getAttributeOrNull(e, JAXWSBindingsConstants.PART_ATTR);
         Element msgPartElm = evaluateXPathNode(e.getOwnerDocument(), part, new NamespaceContextImpl(e));
         Node msgElm = msgPartElm.getParentNode();
@@ -332,7 +325,7 @@ public class JAXWSBindingExtensionHandler extends ExtensionHandlerBase {
      * @param jaxwsBinding
      * @param e
      */
-    private void parseClass(ParserContext context, JAXWSBinding jaxwsBinding, Element e) {
+    private void parseClass(com.sun.tools.internal.ws.api.wsdl.TWSDLParserContext context, JAXWSBinding jaxwsBinding, Element e) {
         String className = XmlUtil.getAttributeOrNull(e, JAXWSBindingsConstants.NAME_ATTR);
         String javaDoc = getJavaDoc(e);
         jaxwsBinding.setClassName(new CustomName(className, javaDoc));
@@ -344,7 +337,7 @@ public class JAXWSBindingExtensionHandler extends ExtensionHandlerBase {
      * @param jaxwsBinding
      * @param e
      */
-    private void parseException(ParserContext context, JAXWSBinding jaxwsBinding, Element e) {
+    private void parseException(com.sun.tools.internal.ws.api.wsdl.TWSDLParserContext context, JAXWSBinding jaxwsBinding, Element e) {
         for(Iterator iter = XmlUtil.getAllChildren(e); iter.hasNext();){
             Element e2 = Util.nextElement(iter);
             if (e2 == null)
@@ -357,29 +350,15 @@ public class JAXWSBindingExtensionHandler extends ExtensionHandlerBase {
         }
     }
 
-    /* (non-Javadoc)
-     * @see ExtensionHandlerBase#handleDefinitionsExtension(ParserContext, Extensible, org.w3c.dom.Element)
-     */
-    protected boolean handleDefinitionsExtension(ParserContext context, Extensible parent, Element e) {
+    public boolean handleDefinitionsExtension(TWSDLParserContext context, TWSDLExtensible parent, Element e) {
         return parseGlobalJAXWSBindings(context, parent, e);
     }
 
-    /* (non-Javadoc)
-     * @see ExtensionHandlerBase#handleTypesExtension(ParserContext, Extensible, org.w3c.dom.Element)
-     */
-    protected boolean handleTypesExtension(ParserContext context, Extensible parent, Element e) {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    /* (non-Javadoc)
-     * @see ExtensionHandlerBase#handlePortTypeExtension(ParserContext, Extensible, org.w3c.dom.Element)
-     */
-    protected boolean handlePortTypeExtension(ParserContext context, Extensible parent, Element e) {
+    public boolean handlePortTypeExtension(TWSDLParserContext context, TWSDLExtensible parent, Element e) {
         if(XmlUtil.matchesTagNS(e, JAXWSBindingsConstants.JAXWS_BINDINGS)){
             context.push();
             context.registerNamespaces(e);
-            JAXWSBinding jaxwsBinding = new JAXWSBinding();
+            JAXWSBinding jaxwsBinding = new JAXWSBinding(context.getLocation(e));
 
             for(Iterator iter = XmlUtil.getAllChildren(e); iter.hasNext();){
                 Element e2 = Util.nextElement(iter);
@@ -405,9 +384,9 @@ public class JAXWSBindingExtensionHandler extends ExtensionHandlerBase {
             }
             parent.addExtension(jaxwsBinding);
             context.pop();
-            context.fireDoneParsingEntity(
-                    JAXWSBindingsConstants.JAXWS_BINDINGS,
-                    jaxwsBinding);
+//            context.fireDoneParsingEntity(
+//                    JAXWSBindingsConstants.JAXWS_BINDINGS,
+//                    jaxwsBinding);
             return true;
         }else {
             Util.fail(
@@ -418,12 +397,7 @@ public class JAXWSBindingExtensionHandler extends ExtensionHandlerBase {
         }
     }
 
-
-
-    /* (non-Javadoc)
-     * @see ExtensionHandlerBase#handleOperationExtension(ParserContext, Extensible, org.w3c.dom.Element)
-     */
-    protected boolean handleOperationExtension(ParserContext context, Extensible parent, Element e) {
+    public boolean handleOperationExtension(TWSDLParserContext context, TWSDLExtensible parent, Element e) {
         if(XmlUtil.matchesTagNS(e, JAXWSBindingsConstants.JAXWS_BINDINGS)){
             if(parent instanceof Operation){
                 return handlePortTypeOperation(context, (Operation)parent, e);
@@ -440,17 +414,11 @@ public class JAXWSBindingExtensionHandler extends ExtensionHandlerBase {
         return false;
     }
 
-    /**
-     * @param context
-     * @param operation
-     * @param e
-     * @return
-     */
-    private boolean handleBindingOperation(ParserContext context, BindingOperation operation, Element e) {
+    private boolean handleBindingOperation(TWSDLParserContext context, BindingOperation operation, Element e) {
         if(XmlUtil.matchesTagNS(e, JAXWSBindingsConstants.JAXWS_BINDINGS)){
             context.push();
             context.registerNamespaces(e);
-            JAXWSBinding jaxwsBinding = new JAXWSBinding();
+            JAXWSBinding jaxwsBinding = new JAXWSBinding(context.getLocation(e));
 
             for(Iterator iter = XmlUtil.getAllChildren(e); iter.hasNext();){
                 Element e2 = Util.nextElement(iter);
@@ -474,9 +442,9 @@ public class JAXWSBindingExtensionHandler extends ExtensionHandlerBase {
             }
             operation.addExtension(jaxwsBinding);
             context.pop();
-            context.fireDoneParsingEntity(
-                    JAXWSBindingsConstants.JAXWS_BINDINGS,
-                    jaxwsBinding);
+//            context.fireDoneParsingEntity(
+//                    JAXWSBindingsConstants.JAXWS_BINDINGS,
+//                    jaxwsBinding);
             return true;
         }else {
             Util.fail(
@@ -487,16 +455,10 @@ public class JAXWSBindingExtensionHandler extends ExtensionHandlerBase {
         }
     }
 
-    /**
-     * @param context
-     * @param parent
-     * @param e
-     * @return
-     */
-    private boolean handlePortTypeOperation(ParserContext context, Operation parent, Element e) {
+    private boolean handlePortTypeOperation(TWSDLParserContext context, Operation parent, Element e) {
         context.push();
         context.registerNamespaces(e);
-        JAXWSBinding jaxwsBinding = new JAXWSBinding();
+        JAXWSBinding jaxwsBinding = new JAXWSBinding(context.getLocation(e));
 
         for(Iterator iter = XmlUtil.getAllChildren(e); iter.hasNext();){
             Element e2 = Util.nextElement(iter);
@@ -524,20 +486,17 @@ public class JAXWSBindingExtensionHandler extends ExtensionHandlerBase {
         }
         parent.addExtension(jaxwsBinding);
         context.pop();
-        context.fireDoneParsingEntity(
-                JAXWSBindingsConstants.JAXWS_BINDINGS,
-                jaxwsBinding);
+//        context.fireDoneParsingEntity(
+//                JAXWSBindingsConstants.JAXWS_BINDINGS,
+//                jaxwsBinding);
         return true;
     }
 
-    /* (non-Javadoc)
-     * @see ExtensionHandlerBase#handleBindingExtension(ParserContext, Extensible, org.w3c.dom.Element)
-     */
-    protected boolean handleBindingExtension(ParserContext context, Extensible parent, Element e) {
+    public boolean handleBindingExtension(TWSDLParserContext context, TWSDLExtensible parent, Element e) {
         if(XmlUtil.matchesTagNS(e, JAXWSBindingsConstants.JAXWS_BINDINGS)){
             context.push();
             context.registerNamespaces(e);
-            JAXWSBinding jaxwsBinding = new JAXWSBinding();
+            JAXWSBinding jaxwsBinding = new JAXWSBinding(context.getLocation(e));
 
             for(Iterator iter = XmlUtil.getAllChildren(e); iter.hasNext();){
                 Element e2 = Util.nextElement(iter);
@@ -559,9 +518,9 @@ public class JAXWSBindingExtensionHandler extends ExtensionHandlerBase {
             }
             parent.addExtension(jaxwsBinding);
             context.pop();
-            context.fireDoneParsingEntity(
-                    JAXWSBindingsConstants.JAXWS_BINDINGS,
-                    jaxwsBinding);
+//            context.fireDoneParsingEntity(
+//                    JAXWSBindingsConstants.JAXWS_BINDINGS,
+//                    jaxwsBinding);
             return true;
         }else {
             Util.fail(
@@ -573,29 +532,13 @@ public class JAXWSBindingExtensionHandler extends ExtensionHandlerBase {
     }
 
     /* (non-Javadoc)
-     * @see ExtensionHandlerBase#handleInputExtension(ParserContext, Extensible, org.w3c.dom.Element)
+     * @see ExtensionHandlerBase#handleFaultExtension(TWSDLParserContextImpl, TWSDLExtensible, org.w3c.dom.Element)
      */
-    protected boolean handleInputExtension(ParserContext context, Extensible parent, Element e) {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    /* (non-Javadoc)
-     * @see ExtensionHandlerBase#handleOutputExtension(ParserContext, Extensible, org.w3c.dom.Element)
-     */
-    protected boolean handleOutputExtension(ParserContext context, Extensible parent, Element e) {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    /* (non-Javadoc)
-     * @see ExtensionHandlerBase#handleFaultExtension(ParserContext, Extensible, org.w3c.dom.Element)
-     */
-    protected boolean handleFaultExtension(ParserContext context, Extensible parent, Element e) {
+    public boolean handleFaultExtension(TWSDLParserContext context, TWSDLExtensible parent, Element e) {
         if(XmlUtil.matchesTagNS(e, JAXWSBindingsConstants.JAXWS_BINDINGS)){
             context.push();
             context.registerNamespaces(e);
-            JAXWSBinding jaxwsBinding = new JAXWSBinding();
+            JAXWSBinding jaxwsBinding = new JAXWSBinding(context.getLocation(e));
 
             for(Iterator iter = XmlUtil.getAllChildren(e); iter.hasNext();){
                 Element e2 = Util.nextElement(iter);
@@ -616,9 +559,9 @@ public class JAXWSBindingExtensionHandler extends ExtensionHandlerBase {
             }
             parent.addExtension(jaxwsBinding);
             context.pop();
-            context.fireDoneParsingEntity(
-                    JAXWSBindingsConstants.JAXWS_BINDINGS,
-                    jaxwsBinding);
+//            context.fireDoneParsingEntity(
+//                    JAXWSBindingsConstants.JAXWS_BINDINGS,
+//                    jaxwsBinding);
             return true;
         }else {
             Util.fail(
@@ -629,14 +572,11 @@ public class JAXWSBindingExtensionHandler extends ExtensionHandlerBase {
         }
     }
 
-    /* (non-Javadoc)
-     * @see ExtensionHandlerBase#handleServiceExtension(ParserContext, Extensible, org.w3c.dom.Element)
-     */
-    protected boolean handleServiceExtension(ParserContext context, Extensible parent, Element e) {
+    public boolean handleServiceExtension(TWSDLParserContext context, TWSDLExtensible parent, Element e) {
         if(XmlUtil.matchesTagNS(e, JAXWSBindingsConstants.JAXWS_BINDINGS)){
             context.push();
             context.registerNamespaces(e);
-            JAXWSBinding jaxwsBinding = new JAXWSBinding();
+            JAXWSBinding jaxwsBinding = new JAXWSBinding(context.getLocation(e));
 
             for(Iterator iter = XmlUtil.getAllChildren(e); iter.hasNext();){
                 Element e2 = Util.nextElement(iter);
@@ -657,9 +597,9 @@ public class JAXWSBindingExtensionHandler extends ExtensionHandlerBase {
             }
             parent.addExtension(jaxwsBinding);
             context.pop();
-            context.fireDoneParsingEntity(
-                    JAXWSBindingsConstants.JAXWS_BINDINGS,
-                    jaxwsBinding);
+//            context.fireDoneParsingEntity(
+//                    JAXWSBindingsConstants.JAXWS_BINDINGS,
+//                    jaxwsBinding);
             return true;
         }else {
             Util.fail(
@@ -670,14 +610,11 @@ public class JAXWSBindingExtensionHandler extends ExtensionHandlerBase {
         }
     }
 
-    /* (non-Javadoc)
-     * @see ExtensionHandlerBase#handlePortExtension(ParserContext, Extensible, org.w3c.dom.Element)
-     */
-    protected boolean handlePortExtension(ParserContext context, Extensible parent, Element e) {
+    public boolean handlePortExtension(TWSDLParserContext context, TWSDLExtensible parent, Element e) {
         if(XmlUtil.matchesTagNS(e, JAXWSBindingsConstants.JAXWS_BINDINGS)){
             context.push();
             context.registerNamespaces(e);
-            JAXWSBinding jaxwsBinding = new JAXWSBinding();
+            JAXWSBinding jaxwsBinding = new JAXWSBinding(context.getLocation(e));
 
             for(Iterator iter = XmlUtil.getAllChildren(e); iter.hasNext();){
                 Element e2 = Util.nextElement(iter);
@@ -701,9 +638,9 @@ public class JAXWSBindingExtensionHandler extends ExtensionHandlerBase {
             }
             parent.addExtension(jaxwsBinding);
             context.pop();
-            context.fireDoneParsingEntity(
-                    JAXWSBindingsConstants.JAXWS_BINDINGS,
-                    jaxwsBinding);
+//            context.fireDoneParsingEntity(
+//                    JAXWSBindingsConstants.JAXWS_BINDINGS,
+//                    jaxwsBinding);
             return true;
         }else {
             Util.fail(
@@ -714,14 +651,6 @@ public class JAXWSBindingExtensionHandler extends ExtensionHandlerBase {
         }
     }
 
-    /* (non-Javadoc)
-     * @see ExtensionHandlerBase#handleMIMEPartExtension(ParserContext, Extensible, org.w3c.dom.Element)
-     */
-    protected boolean handleMIMEPartExtension(ParserContext context, Extensible parent, Element e) {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
     private String getJavaDoc(Element e){
         for(Iterator iter = XmlUtil.getAllChildren(e); iter.hasNext();){
             Element e2 = Util.nextElement(iter);
@@ -733,23 +662,4 @@ public class JAXWSBindingExtensionHandler extends ExtensionHandlerBase {
         }
         return null;
     }
-
-    public void doHandleExtension(WriterContext context, Extension extension)
-        throws IOException {
-        //System.out.println("JAXWSBindingExtensionHandler doHandleExtension: "+extension);
-        // NOTE - this ugliness can be avoided by moving all the XML parsing/writing code
-        // into the document classes themselves
-        if (extension instanceof JAXWSBinding) {
-            JAXWSBinding binding = (JAXWSBinding) extension;
-            System.out.println("binding.getElementName: "+binding.getElementName());
-            context.writeStartTag(binding.getElementName());
-            context.writeStartTag(JAXWSBindingsConstants.ENABLE_WRAPPER_STYLE);
-            context.writeChars(binding.isEnableWrapperStyle().toString());
-            context.writeEndTag(JAXWSBindingsConstants.ENABLE_WRAPPER_STYLE);
-            context.writeEndTag(binding.getElementName());
-        } else {
-            throw new IllegalArgumentException();
-        }
-    }
-
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/MIMEExtensionHandler.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/MIMEExtensionHandler.java
index fb8ea75d483..438e7439e7e 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/MIMEExtensionHandler.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/MIMEExtensionHandler.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,66 +25,59 @@
 
 package com.sun.tools.internal.ws.wsdl.parser;
 
-import java.io.IOException;
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtensible;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLParserContext;
+import com.sun.tools.internal.ws.util.xml.XmlUtil;
+import com.sun.tools.internal.ws.wsdl.document.WSDLConstants;
+import com.sun.tools.internal.ws.wsdl.document.mime.*;
 import org.w3c.dom.Element;
 
-import com.sun.tools.internal.ws.wsdl.document.WSDLConstants;
-import com.sun.tools.internal.ws.wsdl.document.mime.MIMEConstants;
-import com.sun.tools.internal.ws.wsdl.document.mime.MIMEContent;
-import com.sun.tools.internal.ws.wsdl.document.mime.MIMEMultipartRelated;
-import com.sun.tools.internal.ws.wsdl.document.mime.MIMEPart;
-import com.sun.tools.internal.ws.wsdl.document.mime.MIMEXml;
-import com.sun.tools.internal.ws.wsdl.framework.Extensible;
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
-import com.sun.tools.internal.ws.wsdl.framework.ParserContext;
-import com.sun.tools.internal.ws.wsdl.framework.WriterContext;
-import com.sun.tools.internal.ws.util.xml.XmlUtil;
+import java.util.Iterator;
+import java.util.Map;
 
 /**
  * The MIME extension handler for WSDL.
  *
  * @author WS Development Team
  */
-public class MIMEExtensionHandler extends ExtensionHandler {
+public class MIMEExtensionHandler extends AbstractExtensionHandler {
 
-    public MIMEExtensionHandler() {
+    public MIMEExtensionHandler(Map extensionHandlerMap) {
+        super(extensionHandlerMap);
     }
 
     public String getNamespaceURI() {
         return Constants.NS_WSDL_MIME;
     }
 
+    @Override
     public boolean doHandleExtension(
-        ParserContext context,
-        Extensible parent,
+        TWSDLParserContext context,
+        TWSDLExtensible parent,
         Element e) {
-        if (parent.getElementName().equals(WSDLConstants.QNAME_OUTPUT)) {
+        if (parent.getWSDLElementName().equals(WSDLConstants.QNAME_OUTPUT)) {
             return handleInputOutputExtension(context, parent, e);
-        } else if (parent.getElementName().equals(WSDLConstants.QNAME_INPUT)) {
+        } else if (parent.getWSDLElementName().equals(WSDLConstants.QNAME_INPUT)) {
             return handleInputOutputExtension(context, parent, e);
-        } else if (parent.getElementName().equals(MIMEConstants.QNAME_PART)) {
+        } else if (parent.getWSDLElementName().equals(MIMEConstants.QNAME_PART)) {
             return handleMIMEPartExtension(context, parent, e);
         } else {
-            context.fireIgnoringExtension(
-                new QName(e.getNamespaceURI(), e.getLocalName()),
-                parent.getElementName());
+//            context.fireIgnoringExtension(
+//                new QName(e.getNamespaceURI(), e.getLocalName()),
+//                parent.getWSDLElementName());
             return false;
         }
     }
 
     protected boolean handleInputOutputExtension(
-        ParserContext context,
-        Extensible parent,
+        TWSDLParserContext context,
+        TWSDLExtensible parent,
         Element e) {
         if (XmlUtil.matchesTagNS(e, MIMEConstants.QNAME_MULTIPART_RELATED)) {
             context.push();
             context.registerNamespaces(e);
 
-            MIMEMultipartRelated mpr = new MIMEMultipartRelated();
+            MIMEMultipartRelated mpr = new MIMEMultipartRelated(context.getLocation(e));
 
             for (Iterator iter = XmlUtil.getAllChildren(e); iter.hasNext();) {
                 Element e2 = Util.nextElement(iter);
@@ -95,7 +88,7 @@ public class MIMEExtensionHandler extends ExtensionHandler {
                     context.push();
                     context.registerNamespaces(e2);
 
-                    MIMEPart part = new MIMEPart();
+                    MIMEPart part = new MIMEPart(context.getLocation(e2));
 
                     String name =
                         XmlUtil.getAttributeOrNull(e2, Constants.ATTR_NAME);
@@ -104,15 +97,13 @@ public class MIMEExtensionHandler extends ExtensionHandler {
                     }
 
                     for (Iterator iter2 = XmlUtil.getAllChildren(e2);
-                        iter2.hasNext();
+                         iter2.hasNext();
                         ) {
                         Element e3 = Util.nextElement(iter2);
                         if (e3 == null)
                             break;
 
-                        ExtensionHandler h =
-                            (ExtensionHandler) _extensionHandlers.get(
-                                e3.getNamespaceURI());
+                        AbstractExtensionHandler h = getExtensionHandlers().get(e3.getNamespaceURI());
                         boolean handled = false;
                         if (h != null) {
                             handled = h.doHandleExtension(context, part, e3);
@@ -131,20 +122,20 @@ public class MIMEExtensionHandler extends ExtensionHandler {
                                     e3.getTagName(),
                                     e3.getNamespaceURI());
                             } else {
-                                context.fireIgnoringExtension(
-                                    new QName(
-                                        e3.getNamespaceURI(),
-                                        e3.getLocalName()),
-                                    part.getElementName());
+//                                context.fireIgnoringExtension(
+//                                    new QName(
+//                                        e3.getNamespaceURI(),
+//                                        e3.getLocalName()),
+//                                    part.getElementName());
                             }
                         }
                     }
 
                     mpr.add(part);
                     context.pop();
-                    context.fireDoneParsingEntity(
-                        MIMEConstants.QNAME_PART,
-                        part);
+//                    context.fireDoneParsingEntity(
+//                        MIMEConstants.QNAME_PART,
+//                        part);
                 } else {
                     Util.fail(
                         "parsing.invalidElement",
@@ -155,9 +146,9 @@ public class MIMEExtensionHandler extends ExtensionHandler {
 
             parent.addExtension(mpr);
             context.pop();
-            context.fireDoneParsingEntity(
-                MIMEConstants.QNAME_MULTIPART_RELATED,
-                mpr);
+//            context.fireDoneParsingEntity(
+//                MIMEConstants.QNAME_MULTIPART_RELATED,
+//                mpr);
             return true;
         } else if (XmlUtil.matchesTagNS(e, MIMEConstants.QNAME_CONTENT)) {
             MIMEContent content = parseMIMEContent(context, e);
@@ -176,9 +167,10 @@ public class MIMEExtensionHandler extends ExtensionHandler {
         }
     }
 
+    @Override
     protected boolean handleMIMEPartExtension(
-        ParserContext context,
-        Extensible parent,
+        TWSDLParserContext context,
+        TWSDLExtensible parent,
         Element e) {
         if (XmlUtil.matchesTagNS(e, MIMEConstants.QNAME_CONTENT)) {
             MIMEContent content = parseMIMEContent(context, e);
@@ -197,11 +189,11 @@ public class MIMEExtensionHandler extends ExtensionHandler {
         }
     }
 
-    protected MIMEContent parseMIMEContent(ParserContext context, Element e) {
+    protected MIMEContent parseMIMEContent(TWSDLParserContext context, Element e) {
         context.push();
         context.registerNamespaces(e);
 
-        MIMEContent content = new MIMEContent();
+        MIMEContent content = new MIMEContent(context.getLocation(e));
 
         String part = XmlUtil.getAttributeOrNull(e, Constants.ATTR_PART);
         if (part != null) {
@@ -214,15 +206,15 @@ public class MIMEExtensionHandler extends ExtensionHandler {
         }
 
         context.pop();
-        context.fireDoneParsingEntity(MIMEConstants.QNAME_CONTENT, content);
+//        context.fireDoneParsingEntity(MIMEConstants.QNAME_CONTENT, content);
         return content;
     }
 
-    protected MIMEXml parseMIMEXml(ParserContext context, Element e) {
+    protected MIMEXml parseMIMEXml(TWSDLParserContext context, Element e) {
         context.push();
         context.registerNamespaces(e);
 
-        MIMEXml mimeXml = new MIMEXml();
+        MIMEXml mimeXml = new MIMEXml(context.getLocation(e));
 
         String part = XmlUtil.getAttributeOrNull(e, Constants.ATTR_PART);
         if (part != null) {
@@ -230,45 +222,7 @@ public class MIMEExtensionHandler extends ExtensionHandler {
         }
 
         context.pop();
-        context.fireDoneParsingEntity(MIMEConstants.QNAME_MIME_XML, mimeXml);
+//        context.fireDoneParsingEntity(MIMEConstants.QNAME_MIME_XML, mimeXml);
         return mimeXml;
     }
-
-    public void doHandleExtension(WriterContext context, Extension extension)
-        throws IOException {
-        // NOTE - this ugliness can be avoided by moving all the XML parsing/writing code
-        // into the document classes themselves
-        if (extension instanceof MIMEContent) {
-            MIMEContent content = (MIMEContent) extension;
-            context.writeStartTag(content.getElementName());
-            context.writeAttribute(Constants.ATTR_PART, content.getPart());
-            context.writeAttribute(Constants.ATTR_TYPE, content.getType());
-            context.writeEndTag(content.getElementName());
-        } else if (extension instanceof MIMEXml) {
-            MIMEXml mimeXml = (MIMEXml) extension;
-            context.writeStartTag(mimeXml.getElementName());
-            context.writeAttribute(Constants.ATTR_PART, mimeXml.getPart());
-            context.writeEndTag(mimeXml.getElementName());
-        } else if (extension instanceof MIMEMultipartRelated) {
-            MIMEMultipartRelated mpr = (MIMEMultipartRelated) extension;
-            context.writeStartTag(mpr.getElementName());
-            for (Iterator iter = mpr.getParts(); iter.hasNext();) {
-                MIMEPart part = (MIMEPart) iter.next();
-                context.writeStartTag(part.getElementName());
-                for (Iterator iter2 = part.extensions(); iter2.hasNext();) {
-                    Extension e = (Extension) iter2.next();
-                    ExtensionHandler h =
-                        (ExtensionHandler) _extensionHandlers.get(
-                            e.getElementName().getNamespaceURI());
-                    if (h != null) {
-                        h.doHandleExtension(context, e);
-                    }
-                }
-                context.writeEndTag(part.getElementName());
-            }
-            context.writeEndTag(mpr.getElementName());
-        } else {
-            throw new IllegalArgumentException();
-        }
-    }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/MemberSubmissionAddressingExtensionHandler.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/MemberSubmissionAddressingExtensionHandler.java
new file mode 100644
index 00000000000..7f5d0fab387
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/MemberSubmissionAddressingExtensionHandler.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+/*
+ * $Id: MemberSubmissionAddressingExtensionHandler.java,v 1.1.2.6 2006/10/31 19:52:07 vivekp Exp $
+ */
+
+package com.sun.tools.internal.ws.wsdl.parser;
+
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtensible;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLParserContext;
+import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
+import com.sun.xml.internal.ws.api.addressing.AddressingVersion;
+import org.w3c.dom.Element;
+
+import javax.xml.namespace.QName;
+import java.util.Map;
+
+/**
+ * @author Arun Gupta
+ */
+public class MemberSubmissionAddressingExtensionHandler extends W3CAddressingExtensionHandler {
+    public MemberSubmissionAddressingExtensionHandler(Map extensionHandlerMap) {
+        super(extensionHandlerMap);
+    }
+
+    public MemberSubmissionAddressingExtensionHandler(Map extensionHandlerMap, ErrorReceiver env) {
+        super(extensionHandlerMap, env);
+    }
+
+    @Override
+    public String getNamespaceURI() {
+        return AddressingVersion.MEMBER.wsdlNsUri;
+    }
+
+    protected QName getActionQName() {
+        return AddressingVersion.MEMBER.wsdlActionTag;
+    }
+
+    protected QName getWSDLExtensionQName() {
+        return AddressingVersion.MEMBER.wsdlExtensionTag;
+    }
+
+    @Override
+    public boolean handlePortExtension(TWSDLParserContext context, TWSDLExtensible parent, Element e) {
+        // ignore any extension elements
+        return false;
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/MetadataFinder.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/MetadataFinder.java
new file mode 100644
index 00000000000..b08905c0d9e
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/MetadataFinder.java
@@ -0,0 +1,252 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+
+
+package com.sun.tools.internal.ws.wsdl.parser;
+
+import com.sun.tools.internal.ws.resources.WsdlMessages;
+import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
+import com.sun.tools.internal.ws.wscompile.WsimportOptions;
+import com.sun.tools.internal.ws.wsdl.document.WSDLConstants;
+import com.sun.tools.internal.ws.wsdl.document.schema.SchemaConstants;
+import com.sun.tools.internal.ws.wsdl.framework.ParseException;
+import com.sun.xml.internal.ws.api.wsdl.parser.MetaDataResolver;
+import com.sun.xml.internal.ws.api.wsdl.parser.MetadataResolverFactory;
+import com.sun.xml.internal.ws.api.wsdl.parser.ServiceDescriptor;
+import com.sun.xml.internal.ws.util.DOMUtil;
+import com.sun.xml.internal.ws.util.ServiceFinder;
+import com.sun.istack.internal.Nullable;
+import com.sun.istack.internal.NotNull;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.LocatorImpl;
+
+import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMSource;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.List;
+import java.util.Set;
+import java.util.HashSet;
+import java.io.IOException;
+
+/**
+ * @author Vivek Pandey
+ */
+public final class MetadataFinder extends DOMForest{
+
+    public boolean isMexMetadata;
+    private String rootWSDL;
+    private Set rootWsdls = new HashSet();
+
+
+    public MetadataFinder(InternalizationLogic logic, WsimportOptions options, ErrorReceiver errReceiver) {
+        super(logic, options, errReceiver);
+
+    }
+
+    public void parseWSDL() throws SAXException, IOException {
+        // parse source grammars
+        for (InputSource value : options.getWSDLs()) {
+            String systemID = value.getSystemId();
+            errorReceiver.pollAbort();
+
+            //if there is entity resolver use it
+            if (options.entityResolver != null)
+                value = options.entityResolver.resolveEntity(null, systemID);
+            if (value == null)
+                value = new InputSource(systemID);
+
+
+            Document dom = parse(value, true);
+            if (dom == null)
+                continue;
+            Element doc = dom.getDocumentElement();
+            if (doc == null) {
+                continue;
+            }
+            //if its not a WSDL document, retry with MEX
+            if (doc.getNamespaceURI() == null || !doc.getNamespaceURI().equals(WSDLConstants.NS_WSDL) || !doc.getLocalName().equals("definitions")) {
+                core.remove(systemID);
+                rootDocuments.remove(systemID);
+                errorReceiver.warning(locatorTable.getStartLocation(doc), WsdlMessages.INVALID_WSDL_WITH_DOOC(systemID, "{" + fixNull(doc.getNamespaceURI()) + "}" + doc.getLocalName()));
+                dom = getFromMetadataResolver(systemID);
+                if(dom == null)
+                    continue;
+                doc = dom.getDocumentElement();
+            }
+            NodeList schemas = doc.getElementsByTagNameNS(SchemaConstants.NS_XSD, "schema");
+            for (int i = 0; i < schemas.getLength(); i++) {
+                if(!inlinedSchemaElements.contains(schemas.item(i)))
+                    inlinedSchemaElements.add((Element) schemas.item(i));
+            }
+        }
+        identifyRootWslds();
+    }
+
+    /**
+     * Gives the root wsdl document systemId. A root wsdl document is the one which has wsdl:service.
+     * @return null if there is no root wsdl
+     */
+    public @Nullable
+    String getRootWSDL(){
+        return rootWSDL;
+    }
+
+    /**
+     * Gives all the WSDL documents.
+     */
+    public @NotNull
+    Set getRootWSDLs(){
+        return rootWsdls;
+    }
+
+
+    /**
+     * Identifies WSDL documents from the {@link DOMForest}. Also identifies the root wsdl document.
+     */
+    private void identifyRootWslds(){
+        for(String location: rootDocuments){
+            Document doc = get(location);
+            if(doc!=null){
+                Element definition = doc.getDocumentElement();
+                if(definition == null)
+                    continue;
+                if(definition.getNamespaceURI().equals(WSDLConstants.NS_WSDL) && definition.getLocalName().equals("definitions")){
+                    rootWsdls.add(location);
+                    //set the root wsdl at this point. Root wsdl is one which has wsdl:service in it
+                    NodeList nl = definition.getElementsByTagNameNS(WSDLConstants.NS_WSDL, "service");
+
+                    //TODO:what if there are more than one wsdl with wsdl:service element. Probably such cases
+                    //are rare and we will take any one of them, this logic should still work
+                    if(nl.getLength() > 0)
+                        rootWSDL = location;
+                }
+            }
+        }
+    }
+
+
+
+
+    private String fixNull(String s) {
+        if (s == null) return "";
+        else return s;
+    }
+
+
+    /*
+    * If source and target namespace are also passed in,
+    * then if the mex resolver is found and it cannot get
+    * the data, wsimport attempts to add ?wsdl to the
+    * address and retrieve the data with a normal http get.
+    * This behavior should only happen when trying a
+    * mex request first.
+    */
+    private Document getFromMetadataResolver(String systemId) {
+
+        //try MEX
+        MetaDataResolver resolver = null;
+        ServiceDescriptor serviceDescriptor = null;
+        for (MetadataResolverFactory resolverFactory : ServiceFinder.find(MetadataResolverFactory.class)) {
+            resolver = resolverFactory.metadataResolver(options.entityResolver);
+            try {
+                serviceDescriptor = resolver.resolve(new URI(systemId));
+                //we got the ServiceDescriptor, now break
+                if (serviceDescriptor != null)
+                    break;
+            } catch (URISyntaxException e) {
+                throw new ParseException(e);
+            }
+        }
+
+        if (serviceDescriptor != null) {
+            return parseMetadata(systemId, serviceDescriptor);
+        } else {
+            errorReceiver.error(new LocatorImpl(), WsdlMessages.PARSING_UNABLE_TO_GET_METADATA(systemId));
+        }
+        return null;
+    }
+
+    private Document parseMetadata(String systemId, ServiceDescriptor serviceDescriptor) {
+        List mexWsdls = serviceDescriptor.getWSDLs();
+        List mexSchemas = serviceDescriptor.getSchemas();
+        Document root = null;
+        for (Source src : mexWsdls) {
+            if (src instanceof DOMSource) {
+                Node n = ((DOMSource) src).getNode();
+                Document doc;
+                if (n.getNodeType() == Node.ELEMENT_NODE && n.getOwnerDocument() == null) {
+                    doc = DOMUtil.createDom();
+                    doc.importNode(n, true);
+                } else {
+                    doc = n.getOwnerDocument();
+                }
+
+//                Element e = (n.getNodeType() == Node.ELEMENT_NODE)?(Element)n: DOMUtil.getFirstElementChild(n);
+                if (root == null) {
+                    //check if its main wsdl, then set it to root
+                    NodeList nl = doc.getDocumentElement().getElementsByTagNameNS(WSDLConstants.NS_WSDL, "service");
+                    if (nl.getLength() > 0) {
+                        root = doc;
+                        rootWSDL = src.getSystemId();
+                    }
+                }
+                NodeList nl = doc.getDocumentElement().getElementsByTagNameNS(WSDLConstants.NS_WSDL, "import");
+                if (nl.getLength() > 0) {
+                    Element imp = (Element) nl.item(0);
+                    String loc = imp.getAttribute("location");
+                    if (loc != null) {
+                        if (!externalReferences.contains(loc))
+                            externalReferences.add(loc);
+                    }
+                }
+                if (core.keySet().contains(systemId))
+                    core.remove(systemId);
+                core.put(src.getSystemId(), doc);
+                isMexMetadata = true;
+            }
+
+            //TODO:handle SAXSource
+            //TODO:handler StreamSource
+        }
+
+        for (Source src : mexSchemas) {
+            if (src instanceof DOMSource) {
+                Node n = ((DOMSource) src).getNode();
+                Element e = (n.getNodeType() == Node.ELEMENT_NODE) ? (Element) n : DOMUtil.getFirstElementChild(n);
+                inlinedSchemaElements.add(e);
+            }
+            //TODO:handle SAXSource
+            //TODO:handler StreamSource
+        }
+        return root;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/NamespaceContextImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/NamespaceContextImpl.java
index e6f248530a6..b0010ff2c2c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/NamespaceContextImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/NamespaceContextImpl.java
@@ -1,5 +1,9 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
+ */
+/*
+ * Portions Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,17 +28,16 @@
  *
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
+
 package com.sun.tools.internal.ws.wsdl.parser;
 
-import java.util.Iterator;
-
-import javax.xml.namespace.NamespaceContext;
-
+import com.sun.xml.internal.bind.v2.WellKnownNamespace;
 import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.sun.xml.internal.bind.v2.WellKnownNamespace;
+import javax.xml.namespace.NamespaceContext;
+import java.util.Iterator;
 
 public class NamespaceContextImpl implements NamespaceContext {
 
@@ -46,7 +49,19 @@ public class NamespaceContextImpl implements NamespaceContext {
 
     /*
      * Copyright 1999-2004 The Apache Software Foundation.
-     *     */
+     *
+     * Licensed under the Apache License, Version 2.0 (the "License");
+     * you may not use this file except in compliance with the License.
+     * You may obtain a copy of the License at
+     *
+     *     http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     */
     public String getNamespaceURI(String prefix) {
         Node parent = e;
         String namespace = null;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAP12ExtensionHandler.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAP12ExtensionHandler.java
index f86bd414929..63e2068043b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAP12ExtensionHandler.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAP12ExtensionHandler.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,14 +24,19 @@
  */
 package com.sun.tools.internal.ws.wsdl.parser;
 
-import javax.xml.namespace.QName;
-
+import com.sun.tools.internal.ws.wsdl.document.soap.SOAP12Binding;
 import com.sun.tools.internal.ws.wsdl.document.soap.SOAP12Constants;
 import com.sun.tools.internal.ws.wsdl.document.soap.SOAPBinding;
-import com.sun.tools.internal.ws.wsdl.document.soap.SOAP12Binding;
+import org.xml.sax.Locator;
+
+import javax.xml.namespace.QName;
+import java.util.Map;
 
 
 public class SOAP12ExtensionHandler extends SOAPExtensionHandler {
+    public SOAP12ExtensionHandler(Map extensionHandlerMap) {
+        super(extensionHandlerMap);
+    }
 
     /*
      * @see SOAPExtensionHandler#getNamespaceURI()
@@ -57,8 +62,8 @@ public class SOAP12ExtensionHandler extends SOAPExtensionHandler {
         return SOAP12Constants.QNAME_BINDING;
     }
 
-    @Override protected SOAPBinding getSOAPBinding() {
-        return new SOAP12Binding();
+    @Override protected SOAPBinding getSOAPBinding(Locator location) {
+        return new SOAP12Binding(location);
     }
 
     /*
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAPEntityReferenceValidator.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAPEntityReferenceValidator.java
index 0482002d8e7..1b818949b11 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAPEntityReferenceValidator.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAPEntityReferenceValidator.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,17 +25,16 @@
 
 package com.sun.tools.internal.ws.wsdl.parser;
 
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-
 import com.sun.tools.internal.ws.wsdl.document.schema.SchemaConstants;
 import com.sun.tools.internal.ws.wsdl.document.schema.SchemaKinds;
 import com.sun.tools.internal.ws.wsdl.document.soap.SOAPConstants;
 import com.sun.tools.internal.ws.wsdl.framework.EntityReferenceValidator;
 import com.sun.tools.internal.ws.wsdl.framework.Kind;
 
+import javax.xml.namespace.QName;
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  * An interface implemented by a class that is capable of validating
  * a QName/Kind pair referring to an external entity.
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAPExtensionHandler.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAPExtensionHandler.java
index de19bb1fed0..2f39729c31c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAPExtensionHandler.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAPExtensionHandler.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,46 +25,36 @@
 
 package com.sun.tools.internal.ws.wsdl.parser;
 
-import java.io.IOException;
-import java.util.Iterator;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtensible;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLParserContext;
+import com.sun.tools.internal.ws.util.xml.XmlUtil;
+import com.sun.tools.internal.ws.wsdl.document.soap.*;
+import com.sun.tools.internal.ws.wsdl.framework.TWSDLParserContextImpl;
+import org.w3c.dom.Element;
+import org.xml.sax.Locator;
 
 import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-import com.sun.tools.internal.ws.wsdl.document.soap.SOAPAddress;
-import com.sun.tools.internal.ws.wsdl.document.soap.SOAPBinding;
-import com.sun.tools.internal.ws.wsdl.document.soap.SOAPBody;
-import com.sun.tools.internal.ws.wsdl.document.soap.SOAPConstants;
-import com.sun.tools.internal.ws.wsdl.document.soap.SOAPFault;
-import com.sun.tools.internal.ws.wsdl.document.soap.SOAPHeader;
-import com.sun.tools.internal.ws.wsdl.document.soap.SOAPHeaderFault;
-import com.sun.tools.internal.ws.wsdl.document.soap.SOAPOperation;
-import com.sun.tools.internal.ws.wsdl.document.soap.SOAPStyle;
-import com.sun.tools.internal.ws.wsdl.document.soap.SOAPUse;
-import com.sun.tools.internal.ws.wsdl.framework.Extensible;
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
-import com.sun.tools.internal.ws.wsdl.framework.ParserContext;
-import com.sun.tools.internal.ws.wsdl.framework.WriterContext;
-import com.sun.tools.internal.ws.util.xml.XmlUtil;
+import java.util.Iterator;
+import java.util.Map;
 
 /**
  * The SOAP extension handler for WSDL.
  *
  * @author WS Development Team
  */
-public class SOAPExtensionHandler extends ExtensionHandlerBase {
+public class SOAPExtensionHandler extends AbstractExtensionHandler {
 
-    public SOAPExtensionHandler() {
+    public SOAPExtensionHandler(Map extensionHandlerMap) {
+        super(extensionHandlerMap);
     }
 
     public String getNamespaceURI() {
         return Constants.NS_WSDL_SOAP;
     }
 
-    protected boolean handleDefinitionsExtension(
-        ParserContext context,
-        Extensible parent,
+    public boolean handleDefinitionsExtension(
+        TWSDLParserContext context,
+        TWSDLExtensible parent,
         Element e) {
         Util.fail(
             "parsing.invalidExtensionElement",
@@ -73,9 +63,9 @@ public class SOAPExtensionHandler extends ExtensionHandlerBase {
         return false; // keep compiler happy
     }
 
-    protected boolean handleTypesExtension(
-        ParserContext context,
-        Extensible parent,
+    public boolean handleTypesExtension(
+        com.sun.tools.internal.ws.api.wsdl.TWSDLParserContext context,
+        TWSDLExtensible parent,
         Element e) {
         Util.fail(
             "parsing.invalidExtensionElement",
@@ -84,19 +74,19 @@ public class SOAPExtensionHandler extends ExtensionHandlerBase {
         return false; // keep compiler happy
     }
 
-    protected SOAPBinding getSOAPBinding(){
-        return new SOAPBinding();
+    protected SOAPBinding getSOAPBinding(Locator location){
+        return new SOAPBinding(location);
     }
 
-    protected boolean handleBindingExtension(
-        ParserContext context,
-        Extensible parent,
+    public boolean handleBindingExtension(
+        TWSDLParserContext context,
+        TWSDLExtensible parent,
         Element e) {
         if (XmlUtil.matchesTagNS(e, getBindingQName())) {
             context.push();
             context.registerNamespaces(e);
 
-            SOAPBinding binding = getSOAPBinding();
+            SOAPBinding binding = getSOAPBinding(context.getLocation(e));
 
             // NOTE - the "transport" attribute is required according to section 3.3 of the WSDL 1.1 spec,
             // but optional according to the schema in appendix A 4.2 of the same document!
@@ -119,7 +109,7 @@ public class SOAPExtensionHandler extends ExtensionHandlerBase {
             }
             parent.addExtension(binding);
             context.pop();
-            context.fireDoneParsingEntity(getBindingQName(), binding);
+//            context.fireDoneParsingEntity(getBindingQName(), binding);
             return true;
         } else {
             Util.fail(
@@ -130,15 +120,15 @@ public class SOAPExtensionHandler extends ExtensionHandlerBase {
         }
     }
 
-    protected boolean handleOperationExtension(
-        ParserContext context,
-        Extensible parent,
+    public boolean handleOperationExtension(
+        TWSDLParserContext context,
+        TWSDLExtensible parent,
         Element e) {
         if (XmlUtil.matchesTagNS(e, getOperationQName())) {
             context.push();
             context.registerNamespaces(e);
 
-            SOAPOperation operation = new SOAPOperation();
+            SOAPOperation operation = new SOAPOperation(context.getLocation(e));
 
             String soapAction =
                 XmlUtil.getAttributeOrNull(e, Constants.ATTR_SOAP_ACTION);
@@ -161,9 +151,9 @@ public class SOAPExtensionHandler extends ExtensionHandlerBase {
             }
             parent.addExtension(operation);
             context.pop();
-            context.fireDoneParsingEntity(
-                getOperationQName(),
-                operation);
+//            context.fireDoneParsingEntity(
+//                getOperationQName(),
+//                operation);
             return true;
         } else {
             Util.fail(
@@ -174,35 +164,37 @@ public class SOAPExtensionHandler extends ExtensionHandlerBase {
         }
     }
 
-    protected boolean handleInputExtension(
-        ParserContext context,
-        Extensible parent,
+    public boolean handleInputExtension(
+        TWSDLParserContext context,
+        TWSDLExtensible parent,
         Element e) {
         return handleInputOutputExtension(context, parent, e);
     }
-    protected boolean handleOutputExtension(
-        ParserContext context,
-        Extensible parent,
+    public boolean handleOutputExtension(
+        TWSDLParserContext context,
+        TWSDLExtensible parent,
         Element e) {
         return handleInputOutputExtension(context, parent, e);
     }
 
+    @Override
     protected boolean handleMIMEPartExtension(
-        ParserContext context,
-        Extensible parent,
+        TWSDLParserContext context,
+        TWSDLExtensible parent,
         Element e) {
         return handleInputOutputExtension(context, parent, e);
     }
 
     protected boolean handleInputOutputExtension(
-        ParserContext context,
-        Extensible parent,
+        TWSDLParserContext contextif,
+        TWSDLExtensible parent,
         Element e) {
+        TWSDLParserContextImpl context = (TWSDLParserContextImpl)contextif;
         if (XmlUtil.matchesTagNS(e, getBodyQName())) {
             context.push();
             context.registerNamespaces(e);
 
-            SOAPBody body = new SOAPBody();
+            SOAPBody body = new SOAPBody(context.getLocation(e));
 
             String use = XmlUtil.getAttributeOrNull(e, Constants.ATTR_USE);
             if (use != null) {
@@ -237,13 +229,13 @@ public class SOAPExtensionHandler extends ExtensionHandlerBase {
 
             parent.addExtension(body);
             context.pop();
-            context.fireDoneParsingEntity(getBodyQName(), body);
+//            context.fireDoneParsingEntity(getBodyQName(), body);
             return true;
         } else if (XmlUtil.matchesTagNS(e, getHeaderQName())) {
             context.push();
             context.registerNamespaces(e);
 
-            SOAPHeader header = new SOAPHeader();
+            SOAPHeader header = new SOAPHeader(context.getLocation(e));
 
             String use = XmlUtil.getAttributeOrNull(e, Constants.ATTR_USE);
             if (use != null) {
@@ -279,7 +271,7 @@ public class SOAPExtensionHandler extends ExtensionHandlerBase {
             String messageAttr =
                 XmlUtil.getAttributeOrNull(e, Constants.ATTR_MESSAGE);
             if (messageAttr != null) {
-                header.setMessage(context.translateQualifiedName(messageAttr));
+                header.setMessage(context.translateQualifiedName(context.getLocation(e), messageAttr));
             }
 
             for (Iterator iter = XmlUtil.getAllChildren(e); iter.hasNext();) {
@@ -292,7 +284,7 @@ public class SOAPExtensionHandler extends ExtensionHandlerBase {
                     context.push();
                     context.registerNamespaces(e);
 
-                    SOAPHeaderFault headerfault = new SOAPHeaderFault();
+                    SOAPHeaderFault headerfault = new SOAPHeaderFault(context.getLocation(e));
 
                     String use2 =
                         XmlUtil.getAttributeOrNull(e2, Constants.ATTR_USE);
@@ -335,7 +327,7 @@ public class SOAPExtensionHandler extends ExtensionHandlerBase {
                         XmlUtil.getAttributeOrNull(e2, Constants.ATTR_MESSAGE);
                     if (messageAttr2 != null) {
                         headerfault.setMessage(
-                            context.translateQualifiedName(messageAttr2));
+                            context.translateQualifiedName(context.getLocation(e2), messageAttr2));
                     }
 
                     header.add(headerfault);
@@ -361,15 +353,15 @@ public class SOAPExtensionHandler extends ExtensionHandlerBase {
         }
     }
 
-    protected boolean handleFaultExtension(
-        ParserContext context,
-        Extensible parent,
+    public boolean handleFaultExtension(
+        TWSDLParserContext context,
+        TWSDLExtensible parent,
         Element e) {
         if (XmlUtil.matchesTagNS(e, getFaultQName())) {
             context.push();
             context.registerNamespaces(e);
 
-            SOAPFault fault = new SOAPFault();
+            SOAPFault fault = new SOAPFault(context.getLocation(e));
 
             String name = XmlUtil.getAttributeOrNull(e, Constants.ATTR_NAME);
             if (name != null) {
@@ -404,7 +396,7 @@ public class SOAPExtensionHandler extends ExtensionHandlerBase {
 
             parent.addExtension(fault);
             context.pop();
-            context.fireDoneParsingEntity(getFaultQName(), fault);
+//            context.fireDoneParsingEntity(getFaultQName(), fault);
             return true;
         } else {
             Util.fail(
@@ -415,9 +407,9 @@ public class SOAPExtensionHandler extends ExtensionHandlerBase {
         }
     }
 
-    protected boolean handleServiceExtension(
-        ParserContext context,
-        Extensible parent,
+    public boolean handleServiceExtension(
+        TWSDLParserContext context,
+        TWSDLExtensible parent,
         Element e) {
         Util.fail(
             "parsing.invalidExtensionElement",
@@ -426,15 +418,16 @@ public class SOAPExtensionHandler extends ExtensionHandlerBase {
         return false; // keep compiler happy
     }
 
-    protected boolean handlePortExtension(
-        ParserContext context,
-        Extensible parent,
+    @Override
+    public boolean handlePortExtension(
+        TWSDLParserContext context,
+        TWSDLExtensible parent,
         Element e) {
         if (XmlUtil.matchesTagNS(e, getAddressQName())) {
             context.push();
             context.registerNamespaces(e);
 
-            SOAPAddress address = new SOAPAddress();
+            SOAPAddress address = new SOAPAddress(context.getLocation(e));
 
             String location =
                 Util.getRequiredAttribute(e, Constants.ATTR_LOCATION);
@@ -442,7 +435,7 @@ public class SOAPExtensionHandler extends ExtensionHandlerBase {
 
             parent.addExtension(address);
             context.pop();
-            context.fireDoneParsingEntity(getAddressQName(), address);
+//            context.fireDoneParsingEntity(getAddressQName(), address);
             return true;
         } else {
             Util.fail(
@@ -453,131 +446,8 @@ public class SOAPExtensionHandler extends ExtensionHandlerBase {
         }
     }
 
-    public void doHandleExtension(WriterContext context, Extension extension)
-        throws IOException {
-        // NOTE - this ugliness can be avoided by moving all the XML parsing/writing code
-        // into the document classes themselves
-        if (extension instanceof SOAPAddress) {
-            SOAPAddress address = (SOAPAddress) extension;
-            context.writeStartTag(address.getElementName());
-            context.writeAttribute(
-                Constants.ATTR_LOCATION,
-                address.getLocation());
-            context.writeEndTag(address.getElementName());
-        } else if (extension instanceof SOAPBinding) {
-            SOAPBinding binding = (SOAPBinding) extension;
-            context.writeStartTag(binding.getElementName());
-            context.writeAttribute(
-                Constants.ATTR_TRANSPORT,
-                binding.getTransport());
-            String style =
-                (binding.getStyle() == null
-                    ? null
-                    : (binding.getStyle() == SOAPStyle.DOCUMENT
-                        ? Constants.ATTRVALUE_DOCUMENT
-                        : Constants.ATTRVALUE_RPC));
-            context.writeAttribute(Constants.ATTR_STYLE, style);
-            context.writeEndTag(binding.getElementName());
-        } else if (extension instanceof SOAPBody) {
-            SOAPBody body = (SOAPBody) extension;
-            context.writeStartTag(body.getElementName());
-            context.writeAttribute(
-                Constants.ATTR_ENCODING_STYLE,
-                body.getEncodingStyle());
-            context.writeAttribute(Constants.ATTR_PARTS, body.getParts());
-            String use =
-                (body.getUse() == null
-                    ? null
-                    : (body.getUse() == SOAPUse.LITERAL
-                        ? Constants.ATTRVALUE_LITERAL
-                        : Constants.ATTRVALUE_ENCODED));
-            context.writeAttribute(Constants.ATTR_USE, use);
-            context.writeAttribute(
-                Constants.ATTR_NAMESPACE,
-                body.getNamespace());
-            context.writeEndTag(body.getElementName());
-        } else if (extension instanceof SOAPFault) {
-            SOAPFault fault = (SOAPFault) extension;
-            context.writeStartTag(fault.getElementName());
-            context.writeAttribute(Constants.ATTR_NAME, fault.getName());
-            context.writeAttribute(
-                Constants.ATTR_ENCODING_STYLE,
-                fault.getEncodingStyle());
-            String use =
-                (fault.getUse() == null
-                    ? null
-                    : (fault.getUse() == SOAPUse.LITERAL
-                        ? Constants.ATTRVALUE_LITERAL
-                        : Constants.ATTRVALUE_ENCODED));
-            context.writeAttribute(Constants.ATTR_USE, use);
-            context.writeAttribute(
-                Constants.ATTR_NAMESPACE,
-                fault.getNamespace());
-            context.writeEndTag(fault.getElementName());
-        } else if (extension instanceof SOAPHeader) {
-            SOAPHeader header = (SOAPHeader) extension;
-            context.writeStartTag(header.getElementName());
-            context.writeAttribute(Constants.ATTR_MESSAGE, header.getMessage());
-            context.writeAttribute(Constants.ATTR_PART, header.getPart());
-            context.writeAttribute(
-                Constants.ATTR_ENCODING_STYLE,
-                header.getEncodingStyle());
-            String use =
-                (header.getUse() == null
-                    ? null
-                    : (header.getUse() == SOAPUse.LITERAL
-                        ? Constants.ATTRVALUE_LITERAL
-                        : Constants.ATTRVALUE_ENCODED));
-            context.writeAttribute(Constants.ATTR_USE, use);
-            context.writeAttribute(
-                Constants.ATTR_NAMESPACE,
-                header.getNamespace());
-            context.writeEndTag(header.getElementName());
-        } else if (extension instanceof SOAPHeaderFault) {
-            SOAPHeaderFault headerfault = (SOAPHeaderFault) extension;
-            context.writeStartTag(headerfault.getElementName());
-            context.writeAttribute(
-                Constants.ATTR_MESSAGE,
-                headerfault.getMessage());
-            context.writeAttribute(Constants.ATTR_PART, headerfault.getPart());
-            context.writeAttribute(
-                Constants.ATTR_ENCODING_STYLE,
-                headerfault.getEncodingStyle());
-            String use =
-                (headerfault.getUse() == null
-                    ? null
-                    : (headerfault.getUse() == SOAPUse.LITERAL
-                        ? Constants.ATTRVALUE_LITERAL
-                        : Constants.ATTRVALUE_ENCODED));
-            context.writeAttribute(Constants.ATTR_USE, use);
-            context.writeAttribute(
-                Constants.ATTR_NAMESPACE,
-                headerfault.getNamespace());
-            context.writeEndTag(headerfault.getElementName());
-        } else if (extension instanceof SOAPOperation) {
-            SOAPOperation operation = (SOAPOperation) extension;
-            context.writeStartTag(operation.getElementName());
-            context.writeAttribute(
-                Constants.ATTR_SOAP_ACTION,
-                operation.getSOAPAction());
-            String style =
-                (operation.getStyle() == null
-                    ? null
-                    : (operation.isDocument()
-                        ? Constants.ATTRVALUE_DOCUMENT
-                        : Constants.ATTRVALUE_RPC));
-            context.writeAttribute(Constants.ATTR_STYLE, style);
-            context.writeEndTag(operation.getElementName());
-        } else {
-            throw new IllegalArgumentException();
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see ExtensionHandlerBase#handlePortTypeExtension(ParserContext, Extensible, org.w3c.dom.Element)
-     */
-    protected boolean handlePortTypeExtension(ParserContext context, Extensible parent, Element e) {
-        Util.fail(
+    public boolean handlePortTypeExtension(TWSDLParserContext context, TWSDLExtensible parent, Element e) {
+       Util.fail(
             "parsing.invalidExtensionElement",
             e.getTagName(),
             e.getNamespaceURI());
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SchemaExtensionHandler.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SchemaExtensionHandler.java
deleted file mode 100644
index 6edcb6794d1..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SchemaExtensionHandler.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.tools.internal.ws.wsdl.parser;
-
-import java.io.IOException;
-
-import org.w3c.dom.Element;
-
-import com.sun.tools.internal.ws.wsdl.document.schema.Schema;
-import com.sun.tools.internal.ws.wsdl.document.schema.SchemaConstants;
-import com.sun.tools.internal.ws.wsdl.framework.Extensible;
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
-import com.sun.tools.internal.ws.wsdl.framework.ParserContext;
-import com.sun.tools.internal.ws.wsdl.framework.WriterContext;
-import com.sun.tools.internal.ws.util.xml.XmlUtil;
-
-/**
- * The XML Schema extension handler for WSDL.
- *
- * @author WS Development Team
- */
-public class SchemaExtensionHandler extends ExtensionHandler {
-
-    public SchemaExtensionHandler() {
-    }
-
-    public String getNamespaceURI() {
-        return Constants.NS_XSD;
-    }
-
-    public boolean doHandleExtension(
-        ParserContext context,
-        Extensible parent,
-        Element e) {
-        if (XmlUtil.matchesTagNS(e, SchemaConstants.QNAME_SCHEMA)) {
-            SchemaParser parser = new SchemaParser();
-            parent.addExtension(parser.parseSchema(context, e, null));
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    public void doHandleExtension(WriterContext context, Extension extension)
-        throws IOException {
-        if (extension instanceof Schema) {
-            SchemaWriter writer = new SchemaWriter();
-            writer.writeSchema(context, (Schema) extension);
-        } else {
-            // unknown extension
-            throw new IllegalArgumentException();
-        }
-    }
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SchemaParser.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SchemaParser.java
deleted file mode 100644
index cbf991bc79f..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SchemaParser.java
+++ /dev/null
@@ -1,353 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.tools.internal.ws.wsdl.parser;
-
-import java.io.IOException;
-import java.util.Iterator;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-import com.sun.xml.internal.ws.util.xml.NamedNodeMapIterator;
-import com.sun.tools.internal.ws.util.xml.NullEntityResolver;
-import com.sun.tools.internal.ws.wsdl.document.schema.Schema;
-import com.sun.tools.internal.ws.wsdl.document.schema.SchemaAttribute;
-import com.sun.tools.internal.ws.wsdl.document.schema.SchemaConstants;
-import com.sun.tools.internal.ws.wsdl.document.schema.SchemaDocument;
-import com.sun.tools.internal.ws.wsdl.document.schema.SchemaElement;
-import com.sun.tools.internal.ws.wsdl.framework.ParseException;
-import com.sun.tools.internal.ws.wsdl.framework.ParserContext;
-import com.sun.tools.internal.ws.wsdl.framework.ValidationException;
-import com.sun.xml.internal.ws.util.xml.XmlUtil;
-
-/**
- * A parser for XML Schema, including the fragments found inside a WSDL document.
- *
- * @author WS Development Team
- */
-public class SchemaParser {
-
-    public SchemaParser() {
-    }
-
-    public boolean getFollowImports() {
-        return _followImports;
-    }
-
-    public void setFollowImports(boolean b) {
-        _followImports = b;
-    }
-
-    public SchemaDocument parse(InputSource source) {
-        SchemaDocument schemaDocument = new SchemaDocument();
-        schemaDocument.setSystemId(source.getSystemId());
-        ParserContext context = new ParserContext(schemaDocument, null);
-        context.setFollowImports(_followImports);
-        schemaDocument.setSchema(parseSchema(context, source, null));
-        return schemaDocument;
-    }
-
-    public Schema parseSchema(
-        ParserContext context,
-        InputSource source,
-        String expectedTargetNamespaceURI) {
-        Schema schema =
-            parseSchemaNoImport(context, source, expectedTargetNamespaceURI);
-        schema.defineAllEntities();
-        processImports(context, source, schema);
-        return schema;
-    }
-
-    public Schema parseSchema(
-        ParserContext context,
-        Element e,
-        String expectedTargetNamespaceURI) {
-        Schema schema =
-            parseSchemaNoImport(context, e, expectedTargetNamespaceURI);
-        schema.defineAllEntities();
-        processImports(context, null, schema);
-        return schema;
-    }
-
-    protected void processImports(
-        ParserContext context,
-        InputSource source,
-        Schema schema) {
-        for (Iterator iter = schema.getContent().children(); iter.hasNext();) {
-            SchemaElement child = (SchemaElement) iter.next();
-            if (child.getQName().equals(SchemaConstants.QNAME_IMPORT)) {
-                String location =
-                    child.getValueOfAttributeOrNull(
-                        Constants.ATTR_SCHEMA_LOCATION);
-                String namespace =
-                    child.getValueOfAttributeOrNull(Constants.ATTR_NAMESPACE);
-                //bug fix: 4857762, add adjustedLocation to teh importDocuments and ignore if it
-                //exists, to avoid duplicates
-                if (location != null) {
-                    String adjustedLocation = null;
-                    if (source != null && source.getSystemId() != null) {
-                        adjustedLocation =
-                            Util.processSystemIdWithBase(
-                                source.getSystemId(),
-                                location);
-                    }
-                    //bug fix: 4856674
-                    if (adjustedLocation == null) {
-                        adjustedLocation =
-                            context.getWSDLLocation() == null
-                                ? location
-                                : Util.processSystemIdWithBase(
-                                    context.getWSDLLocation(),
-                                    location);
-                    }
-                    if (!context
-                        .getDocument()
-                        .isImportedDocument(adjustedLocation)) {
-                        context.getDocument().addImportedEntity(
-                            parseSchema(
-                                context,
-                                new InputSource(adjustedLocation),
-                                namespace));
-                        context.getDocument().addImportedDocument(
-                            adjustedLocation);
-                    }
-                }
-            } else if (
-                child.getQName().equals(SchemaConstants.QNAME_INCLUDE)
-                    && (schema.getTargetNamespaceURI() != null)) {
-                String location =
-                    child.getValueOfAttributeOrNull(
-                        Constants.ATTR_SCHEMA_LOCATION);
-                if (location != null
-                    && !context.getDocument().isIncludedDocument(location)) {
-                    context.getDocument().addIncludedDocument(location);
-                    String adjustedLocation = null;
-                    if (source != null && source.getSystemId() != null) {
-                        adjustedLocation =
-                            Util.processSystemIdWithBase(
-                                source.getSystemId(),
-                                location);
-                    }
-                    if (adjustedLocation == null) {
-                        adjustedLocation =
-                            context.getDocument().getSystemId() == null
-                                ? location
-                                : Util.processSystemIdWithBase(
-                                    context.getDocument().getSystemId(),
-                                    location);
-                    }
-                    context.getDocument().addIncludedEntity(
-                        parseSchema(
-                            context,
-                            new InputSource(adjustedLocation),
-                            schema.getTargetNamespaceURI()));
-                }
-            } else if (
-                child.getQName().equals(SchemaConstants.QNAME_REDEFINE)) {
-                // not supported
-                Util.fail("validation.unsupportedSchemaFeature", "redefine");
-            }
-        }
-    }
-
-    protected Schema parseSchemaNoImport(
-        ParserContext context,
-        InputSource source,
-        String expectedTargetNamespaceURI) {
-        try {
-            DocumentBuilderFactory builderFactory =
-                DocumentBuilderFactory.newInstance();
-            builderFactory.setNamespaceAware(true);
-            builderFactory.setValidating(false);
-            DocumentBuilder builder = builderFactory.newDocumentBuilder();
-            builder.setErrorHandler(new ErrorHandler() {
-                public void error(SAXParseException e)
-                    throws SAXParseException {
-                    throw e;
-                }
-                public void fatalError(SAXParseException e)
-                    throws SAXParseException {
-                    throw e;
-                }
-                public void warning(SAXParseException err)
-                    throws SAXParseException {
-                    // do nothing
-                }
-            });
-            builder.setEntityResolver(new NullEntityResolver());
-
-            try {
-                Document document = builder.parse(source);
-                return parseSchemaNoImport(
-                    context,
-                    document,
-                    expectedTargetNamespaceURI);
-            } catch (IOException e) {
-                throw new ParseException(
-                    "parsing.ioException",e);
-            } catch (SAXException e) {
-                throw new ParseException(
-                    "parsing.saxException",e);
-            }
-        } catch (ParserConfigurationException e) {
-            throw new ParseException(
-                "parsing.parserConfigException",e);
-        } catch (FactoryConfigurationError e) {
-            throw new ParseException(
-                "parsing.factoryConfigException",e);
-        }
-    }
-
-    protected Schema parseSchemaNoImport(
-        ParserContext context,
-        Document doc,
-        String expectedTargetNamespaceURI) {
-        Element root = doc.getDocumentElement();
-        Util.verifyTagNSRootElement(root, SchemaConstants.QNAME_SCHEMA);
-        return parseSchemaNoImport(context, root, expectedTargetNamespaceURI);
-    }
-
-    protected Schema parseSchemaNoImport(
-        ParserContext context,
-        Element e,
-        String expectedTargetNamespaceURI) {
-        Schema schema = new Schema(context.getDocument());
-        String targetNamespaceURI =
-            XmlUtil.getAttributeOrNull(e, Constants.ATTR_TARGET_NAMESPACE);
-        //bug 4849754 fix, in both the case of xsd:include and xsd:import this should work
-        if (targetNamespaceURI != null
-            && expectedTargetNamespaceURI != null
-            && !expectedTargetNamespaceURI.equals(targetNamespaceURI)) {
-            throw new ValidationException(
-                "validation.incorrectTargetNamespace",
-                new Object[] {
-                    targetNamespaceURI,
-                    expectedTargetNamespaceURI });
-        }
-        if (targetNamespaceURI == null)
-            schema.setTargetNamespaceURI(expectedTargetNamespaceURI);
-        else
-            schema.setTargetNamespaceURI(targetNamespaceURI);
-
-        // snapshot the current prefixes
-        for (Iterator iter = context.getPrefixes(); iter.hasNext();) {
-            String prefix = (String) iter.next();
-            String nsURI = context.getNamespaceURI(prefix);
-            if (nsURI == null) {
-                // should not happen
-                throw new ParseException("parsing.shouldNotHappen");
-            }
-            schema.addPrefix(prefix, nsURI);
-        }
-
-        context.push();
-        context.registerNamespaces(e);
-
-        // just internalize the XML fragment
-        SchemaElement schemaElement =
-            new SchemaElement(SchemaConstants.QNAME_SCHEMA);
-
-        copyNamespaceDeclarations(schemaElement, e);
-        copyAttributesNoNs(schemaElement, e);
-        copyElementContent(schemaElement, e);
-
-        schema.setContent(schemaElement);
-        schemaElement.setSchema(schema);
-
-        context.pop();
-        context.fireDoneParsingEntity(SchemaConstants.QNAME_SCHEMA, schema);
-        return schema;
-    }
-
-    protected void copyAttributesNoNs(SchemaElement target, Element source) {
-        for (Iterator iter = new NamedNodeMapIterator(source.getAttributes());
-            iter.hasNext();
-            ) {
-            Attr attr = (Attr) iter.next();
-            if (attr.getName().equals(PREFIX_XMLNS)
-                || attr.getName().startsWith(PREFIX_XMLNS_COLON)) {
-                continue;
-            }
-
-            SchemaAttribute attribute =
-                new SchemaAttribute(attr.getLocalName());
-            attribute.setNamespaceURI(attr.getNamespaceURI());
-            attribute.setValue(attr.getValue());
-            target.addAttribute(attribute);
-        }
-    }
-
-    protected void copyNamespaceDeclarations(
-        SchemaElement target,
-        Element source) {
-        for (Iterator iter = new NamedNodeMapIterator(source.getAttributes());
-            iter.hasNext();
-            ) {
-            Attr attr = (Attr) iter.next();
-            if (attr.getName().equals(PREFIX_XMLNS)) {
-                // default namespace declaration
-                target.addPrefix("", attr.getValue());
-            } else {
-                String prefix = XmlUtil.getPrefix(attr.getName());
-                if (prefix != null && prefix.equals(PREFIX_XMLNS)) {
-                    String nsPrefix = XmlUtil.getLocalPart(attr.getName());
-                    String uri = attr.getValue();
-                    target.addPrefix(nsPrefix, uri);
-                }
-            }
-        }
-    }
-
-    protected void copyElementContent(SchemaElement target, Element source) {
-        for (Iterator iter = XmlUtil.getAllChildren(source); iter.hasNext();) {
-            Element e2 = Util.nextElementIgnoringCharacterContent(iter);
-            if (e2 == null)
-                break;
-            SchemaElement newElement = new SchemaElement(e2.getLocalName());
-            newElement.setNamespaceURI(e2.getNamespaceURI());
-            copyNamespaceDeclarations(newElement, e2);
-            copyAttributesNoNs(newElement, e2);
-            copyElementContent(newElement, e2);
-            target.addChild(newElement);
-            newElement.setParent(target);
-        }
-    }
-
-    private boolean _followImports;
-
-    private final static String PREFIX_XMLNS = "xmlns";
-    private final static String PREFIX_XMLNS_COLON = "xmlns:";
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SchemaWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SchemaWriter.java
deleted file mode 100644
index 0bd91bd5650..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SchemaWriter.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.tools.internal.ws.wsdl.parser;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-
-import com.sun.tools.internal.ws.wsdl.document.schema.Schema;
-import com.sun.tools.internal.ws.wsdl.document.schema.SchemaAttribute;
-import com.sun.tools.internal.ws.wsdl.document.schema.SchemaDocument;
-import com.sun.tools.internal.ws.wsdl.document.schema.SchemaElement;
-import com.sun.tools.internal.ws.wsdl.framework.WriterContext;
-
-/**
- * A writer for XML Schema fragments within a WSDL document.
- *
- * @author WS Development Team
- */
-public class SchemaWriter {
-
-    public SchemaWriter() {
-    }
-
-    public void write(SchemaDocument document, OutputStream os)
-        throws IOException {
-        WriterContext context = new WriterContext(os);
-        writeSchema(context, document.getSchema());
-        context.flush();
-    }
-
-    public void writeSchema(WriterContext context, Schema schema)
-        throws IOException {
-        context.push();
-        try {
-            writeTopSchemaElement(context, schema);
-        } catch (Exception e) {
-        } finally {
-            context.pop();
-        }
-    }
-
-    protected void writeTopSchemaElement(WriterContext context, Schema schema)
-        throws IOException {
-        SchemaElement schemaElement = schema.getContent();
-        QName name = schemaElement.getQName();
-
-        // make sure that all namespaces we expect are actually declared
-        for (Iterator iter = schema.prefixes(); iter.hasNext();) {
-            String prefix = (String) iter.next();
-            String expectedURI = schema.getURIForPrefix(prefix);
-            if (!expectedURI.equals(context.getNamespaceURI(prefix))) {
-                context.declarePrefix(prefix, expectedURI);
-            }
-        }
-
-        for (Iterator iter = schemaElement.prefixes(); iter.hasNext();) {
-            String prefix = (String) iter.next();
-            String uri = schemaElement.getURIForPrefix(prefix);
-            context.declarePrefix(prefix, uri);
-        }
-
-        context.writeStartTag(name);
-
-        for (Iterator iter = schemaElement.attributes(); iter.hasNext();) {
-            SchemaAttribute attribute = (SchemaAttribute) iter.next();
-            if (attribute.getNamespaceURI() == null) {
-                context.writeAttribute(
-                    attribute.getLocalName(),
-                    attribute.getValue(context));
-            } else {
-                context.writeAttribute(
-                    context.getQNameString(attribute.getQName()),
-                    attribute.getValue(context));
-            }
-        }
-
-        context.writeAllPendingNamespaceDeclarations();
-
-        for (Iterator iter = schemaElement.children(); iter.hasNext();) {
-            SchemaElement child = (SchemaElement) iter.next();
-            writeSchemaElement(context, child);
-        }
-
-        context.writeEndTag(name);
-    }
-
-    protected void writeSchemaElement(
-        WriterContext context,
-        SchemaElement schemaElement)
-        throws IOException {
-        QName name = schemaElement.getQName();
-
-        if (schemaElement.declaresPrefixes()) {
-            context.push();
-        }
-
-        context.writeStartTag(name);
-
-        if (schemaElement.declaresPrefixes()) {
-            for (Iterator iter = schemaElement.prefixes(); iter.hasNext();) {
-                String prefix = (String) iter.next();
-                String uri = schemaElement.getURIForPrefix(prefix);
-                context.writeNamespaceDeclaration(prefix, uri);
-                context.declarePrefix(prefix, uri);
-            }
-        }
-
-        for (Iterator iter = schemaElement.attributes(); iter.hasNext();) {
-            SchemaAttribute attribute = (SchemaAttribute) iter.next();
-            if (attribute.getNamespaceURI() == null) {
-                context.writeAttribute(
-                    attribute.getLocalName(),
-                    attribute.getValue(context));
-            } else {
-                context.writeAttribute(
-                    context.getQNameString(attribute.getQName()),
-                    attribute.getValue(context));
-            }
-        }
-
-        for (Iterator iter = schemaElement.children(); iter.hasNext();) {
-            SchemaElement child = (SchemaElement) iter.next();
-            writeSchemaElement(context, child);
-        }
-
-        context.writeEndTag(name);
-
-        if (schemaElement.declaresPrefixes()) {
-            context.pop();
-        }
-    }
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/Util.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/Util.java
index 448eb34b924..879cfbfeb2a 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/Util.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/Util.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,20 +25,18 @@
 
 package com.sun.tools.internal.ws.wsdl.parser;
 
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-
+import com.sun.tools.internal.ws.wsdl.framework.ParseException;
+import com.sun.xml.internal.ws.util.xml.XmlUtil;
 import org.w3c.dom.Comment;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.Text;
 
-import com.sun.tools.internal.ws.wsdl.framework.ParseException;
-import com.sun.xml.internal.ws.util.xml.XmlUtil;
+import javax.xml.namespace.QName;
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Iterator;
 
 /**2
  * Defines various utility methods.
@@ -76,9 +74,7 @@ public class Util {
     }
 
     public static void verifyTagNS(Element element, QName name) {
-        if (!element.getLocalName().equals(name.getLocalPart())
-            || (element.getNamespaceURI() != null
-                && !element.getNamespaceURI().equals(name.getNamespaceURI())))
+        if (!isTagName(element, name))
             fail(
                 "parsing.invalidTagNS",
                 new Object[] {
@@ -88,6 +84,13 @@ public class Util {
                     name.getNamespaceURI()});
     }
 
+    public static boolean isTagName(Element element, QName name){
+        return (element.getLocalName().equals(name.getLocalPart())
+            && (element.getNamespaceURI() != null
+                && element.getNamespaceURI().equals(name.getNamespaceURI())));
+
+    }
+
     public static void verifyTagNSRootElement(Element element, QName name) {
         if (!element.getLocalName().equals(name.getLocalPart())
             || (element.getNamespaceURI() != null
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/VersionChecker.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/VersionChecker.java
new file mode 100644
index 00000000000..ce752e345e5
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/VersionChecker.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+
+
+package com.sun.tools.internal.ws.wsdl.parser;
+
+import com.sun.tools.internal.ws.resources.WsdlMessages;
+import com.sun.tools.internal.ws.wsdl.document.jaxws.JAXWSBindingsConstants;
+import org.xml.sax.*;
+import org.xml.sax.helpers.LocatorImpl;
+import org.xml.sax.helpers.XMLFilterImpl;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Checks the jaxb:version attribute on a XML Schema document.
+ *
+ * jaxws:version is optional, if absent its value is assumed to be "2.0" and if present its value must be
+ * "2.0" or more.
+ *
+ * @author
+ *     Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ *     Vivek Pandey
+ */
+public class VersionChecker extends XMLFilterImpl {
+
+    /**
+     * We store the value of the version attribute in this variable
+     * when we hit the root element.
+     */
+    private String version = null ;
+
+    /** Will be set to true once we hit the root element. */
+    private boolean seenRoot = false;
+
+    /** Will be set to true once we hit a binding declaration. */
+    private boolean seenBindings = false;
+
+    private Locator locator;
+
+    /**
+     * Stores the location of the start tag of the root tag.
+     */
+    private Locator rootTagStart;
+
+    public VersionChecker( XMLReader parent ) {
+        setParent(parent);
+    }
+
+    public VersionChecker( ContentHandler handler, ErrorHandler eh, EntityResolver er ) {
+        setContentHandler(handler);
+        if(eh!=null)    setErrorHandler(eh);
+        if(er!=null)    setEntityResolver(er);
+    }
+
+    public void startElement(String namespaceURI, String localName, String qName, Attributes atts)
+        throws SAXException {
+
+        super.startElement(namespaceURI, localName, qName, atts);
+
+        if(!seenRoot) {
+            // if this is the root element
+            seenRoot = true;
+            rootTagStart = new LocatorImpl(locator);
+
+            version = atts.getValue(JAXWSBindingsConstants.NS_JAXWS_BINDINGS,"version");
+            if( namespaceURI.equals(JAXWSBindingsConstants.NS_JAXWS_BINDINGS) ) {
+                String version2 = atts.getValue("","version");
+                if( version!=null && version2!=null ) {
+                    // we have both @version and @jaxb:version. error.
+                    SAXParseException e = new SAXParseException(
+                        WsdlMessages.INTERNALIZER_TWO_VERSION_ATTRIBUTES(), locator);
+                    getErrorHandler().error(e);
+                }
+                //According to JAXWS 2.0 spec, if version attribute is missing its assumed to be "2.0"
+                if( version==null)
+                    version = (version2!=null)?version2:"2.0";
+            }
+
+        }
+
+        if( JAXWSBindingsConstants.NS_JAXWS_BINDINGS.equals(namespaceURI)){
+            seenBindings = true;
+            if(version == null)
+                version = "2.0";
+        }
+
+    }
+
+    public void endDocument() throws SAXException {
+        super.endDocument();
+
+        if( seenBindings && version==null ) {
+            // if we see a binding declaration but not version attribute
+            SAXParseException e = new SAXParseException(WsdlMessages.INTERNALIZER_VERSION_NOT_PRESENT(), rootTagStart);
+            getErrorHandler().error(e);
+        }
+
+        // if present, the value must be >= 2.0
+        if( version!=null && !VERSIONS.contains(version) ) {
+            SAXParseException e = new SAXParseException(WsdlMessages.INTERNALIZER_INCORRECT_VERSION(), rootTagStart);
+            getErrorHandler().error(e);
+        }
+    }
+
+    public void setDocumentLocator(Locator locator) {
+        super.setDocumentLocator(locator);
+        this.locator = locator;
+    }
+
+    private static final Set VERSIONS = new HashSet(Arrays.asList("2.0","2.1"));
+
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingExtensionHandler.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingExtensionHandler.java
new file mode 100644
index 00000000000..b948a882d89
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingExtensionHandler.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+/*
+ * $Id: W3CAddressingExtensionHandler.java,v 1.1.2.9 2007/02/06 00:33:38 kohsuke Exp $
+ */
+
+package com.sun.tools.internal.ws.wsdl.parser;
+
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtensible;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLParserContext;
+import com.sun.tools.internal.ws.resources.WsdlMessages;
+import com.sun.tools.internal.ws.util.xml.XmlUtil;
+import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
+import com.sun.tools.internal.ws.wsdl.document.Fault;
+import com.sun.tools.internal.ws.wsdl.document.Input;
+import com.sun.tools.internal.ws.wsdl.document.Output;
+import com.sun.xml.internal.ws.api.addressing.AddressingVersion;
+import org.w3c.dom.Element;
+import org.xml.sax.Locator;
+
+import javax.xml.namespace.QName;
+import java.util.Map;
+
+/**
+ * @author Arun Gupta
+ */
+public class W3CAddressingExtensionHandler extends AbstractExtensionHandler {
+    private ErrorReceiver errReceiver;
+
+    public W3CAddressingExtensionHandler(Map extensionHandlerMap) {
+        this(extensionHandlerMap, null);
+    }
+
+    public W3CAddressingExtensionHandler(Map extensionHandlerMap, ErrorReceiver errReceiver) {
+        super(extensionHandlerMap);
+        this.errReceiver = errReceiver;
+    }
+
+    @Override
+    public String getNamespaceURI() {
+        return AddressingVersion.W3C.wsdlNsUri;
+    }
+
+    protected QName getActionQName() {
+        return AddressingVersion.W3C.wsdlActionTag;
+    }
+
+    protected QName getWSDLExtensionQName() {
+        return AddressingVersion.W3C.wsdlExtensionTag;
+    }
+
+    @Override
+    public boolean handleBindingExtension(TWSDLParserContext context, TWSDLExtensible parent, Element e) {
+        if (XmlUtil.matchesTagNS(e, getWSDLExtensionQName())) {
+            context.push();
+            context.registerNamespaces(e);
+
+            // TODO: read UsingAddressing extensibility element and store
+            // TODO: it as extension in "parent". It may be used to generate
+            // TODO: @Action/@FaultAction later.
+
+            context.pop();
+            return true;
+        }
+        return false; // keep compiler happy
+    }
+
+    @Override
+    public boolean handleInputExtension(TWSDLParserContext context, TWSDLExtensible parent, Element e) {
+        String actionValue = XmlUtil.getAttributeNSOrNull(e, getActionQName());
+        if (actionValue == null || actionValue.equals("")) {
+            return warnEmptyAction(parent, context.getLocation(e));
+        }
+
+        context.push();
+        ((Input)parent).setAction(actionValue);
+        context.pop();
+
+        return true;
+    }
+
+    @Override
+    public boolean handleOutputExtension(TWSDLParserContext context, TWSDLExtensible parent, Element e) {
+        String actionValue = XmlUtil.getAttributeNSOrNull(e, getActionQName());
+        if (actionValue == null || actionValue.equals("")) {
+            return warnEmptyAction(parent,context.getLocation(e));
+        }
+
+        context.push();
+        ((Output)parent).setAction(actionValue);
+        context.pop();
+
+        return true;
+    }
+
+    @Override
+    public boolean handleFaultExtension(TWSDLParserContext context, TWSDLExtensible parent, Element e) {
+        String actionValue = XmlUtil.getAttributeNSOrNull(e, getActionQName());
+        if (actionValue == null || actionValue.equals("")) {
+            errReceiver.warning(context.getLocation(e), WsdlMessages.WARNING_FAULT_EMPTY_ACTION(parent.getNameValue(), parent.getWSDLElementName().getLocalPart(), parent.getParent().getNameValue()));
+            return false; // keep compiler happy
+        }
+
+        context.push();
+        ((Fault)parent).setAction(actionValue);
+        context.pop();
+
+        return true;
+    }
+
+    @Override
+    public boolean handlePortExtension(TWSDLParserContext context, TWSDLExtensible parent, Element e) {
+        return handleBindingExtension(context, parent, e);
+    }
+
+    private boolean warnEmptyAction(TWSDLExtensible parent, Locator pos) {
+        errReceiver.warning(pos, WsdlMessages.WARNING_INPUT_OUTPUT_EMPTY_ACTION(parent.getWSDLElementName().getLocalPart(), parent.getParent().getNameValue()));
+        return false; // keep compiler happy
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLInternalizationLogic.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLInternalizationLogic.java
new file mode 100644
index 00000000000..885f821efc8
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLInternalizationLogic.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+
+
+package com.sun.tools.internal.ws.wsdl.parser;
+
+import com.sun.tools.internal.ws.wsdl.document.WSDLConstants;
+import com.sun.tools.internal.ws.wsdl.document.jaxws.JAXWSBindingsConstants;
+import com.sun.tools.internal.ws.wsdl.document.schema.SchemaConstants;
+import com.sun.tools.internal.xjc.util.DOMUtils;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.xml.sax.Attributes;
+import org.xml.sax.helpers.XMLFilterImpl;
+
+/**
+ * @author Vivek Pandey
+ */
+public class WSDLInternalizationLogic implements InternalizationLogic{
+
+    /**
+     * This filter looks for <xs:import> and <xs:include>
+     * and parses those documents referenced by them.
+     */
+    private static final class ReferenceFinder extends AbstractReferenceFinderImpl {
+        ReferenceFinder( DOMForest parent ) {
+            super(parent);
+        }
+
+        protected String findExternalResource( String nsURI, String localName, Attributes atts) {
+            if(WSDLConstants.NS_WSDL.equals(nsURI) && "import".equals(localName)){
+                if(parent.isExtensionMode()){
+                    //TODO: add support for importing schema using wsdl:import
+                }
+                return atts.getValue("location");
+            }else if(SchemaConstants.NS_XSD.equals(nsURI) && "import".equals(localName)){
+                return atts.getValue("schemaLocation");
+            }
+            return null;
+        }
+    }
+    public XMLFilterImpl createExternalReferenceFinder(DOMForest parent) {
+        return new ReferenceFinder(parent);
+    }
+
+    public boolean checkIfValidTargetNode(DOMForest parent, Element bindings, Element target) {
+        return false;
+    }
+
+    public Element refineSchemaTarget(Element target) {
+        // look for existing xs:annotation
+        Element annotation = DOMUtils.getFirstChildElement(target, Constants.NS_XSD, "annotation");
+        if(annotation==null)
+            // none exists. need to make one
+            annotation = insertXMLSchemaElement( target, "annotation" );
+
+        // then look for appinfo
+        Element appinfo = DOMUtils.getFirstChildElement(annotation, Constants.NS_XSD, "appinfo" );
+        if(appinfo==null)
+            // none exists. need to make one
+            appinfo = insertXMLSchemaElement( annotation, "appinfo" );
+
+        return appinfo;
+
+    }
+
+    public Element refineWSDLTarget(Element target){
+        // look for existing xs:annotation
+        Element JAXWSBindings = DOMUtils.getFirstChildElement(target, JAXWSBindingsConstants.NS_JAXWS_BINDINGS, "bindings");
+        if(JAXWSBindings==null)
+            // none exists. need to make one
+            JAXWSBindings = insertJAXWSBindingsElement(target, "bindings" );
+        return JAXWSBindings;
+    }
+
+    private Element insertJAXWSBindingsElement( Element parent, String localName ) {
+        String qname = "JAXWS:"+localName;
+
+        Element child = parent.getOwnerDocument().createElementNS(JAXWSBindingsConstants.NS_JAXWS_BINDINGS, qname );
+
+        NodeList children = parent.getChildNodes();
+
+        if( children.getLength()==0 )
+            parent.appendChild(child);
+        else
+            parent.insertBefore( child, children.item(0) );
+
+        return child;
+    }
+
+
+    /**
+     * Creates a new XML Schema element of the given local name
+     * and insert it as the first child of the given parent node.
+     *
+     * @return
+     *      Newly create element.
+     */
+    private Element insertXMLSchemaElement( Element parent, String localName ) {
+        // use the same prefix as the parent node to avoid modifying
+        // the namespace binding.
+        String qname = parent.getTagName();
+        int idx = qname.indexOf(':');
+        if(idx==-1)     qname = localName;
+        else            qname = qname.substring(0,idx+1)+localName;
+
+        Element child = parent.getOwnerDocument().createElementNS( Constants.NS_XSD, qname );
+
+        NodeList children = parent.getChildNodes();
+
+        if( children.getLength()==0 )
+            parent.appendChild(child);
+        else
+            parent.insertBefore( child, children.item(0) );
+
+        return child;
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLParser.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLParser.java
index 93d3cf9343b..c3bf8af4f94 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLParser.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLParser.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,42 +25,13 @@
 
 package com.sun.tools.internal.ws.wsdl.parser;
 
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.dom.DOMSource;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.EntityResolver;
-
-import com.sun.xml.internal.ws.util.localization.LocalizableMessageFactory;
-import com.sun.xml.internal.ws.util.localization.Localizer;
-import com.sun.xml.internal.ws.util.JAXWSUtils;
-import com.sun.tools.internal.ws.util.xml.NullEntityResolver;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtensible;
+import com.sun.tools.internal.ws.api.wsdl.TWSDLExtensionHandler;
+import com.sun.tools.internal.ws.resources.WsdlMessages;
+import com.sun.tools.internal.ws.util.xml.XmlUtil;
+import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
+import com.sun.tools.internal.ws.wscompile.WsimportOptions;
+import com.sun.tools.internal.ws.wscompile.ErrorReceiverFilter;
 import com.sun.tools.internal.ws.wsdl.document.Binding;
 import com.sun.tools.internal.ws.wsdl.document.BindingFault;
 import com.sun.tools.internal.ws.wsdl.document.BindingInput;
@@ -79,309 +50,192 @@ import com.sun.tools.internal.ws.wsdl.document.Output;
 import com.sun.tools.internal.ws.wsdl.document.Port;
 import com.sun.tools.internal.ws.wsdl.document.PortType;
 import com.sun.tools.internal.ws.wsdl.document.Service;
-import com.sun.tools.internal.ws.wsdl.document.Types;
 import com.sun.tools.internal.ws.wsdl.document.WSDLConstants;
 import com.sun.tools.internal.ws.wsdl.document.WSDLDocument;
+import com.sun.tools.internal.ws.wsdl.document.jaxws.JAXWSBindingsConstants;
 import com.sun.tools.internal.ws.wsdl.document.schema.SchemaConstants;
 import com.sun.tools.internal.ws.wsdl.document.schema.SchemaKinds;
 import com.sun.tools.internal.ws.wsdl.framework.Entity;
-import com.sun.tools.internal.ws.wsdl.framework.Extensible;
-import com.sun.tools.internal.ws.wsdl.framework.ParseException;
-import com.sun.tools.internal.ws.wsdl.framework.ParserContext;
 import com.sun.tools.internal.ws.wsdl.framework.ParserListener;
-import com.sun.tools.internal.ws.util.xml.XmlUtil;
-import com.sun.tools.internal.ws.processor.util.ProcessorEnvironment;
-import com.sun.tools.internal.ws.processor.config.WSDLModelInfo;
+import com.sun.tools.internal.ws.wsdl.framework.TWSDLParserContextImpl;
+import com.sun.xml.internal.ws.util.ServiceFinder;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.io.IOException;
 
 /**
- * A parser for WSDL documents.
+ * A parser for WSDL documents. This parser is used only at the tool time.
+ * Extensions should extend TWSDLExtensionHandler, so that it will be called during
+ * parsing wsdl to handle wsdl extenisbility elements. Generally these extensions
+ * will effect the artifacts generated during WSDL processing.
+ *
+ * @see com.sun.xml.internal.ws.wsdl.parser.RuntimeWSDLParser which will be used for WSDL parsing
+ * at runtime.
  *
  * @author WS Development Team
  */
 public class WSDLParser {
-    private WSDLModelInfo modelInfo;
-    private EntityResolver entityResolver;
-    //all the wsdl:import system Ids
-    private final Set imports = new HashSet();
-    //Map which holds wsdl Document(s) for a given SystemId
-    private final Map wsdlDocuments = new HashMap();
+    private final ErrorReceiverFilter errReceiver;
+    private WsimportOptions options;
+    private MetadataFinder forest;
 
-    private WSDLParser() {
-        _extensionHandlers = new HashMap();
-        hSet = new HashSet();
+    //wsdl extension handlers
+    private final Map extensionHandlers;
+
+    private ArrayList listeners;
+
+    public WSDLParser(WsimportOptions options, ErrorReceiverFilter errReceiver) {
+        this.extensionHandlers = new HashMap();
+        this.options = options;
+        this.errReceiver = errReceiver;
 
         // register handlers for default extensions
-        register(new SOAPExtensionHandler());
-        register(new HTTPExtensionHandler());
-        register(new MIMEExtensionHandler());
-        register(new SchemaExtensionHandler());
-        register(new JAXWSBindingExtensionHandler());
-        register(new SOAP12ExtensionHandler());
+        register(new SOAPExtensionHandler(extensionHandlers));
+        register(new HTTPExtensionHandler(extensionHandlers));
+        register(new MIMEExtensionHandler(extensionHandlers));
+        register(new JAXWSBindingExtensionHandler(extensionHandlers));
+        register(new SOAP12ExtensionHandler(extensionHandlers));
+        register(new MemberSubmissionAddressingExtensionHandler(extensionHandlers, errReceiver));
+        register(new W3CAddressingExtensionHandler(extensionHandlers, errReceiver));
+
+        for (TWSDLExtensionHandler te : ServiceFinder.find(TWSDLExtensionHandler.class)) {
+            register(te);
+        }
+
     }
 
-    public WSDLParser(WSDLModelInfo modelInfo) {
-        this();
-        assert(modelInfo != null);
-        this.modelInfo = modelInfo;
-        this.entityResolver = modelInfo.getEntityResolver();
-    }
-
-    public void register(ExtensionHandler h) {
-        _extensionHandlers.put(h.getNamespaceURI(), h);
-        h.setExtensionHandlers(_extensionHandlers);
-    }
-
-    public void unregister(ExtensionHandler h) {
-        _extensionHandlers.put(h.getNamespaceURI(), null);
-        h.setExtensionHandlers(null);
-    }
-
-    public void unregister(String uri) {
-        _extensionHandlers.put(uri, null);
-    }
-
-    public boolean getFollowImports() {
-        return _followImports;
-    }
-
-    public void setFollowImports(boolean b) {
-        _followImports = b;
+    private void register(TWSDLExtensionHandler h) {
+        extensionHandlers.put(h.getNamespaceURI(), h);
     }
 
     public void addParserListener(ParserListener l) {
-        if (_listeners == null) {
-            _listeners = new ArrayList();
+        if (listeners == null) {
+            listeners = new ArrayList();
         }
-        _listeners.add(l);
+        listeners.add(l);
     }
 
-    public void removeParserListener(ParserListener l) {
-        if (_listeners == null) {
-            return;
-        }
-        _listeners.remove(l);
-    }
+    public WSDLDocument parse() throws SAXException, IOException {
+        forest = new MetadataFinder(new WSDLInternalizationLogic(), options, errReceiver);
+        forest.parseWSDL();
+        if(forest.isMexMetadata)
+            errReceiver.reset();
 
-//    public WSDLDocument parse(InputSource source) {
-//        _messageFactory =
-//            new LocalizableMessageFactory("com.sun.tools.internal.ws.resources.wsdl");
-//        _localizer = new Localizer();
-//
-//        WSDLDocument document = new WSDLDocument();
-//        document.setSystemId(source.getSystemId());
-//        ParserContext context = new ParserContext(document, _listeners);
-//        context.setFollowImports(_followImports);
-//        document.setDefinitions(parseDefinitions(context, source, null));
-//        return document;
-//    }
-
-    public WSDLDocument parse(){
-        String location = modelInfo.getLocation();
-        assert(location != null);
-        _messageFactory =
-            new LocalizableMessageFactory("com.sun.tools.internal.ws.resources.wsdl");
-        _localizer = new Localizer();
-
-        WSDLDocument document = new WSDLDocument();
-        InputSource source = null;
-        String wsdlLoc = JAXWSUtils.absolutize(JAXWSUtils.getFileOrURLName(location));
-        if(entityResolver != null){
-            try {
-                source = entityResolver.resolveEntity(null, wsdlLoc);
-            } catch (SAXException e) {
-                if (source.getSystemId() != null) {
-                    throw new ParseException(
-                        "parsing.saxExceptionWithSystemId",
-                        source.getSystemId(),e);
-                } else {
-                    throw new ParseException("parsing.saxException",e);
-                }
-            } catch (IOException e) {
-                if (source.getSystemId() != null) {
-                    throw new ParseException(
-                        "parsing.ioExceptionWithSystemId",
-                        source.getSystemId(),e);
-                } else {
-                    throw new ParseException("parsing.ioException",e);
-                }
+        // parse external binding files
+        for (InputSource value : options.getWSDLBindings()) {
+            errReceiver.pollAbort();
+            Document root = forest.parse(value, true); // TODO: I think this should be false - KK
+            if(root==null)       continue;   // error must have been reported
+            Element binding = root.getDocumentElement();
+            if (!fixNull(binding.getNamespaceURI()).equals(JAXWSBindingsConstants.NS_JAXWS_BINDINGS)
+                    || !binding.getLocalName().equals("bindings")){
+                    errReceiver.error(forest.locatorTable.getStartLocation(binding), WsdlMessages.PARSER_NOT_A_BINDING_FILE(
+                        binding.getNamespaceURI(),
+                        binding.getLocalName()));
+                continue;
             }
+
+            NodeList nl = binding.getElementsByTagNameNS(
+                "http://java.sun.com/xml/ns/javaee", "handler-chains");
+            for(int i = 0; i < nl.getLength(); i++){
+                options.addHandlerChainConfiguration((Element) nl.item(i));
+            }
+
         }
-        if(source == null){
-            //default resolution
-            source = new InputSource(wsdlLoc);
-        }
-        document.setSystemId(wsdlLoc);
-        ParserContext context = new ParserContext(document, _listeners);
-        context.setFollowImports(_followImports);
-        document.setDefinitions(parseDefinitions(context, source, null));
+        return buildWSDLDocument();
+    }
+
+    private String fixNull(String s) {
+        if(s==null) return "";
+        else        return s;
+    }
+
+    public MetadataFinder getDOMForest() {
+        return forest;
+    }
+
+    private WSDLDocument buildWSDLDocument(){
+        /**
+         * Currently we are working off first WSDL document
+         * TODO: add support of creating WSDLDocument from collection of WSDL documents
+         */
+
+        String location = forest.getRootWSDL();
+
+        //It means that WSDL is not found, an error might have been reported, lets try to recover
+        if(location == null)
+            return null;
+
+        Document root = forest.get(location);
+
+        if(root == null)
+            return null;
+
+        WSDLDocument document = new WSDLDocument(forest, errReceiver);
+        document.setSystemId(location);
+        TWSDLParserContextImpl context = new TWSDLParserContextImpl(forest, document, listeners, errReceiver);
+
+        Definitions definitions = parseDefinitions(context, root);
+        document.setDefinitions(definitions);
         return document;
     }
 
-    protected Definitions parseDefinitions(ParserContext context,
-            InputSource source, String expectedTargetNamespaceURI) {
+    private Definitions parseDefinitions(TWSDLParserContextImpl context, Document root) {
         context.pushWSDLLocation();
         context.setWSDLLocation(context.getDocument().getSystemId());
-        String sysId = context.getDocument().getSystemId();
-        buildDocumentFromWSDL(sysId, source, expectedTargetNamespaceURI);
-        Document root = wsdlDocuments.get(sysId);
 
-        //Internalizer.transform takes Set of jaxws:bindings elements, this is to allow multiple external
-        //bindings to be transformed.
-        new Internalizer().transform(modelInfo.getJAXWSBindings(), wsdlDocuments,
-                (ProcessorEnvironment)modelInfo.getParent().getEnvironment());
+        new Internalizer(forest, options, errReceiver).transform();
 
         //print the wsdl
 //        try{
-//            dump(System.out);
+//            forest.dump(System.out);
 //        }catch(IOException e){
 //            e.printStackTrace();
 //        }
 
-        Definitions definitions = parseDefinitionsNoImport(context, root, expectedTargetNamespaceURI);
-        processImports(context, source, definitions);
+        Definitions definitions = parseDefinitionsNoImport(context, root);
+        if(definitions == null){
+            Locator locator = forest.locatorTable.getStartLocation(root.getDocumentElement());
+            errReceiver.error(locator, WsdlMessages.PARSING_NOT_AWSDL(locator.getSystemId()));
+
+        }
+        processImports(context);
         context.popWSDLLocation();
         return definitions;
     }
 
-    /**
-     * @param systemId
-     * @param source
-     * @param expectedTargetNamespaceURI
-     */
-    private void buildDocumentFromWSDL(String systemId, InputSource source, String expectedTargetNamespaceURI) {
-        try {
-            DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
-            builderFactory.setNamespaceAware(true);
-            builderFactory.setValidating(false);
-            DocumentBuilder builder = builderFactory.newDocumentBuilder();
-            builder.setErrorHandler(new ErrorHandler() {
-                public void error(SAXParseException e)
-                    throws SAXParseException {
-                    throw e;
-                }
-
-                public void fatalError(SAXParseException e)
-                    throws SAXParseException {
-                    throw e;
-                }
-
-                public void warning(SAXParseException err)
-                    throws SAXParseException {
-                    // do nothing
-                }
-            });
-            if(entityResolver != null)
-                builder.setEntityResolver(entityResolver);
-            else
-                builder.setEntityResolver(new NullEntityResolver());
-
-            try {
-                Document document = builder.parse(source);
-                wsdlDocuments.put(systemId, document);
-                Element e = document.getDocumentElement();
-                Util.verifyTagNSRootElement(e, WSDLConstants.QNAME_DEFINITIONS);
-                String name = XmlUtil.getAttributeOrNull(e, Constants.ATTR_NAME);
-
-                String _targetNamespaceURI =
-                    XmlUtil.getAttributeOrNull(e, Constants.ATTR_TARGET_NAMESPACE);
-
-                if (expectedTargetNamespaceURI != null
-                    && !expectedTargetNamespaceURI.equals(_targetNamespaceURI)){
-                    //TODO: throw an exception???
-                }
-
-                for (Iterator iter = XmlUtil.getAllChildren(e); iter.hasNext();) {
-                    Element e2 = Util.nextElement(iter);
-                    if (e2 == null)
-                        break;
-
-                    //check to see if it has imports
-                    if (XmlUtil.matchesTagNS(e2, WSDLConstants.QNAME_IMPORT)){
-                        String namespace = Util.getRequiredAttribute(e2, Constants.ATTR_NAMESPACE);
-                        String location = Util.getRequiredAttribute(e2, Constants.ATTR_LOCATION);
-                        location = getAdjustedLocation(source, location);
-                        if(location != null && !location.equals("")){
-                            if(!imports.contains(location)){
-                                imports.add(location);
-                                InputSource impSource = null;
-                                if(entityResolver != null){
-                                    impSource = entityResolver.resolveEntity(null, location);
-                                }
-
-                                if(impSource==null)
-                                    impSource = new InputSource(location);  // default resolution{
-
-                                buildDocumentFromWSDL(location, impSource, namespace);
-                            }
-                        }
-                    }
-                }
-            } catch (IOException e) {
-                if (source.getSystemId() != null) {
-                    throw new ParseException(
-                        "parsing.ioExceptionWithSystemId",
-                        source.getSystemId(),e);
-                } else {
-                    throw new ParseException("parsing.ioException",e);
-                }
-            } catch (SAXException e) {
-                if (source.getSystemId() != null) {
-                    throw new ParseException(
-                        "parsing.saxExceptionWithSystemId",
-                        source.getSystemId(),e);
-                } else {
-                    throw new ParseException("parsing.saxException",e);
-                }
-            }
-        } catch (ParserConfigurationException e) {
-            throw new ParseException(
-                "parsing.parserConfigException",e);
-        } catch (FactoryConfigurationError e) {
-            throw new ParseException(
-                "parsing.factoryConfigException",e);
-        }
-    }
-
-    private String getAdjustedLocation(InputSource source, String location) {
-        return source.getSystemId() == null
-            ? location
-            : Util.processSystemIdWithBase(
-                source.getSystemId(),
-                location);
-    }
-
-    /**
-     * Dumps the contents of the forest to the specified stream.
-     *
-     * This is a debug method. As such, error handling is sloppy.
-     */
-    public void dump( OutputStream out ) throws IOException {
-        try {
-            // create identity transformer
-            Transformer it = XmlUtil.newTransformer();
-
-            for( Iterator itr=wsdlDocuments.entrySet().iterator(); itr.hasNext(); ) {
-                Map.Entry e = (Map.Entry)itr.next();
-
-                out.write( ("---<< "+e.getKey()+"\n").getBytes() );
-
-                it.transform( new DOMSource((Document)e.getValue()), new StreamResult(out) );
-
-                out.write( "\n\n\n".getBytes() );
-            }
-        } catch( TransformerException e ) {
-            e.printStackTrace();
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see WSDLParser#processImports(ParserContext, org.xml.sax.InputSource, Definitions)
-     */
-    protected void processImports(ParserContext context, InputSource source, Definitions definitions) {
-        for(String location : imports){
+    private void processMexDocs(TWSDLParserContextImpl context){
+        for(String location : forest.listSystemIDs()){
             if (!context.getDocument().isImportedDocument(location)){
-                Definitions importedDefinitions = parseDefinitionsNoImport(context,
-                        wsdlDocuments.get(location), location);
+                Document doc = forest.get(location);
+                if(doc == null)
+                    continue;
+                Definitions importedDefinitions = parseDefinitionsNoImport(context, doc);
+                if(importedDefinitions == null)
+                    continue;
+                context.getDocument().addImportedEntity(importedDefinitions);
+                context.getDocument().addImportedDocument(location);
+            }
+        }
+    }
+    private void processImports(TWSDLParserContextImpl context) {
+        for(String location : forest.getExternalReferences()){
+            if (!context.getDocument().isImportedDocument(location)){
+                Document doc = forest.get(location);
+                if(doc == null)
+                    continue;
+                Definitions importedDefinitions = parseDefinitionsNoImport(context, doc);
                 if(importedDefinitions == null)
                     continue;
                 context.getDocument().addImportedEntity(importedDefinitions);
@@ -390,93 +244,25 @@ public class WSDLParser {
         }
     }
 
-    protected Definitions parseDefinitionsNoImport(
-        ParserContext context,
-        InputSource source,
-        String expectedTargetNamespaceURI) {
-        try {
-            DocumentBuilderFactory builderFactory =
-                DocumentBuilderFactory.newInstance();
-            builderFactory.setNamespaceAware(true);
-            builderFactory.setValidating(false);
-            DocumentBuilder builder = builderFactory.newDocumentBuilder();
-            builder.setErrorHandler(new ErrorHandler() {
-                public void error(SAXParseException e)
-                    throws SAXParseException {
-                    throw e;
-                }
-
-                public void fatalError(SAXParseException e)
-                    throws SAXParseException {
-                    throw e;
-                }
-
-                public void warning(SAXParseException err)
-                    throws SAXParseException {
-                    // do nothing
-                }
-            });
-            builder.setEntityResolver(new NullEntityResolver());
-
-            try {
-                Document document = builder.parse(source);
-                return parseDefinitionsNoImport(
-                    context,
-                    document,
-                    expectedTargetNamespaceURI);
-            } catch (IOException e) {
-                if (source.getSystemId() != null) {
-                    throw new ParseException(
-                        "parsing.ioExceptionWithSystemId",
-                        source.getSystemId(),e);
-                } else {
-                    throw new ParseException("parsing.ioException",e);
-                }
-            } catch (SAXException e) {
-                if (source.getSystemId() != null) {
-                    throw new ParseException(
-                        "parsing.saxExceptionWithSystemId",
-                        source.getSystemId(),
-                        e);
-                } else {
-                    throw new ParseException("parsing.saxException",e);
-                }
-            }
-        } catch (ParserConfigurationException e) {
-            throw new ParseException("parsing.parserConfigException",e);
-        } catch (FactoryConfigurationError e) {
-            throw new ParseException("parsing.factoryConfigException",e);
+    private Definitions parseDefinitionsNoImport(
+        TWSDLParserContextImpl context,
+        Document doc) {
+        Element e = doc.getDocumentElement();
+        //at this poinjt we expect a wsdl or schema document to be fully qualified
+        if(e.getNamespaceURI() == null || (!e.getNamespaceURI().equals(WSDLConstants.NS_WSDL) || !e.getLocalName().equals("definitions"))){
+            return null;
         }
-    }
-
-    protected Definitions parseDefinitionsNoImport(
-        ParserContext context,
-        Document doc,
-        String expectedTargetNamespaceURI) {
-        _targetNamespaceURI = null;
-        Element root = doc.getDocumentElement();
-        Util.verifyTagNSRootElement(root, WSDLConstants.QNAME_DEFINITIONS);
-        return parseDefinitionsNoImport(
-            context,
-            root,
-            expectedTargetNamespaceURI);
-    }
-
-    protected Definitions parseDefinitionsNoImport(
-        ParserContext context,
-        Element e,
-        String expectedTargetNamespaceURI) {
         context.push();
         context.registerNamespaces(e);
 
-        Definitions definitions = new Definitions(context.getDocument());
+        Definitions definitions = new Definitions(context.getDocument(), forest.locatorTable.getStartLocation(e));
         String name = XmlUtil.getAttributeOrNull(e, Constants.ATTR_NAME);
         definitions.setName(name);
 
-        _targetNamespaceURI =
+        String targetNamespaceURI =
             XmlUtil.getAttributeOrNull(e, Constants.ATTR_TARGET_NAMESPACE);
 
-        definitions.setTargetNamespaceURI(_targetNamespaceURI);
+        definitions.setTargetNamespaceURI(targetNamespaceURI);
 
         boolean gotDocumentation = false;
         boolean gotTypes = false;
@@ -488,24 +274,22 @@ public class WSDLParser {
 
             if (XmlUtil.matchesTagNS(e2, WSDLConstants.QNAME_DOCUMENTATION)) {
                 if (gotDocumentation) {
-                    Util.fail(
-                        "parsing.onlyOneDocumentationAllowed",
-                        e.getLocalName());
+                    errReceiver.error(forest.locatorTable.getStartLocation(e2), WsdlMessages.PARSING_ONLY_ONE_DOCUMENTATION_ALLOWED(e.getLocalName()));
+                    return null;
                 }
                 gotDocumentation = true;
                 if(definitions.getDocumentation() == null)
                     definitions.setDocumentation(getDocumentationFor(e2));
             } else if (XmlUtil.matchesTagNS(e2, WSDLConstants.QNAME_TYPES)) {
-                if (gotTypes) {
-                    Util.fail(
-                        "parsing.onlyOneTypesAllowed",
-                        Constants.TAG_DEFINITIONS);
+                if (gotTypes && !options.isExtensionMode()) {
+                    errReceiver.error(forest.locatorTable.getStartLocation(e2), WsdlMessages.PARSING_ONLY_ONE_TYPES_ALLOWED(Constants.TAG_DEFINITIONS));
+                    return null;
                 }
+                gotTypes = true;
                 //add all the wsdl:type elements to latter make a list of all the schema elements
                 // that will be needed to create jaxb model
-                addSchemaElements(e2);
-
-                //definitions.setTypes(parseTypes(context, definitions, e2));
+                if(!options.isExtensionMode())
+                    validateSchemaImports(e2);
             } else if (XmlUtil.matchesTagNS(e2, WSDLConstants.QNAME_MESSAGE)) {
                 Message message = parseMessage(context, definitions, e2);
                 definitions.add(message);
@@ -521,10 +305,8 @@ public class WSDLParser {
                 definitions.add(service);
             } else if (XmlUtil.matchesTagNS(e2, WSDLConstants.QNAME_IMPORT)) {
                 definitions.add(parseImport(context, definitions, e2));
-            } else if (
-                (_useWSIBasicProfile)
-                    && (XmlUtil.matchesTagNS(e2, SchemaConstants.QNAME_IMPORT))) {
-                warn("warning.wsi.r2003");
+            } else if (XmlUtil.matchesTagNS(e2, SchemaConstants.QNAME_IMPORT)) {
+                errReceiver.warning(forest.locatorTable.getStartLocation(e2), WsdlMessages.WARNING_WSI_R_2003());
             } else {
                 // possible extensibility element -- must live outside the WSDL namespace
                 checkNotWsdlElement(e2);
@@ -541,13 +323,13 @@ public class WSDLParser {
         return definitions;
     }
 
-    protected Message parseMessage(
-        ParserContext context,
+    private Message parseMessage(
+        TWSDLParserContextImpl context,
         Definitions definitions,
         Element e) {
         context.push();
         context.registerNamespaces(e);
-        Message message = new Message(definitions);
+        Message message = new Message(definitions, forest.locatorTable.getStartLocation(e), errReceiver);
         String name = Util.getRequiredAttribute(e, Constants.ATTR_NAME);
         message.setName(name);
 
@@ -582,10 +364,10 @@ public class WSDLParser {
         return message;
     }
 
-    protected MessagePart parseMessagePart(ParserContext context, Element e) {
+    private MessagePart parseMessagePart(TWSDLParserContextImpl context, Element e) {
         context.push();
         context.registerNamespaces(e);
-        MessagePart part = new MessagePart();
+        MessagePart part = new MessagePart(forest.locatorTable.getStartLocation(e));
         String partName = Util.getRequiredAttribute(e, Constants.ATTR_NAME);
         part.setName(partName);
 
@@ -595,19 +377,20 @@ public class WSDLParser {
 
         if (elementAttr != null) {
             if (typeAttr != null) {
-                Util.fail("parsing.onlyOneOfElementOrTypeRequired", partName);
+                errReceiver.error(context.getLocation(e), WsdlMessages.PARSING_ONLY_ONE_OF_ELEMENT_OR_TYPE_REQUIRED(partName));
+
             }
 
-            part.setDescriptor(context.translateQualifiedName(elementAttr));
+            part.setDescriptor(context.translateQualifiedName(context.getLocation(e), elementAttr));
             part.setDescriptorKind(SchemaKinds.XSD_ELEMENT);
         } else if (typeAttr != null) {
-            part.setDescriptor(context.translateQualifiedName(typeAttr));
+            part.setDescriptor(context.translateQualifiedName(context.getLocation(e), typeAttr));
             part.setDescriptorKind(SchemaKinds.XSD_TYPE);
         } else {
             // XXX-NOTE - this is wrong; for extensibility purposes,
             // any attribute can be specified on a  element, so
             // we need to put an extensibility hook here
-            Util.fail("parsing.elementOrTypeRequired", partName);
+            errReceiver.warning(forest.locatorTable.getStartLocation(e), WsdlMessages.PARSING_ELEMENT_OR_TYPE_REQUIRED(partName));
         }
 
         context.pop();
@@ -615,13 +398,13 @@ public class WSDLParser {
         return part;
     }
 
-    protected PortType parsePortType(
-        ParserContext context,
+    private PortType parsePortType(
+        TWSDLParserContextImpl context,
         Definitions definitions,
         Element e) {
         context.push();
         context.registerNamespaces(e);
-        PortType portType = new PortType(definitions);
+        PortType portType = new PortType(definitions, forest.locatorTable.getStartLocation(e), errReceiver);
         String name = Util.getRequiredAttribute(e, Constants.ATTR_NAME);
         portType.setName(name);
 
@@ -634,9 +417,7 @@ public class WSDLParser {
 
             if (XmlUtil.matchesTagNS(e2, WSDLConstants.QNAME_DOCUMENTATION)) {
                 if (gotDocumentation) {
-                    Util.fail(
-                        "parsing.onlyOneDocumentationAllowed",
-                        e.getLocalName());
+                    errReceiver.error(forest.locatorTable.getStartLocation(e), WsdlMessages.PARSING_ONLY_ONE_DOCUMENTATION_ALLOWED(e.getLocalName()));
                 }
                 gotDocumentation = true;
                 if(portType.getDocumentation() == null)
@@ -644,6 +425,7 @@ public class WSDLParser {
             } else if (
                 XmlUtil.matchesTagNS(e2, WSDLConstants.QNAME_OPERATION)) {
                 Operation op = parsePortTypeOperation(context, e2);
+                op.setParent(portType);
                 portType.add(op);
             } else {
                 // possible extensibility element -- must live outside the WSDL namespace
@@ -664,13 +446,13 @@ public class WSDLParser {
         return portType;
     }
 
-    protected Operation parsePortTypeOperation(
-        ParserContext context,
+    private Operation parsePortTypeOperation(
+        TWSDLParserContextImpl context,
         Element e) {
         context.push();
         context.registerNamespaces(e);
 
-        Operation operation = new Operation();
+        Operation operation = new Operation(forest.locatorTable.getStartLocation(e));
         String name = Util.getRequiredAttribute(e, Constants.ATTR_NAME);
         operation.setName(name);
         String parameterOrderAttr =
@@ -691,29 +473,25 @@ public class WSDLParser {
 
             if (XmlUtil.matchesTagNS(e2, WSDLConstants.QNAME_DOCUMENTATION)) {
                 if (gotDocumentation) {
-                    Util.fail(
-                        "parsing.onlyOneDocumentationAllowed",
-                        e.getLocalName());
+                    errReceiver.error(forest.locatorTable.getStartLocation(e2), WsdlMessages.PARSING_ONLY_ONE_DOCUMENTATION_ALLOWED(e2.getLocalName()));
                 }
                 gotDocumentation = true;
                 if(operation.getDocumentation() == null)
                     operation.setDocumentation(getDocumentationFor(e2));
             } else if (XmlUtil.matchesTagNS(e2, WSDLConstants.QNAME_INPUT)) {
                 if (gotInput) {
-                    Util.fail(
-                        "parsing.tooManyElements",
-                        new Object[] {
-                            Constants.TAG_INPUT,
+                    errReceiver.error(forest.locatorTable.getStartLocation(e), WsdlMessages.PARSING_TOO_MANY_ELEMENTS(Constants.TAG_INPUT,
                             Constants.TAG_OPERATION,
-                            name });
+                            name));
                 }
 
                 context.push();
                 context.registerNamespaces(e2);
-                Input input = new Input();
+                Input input = new Input(forest.locatorTable.getStartLocation(e2), errReceiver);
+                input.setParent(operation);
                 String messageAttr =
                     Util.getRequiredAttribute(e2, Constants.ATTR_MESSAGE);
-                input.setMessage(context.translateQualifiedName(messageAttr));
+                input.setMessage(context.translateQualifiedName(context.getLocation(e2), messageAttr));
                 String nameAttr =
                     XmlUtil.getAttributeOrNull(e2, Constants.ATTR_NAME);
                 input.setName(nameAttr);
@@ -723,10 +501,27 @@ public class WSDLParser {
                     inputBeforeOutput = false;
                 }
 
+                // check for extensiblity attributes
+                for (Iterator iter2 = XmlUtil.getAllAttributes(e2);
+                     iter2.hasNext();
+                ) {
+                    Attr e3 = (Attr)iter2.next();
+                    if (e3.getLocalName().equals(Constants.ATTR_MESSAGE) ||
+                        e3.getLocalName().equals(Constants.ATTR_NAME))
+                        continue;
+
+                    // possible extensibility element -- must live outside the WSDL namespace
+                    checkNotWsdlAttribute(e3);
+                    if (!handleExtension(context, input, e3, e2)) {
+                        // ignore the extensiblity attribute
+                        // TODO throw a WARNING
+                    }
+                }
+
                 // verify that there is at most one child element and it is a documentation element
                 boolean gotDocumentation2 = false;
                 for (Iterator iter2 = XmlUtil.getAllChildren(e2);
-                    iter2.hasNext();
+                     iter2.hasNext();
                     ) {
                     Element e3 = Util.nextElement(iter2);
                     if (e3 == null)
@@ -735,36 +530,30 @@ public class WSDLParser {
                     if (XmlUtil
                         .matchesTagNS(e3, WSDLConstants.QNAME_DOCUMENTATION)) {
                         if (gotDocumentation2) {
-                            Util.fail(
-                                "parsing.onlyOneDocumentationAllowed",
-                                e.getLocalName());
+                            errReceiver.error(forest.locatorTable.getStartLocation(e), WsdlMessages.PARSING_ONLY_ONE_DOCUMENTATION_ALLOWED(e.getLocalName()));
                         }
                         gotDocumentation2 = true;
                         input.setDocumentation(getDocumentationFor(e3));
                     } else {
-                        Util.fail(
-                            "parsing.invalidElement",
-                            e3.getTagName(),
-                            e3.getNamespaceURI());
+                        errReceiver.error(forest.locatorTable.getStartLocation(e3), WsdlMessages.PARSING_INVALID_ELEMENT(e3.getTagName(),
+                            e3.getNamespaceURI()));
                     }
                 }
                 context.pop();
             } else if (XmlUtil.matchesTagNS(e2, WSDLConstants.QNAME_OUTPUT)) {
                 if (gotOutput) {
-                    Util.fail(
-                        "parsing.tooManyElements",
-                        new Object[] {
-                            Constants.TAG_OUTPUT,
+                    errReceiver.error(forest.locatorTable.getStartLocation(e), WsdlMessages.PARSING_TOO_MANY_ELEMENTS(Constants.TAG_INPUT,
                             Constants.TAG_OPERATION,
-                            name });
+                            name));
                 }
 
                 context.push();
                 context.registerNamespaces(e2);
-                Output output = new Output();
+                Output output = new Output(forest.locatorTable.getStartLocation(e2), errReceiver);
+                output.setParent(operation);
                 String messageAttr =
                     Util.getRequiredAttribute(e2, Constants.ATTR_MESSAGE);
-                output.setMessage(context.translateQualifiedName(messageAttr));
+                output.setMessage(context.translateQualifiedName(context.getLocation(e2), messageAttr));
                 String nameAttr =
                     XmlUtil.getAttributeOrNull(e2, Constants.ATTR_NAME);
                 output.setName(nameAttr);
@@ -774,10 +563,27 @@ public class WSDLParser {
                     inputBeforeOutput = true;
                 }
 
+                // check for extensiblity attributes
+                for (Iterator iter2 = XmlUtil.getAllAttributes(e2);
+                     iter2.hasNext();
+                ) {
+                    Attr e3 = (Attr)iter2.next();
+                    if (e3.getLocalName().equals(Constants.ATTR_MESSAGE) ||
+                        e3.getLocalName().equals(Constants.ATTR_NAME))
+                        continue;
+
+                    // possible extensibility element -- must live outside the WSDL namespace
+                    checkNotWsdlAttribute(e3);
+                    if (!handleExtension(context, output, e3, e2)) {
+                        // ignore the extensiblity attribute
+                        // TODO throw a WARNING
+                    }
+                }
+
                 // verify that there is at most one child element and it is a documentation element
                 boolean gotDocumentation2 = false;
                 for (Iterator iter2 = XmlUtil.getAllChildren(e2);
-                    iter2.hasNext();
+                     iter2.hasNext();
                     ) {
                     Element e3 = Util.nextElement(iter2);
                     if (e3 == null)
@@ -786,37 +592,51 @@ public class WSDLParser {
                     if (XmlUtil
                         .matchesTagNS(e3, WSDLConstants.QNAME_DOCUMENTATION)) {
                         if (gotDocumentation2) {
-                            Util.fail(
-                                "parsing.onlyOneDocumentationAllowed",
-                                e.getLocalName());
+                            errReceiver.error(forest.locatorTable.getStartLocation(e), WsdlMessages.PARSING_ONLY_ONE_DOCUMENTATION_ALLOWED(e.getLocalName()));
                         }
                         gotDocumentation2 = true;
                         output.setDocumentation(getDocumentationFor(e3));
                     } else {
-                        Util.fail(
-                            "parsing.invalidElement",
-                            e3.getTagName(),
-                            e3.getNamespaceURI());
+                        errReceiver.error(forest.locatorTable.getStartLocation(e3), WsdlMessages.PARSING_INVALID_ELEMENT(e3.getTagName(),
+                            e3.getNamespaceURI()));
                     }
                 }
                 context.pop();
             } else if (XmlUtil.matchesTagNS(e2, WSDLConstants.QNAME_FAULT)) {
                 context.push();
                 context.registerNamespaces(e2);
-                Fault fault = new Fault();
+                Fault fault = new Fault(forest.locatorTable.getStartLocation(e2));
+                fault.setParent(operation);
                 String messageAttr =
                     Util.getRequiredAttribute(e2, Constants.ATTR_MESSAGE);
-                fault.setMessage(context.translateQualifiedName(messageAttr));
+                fault.setMessage(context.translateQualifiedName(context.getLocation(e2), messageAttr));
                 String nameAttr =
                     XmlUtil.getAttributeOrNull(e2, Constants.ATTR_NAME);
                 fault.setName(nameAttr);
                 operation.addFault(fault);
                 gotFault = true;
 
+                // check for extensiblity attributes
+                for (Iterator iter2 = XmlUtil.getAllAttributes(e2);
+                     iter2.hasNext();
+                ) {
+                    Attr e3 = (Attr)iter2.next();
+                    if (e3.getLocalName().equals(Constants.ATTR_MESSAGE) ||
+                        e3.getLocalName().equals(Constants.ATTR_NAME))
+                        continue;
+
+                    // possible extensibility element -- must live outside the WSDL namespace
+                    checkNotWsdlAttribute(e3);
+                    if (!handleExtension(context, fault, e3, e2)) {
+                        // ignore the extensiblity attribute
+                        // TODO throw a WARNING
+                    }
+                }
+
                 // verify that there is at most one child element and it is a documentation element
                 boolean gotDocumentation2 = false;
                 for (Iterator iter2 = XmlUtil.getAllChildren(e2);
-                    iter2.hasNext();
+                     iter2.hasNext();
                     ) {
                     Element e3 = Util.nextElement(iter2);
                     if (e3 == null)
@@ -825,9 +645,7 @@ public class WSDLParser {
                     if (XmlUtil
                         .matchesTagNS(e3, WSDLConstants.QNAME_DOCUMENTATION)) {
                         if (gotDocumentation2) {
-                            Util.fail(
-                                "parsing.onlyOneDocumentationAllowed",
-                                e.getLocalName());
+                            errReceiver.error(forest.locatorTable.getStartLocation(e), WsdlMessages.PARSING_ONLY_ONE_DOCUMENTATION_ALLOWED(e.getLocalName()));
                         }
                         gotDocumentation2 = true;
                         if(fault.getDocumentation() == null)
@@ -869,7 +687,7 @@ public class WSDLParser {
         } else if (gotOutput && !gotInput && !gotFault) {
             operation.setStyle(OperationStyle.NOTIFICATION);
         } else {
-            Util.fail("parsing.invalidOperationStyle", name);
+            errReceiver.error(forest.locatorTable.getStartLocation(e), WsdlMessages.PARSING_INVALID_OPERATION_STYLE(name));
         }
 
         context.pop();
@@ -877,17 +695,17 @@ public class WSDLParser {
         return operation;
     }
 
-    protected Binding parseBinding(
-        ParserContext context,
+    private Binding parseBinding(
+        TWSDLParserContextImpl context,
         Definitions definitions,
         Element e) {
         context.push();
         context.registerNamespaces(e);
-        Binding binding = new Binding(definitions);
+        Binding binding = new Binding(definitions, forest.locatorTable.getStartLocation(e), errReceiver);
         String name = Util.getRequiredAttribute(e, Constants.ATTR_NAME);
         binding.setName(name);
         String typeAttr = Util.getRequiredAttribute(e, Constants.ATTR_TYPE);
-        binding.setPortType(context.translateQualifiedName(typeAttr));
+        binding.setPortType(context.translateQualifiedName(context.getLocation(e), typeAttr));
 
         boolean gotDocumentation = false;
 
@@ -898,9 +716,7 @@ public class WSDLParser {
 
             if (XmlUtil.matchesTagNS(e2, WSDLConstants.QNAME_DOCUMENTATION)) {
                 if (gotDocumentation) {
-                    Util.fail(
-                        "parsing.onlyOneDocumentationAllowed",
-                        e.getLocalName());
+                    errReceiver.error(forest.locatorTable.getStartLocation(e), WsdlMessages.PARSING_ONLY_ONE_DOCUMENTATION_ALLOWED(e.getLocalName()));
                 }
                 gotDocumentation = true;
                 binding.setDocumentation(getDocumentationFor(e2));
@@ -922,12 +738,12 @@ public class WSDLParser {
         return binding;
     }
 
-    protected BindingOperation parseBindingOperation(
-        ParserContext context,
+    private BindingOperation parseBindingOperation(
+        TWSDLParserContextImpl context,
         Element e) {
         context.push();
         context.registerNamespaces(e);
-        BindingOperation operation = new BindingOperation();
+        BindingOperation operation = new BindingOperation(forest.locatorTable.getStartLocation(e));
         String name = Util.getRequiredAttribute(e, Constants.ATTR_NAME);
         operation.setName(name);
 
@@ -944,39 +760,22 @@ public class WSDLParser {
                 break;
             if (XmlUtil.matchesTagNS(e2, WSDLConstants.QNAME_DOCUMENTATION)) {
                 if (gotDocumentation) {
-                    Util.fail(
-                        "parsing.onlyOneDocumentationAllowed",
-                        e.getLocalName());
+                    errReceiver.error(forest.locatorTable.getStartLocation(e), WsdlMessages.PARSING_ONLY_ONE_DOCUMENTATION_ALLOWED(e.getLocalName()));
                 }
                 gotDocumentation = true;
                 operation.setDocumentation(getDocumentationFor(e2));
             } else if (XmlUtil.matchesTagNS(e2, WSDLConstants.QNAME_INPUT)) {
                 if (gotInput) {
-                    Util.fail(
-                        "parsing.tooManyElements",
-                        new Object[] {
-                            Constants.TAG_INPUT,
+                    errReceiver.error(forest.locatorTable.getStartLocation(e), WsdlMessages.PARSING_TOO_MANY_ELEMENTS(Constants.TAG_INPUT,
                             Constants.TAG_OPERATION,
-                            name });
+                            name));
                 }
 
                 /* Here we check for the use scenario */
                 Iterator itere2 = XmlUtil.getAllChildren(e2);
-                Element ee = Util.nextElement(itere2);
-                if (hSet.isEmpty()) {
-                    hSet.add(ee.getAttribute("use"));
-                } else {
-                    /* this codition will happen when the wsdl used has a mixture of
-                       literal and encoded style */
-                    if (!hSet.contains(ee.getAttribute("use"))
-                        && (ee.getAttribute("use") != "")) {
-                        hSet.add(ee.getAttribute("use"));
-                    }
-                }
-
                 context.push();
                 context.registerNamespaces(e2);
-                BindingInput input = new BindingInput();
+                BindingInput input = new BindingInput(forest.locatorTable.getStartLocation(e2));
                 String nameAttr =
                     XmlUtil.getAttributeOrNull(e2, Constants.ATTR_NAME);
                 input.setName(nameAttr);
@@ -989,7 +788,7 @@ public class WSDLParser {
                 // verify that there is at most one child element and it is a documentation element
                 boolean gotDocumentation2 = false;
                 for (Iterator iter2 = XmlUtil.getAllChildren(e2);
-                    iter2.hasNext();
+                     iter2.hasNext();
                     ) {
                     Element e3 = Util.nextElement(iter2);
                     if (e3 == null)
@@ -998,9 +797,7 @@ public class WSDLParser {
                     if (XmlUtil
                         .matchesTagNS(e3, WSDLConstants.QNAME_DOCUMENTATION)) {
                         if (gotDocumentation2) {
-                            Util.fail(
-                                "parsing.onlyOneDocumentationAllowed",
-                                e.getLocalName());
+                            errReceiver.error(forest.locatorTable.getStartLocation(e), WsdlMessages.PARSING_ONLY_ONE_DOCUMENTATION_ALLOWED(e.getLocalName()));
                         }
                         gotDocumentation2 = true;
                         input.setDocumentation(getDocumentationFor(e3));
@@ -1015,17 +812,14 @@ public class WSDLParser {
                 context.pop();
             } else if (XmlUtil.matchesTagNS(e2, WSDLConstants.QNAME_OUTPUT)) {
                 if (gotOutput) {
-                    Util.fail(
-                        "parsing.tooManyElements",
-                        new Object[] {
-                            Constants.TAG_OUTPUT,
+                    errReceiver.error(forest.locatorTable.getStartLocation(e), WsdlMessages.PARSING_TOO_MANY_ELEMENTS(Constants.TAG_INPUT,
                             Constants.TAG_OPERATION,
-                            name });
+                            name));
                 }
 
                 context.push();
                 context.registerNamespaces(e2);
-                BindingOutput output = new BindingOutput();
+                BindingOutput output = new BindingOutput(forest.locatorTable.getStartLocation(e2));
                 String nameAttr =
                     XmlUtil.getAttributeOrNull(e2, Constants.ATTR_NAME);
                 output.setName(nameAttr);
@@ -1038,7 +832,7 @@ public class WSDLParser {
                 // verify that there is at most one child element and it is a documentation element
                 boolean gotDocumentation2 = false;
                 for (Iterator iter2 = XmlUtil.getAllChildren(e2);
-                    iter2.hasNext();
+                     iter2.hasNext();
                     ) {
 
                     Element e3 = Util.nextElement(iter2);
@@ -1048,9 +842,7 @@ public class WSDLParser {
                     if (XmlUtil
                         .matchesTagNS(e3, WSDLConstants.QNAME_DOCUMENTATION)) {
                         if (gotDocumentation2) {
-                            Util.fail(
-                                "parsing.onlyOneDocumentationAllowed",
-                                e.getLocalName());
+                            errReceiver.error(forest.locatorTable.getStartLocation(e), WsdlMessages.PARSING_ONLY_ONE_DOCUMENTATION_ALLOWED(e.getLocalName()));
                         }
                         gotDocumentation2 = true;
                         output.setDocumentation(getDocumentationFor(e3));
@@ -1066,7 +858,7 @@ public class WSDLParser {
             } else if (XmlUtil.matchesTagNS(e2, WSDLConstants.QNAME_FAULT)) {
                 context.push();
                 context.registerNamespaces(e2);
-                BindingFault fault = new BindingFault();
+                BindingFault fault = new BindingFault(forest.locatorTable.getStartLocation(e2));
                 String nameAttr =
                     Util.getRequiredAttribute(e2, Constants.ATTR_NAME);
                 fault.setName(nameAttr);
@@ -1076,7 +868,7 @@ public class WSDLParser {
                 // verify that there is at most one child element and it is a documentation element
                 boolean gotDocumentation2 = false;
                 for (Iterator iter2 = XmlUtil.getAllChildren(e2);
-                    iter2.hasNext();
+                     iter2.hasNext();
                     ) {
                     Element e3 = Util.nextElement(iter2);
                     if (e3 == null)
@@ -1085,9 +877,7 @@ public class WSDLParser {
                     if (XmlUtil
                         .matchesTagNS(e3, WSDLConstants.QNAME_DOCUMENTATION)) {
                         if (gotDocumentation2) {
-                            Util.fail(
-                                "parsing.onlyOneDocumentationAllowed",
-                                e.getLocalName());
+                            errReceiver.error(forest.locatorTable.getStartLocation(e), WsdlMessages.PARSING_ONLY_ONE_DOCUMENTATION_ALLOWED(e.getLocalName()));
                         }
                         gotDocumentation2 = true;
                         if(fault.getDocumentation() == null)
@@ -1119,7 +909,7 @@ public class WSDLParser {
         } else if (gotOutput && !gotInput && !gotFault) {
             operation.setStyle(OperationStyle.NOTIFICATION);
         } else {
-            Util.fail("parsing.invalidOperationStyle", name);
+            errReceiver.error(forest.locatorTable.getStartLocation(e), WsdlMessages.PARSING_INVALID_OPERATION_STYLE(name));
         }
 
         context.pop();
@@ -1127,13 +917,13 @@ public class WSDLParser {
         return operation;
     }
 
-    protected Import parseImport(
-        ParserContext context,
+    private Import parseImport(
+        TWSDLParserContextImpl context,
         Definitions definitions,
         Element e) {
         context.push();
         context.registerNamespaces(e);
-        Import anImport = new Import();
+        Import anImport = new Import(forest.locatorTable.getStartLocation(e));
         String namespace =
             Util.getRequiredAttribute(e, Constants.ATTR_NAMESPACE);
         anImport.setNamespace(namespace);
@@ -1150,17 +940,13 @@ public class WSDLParser {
 
             if (XmlUtil.matchesTagNS(e2, WSDLConstants.QNAME_DOCUMENTATION)) {
                 if (gotDocumentation) {
-                    Util.fail(
-                        "parsing.onlyOneDocumentationAllowed",
-                        e.getLocalName());
+                    errReceiver.error(forest.locatorTable.getStartLocation(e), WsdlMessages.PARSING_ONLY_ONE_DOCUMENTATION_ALLOWED(e.getLocalName()));
                 }
                 gotDocumentation = true;
                 anImport.setDocumentation(getDocumentationFor(e2));
             } else {
-                Util.fail(
-                    "parsing.invalidElement",
-                    e2.getTagName(),
-                    e2.getNamespaceURI());
+                errReceiver.error(forest.locatorTable.getStartLocation(e2), WsdlMessages.PARSING_INVALID_ELEMENT(e2.getTagName(),
+                    e2.getNamespaceURI()));
             }
         }
         context.pop();
@@ -1168,13 +954,13 @@ public class WSDLParser {
         return anImport;
     }
 
-    protected Service parseService(
-        ParserContext context,
+    private Service parseService(
+        TWSDLParserContextImpl context,
         Definitions definitions,
         Element e) {
         context.push();
         context.registerNamespaces(e);
-        Service service = new Service(definitions);
+        Service service = new Service(definitions, forest.locatorTable.getStartLocation(e), errReceiver);
         String name = Util.getRequiredAttribute(e, Constants.ATTR_NAME);
         service.setName(name);
 
@@ -1187,9 +973,7 @@ public class WSDLParser {
 
             if (XmlUtil.matchesTagNS(e2, WSDLConstants.QNAME_DOCUMENTATION)) {
                 if (gotDocumentation) {
-                    Util.fail(
-                        "parsing.onlyOneDocumentationAllowed",
-                        e.getLocalName());
+                    errReceiver.error(forest.locatorTable.getStartLocation(e), WsdlMessages.PARSING_ONLY_ONE_DOCUMENTATION_ALLOWED(e.getLocalName()));
                 }
                 gotDocumentation = true;
                 if(service.getDocumentation() == null)
@@ -1211,20 +995,20 @@ public class WSDLParser {
         return service;
     }
 
-    protected Port parsePort(
-        ParserContext context,
+    private Port parsePort(
+        TWSDLParserContextImpl context,
         Definitions definitions,
         Element e) {
         context.push();
         context.registerNamespaces(e);
 
-        Port port = new Port(definitions);
+        Port port = new Port(definitions, forest.locatorTable.getStartLocation(e), errReceiver);
         String name = Util.getRequiredAttribute(e, Constants.ATTR_NAME);
         port.setName(name);
 
         String bindingAttr =
             Util.getRequiredAttribute(e, Constants.ATTR_BINDING);
-        port.setBinding(context.translateQualifiedName(bindingAttr));
+        port.setBinding(context.translateQualifiedName(context.getLocation(e), bindingAttr));
 
         boolean gotDocumentation = false;
 
@@ -1235,9 +1019,7 @@ public class WSDLParser {
 
             if (XmlUtil.matchesTagNS(e2, WSDLConstants.QNAME_DOCUMENTATION)) {
                 if (gotDocumentation) {
-                    Util.fail(
-                        "parsing.onlyOneDocumentationAllowed",
-                        e.getLocalName());
+                    errReceiver.error(forest.locatorTable.getStartLocation(e), WsdlMessages.PARSING_ONLY_ONE_DOCUMENTATION_ALLOWED(e.getLocalName()));
                 }
                 gotDocumentation = true;
                 if(port.getDocumentation() == null)
@@ -1256,116 +1038,79 @@ public class WSDLParser {
         return port;
     }
 
-    protected Types parseTypes(
-        ParserContext context,
-        Definitions definitions,
-        Element e) {
-        context.push();
-        context.registerNamespaces(e);
-        Types types = new Types();
-
-        boolean gotDocumentation = false;
-
-        for (Iterator iter = XmlUtil.getAllChildren(e); iter.hasNext();) {
-            Element e2 = Util.nextElement(iter);
-            if (e2 == null)
-                break;
-
-            if (XmlUtil.matchesTagNS(e2, WSDLConstants.QNAME_DOCUMENTATION)) {
-                if (gotDocumentation) {
-                    Util.fail(
-                        "parsing.onlyOneDocumentationAllowed",
-                        e.getLocalName());
-                }
-                gotDocumentation = true;
-                types.setDocumentation(getDocumentationFor(e2));
-            } //bug fix 4854004
-            else if (
-                (_useWSIBasicProfile)
-                    && (XmlUtil.matchesTagNS(e2, SchemaConstants.QNAME_IMPORT))) {
-                warn("warning.wsi.r2003");
-            } else {
-                // possible extensibility element -- must live outside the WSDL namespace
-                checkNotWsdlElement(e2);
-                try {
-                    if (!handleExtension(context, types, e2)) {
-                        checkNotWsdlRequired(e2);
-                    }
-                } catch (ParseException pe) {
-                    if (pe.getKey().equals("parsing.incorrectRootElement")) {
-                        if (_useWSIBasicProfile) {
-                            warn("warning.wsi.r2004");
-                        }
-                        throw pe;
-                    }
-                }
-            }
-        }
-
-        context.pop();
-        context.fireDoneParsingEntity(WSDLConstants.QNAME_TYPES, types);
-        return types;
-    }
-
-    private List _elements = new ArrayList();
-
-    public void addSchemaElements(Element typesElement){
+    private void validateSchemaImports(Element typesElement){
         for (Iterator iter = XmlUtil.getAllChildren(typesElement); iter.hasNext();) {
             Element e = Util.nextElement(iter);
             if (e == null)
                 break;
-
-            if (XmlUtil.matchesTagNS(e, SchemaConstants.QNAME_SCHEMA)) {
-                _elements.add(e);
-            } else {
-                // possible extensibility element -- must live outside the WSDL namespace
+            if (XmlUtil.matchesTagNS(e, SchemaConstants.QNAME_IMPORT)) {
+                errReceiver.warning(forest.locatorTable.getStartLocation(e), WsdlMessages.WARNING_WSI_R_2003());
+            }else{
                 checkNotWsdlElement(e);
+//                if (XmlUtil.matchesTagNS(e, SchemaConstants.QNAME_SCHEMA)) {
+//                    forest.getInlinedSchemaElement().add(e);
+//                }
+
             }
         }
     }
 
-    public List getSchemaElements(){
-        return _elements;
-    }
 
-    protected boolean handleExtension(
-        ParserContext context,
-        Extensible entity,
+    private boolean handleExtension(
+        TWSDLParserContextImpl context,
+        TWSDLExtensible entity,
         Element e) {
-        ExtensionHandler h =
-            (ExtensionHandler) _extensionHandlers.get(e.getNamespaceURI());
+        TWSDLExtensionHandler h =
+             (TWSDLExtensionHandler) extensionHandlers.get(e.getNamespaceURI());
         if (h == null) {
-            context.fireIgnoringExtension(
-                new QName(e.getNamespaceURI(), e.getLocalName()),
-                ((Entity) entity).getElementName());
+            context.fireIgnoringExtension(e, (Entity) entity);
             return false;
         } else {
             return h.doHandleExtension(context, entity, e);
         }
     }
 
-    protected void checkNotWsdlElement(Element e) {
-        // possible extensibility element -- must live outside the WSDL namespace
-        if (e.getNamespaceURI().equals(Constants.NS_WSDL))
-            Util.fail("parsing.invalidWsdlElement", e.getTagName());
+    private boolean handleExtension(
+        TWSDLParserContextImpl context,
+        TWSDLExtensible entity,
+        Node n,
+        Element e) {
+        TWSDLExtensionHandler h =
+            (TWSDLExtensionHandler) extensionHandlers.get(n.getNamespaceURI());
+        if (h == null) {
+            context.fireIgnoringExtension(e, (Entity) entity);
+            return false;
+        } else {
+            return h.doHandleExtension(context, entity, e);
+        }
     }
 
-    protected void checkNotWsdlRequired(Element e) {
+    private void checkNotWsdlElement(Element e) {
+        // possible extensibility element -- must live outside the WSDL namespace
+        if (e.getNamespaceURI() != null && e.getNamespaceURI().equals(Constants.NS_WSDL))
+            errReceiver.error(forest.locatorTable.getStartLocation(e), WsdlMessages.PARSING_INVALID_WSDL_ELEMENT(e.getTagName()));
+    }
+
+    private void checkNotWsdlAttribute(Attr a) {
+        // possible extensibility element -- must live outside the WSDL namespace
+        if (a.getNamespaceURI().equals(Constants.NS_WSDL))
+            errReceiver.error(forest.locatorTable.getStartLocation(a.getOwnerElement()), WsdlMessages.PARSING_INVALID_WSDL_ELEMENT(a.getLocalName()));
+    }
+
+    private void checkNotWsdlRequired(Element e) {
         // check the wsdl:required attribute, fail if set to "true"
         String required =
             XmlUtil.getAttributeNSOrNull(
                 e,
                 Constants.ATTR_REQUIRED,
                 Constants.NS_WSDL);
-        if (required != null && required.equals(Constants.TRUE)) {
-            Util.fail(
-                "parsing.requiredExtensibilityElement",
-                e.getTagName(),
-                e.getNamespaceURI());
+        if (required != null && required.equals(Constants.TRUE) && !options.isExtensionMode()) {
+            errReceiver.error(forest.locatorTable.getStartLocation(e), WsdlMessages.PARSING_REQUIRED_EXTENSIBILITY_ELEMENT(e.getTagName(),
+                e.getNamespaceURI()));
         }
     }
 
-    protected Documentation getDocumentationFor(Element e) {
+    private Documentation getDocumentationFor(Element e) {
         String s = XmlUtil.getTextForNode(e);
         if (s == null) {
             return null;
@@ -1373,37 +1118,4 @@ public class WSDLParser {
             return new Documentation(s);
         }
     }
-
-    protected void error(String key) {
-        System.err.println(
-            _localizer.localize(_messageFactory.getMessage(key)));
-    }
-
-    public HashSet getUse() {
-        return hSet;
-    }
-
-    protected void warn(String key) {
-        System.err.println(
-            _localizer.localize(_messageFactory.getMessage(key)));
-    }
-
-    protected void warn(String key, String arg) {
-        System.err.println(
-            _localizer.localize(_messageFactory.getMessage(key, arg)));
-    }
-
-    protected void warn(String key, Object[] args) {
-        System.err.println(
-            _localizer.localize(_messageFactory.getMessage(key, args)));
-    }
-
-    private boolean _followImports;
-    private String _targetNamespaceURI;
-    private Map _extensionHandlers;
-    private ArrayList _listeners;
-    private boolean _useWSIBasicProfile = true;
-    private LocalizableMessageFactory _messageFactory = null;
-    private Localizer _localizer;
-    private HashSet hSet = null;
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLWriter.java
deleted file mode 100644
index e169c884eb1..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLWriter.java
+++ /dev/null
@@ -1,371 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.tools.internal.ws.wsdl.parser;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-
-import com.sun.tools.internal.ws.wsdl.document.Binding;
-import com.sun.tools.internal.ws.wsdl.document.BindingFault;
-import com.sun.tools.internal.ws.wsdl.document.BindingInput;
-import com.sun.tools.internal.ws.wsdl.document.BindingOperation;
-import com.sun.tools.internal.ws.wsdl.document.BindingOutput;
-import com.sun.tools.internal.ws.wsdl.document.Definitions;
-import com.sun.tools.internal.ws.wsdl.document.Documentation;
-import com.sun.tools.internal.ws.wsdl.document.Fault;
-import com.sun.tools.internal.ws.wsdl.document.Import;
-import com.sun.tools.internal.ws.wsdl.document.Input;
-import com.sun.tools.internal.ws.wsdl.document.Message;
-import com.sun.tools.internal.ws.wsdl.document.MessagePart;
-import com.sun.tools.internal.ws.wsdl.document.Operation;
-import com.sun.tools.internal.ws.wsdl.document.Output;
-import com.sun.tools.internal.ws.wsdl.document.Port;
-import com.sun.tools.internal.ws.wsdl.document.PortType;
-import com.sun.tools.internal.ws.wsdl.document.Service;
-import com.sun.tools.internal.ws.wsdl.document.Types;
-import com.sun.tools.internal.ws.wsdl.document.WSDLConstants;
-import com.sun.tools.internal.ws.wsdl.document.WSDLDocument;
-import com.sun.tools.internal.ws.wsdl.document.WSDLDocumentVisitor;
-import com.sun.tools.internal.ws.wsdl.document.schema.SchemaKinds;
-import com.sun.tools.internal.ws.wsdl.document.jaxws.JAXWSBindingsConstants;
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
-import com.sun.tools.internal.ws.wsdl.framework.Kind;
-import com.sun.tools.internal.ws.wsdl.framework.WriterContext;
-
-/**
- * A writer for WSDL documents.
- *
- * @author WS Development Team
- */
-public class WSDLWriter {
-
-    public WSDLWriter() throws IOException {
-        _extensionHandlers = new HashMap();
-
-        // register handlers for default extensions
-        register(new SOAPExtensionHandler());
-        register(new HTTPExtensionHandler());
-        register(new MIMEExtensionHandler());
-        register(new SchemaExtensionHandler());
-        register(new JAXWSBindingExtensionHandler());
-    }
-
-    public void register(ExtensionHandler h) {
-        _extensionHandlers.put(h.getNamespaceURI(), h);
-        h.setExtensionHandlers(_extensionHandlers);
-    }
-
-    public void unregister(ExtensionHandler h) {
-        _extensionHandlers.put(h.getNamespaceURI(), null);
-        h.setExtensionHandlers(null);
-    }
-
-    public void unregister(String uri) {
-        _extensionHandlers.put(uri, null);
-    }
-
-    public void write(final WSDLDocument document, OutputStream os)
-        throws IOException {
-        final WriterContext context = new WriterContext(os);
-        try {
-            document.accept(new WSDLDocumentVisitor() {
-                public void preVisit(Definitions definitions)
-                    throws Exception {
-                    context.push();
-                    initializePrefixes(context, document);
-                    context.writeStartTag(definitions.getElementName());
-                    context.writeAttribute(
-                        Constants.ATTR_NAME,
-                        definitions.getName());
-                    context.writeAttribute(
-                        Constants.ATTR_TARGET_NAMESPACE,
-                        definitions.getTargetNamespaceURI());
-                    context.writeAllPendingNamespaceDeclarations();
-                }
-                public void postVisit(Definitions definitions)
-                    throws Exception {
-                    context.writeEndTag(definitions.getElementName());
-                    context.pop();
-                }
-                public void visit(Import i) throws Exception {
-                    context.writeStartTag(i.getElementName());
-                    context.writeAttribute(
-                        Constants.ATTR_NAMESPACE,
-                        i.getNamespace());
-                    context.writeAttribute(
-                        Constants.ATTR_LOCATION,
-                        i.getLocation());
-                    context.writeEndTag(i.getElementName());
-                }
-                public void preVisit(Types types) throws Exception {
-                    context.writeStartTag(types.getElementName());
-                }
-                public void postVisit(Types types) throws Exception {
-                    context.writeEndTag(types.getElementName());
-                }
-                public void preVisit(Message message) throws Exception {
-                    context.writeStartTag(message.getElementName());
-                    context.writeAttribute(
-                        Constants.ATTR_NAME,
-                        message.getName());
-                }
-                public void postVisit(Message message) throws Exception {
-                    context.writeEndTag(message.getElementName());
-                }
-                public void visit(MessagePart part) throws Exception {
-                    context.writeStartTag(part.getElementName());
-                    context.writeAttribute(Constants.ATTR_NAME, part.getName());
-
-                    QName dname = part.getDescriptor();
-                    Kind dkind = part.getDescriptorKind();
-                    if (dname != null && dkind != null) {
-                        if (dkind.equals(SchemaKinds.XSD_ELEMENT)) {
-                            context.writeAttribute(
-                                Constants.ATTR_ELEMENT,
-                                dname);
-                        } else if (dkind.equals(SchemaKinds.XSD_TYPE)) {
-                            context.writeAttribute(Constants.ATTR_TYPE, dname);
-                        } else {
-                            // TODO - add support for attribute extensions here
-                        }
-                    }
-                    context.writeEndTag(part.getElementName());
-                }
-                public void preVisit(PortType portType) throws Exception {
-                    context.writeStartTag(portType.getElementName());
-                    context.writeAttribute(
-                        Constants.ATTR_NAME,
-                        portType.getName());
-                }
-                public void postVisit(PortType portType) throws Exception {
-                    context.writeEndTag(portType.getElementName());
-                }
-                public void preVisit(Operation operation) throws Exception {
-                    context.writeStartTag(operation.getElementName());
-                    context.writeAttribute(
-                        Constants.ATTR_NAME,
-                        operation.getName());
-                    //bug fix: 4947340, parameterOder="" should not be generated
-                    if(operation.getParameterOrder() != null &&
-                        operation.getParameterOrder().length() > 0) {
-                        context.writeAttribute(
-                            Constants.ATTR_PARAMETER_ORDER,
-                            operation.getParameterOrder());
-                    }
-                }
-                public void postVisit(Operation operation) throws Exception {
-                    context.writeEndTag(operation.getElementName());
-                }
-                public void preVisit(Input input) throws Exception {
-                    context.writeStartTag(input.getElementName());
-                    context.writeAttribute(
-                        Constants.ATTR_NAME,
-                        input.getName());
-                    context.writeAttribute(
-                        Constants.ATTR_MESSAGE,
-                        input.getMessage());
-                }
-                public void postVisit(Input input) throws Exception {
-                    context.writeEndTag(input.getElementName());
-                }
-                public void preVisit(Output output) throws Exception {
-                    context.writeStartTag(output.getElementName());
-                    context.writeAttribute(
-                        Constants.ATTR_NAME,
-                        output.getName());
-                    context.writeAttribute(
-                        Constants.ATTR_MESSAGE,
-                        output.getMessage());
-                }
-                public void postVisit(Output output) throws Exception {
-                    context.writeEndTag(output.getElementName());
-                }
-                public void preVisit(Fault fault) throws Exception {
-                    context.writeStartTag(fault.getElementName());
-                    context.writeAttribute(
-                        Constants.ATTR_NAME,
-                        fault.getName());
-                    context.writeAttribute(
-                        Constants.ATTR_MESSAGE,
-                        fault.getMessage());
-                }
-                public void postVisit(Fault fault) throws Exception {
-                    context.writeEndTag(fault.getElementName());
-                }
-                public void preVisit(Binding binding) throws Exception {
-                    context.writeStartTag(binding.getElementName());
-                    context.writeAttribute(
-                        Constants.ATTR_NAME,
-                        binding.getName());
-                    context.writeAttribute(
-                        Constants.ATTR_TYPE,
-                        binding.getPortType());
-                }
-                public void postVisit(Binding binding) throws Exception {
-                    context.writeEndTag(binding.getElementName());
-                }
-
-                public void preVisit(BindingOperation operation)
-                    throws Exception {
-                    context.writeStartTag(operation.getElementName());
-                    context.writeAttribute(
-                        Constants.ATTR_NAME,
-                        operation.getName());
-                }
-                public void postVisit(BindingOperation operation)
-                    throws Exception {
-                    context.writeEndTag(operation.getElementName());
-                }
-                public void preVisit(BindingInput input) throws Exception {
-                    context.writeStartTag(input.getElementName());
-                    context.writeAttribute(
-                        Constants.ATTR_NAME,
-                        input.getName());
-                }
-                public void postVisit(BindingInput input) throws Exception {
-                    context.writeEndTag(input.getElementName());
-                }
-                public void preVisit(BindingOutput output) throws Exception {
-                    context.writeStartTag(output.getElementName());
-                    context.writeAttribute(
-                        Constants.ATTR_NAME,
-                        output.getName());
-                }
-                public void postVisit(BindingOutput output) throws Exception {
-                    context.writeEndTag(output.getElementName());
-                }
-                public void preVisit(BindingFault fault) throws Exception {
-                    context.writeStartTag(fault.getElementName());
-                    context.writeAttribute(
-                        Constants.ATTR_NAME,
-                        fault.getName());
-                }
-                public void postVisit(BindingFault fault) throws Exception {
-                    context.writeEndTag(fault.getElementName());
-                }
-
-                public void preVisit(Service service) throws Exception {
-                    context.writeStartTag(service.getElementName());
-                    context.writeAttribute(
-                        Constants.ATTR_NAME,
-                        service.getName());
-                }
-                public void postVisit(Service service) throws Exception {
-                    context.writeEndTag(service.getElementName());
-                }
-                public void preVisit(Port port) throws Exception {
-                    context.writeStartTag(port.getElementName());
-                    context.writeAttribute(Constants.ATTR_NAME, port.getName());
-                    context.writeAttribute(
-                        Constants.ATTR_BINDING,
-                        port.getBinding());
-                }
-                public void postVisit(Port port) throws Exception {
-                    context.writeEndTag(port.getElementName());
-                }
-                public void preVisit(Extension extension) throws Exception {
-                    ExtensionHandler h =
-                        (ExtensionHandler) _extensionHandlers.get(
-                            extension.getElementName().getNamespaceURI());
-                    h.doHandleExtension(context, extension);
-                }
-                public void postVisit(Extension extension) throws Exception {
-                }
-                public void visit(Documentation documentation)
-                    throws Exception {
-                    context.writeTag(WSDLConstants.QNAME_DOCUMENTATION, null);
-                }
-            });
-            context.flush();
-        } catch (Exception e) {
-            if (e instanceof IOException) {
-                throw (IOException) e;
-            } else if (e instanceof RuntimeException) {
-                throw (RuntimeException) e;
-            } else {
-                // entirely unexpected exception
-                throw new IllegalStateException();
-            }
-        }
-    }
-
-    private void initializePrefixes(
-        WriterContext context,
-        WSDLDocument document)
-        throws IOException {
-        // deal with the target namespace first
-        String tnsURI = document.getDefinitions().getTargetNamespaceURI();
-        if (tnsURI != null) {
-            context.setTargetNamespaceURI(tnsURI);
-            context.declarePrefix(TARGET_NAMESPACE_PREFIX, tnsURI);
-        }
-
-        // then with the WSDL namespace
-//        context.declarePrefix(_commonPrefixes.get(Constants.NS_WSDL), Constants.NS_WSDL);
-        context.declarePrefix("", Constants.NS_WSDL);
-
-        // then with all other namespaces
-        Set namespaces = document.collectAllNamespaces();
-        for (Iterator iter = namespaces.iterator(); iter.hasNext();) {
-            String nsURI = (String) iter.next();
-            if (context.getPrefixFor(nsURI) != null)
-                continue;
-
-            String prefix = (String) _commonPrefixes.get(nsURI);
-            if (prefix == null) {
-                // create a new prefix for it
-                prefix = context.findNewPrefix(NEW_NAMESPACE_PREFIX_BASE);
-            }
-            context.declarePrefix(prefix, nsURI);
-        }
-    }
-
-    private Map _extensionHandlers;
-
-    ////////
-
-    private static Map _commonPrefixes;
-
-    static {
-        _commonPrefixes = new HashMap();
-        _commonPrefixes.put(Constants.NS_WSDL, "wsdl");
-        _commonPrefixes.put(Constants.NS_WSDL_SOAP, "soap");
-        _commonPrefixes.put(Constants.NS_WSDL_HTTP, "http");
-        _commonPrefixes.put(Constants.NS_WSDL_MIME, "mime");
-        _commonPrefixes.put(Constants.NS_XSD, "xsd");
-        _commonPrefixes.put(Constants.NS_XSI, "xsi");
-        _commonPrefixes.put(JAXWSBindingsConstants.NS_JAXWS_BINDINGS, "jaxws");
-    }
-
-    private final static String TARGET_NAMESPACE_PREFIX = "tns";
-    private final static String NEW_NAMESPACE_PREFIX_BASE = "ns";
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WhitespaceStripper.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WhitespaceStripper.java
new file mode 100644
index 00000000000..8a6c054fc4d
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WhitespaceStripper.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+
+
+package com.sun.tools.internal.ws.wsdl.parser;
+
+import com.sun.xml.internal.bind.WhiteSpaceProcessor;
+import org.xml.sax.*;
+import org.xml.sax.helpers.XMLFilterImpl;
+
+/**
+ * Strips ignorable whitespace from SAX event stream.
+ *
+ * 
    
+ * This filter works only when the event stream doesn't
+ * contain any mixed content.
+ *
+ * @author
+ *     Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ *     Vivek Pandey
+ */
+class WhitespaceStripper extends XMLFilterImpl {
+
+    private int state = 0;
+
+    private char[] buf = new char[1024];
+    private int bufLen = 0;
+
+    private static final int AFTER_START_ELEMENT = 1;
+    private static final int AFTER_END_ELEMENT = 2;
+
+    public WhitespaceStripper(XMLReader reader) {
+        setParent(reader);
+    }
+
+    public WhitespaceStripper(ContentHandler handler, ErrorHandler eh, EntityResolver er) {
+        setContentHandler(handler);
+        if(eh!=null)    setErrorHandler(eh);
+        if(er!=null)    setEntityResolver(er);
+    }
+
+    public void characters(char[] ch, int start, int length) throws SAXException {
+        switch(state) {
+        case AFTER_START_ELEMENT:
+            // we have to store the characters here, even if it consists entirely
+            // of whitespaces. This is because successive characters event might
+            // include non-whitespace char, in which case all the whitespaces in
+            // this event may suddenly become significant.
+            if( bufLen+length>buf.length ) {
+                // reallocate buffer
+                char[] newBuf = new char[Math.max(bufLen+length,buf.length*2)];
+                System.arraycopy(buf,0,newBuf,0,bufLen);
+                buf = newBuf;
+            }
+            System.arraycopy(ch,start,buf,bufLen,length);
+            bufLen += length;
+            break;
+        case AFTER_END_ELEMENT:
+            // check if this is ignorable.
+            int len = start+length;
+            for( int i=start; i=0; i-- )
+                if( !WhiteSpaceProcessor.isWhiteSpace(buf[i]) ) {
+                    super.characters(buf, 0, bufLen);
+                    return;
+               }
+        }
+    }
+
+    public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {
+        // ignore completely.
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/AbortException.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/AbortException.java
index 97acb1f7c2e..e95f5b4b84c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/AbortException.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/AbortException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/BadCommandLineException.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/BadCommandLineException.java
index 8ff4caecbc9..4be6b4f5f09 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/BadCommandLineException.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/BadCommandLineException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc;
 
 import com.sun.istack.internal.Nullable;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/ConsoleErrorReporter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/ConsoleErrorReporter.java
index c204f2c2257..a65f69c4424 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/ConsoleErrorReporter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/ConsoleErrorReporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc;
 
 import java.io.OutputStream;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/Driver.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/Driver.java
index fb5a3423959..75a302f7f65 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/Driver.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/Driver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc;
 
 import java.io.FileOutputStream;
@@ -35,6 +34,7 @@ import java.util.Iterator;
 import com.sun.codemodel.internal.CodeWriter;
 import com.sun.codemodel.internal.JCodeModel;
 import com.sun.codemodel.internal.writer.ZipCodeWriter;
+import com.sun.istack.internal.NotNull;
 import com.sun.istack.internal.Nullable;
 import com.sun.tools.internal.xjc.generator.bean.BeanGenerator;
 import com.sun.tools.internal.xjc.model.Model;
@@ -199,7 +199,7 @@ public class Driver {
      *      All non-zero values indicate an error. The error message
      *      will be sent to the specified PrintStream.
      */
-    public static int run(String[] args, XJCListener listener) throws BadCommandLineException {
+    public static int run(String[] args, @NotNull final XJCListener listener) throws BadCommandLineException {
 
         // recognize those special options before we start parsing options.
         for (String arg : args) {
@@ -249,6 +249,11 @@ public class Driver {
                     if(!opt.quiet)
                         super.warning(exception);
                 }
+                @Override
+                public void pollAbort() throws AbortException {
+                    if(listener.isCanceled())
+                        throw new AbortException();
+                }
             };
 
             if( opt.mode==Mode.FOREST ) {
@@ -422,7 +427,7 @@ public class Driver {
         public boolean noNS = false;
 
         /** Parse XJC-specific options. */
-        protected int parseArgument(String[] args, int i) throws BadCommandLineException {
+        public int parseArgument(String[] args, int i) throws BadCommandLineException {
             if (args[i].equals("-noNS")) {
                 noNS = true;
                 return 1;
@@ -471,7 +476,7 @@ public class Driver {
      *      If the parsing of options have started, set a partly populated
      *      {@link Options} object.
      */
-    protected static void usage( @Nullable Options opts, boolean privateUsage ) {
+    public static void usage( @Nullable Options opts, boolean privateUsage ) {
         if( privateUsage ) {
             System.out.println(Messages.format(Messages.DRIVER_PRIVATE_USAGE));
         } else {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/ErrorReceiver.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/ErrorReceiver.java
index b602829fb4e..53100508410 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/ErrorReceiver.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/ErrorReceiver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,8 +28,8 @@
  */
 package com.sun.tools.internal.xjc;
 
-import com.sun.tools.internal.xjc.api.ErrorListener;
 import com.sun.istack.internal.SAXParseException2;
+import com.sun.tools.internal.xjc.api.ErrorListener;
 
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.Locator;
@@ -100,6 +100,13 @@ public abstract class ErrorReceiver  implements ErrorHandler, ErrorListener {
     public abstract void fatalError(SAXParseException exception) throws AbortException;
     public abstract void warning(SAXParseException exception) throws AbortException;
 
+    /**
+     * This method will be invoked periodically to allow {@link AbortException}
+     * to be thrown, especially when this is driven by some kind of GUI.
+     */
+    public void pollAbort() throws AbortException {
+    }
+
     /**
      * Reports verbose messages to users.
      *
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/Language.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/Language.java
index 36444eed379..be45728aa50 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/Language.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/Language.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/MessageBundle.properties b/jaxws/src/share/classes/com/sun/tools/internal/xjc/MessageBundle.properties
index 37f55bd67f7..243323e9335 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/MessageBundle.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/MessageBundle.properties
@@ -1,3 +1,28 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
 ConsoleErrorReporter.UnknownLocation = \
 	unknown location
 	
@@ -8,7 +33,9 @@ ConsoleErrorReporter.UnknownFile = \
 	unknown file
 	
 Driver.Private.Usage = \
-Usage: xjc [-options ...]  ... [-b ] ...\n\
+Usage: xjc [-options ...]  ... [-b ] ...\n\
+If dir is specified, all schema files in it will be compiled.\n\
+If jar is specified, /META-INF/sun-jaxb.episode binding file will be compiled.\n\
 Options:\n\
 \ \ -debug             :  run in the debug mode\n\
 \ \ -nv                :  do not perform strict validation of the input schema(s)\n\
@@ -26,6 +53,7 @@ Options:\n\
 \ \ -readOnly          :  generated files will be in read-only mode\n\
 \ \ -npa               :  suppress generation of package level annotations (**/package-info.java)\n\
 \ \ -no-header         :  suppress generation of a file header with timestamp\n\
+\ \ -target 2.0        :  behave like XJC 2.0 and generate code that doesn't use any 2.1 features.\n\
 \ \ -private           :  display this help message\n\
 \ \ -xmlschema         :  treat input as W3C XML Schema (default)\n\
 \ \ -relaxng           :  treat input as RELAX NG (experimental,unsupported)\n\
@@ -45,7 +73,9 @@ Options in Code mode:\n\
 \ \ -p      :  specifies the target package\n
 
 Driver.Public.Usage = \
-Usage: xjc [-options ...]  ... [-b ] ...\n\
+Usage: xjc [-options ...]  ... [-b ] ...\n\
+If dir is specified, all schema files in it will be compiled.\n\
+If jar is specified, /META-INF/sun-jaxb.episode binding file will be compiled.\n\
 Options:\n\
 \ \ -nv                :  do not perform strict validation of the input schema(s)\n\
 \ \ -extension         :  allow vendor extensions - do not strictly follow the\n\
@@ -62,6 +92,7 @@ Options:\n\
 \ \ -readOnly          :  generated files will be in read-only mode\n\
 \ \ -npa               :  suppress generation of package level annotations (**/package-info.java)\n\
 \ \ -no-header         :  suppress generation of a file header with timestamp\n\
+\ \ -target 2.0        :  behave like XJC 2.0 and generate code that doesn't use any 2.1 features.\n\
 \ \ -xmlschema         :  treat input as W3C XML Schema (default)\n\
 \ \ -relaxng           :  treat input as RELAX NG (experimental,unsupported)\n\
 \ \ -relaxng-compact   :  treat input as RELAX NG compact syntax (experimental,unsupported)\n\
@@ -78,24 +109,9 @@ Driver.ExperimentalLanguageWarning = \
 	Are you trying to compile {0}? Support for {0} is experimental. \
 	You may enable it by using the {1} option.
 
-Driver.MissingCatalog = \
-	the -catalog option is missing a file name
-
-Driver.MissingClassPath = \
-	the -classpath option is missing a directory/jarfile name
-
-Driver.MissingDir = \
-	the -d option is missing a directory name
-
 Driver.NonExistentDir = \
     cowardly refuses to write to a non-existent directory "{0}"
 	
-Driver.MissingFileName = \
-	the -b option is missing a file name
-	
-Driver.MissingPackageName = \
-	the -p option is missing a package name
-	
 Driver.MissingRuntimePackageName = \
 	the -use-runtime option is missing a package name
 	
@@ -113,8 +129,11 @@ Driver.MissingProxyPort = \
 	either the -port option is missing an operand \n\
         or -host was specified but not -port
 
-Driver.MISSING_PROXY = \
-    the -httpproxy option is missing an operand
+Driver.ILLEGAL_PROXY = \
+    "{0}" is not a valid proxy format. The format is [user[:password]@]proxyHost[:proxyPort]
+
+Driver.ILLEGAL_TARGET_VERSION = \
+    "{0}" is not a valid target version. "2.0" and "2.1" are supported.
 
 Driver.MISSING_PROXYFILE = \
     the -httpproxyfile option is missing an operand
@@ -155,18 +174,18 @@ Driver.CompilingSchema = \
 Driver.FailedToGenerateCode = \
 	Failed to produce code.
 
-# DO NOT localize the JAXB 2.0 in JDK 1.6 string - it is a token for an ant 	
+# DO NOT localize the JAXB 2.1.3 in JDK string - it is a token for an ant 	
 Driver.FilePrologComment = \
-	This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 \n\
+	This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK \n\
 	See http://java.sun.com/xml/jaxb \n\
 	Any modifications to this file will be lost upon recompilation of the source schema. \n\
 	Generated on: {0} \n
 
 Driver.Version = \
-	xjc version "JAXB 2.0 in JDK 1.6" \n\
-	JavaTM Architecture for XML Binding(JAXB) Reference Implementation, (build JAXB 2.0 in JDK 1.6)	
+	xjc version "JAXB 2.1.3" \n\
+	JavaTM Architecture for XML Binding(JAXB) Reference Implementation, (build JAXB 2.1.3 in JDK)	
 
-Driver.BuildID = JAXB 2.0 in JDK 1.6
+Driver.BuildID = JAXB 2.1.3 in JDK
 	
 # see java.text.SimpleDateFormat for format syntax
 Driver.DateFormat = \
@@ -195,9 +214,6 @@ ModelLoader.TooManySchema = \
 ModelLoader.BindingFileNotSupportedForRNC = \
     External binding files are not supported for the RELAX NG compact syntax.
 
-Driver.MissingVersion = \
-	the -source option is missing the version value
-
 Driver.DefaultVersion = \
 	Defaulting the version to JAXB 2.0
 
@@ -216,6 +232,13 @@ Driver.NotAFileNorURL = \
 FIELD_RENDERER_CONFLICT = \
     "-{0}" and "-{1}" are mutually exclusive since both affect the code generation 
 
-NAME_CONVERTER_CONFLICT - \
+NAME_CONVERTER_CONFLICT = \
     "-{0}" and "-{1}" are mutually exclusive since both affect the code generation
+
+FAILED_TO_LOAD = \
+    Failed to load "{0}": {1}
+
+PLUGIN_LOAD_FAILURE = \
+    Failure to load a plugin: "{0}". Use the system property ''-Dcom.sun.tools.internal.xjc.Options.findServices=true'' to \
+    diagnose it further
  
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/Messages.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/Messages.java
index ea3268f8bc6..ac06d6b1319 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/Messages.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/Messages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,30 +65,15 @@ class Messages
     static final String EXPERIMENTAL_LANGUAGE_WARNING = // 2 arg
         "Driver.ExperimentalLanguageWarning";
 
-    static final String MISSING_CLASSPATH = // 0 args
-        "Driver.MissingClassPath";
-
-    static final String MISSING_DIR = // 0 args
-        "Driver.MissingDir";
-
     static final String NON_EXISTENT_DIR = // 1 arg
         "Driver.NonExistentDir";
 
-    static final String MISSING_FILENAME = // 0 args
-        "Driver.MissingFileName";
-
-    static final String MISSING_PACKAGENAME = // 0 args
-        "Driver.MissingPackageName";
-
     static final String MISSING_RUNTIME_PACKAGENAME = // 0 args
         "Driver.MissingRuntimePackageName";
 
     static final String MISSING_MODE_OPERAND = // 0 args
         "Driver.MissingModeOperand";
 
-    static final String MISSING_CATALOG = // 0 args
-        "Driver.MissingCatalog";
-
     static final String MISSING_COMPATIBILITY_OPERAND = // 0 args
         "Driver.MissingCompatibilityOperand";
 
@@ -104,6 +89,12 @@ class Messages
     static final String ILLEGAL_PROXY = // 1 arg
         "Driver.ILLEGAL_PROXY";
 
+    static final String ILLEGAL_TARGET_VERSION = // 1 arg
+        "Driver.ILLEGAL_TARGET_VERSION";
+
+    static final String MISSING_OPERAND = // 1 arg
+        "Driver.MissingOperand";
+
     static final String MISSING_PROXYHOST = // 0 args
         "Driver.MissingProxyHost";
 
@@ -170,9 +161,6 @@ class Messages
     static final String ERR_BINDING_FILE_NOT_SUPPORTED_FOR_RNC = // 0 args
         "ModelLoader.BindingFileNotSupportedForRNC";
 
-     static final String MISSING_VERSION = // 0 args
-        "Driver.MissingVersion";
-
     static final String DEFAULT_VERSION = // 0 args
         "Driver.DefaultVersion";
 
@@ -190,5 +178,10 @@ class Messages
         "FIELD_RENDERER_CONFLICT";
 
     static final String NAME_CONVERTER_CONFLICT = // 2 args
-            "NAME_CONVERTER_CONFLICT";
+        "NAME_CONVERTER_CONFLICT";
+    static final String FAILED_TO_LOAD = // 2 args
+        "FAILED_TO_LOAD";
+
+    static final String PLUGIN_LOAD_FAILURE = // 1 arg
+        "PLUGIN_LOAD_FAILURE";
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/ModelLoader.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/ModelLoader.java
index 5c84f6af71d..12dd6f1388d 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/ModelLoader.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/ModelLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc;
 
 import java.io.IOException;
@@ -37,6 +36,7 @@ import com.sun.tools.internal.xjc.reader.internalizer.DOMForest;
 import com.sun.tools.internal.xjc.reader.internalizer.DOMForestScanner;
 import com.sun.tools.internal.xjc.reader.internalizer.InternalizationLogic;
 import com.sun.tools.internal.xjc.reader.internalizer.VersionChecker;
+import com.sun.tools.internal.xjc.reader.internalizer.SCDBasedBindingSet;
 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;
@@ -89,6 +89,11 @@ public final class ModelLoader {
     private final Options opt;
     private final ErrorReceiverFilter errorReceiver;
     private final JCodeModel codeModel;
+    /**
+     * {@link DOMForest#transform(boolean)} creates this on the side.
+     */
+    private SCDBasedBindingSet scdBasedBindingSet;
+
 
     /**
      * A convenience method to load schemas into a {@link Model}.
@@ -177,6 +182,9 @@ public final class ModelLoader {
                     e.printStackTrace();
             }
             return null;
+        } catch (AbortException e) {
+            // error should have been reported already, since this is requested by the error receiver
+            return null;
         }
     }
 
@@ -297,11 +305,14 @@ public final class ModelLoader {
         forest.setEntityResolver(opt.entityResolver);
 
         // parse source grammars
-        for (InputSource value : opt.getGrammars())
+        for (InputSource value : opt.getGrammars()) {
+            errorReceiver.pollAbort();
             forest.parse(value, true);
+        }
 
         // parse external binding files
         for (InputSource value : opt.getBindFiles()) {
+            errorReceiver.pollAbort();
             Document dom = forest.parse(value, true);
             if(dom==null)       continue;   // error must have been reported
             Element root = dom.getDocumentElement();
@@ -317,7 +328,7 @@ public final class ModelLoader {
                         -1, -1));
         }
 
-        forest.transform();
+        scdBasedBindingSet = forest.transform(opt.isExtensionMode());
 
         return forest;
     }
@@ -350,7 +361,7 @@ public final class ModelLoader {
         // the default slower way is to parse everything into DOM first.
         // so that we can take external annotations into account.
         DOMForest forest = buildDOMForest( new XMLSchemaInternalizationLogic() );
-        return createXSOM(forest);
+        return createXSOM(forest, scdBasedBindingSet);
     }
 
     /**
@@ -479,18 +490,23 @@ public final class ModelLoader {
     /**
      * Parses a {@link DOMForest} into a {@link XSSchemaSet}.
      */
-    public XSSchemaSet createXSOM(DOMForest forest) throws SAXException {
+    public XSSchemaSet createXSOM(DOMForest forest, SCDBasedBindingSet scdBasedBindingSet) throws SAXException {
         // set up other parameters to XSOMParser
         XSOMParser reader = createXSOMParser(forest);
 
         // re-parse the transformed schemas
         for (String systemId : forest.getRootDocuments()) {
+            errorReceiver.pollAbort();
             Document dom = forest.get(systemId);
             if (!dom.getDocumentElement().getNamespaceURI().equals(Const.JAXB_NSURI))
                 reader.parse(systemId);
         }
 
-        return reader.getResult();
+        XSSchemaSet result = reader.getResult();
+
+        scdBasedBindingSet.apply(result,errorReceiver);
+
+        return result;
     }
 
     /**
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/Options.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/Options.java
index b741be4fdff..b81e4aa9f0a 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/Options.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/Options.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.lang.reflect.Array;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -50,6 +52,7 @@ import com.sun.codemodel.internal.writer.PrologCodeWriter;
 import com.sun.org.apache.xml.internal.resolver.CatalogManager;
 import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver;
 import com.sun.tools.internal.xjc.api.ClassNameAllocator;
+import com.sun.tools.internal.xjc.api.SpecVersion;
 import com.sun.tools.internal.xjc.generator.bean.field.FieldRendererFactory;
 import com.sun.tools.internal.xjc.model.Model;
 import com.sun.tools.internal.xjc.reader.Util;
@@ -96,6 +99,11 @@ public class Options
      */
     public boolean runtime14 = false;
 
+    /**
+     * If true, try to resolve name conflicts automatically by assigning mechanical numbers.
+     */
+    public boolean automaticNameConflictResolution = false;
+
     /**
      * strictly follow the compatibility rules and reject schemas that
      * contain features from App. E.2, use vendor binding extensions
@@ -114,6 +122,16 @@ public class Options
      */
     public int compatibilityMode = STRICT;
 
+    public boolean isExtensionMode() {
+        return compatibilityMode==EXTENSION;
+    }
+
+    /**
+     * Generates output for the specified version of the runtime.
+     */
+    public SpecVersion target = SpecVersion.V2_1;
+
+
     /** Target direcoty when producing files. */
     public File targetDir = new File(".");
 
@@ -376,12 +394,19 @@ public class Options
     }
 
     /**
-     * Adds a new input schema.
+     * Adds a new binding file.
      */
     public void addBindFile( InputSource is ) {
         bindFiles.add(absolutize(is));
     }
 
+    /**
+     * Adds a new binding file.
+     */
+    public void addBindFile( File bindFile ) {
+        bindFiles.add(fileToInputSource(bindFile));
+    }
+
     /**
      * Recursively scan directories and add all ".xjb" files in it.
      */
@@ -410,12 +435,9 @@ public class Options
      * @exception BadCommandLineException
      *      If the callee wants to provide a custom message for an error.
      */
-    protected int parseArgument( String[] args, int i ) throws BadCommandLineException {
+    public int parseArgument( String[] args, int i ) throws BadCommandLineException {
         if (args[i].equals("-classpath") || args[i].equals("-cp")) {
-            if (i == args.length - 1)
-                throw new BadCommandLineException(
-                    Messages.format(Messages.MISSING_CLASSPATH));
-            File file = new File(args[++i]);
+            File file = new File(requireArgument(args[i],args,++i));
             try {
                 classpaths.add(file.toURL());
             } catch (MalformedURLException e) {
@@ -425,10 +447,7 @@ public class Options
             return 2;
         }
         if (args[i].equals("-d")) {
-            if (i == args.length - 1)
-                throw new BadCommandLineException(
-                    Messages.format(Messages.MISSING_DIR));
-            targetDir = new File(args[++i]);
+            targetDir = new File(requireArgument("-d",args,++i));
             if( !targetDir.exists() )
                 throw new BadCommandLineException(
                     Messages.format(Messages.NON_EXISTENT_DIR,targetDir));
@@ -439,10 +458,7 @@ public class Options
             return 1;
         }
         if (args[i].equals("-p")) {
-            if (i == args.length - 1)
-                throw new BadCommandLineException(
-                    Messages.format(Messages.MISSING_PACKAGENAME));
-            defaultPackage = args[++i];
+            defaultPackage = requireArgument("-p",args,++i);
             if(defaultPackage.length()==0) { // user specified default package
                 // there won't be any package to annotate, so disable them
                 // automatically as a usability feature
@@ -479,12 +495,12 @@ public class Options
             runtime14 = true;
             return 1;
         }
+        if (args[i].equals("-XautoNameResolution")) {
+            automaticNameConflictResolution = true;
+            return 1;
+        }
         if (args[i].equals("-b")) {
-            if (i==args.length-1 || args[i + 1].startsWith("-"))
-                throw new BadCommandLineException(
-                    Messages.format(Messages.MISSING_FILENAME));
-
-            addFile(args[i + 1],bindFiles,".xjb");
+            addFile(requireArgument("-b",args,++i),bindFiles,".xjb");
             return 2;
         }
         if (args[i].equals("-dtd")) {
@@ -511,6 +527,13 @@ public class Options
             compatibilityMode = EXTENSION;
             return 1;
         }
+        if (args[i].equals("-target")) {
+            String token = requireArgument("-target",args,++i);
+            target = SpecVersion.parse(token);
+            if(target==null)
+                throw new BadCommandLineException(Messages.format(Messages.ILLEGAL_TARGET_VERSION,token));
+            return 2;
+        }
         if (args[i].equals("-httpproxyfile")) {
             if (i == args.length - 1 || args[i + 1].startsWith("-")) {
                 throw new BadCommandLineException(
@@ -544,32 +567,19 @@ public class Options
             return 2;
         }
         if (args[i].equals("-host")) {
-            // legacy option. we use -httpproxy for more control
-            if (i == args.length - 1 || args[i + 1].startsWith("-")) {
-                throw new BadCommandLineException(
-                    Messages.format(Messages.MISSING_PROXYHOST));
-            }
-            proxyHost = args[++i];
+            proxyHost = requireArgument("-host",args,++i);
             return 2;
         }
         if (args[i].equals("-port")) {
-            // legacy option. we use -httpproxy for more control
-            if (i == args.length - 1 || args[i + 1].startsWith("-")) {
-                throw new BadCommandLineException(
-                    Messages.format(Messages.MISSING_PROXYPORT));
-            }
-            proxyPort = args[++i];
+            proxyPort = requireArgument("-port",args,++i);
             return 2;
         }
         if( args[i].equals("-catalog") ) {
             // use Sun's "XML Entity and URI Resolvers" by Norman Walsh
             // to resolve external entities.
             // http://www.sun.com/xml/developers/resolver/
-            if (i == args.length - 1)
-                throw new BadCommandLineException(
-                    Messages.format(Messages.MISSING_CATALOG));
 
-            File catalogFile = new File(args[++i]);
+            File catalogFile = new File(requireArgument("-catalog",args,++i));
             try {
                 addCatalog(catalogFile);
             } catch (IOException e) {
@@ -579,14 +589,11 @@ public class Options
             return 2;
         }
         if (args[i].equals("-source")) {
-            if (i == args.length - 1)
-                throw new BadCommandLineException(
-                    Messages.format(Messages.MISSING_VERSION));
-            String version = args[++i];
+            String version = requireArgument("-source",args,++i);
             //For source 1.0 the 1.0 Driver is loaded
             //Hence anything other than 2.0 is defaulted to
             //2.0
-            if( !version.equals("2.0") )
+            if( !version.equals("2.0") && !version.equals("2.1") )
                 throw new BadCommandLineException(
                     Messages.format(Messages.DEFAULT_VERSION));
             return 2;
@@ -603,14 +610,23 @@ public class Options
 
         // see if this is one of the extensions
         for( Plugin plugin : getAllPlugins() ) {
-            if( ('-'+plugin.getOptionName()).equals(args[i]) ) {
-                activePlugins.add(plugin);
-                plugin.onActivated(this);
-                pluginURIs.addAll(plugin.getCustomizationURIs());
-                return 1;
-            }
-
             try {
+                if( ('-'+plugin.getOptionName()).equals(args[i]) ) {
+                    activePlugins.add(plugin);
+                    plugin.onActivated(this);
+                    pluginURIs.addAll(plugin.getCustomizationURIs());
+
+                    // give the plugin a chance to parse arguments to this option.
+                    // this is new in 2.1, and due to the backward compatibility reason,
+                    // if plugin didn't understand it, we still return 1 to indicate
+                    // that this option is consumed.
+                    int r = plugin.parseArgument(this,args,i);
+                    if(r!=0)
+                        return r;
+                    else
+                        return 1;
+                }
+
                 int r = plugin.parseArgument(this,args,i);
                 if(r!=0)    return r;
             } catch (IOException e) {
@@ -641,6 +657,17 @@ public class Options
         }
     }
 
+    /**
+     * Obtains an operand and reports an error if it's not there.
+     */
+    public String requireArgument(String optionName, String[] args, int i) throws BadCommandLineException {
+        if (i == args.length || args[i].startsWith("-")) {
+            throw new BadCommandLineException(
+                Messages.format(Messages.MISSING_OPERAND,optionName));
+        }
+        return args[i];
+    }
+
     /**
      * Parses a token to a file (or a set of files)
      * and add them as {@link InputSource} to the specified list.
@@ -698,7 +725,10 @@ public class Options
                         Messages.format(Messages.UNRECOGNIZED_PARAMETER, args[i]));
                 i += (j-1);
             } else {
-                addFile(args[i],grammars,".xsd");
+                if(args[i].endsWith(".jar"))
+                    scanEpisodeFile(new File(args[i]));
+                else
+                    addFile(args[i],grammars,".xsd");
             }
         }
 
@@ -729,6 +759,27 @@ public class Options
 
         if( schemaLanguage==null )
             schemaLanguage = guessSchemaLanguage();
+
+        if(pluginLoadFailure!=null)
+            throw new BadCommandLineException(
+                Messages.format(Messages.PLUGIN_LOAD_FAILURE,pluginLoadFailure));
+    }
+
+    /**
+     * Finds the META-INF/sun-jaxb.episode file to add as a binding customization.
+     */
+    private void scanEpisodeFile(File jar) throws BadCommandLineException {
+        try {
+            URLClassLoader ucl = new URLClassLoader(new URL[]{jar.toURL()});
+            Enumeration resources = ucl.findResources("META-INF/sun-jaxb.episode");
+            while (resources.hasMoreElements()) {
+                URL url = resources.nextElement();
+                addBindFile(new InputSource(url.toExternalForm()));
+            }
+        } catch (IOException e) {
+            throw new BadCommandLineException(
+                    Messages.format(Messages.FAILED_TO_LOAD,jar,e.getMessage()), e);
+        }
     }
 
 
@@ -767,6 +818,14 @@ public class Options
         if(noFileHeader)
             return core;
 
+        return new PrologCodeWriter( core,getPrologComment() );
+    }
+
+    /**
+     * Gets the string suitable to be used as the prolog comment baked into artifacts.
+     * This is the string like "This file was generated by the JAXB RI on YYYY/mm/dd..."
+     */
+    public String getPrologComment() {
         // generate format syntax:  'at' 
    
+     * Starting 2.1, when an option matches the name returned
+     * from this method, XJC will then invoke {@link #parseArgument(Options, String[], int)},
+     * allowing plugins to handle arguments to this option.
      */
     public abstract String getOptionName();
 
@@ -227,7 +232,13 @@ public abstract class Plugin {
      *      If the add-on executes successfully, return true.
      *      If it detects some errors but those are reported and
      *      recovered gracefully, return false.
+     *
+     * @throws SAXException
+     *      After an error is reported to {@link ErrorHandler}, the
+     *      same exception can be thrown to indicate a fatal irrecoverable
+     *      error. {@link ErrorHandler} itself may throw it, if it chooses
+     *      not to recover from the error.
      */
     public abstract boolean run(
-        Outline outline, Options opt, ErrorHandler errorHandler );
+        Outline outline, Options opt, ErrorHandler errorHandler ) throws SAXException ;
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/ProgressCodeWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/ProgressCodeWriter.java
index b0dc87c6418..d5c715d8967 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/ProgressCodeWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/ProgressCodeWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc;
 
 import java.io.File;
@@ -67,6 +66,8 @@ final class ProgressCodeWriter extends FilterCodeWriter {
         if(name.length()!=0)    name +=     File.separatorChar;
         name += fileName;
 
+        if(progress.isCanceled())
+            throw new AbortException();
         progress.generatedFile(name,current++,totalFileCount);
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/SchemaCache.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/SchemaCache.java
index c419344afe6..2ed1b6c75b6 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/SchemaCache.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/SchemaCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc;
 
 import java.lang.reflect.Field;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/XJCListener.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/XJCListener.java
index 9df0cd3e9cf..8f644cac0ae 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/XJCListener.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/XJCListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc;
 
 import java.io.PrintStream;
@@ -93,4 +92,27 @@ public abstract class XJCListener implements ErrorListener {
      *      never null. this is the root object that represents the code generation strategy.
      */
     public void compiled(Outline outline) {}
+
+    /**
+     * XJC will periodically invoke this method to see if it should cancel a compilation.
+     *
+     * 
    
+     * As long as this method returns false, XJC will keep going. If this method ever returns
+     * true, XJC will abort the processing right away and
+     * returns non-zero from {@link Driver#run(String[], XJCListener)}.
+     * Note that XJC will not report an abortion through the {@link #message(String)} method.
+     *
+     * 
    
+     * Note that despite all the efforts to check this method frequently, XJC may still fail to
+     * invoke this method for a long time. Such scenario would include network related problems
+     * or other I/O block (you can't even interrupt the thread while I/O is blocking.)
+     * So just beware that this is not a cure-all.
+     *
+     * @return
+     *      true if the {@link XJCListener} wants to abort the processing.
+     * @since 2.1
+     */
+    public boolean isCanceled() {
+        return false;
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/at_generated/PluginImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/at_generated/PluginImpl.java
index 6b72ddcfde2..8ffd942fda5 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/at_generated/PluginImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/at_generated/PluginImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.addon.at_generated;
 
 import java.text.SimpleDateFormat;
@@ -91,7 +90,7 @@ public class PluginImpl extends Plugin {
         m.annotate(annotation)
                 .param("value",Driver.class.getName())
                 .param("date", getISO8601Date())
-                .param("comment", "JAXB RI v" + Options.getBuildID());
+                .param("comments", "JAXB RI v" + Options.getBuildID());
     }
 
     // cache the timestamp so that all the @Generated annotations match
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/code_injector/Const.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/code_injector/Const.java
index f7ec9858c6b..324d137f7eb 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/code_injector/Const.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/code_injector/Const.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.addon.code_injector;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/code_injector/PluginImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/code_injector/PluginImpl.java
index 999c1908364..1c31b0be46e 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/code_injector/PluginImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/code_injector/PluginImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.addon.code_injector;
 
 import java.util.Collections;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/episode/PluginImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/episode/PluginImpl.java
new file mode 100644
index 00000000000..6adfe737371
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/episode/PluginImpl.java
@@ -0,0 +1,244 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.tools.internal.xjc.addon.episode;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.sun.tools.internal.xjc.BadCommandLineException;
+import com.sun.tools.internal.xjc.Options;
+import com.sun.tools.internal.xjc.Plugin;
+import com.sun.tools.internal.xjc.outline.ClassOutline;
+import com.sun.tools.internal.xjc.outline.Outline;
+import com.sun.tools.internal.xjc.reader.Const;
+import com.sun.xml.internal.txw2.TXW;
+import com.sun.xml.internal.txw2.output.StreamSerializer;
+import com.sun.xml.internal.xsom.XSAnnotation;
+import com.sun.xml.internal.xsom.XSAttGroupDecl;
+import com.sun.xml.internal.xsom.XSAttributeDecl;
+import com.sun.xml.internal.xsom.XSAttributeUse;
+import com.sun.xml.internal.xsom.XSComplexType;
+import com.sun.xml.internal.xsom.XSComponent;
+import com.sun.xml.internal.xsom.XSContentType;
+import com.sun.xml.internal.xsom.XSDeclaration;
+import com.sun.xml.internal.xsom.XSElementDecl;
+import com.sun.xml.internal.xsom.XSFacet;
+import com.sun.xml.internal.xsom.XSIdentityConstraint;
+import com.sun.xml.internal.xsom.XSModelGroup;
+import com.sun.xml.internal.xsom.XSModelGroupDecl;
+import com.sun.xml.internal.xsom.XSNotation;
+import com.sun.xml.internal.xsom.XSParticle;
+import com.sun.xml.internal.xsom.XSSchema;
+import com.sun.xml.internal.xsom.XSSimpleType;
+import com.sun.xml.internal.xsom.XSWildcard;
+import com.sun.xml.internal.xsom.XSXPath;
+import com.sun.xml.internal.xsom.visitor.XSFunction;
+import com.sun.xml.internal.bind.v2.schemagen.episode.Bindings;
+
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+
+/**
+ * Creates the episode file,
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public class PluginImpl extends Plugin {
+
+    private File episodeFile;
+
+    public String getOptionName() {
+        return "episode";
+    }
+
+    public String getUsage() {
+        return "  -episode     :  generate the episode file for separate compilation";
+    }
+
+    public int parseArgument(Options opt, String[] args, int i) throws BadCommandLineException, IOException {
+        if(args[i].equals("-episode")) {
+            episodeFile = new File(opt.requireArgument("-episode",args,++i));
+            return 2;
+        }
+        return 0;
+    }
+
+    /**
+     * Capture all the generated classes from global schema components
+     * and generate them in an episode file.
+     */
+    public boolean run(Outline model, Options opt, ErrorHandler errorHandler) throws SAXException {
+        try {
+            // reorganize qualifying components by their namespaces to
+            // generate the list nicely
+            Map> perSchema = new HashMap>();
+            boolean hasComponentInNoNamespace = false;
+
+            for( ClassOutline co : model.getClasses() ) {
+                XSComponent sc = co.target.getSchemaComponent();
+                if(sc==null)        continue;
+                if (!(sc instanceof XSDeclaration))
+                    continue;
+                XSDeclaration decl = (XSDeclaration) sc;
+                if(decl.isLocal())
+                    continue;   // local components cannot be referenced from outside, so no need to list.
+
+                List list = perSchema.get(decl.getOwnerSchema());
+                if(list==null) {
+                    list = new ArrayList();
+                    perSchema.put(decl.getOwnerSchema(),list);
+                }
+
+                list.add(co);
+
+                if(decl.getTargetNamespace().equals(""))
+                    hasComponentInNoNamespace = true;
+            }
+
+            OutputStream os = new FileOutputStream(episodeFile);
+            Bindings bindings = TXW.create(Bindings.class, new StreamSerializer(os, "UTF-8"));
+            if(hasComponentInNoNamespace) // otherwise jaxb binding NS should be the default namespace
+                bindings._namespace(Const.JAXB_NSURI,"jaxb");
+            else
+                bindings._namespace(Const.JAXB_NSURI,"");
+            bindings.version("2.1");
+            bindings._comment("\n\n"+opt.getPrologComment()+"\n  ");
+
+            // generate listing per schema
+            for (Map.Entry> e : perSchema.entrySet()) {
+                Bindings group = bindings.bindings();
+                String tns = e.getKey().getTargetNamespace();
+                if(!tns.equals(""))
+                    group._namespace(tns,"tns");
+
+                group.scd("x-schema::"+(tns.equals("")?"":"tns"));
+                group.schemaBindings().map(false);
+
+                for (ClassOutline co : e.getValue()) {
+                    Bindings child = group.bindings();
+                    child.scd(co.target.getSchemaComponent().apply(SCD));
+                    child.klass().ref(co.implClass.fullName());
+                }
+                group.commit(true);
+            }
+
+            bindings.commit();
+
+            return true;
+        } catch (IOException e) {
+            errorHandler.error(new SAXParseException("Failed to write to "+episodeFile,null,e));
+            return false;
+        }
+    }
+
+    /**
+     * Computes SCD.
+     * This is fairly limited as JAXB can only map a certain kind of components to classes.
+     */
+    private static final XSFunction SCD = new XSFunction() {
+        private String name(XSDeclaration decl) {
+            if(decl.getTargetNamespace().equals(""))
+                return decl.getName();
+            else
+                return "tns:"+decl.getName();
+        }
+
+        public String complexType(XSComplexType type) {
+            return "~"+name(type);
+        }
+
+        public String simpleType(XSSimpleType simpleType) {
+            return "~"+name(simpleType);
+        }
+
+        public String elementDecl(XSElementDecl decl) {
+            return name(decl);
+        }
+
+        // the rest is doing nothing
+        public String annotation(XSAnnotation ann) {
+            throw new UnsupportedOperationException();
+        }
+
+        public String attGroupDecl(XSAttGroupDecl decl) {
+            throw new UnsupportedOperationException();
+        }
+
+        public String attributeDecl(XSAttributeDecl decl) {
+            throw new UnsupportedOperationException();
+        }
+
+        public String attributeUse(XSAttributeUse use) {
+            throw new UnsupportedOperationException();
+        }
+
+        public String schema(XSSchema schema) {
+            throw new UnsupportedOperationException();
+        }
+
+        public String facet(XSFacet facet) {
+            throw new UnsupportedOperationException();
+        }
+
+        public String notation(XSNotation notation) {
+            throw new UnsupportedOperationException();
+        }
+
+        public String identityConstraint(XSIdentityConstraint decl) {
+            throw new UnsupportedOperationException();
+        }
+
+        public String xpath(XSXPath xpath) {
+            throw new UnsupportedOperationException();
+        }
+
+        public String particle(XSParticle particle) {
+            throw new UnsupportedOperationException();
+        }
+
+        public String empty(XSContentType empty) {
+            throw new UnsupportedOperationException();
+        }
+
+        public String wildcard(XSWildcard wc) {
+            throw new UnsupportedOperationException();
+        }
+
+        public String modelGroupDecl(XSModelGroupDecl decl) {
+            throw new UnsupportedOperationException();
+        }
+
+        public String modelGroup(XSModelGroup group) {
+            throw new UnsupportedOperationException();
+        }
+    };
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/episode/package-info.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/episode/package-info.java
new file mode 100644
index 00000000000..f8943dd5928
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/episode/package-info.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+@XmlNamespace(Const.JAXB_NSURI)
+package com.sun.tools.internal.xjc.addon.episode;
+
+import com.sun.xml.internal.txw2.annotation.XmlNamespace;
+import com.sun.tools.internal.xjc.reader.Const;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/locator/SourceLocationAddOn.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/locator/SourceLocationAddOn.java
index b3522842ee2..8917dde2f97 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/locator/SourceLocationAddOn.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/locator/SourceLocationAddOn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.addon.locator;
 
 import java.io.IOException;
@@ -32,6 +31,7 @@ import javax.xml.bind.annotation.XmlTransient;
 import com.sun.codemodel.internal.JDefinedClass;
 import com.sun.codemodel.internal.JMod;
 import com.sun.codemodel.internal.JVar;
+import com.sun.codemodel.internal.JMethod;
 import com.sun.tools.internal.xjc.BadCommandLineException;
 import com.sun.tools.internal.xjc.Options;
 import com.sun.tools.internal.xjc.Plugin;
@@ -80,6 +80,10 @@ public class SourceLocationAddOn extends Plugin {
                 impl._implements(Locatable.class);
 
                 impl.method(JMod.PUBLIC, Locator.class, "sourceLocation").body()._return($loc);
+
+                JMethod setter = impl.method(JMod.PUBLIC, Void.TYPE, "setSourceLocation");
+                JVar $newLoc = setter.param(Locator.class, "newLocator");
+                setter.body().assign($loc, $newLoc);
             }
         }
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/sync/SynchronizedMethodAddOn.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/sync/SynchronizedMethodAddOn.java
index 100ccb09265..ef79081bd19 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/sync/SynchronizedMethodAddOn.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/sync/SynchronizedMethodAddOn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.addon.sync;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/ClassNameAllocator.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/ClassNameAllocator.java
index cad2d41f4d8..9b26d0973b7 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/ClassNameAllocator.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/ClassNameAllocator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.api;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/ErrorListener.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/ErrorListener.java
index a83d3133002..8638aad3d98 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/ErrorListener.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/ErrorListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.api;
 
 import org.xml.sax.ErrorHandler;
@@ -43,7 +42,7 @@ import org.xml.sax.SAXParseException;
  *
  * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
  */
-public interface ErrorListener extends ErrorHandler {
+public interface ErrorListener extends com.sun.xml.internal.bind.api.ErrorListener {
     void error(SAXParseException exception);
     void fatalError(SAXParseException exception);
     void warning(SAXParseException exception);
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/J2SJAXBModel.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/J2SJAXBModel.java
index 2fa01545506..f8b79676954 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/J2SJAXBModel.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/J2SJAXBModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.api;
 
 import java.io.IOException;
 
 import javax.xml.bind.SchemaOutputResolver;
 import javax.xml.namespace.QName;
+import javax.xml.transform.Result;
 
 /**
  * {@link JAXBModel} that exposes additional information available
@@ -56,20 +56,6 @@ public interface J2SJAXBModel extends JAXBModel {
     /**
      * Generates the schema documents from the model.
      *
-     * 
    
-     * The caller can use the additionalElementDecls parameter to
-     * 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
-     *
-     * then JAXB generates the following element declaration (in the schema
-     * document for the namespace "foo")"
-     *
-     * <xs:element name="bar" type="xs:string" />
-     *
-     * This can be used for generating schema components necessary for WSDL.
-     *
      * @param outputResolver
      *      this object controls the output to which schemas
      *      will be sent.
@@ -78,4 +64,18 @@ public interface J2SJAXBModel extends JAXBModel {
      *      if {@link SchemaOutputResolver} throws an {@link IOException}.
      */
     void generateSchema(SchemaOutputResolver outputResolver, ErrorListener errorListener) throws IOException;
+
+    /**
+     * Generates the episode file from the model.
+     *
+     * 
    
+     * The "episode file" is really just a JAXB customization file (but with vendor extensions,
+     * at this point), that can be used later with a schema compilation to support separate
+     * compilation.
+     *
+     * @param output
+     *      This receives the generated episode file.
+     * @since 2.1
+     */
+    void generateEpisodeFile(Result output);
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/JAXBModel.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/JAXBModel.java
index c586246e922..55d72fa1f1e 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/JAXBModel.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/JAXBModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.api;
 
 import java.util.List;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/JavaCompiler.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/JavaCompiler.java
index a5840c2e901..eea00475d51 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/JavaCompiler.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/JavaCompiler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.api;
 
 import java.util.Collection;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/Mapping.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/Mapping.java
index 14db890f4c0..af03a583455 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/Mapping.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/Mapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.api;
 
 import java.util.List;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/Property.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/Property.java
index 23d25128fd7..e29fc25a32f 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/Property.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/Property.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.api;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/Reference.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/Reference.java
index b5e6325b4d9..41ff0a69a6b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/Reference.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/Reference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.api;
 
 import com.sun.mirror.apt.AnnotationProcessorEnvironment;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/S2JJAXBModel.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/S2JJAXBModel.java
index b84f89b67f5..a5c4c29c5aa 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/S2JJAXBModel.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/S2JJAXBModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,15 +22,17 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.api;
 
 import java.util.Collection;
+import java.util.List;
 
 import javax.xml.namespace.QName;
+import javax.xml.bind.annotation.XmlSeeAlso;
 
 import com.sun.codemodel.internal.CodeWriter;
 import com.sun.codemodel.internal.JCodeModel;
+import com.sun.codemodel.internal.JClass;
 import com.sun.tools.internal.xjc.Options;
 import com.sun.tools.internal.xjc.Plugin;
 
@@ -50,6 +52,15 @@ public interface S2JJAXBModel extends JAXBModel {
      */
     Mapping get( QName elementName );
 
+    /**
+     * Gets all the ObjectFactory classes generated by the compilation.
+     *
+     * 
    
+     * This should be used for generating {@link XmlSeeAlso} on the SEI.
+     */
+    List getAllObjectFactories();
+
+
     /**
      * Gets a read-only view of all the {@link Mapping}s.
      */
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/SchemaCompiler.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/SchemaCompiler.java
index 53b8b8fbbc0..36adf48a0a9 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/SchemaCompiler.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/SchemaCompiler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.api;
 
 import javax.xml.stream.XMLStreamException;
@@ -97,6 +96,16 @@ public interface SchemaCompiler {
      */
     void parseSchema( InputSource source );
 
+    /**
+     * Specifies the target spec version for this compilaion.
+     *
+     * @param version
+     *      If null, XJC will generate the source code that
+     *      takes advantage of the latest JAXB spec that it understands.
+     * @since 2.1 EA2
+     */
+    void setTargetVersion( SpecVersion version );
+
     /**
      * Parses a schema or an external binding file
      * from the specified DOM element.
@@ -202,6 +211,13 @@ public interface SchemaCompiler {
      */
     void setClassNameAllocator( ClassNameAllocator allocator );
 
+    /**
+     * Clears all the schema files parsed so far.
+     *
+     * @since 2.1.1
+     */
+    void resetSchema();
+
     /**
      * Obtains the compiled schema object model.
      *
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/SpecVersion.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/SpecVersion.java
new file mode 100644
index 00000000000..de2081b7bfd
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/SpecVersion.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.tools.internal.xjc.api;
+
+/**
+ * Represents the spec version constant.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public enum SpecVersion {
+    V2_0, V2_1;
+
+    /**
+     * Returns true if this version is equal or later than the given one.
+     */
+    public boolean isLaterThan(SpecVersion t) {
+        return this.ordinal()>=t.ordinal();
+    }
+
+    /**
+     * Parses "2.0" and "2.1" into the {@link SpecVersion} object.
+     *
+     * @return null for parsing failure.
+     */
+    public static SpecVersion parse(String token) {
+        if(token.equals("2.0"))
+            return V2_0;
+        else
+        if(token.equals("2.1"))
+            return V2_1;
+        return null;
+    }
+
+    public static final SpecVersion LATEST = V2_1;
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/TypeAndAnnotation.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/TypeAndAnnotation.java
index 660f61006d4..48ff3c414bb 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/TypeAndAnnotation.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/TypeAndAnnotation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.api;
 
 import com.sun.codemodel.internal.JAnnotatable;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/XJC.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/XJC.java
index 2f9e5b9fe14..734dd417dc7 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/XJC.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/XJC.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.api;
 
 import com.sun.tools.internal.xjc.api.impl.j2s.JavaCompilerImpl;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/JAXBModelImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/JAXBModelImpl.java
index 93be90b235c..fcc3654a1c3 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/JAXBModelImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/JAXBModelImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.api.impl.j2s;
 
 import java.io.IOException;
@@ -37,6 +36,7 @@ import javax.xml.bind.SchemaOutputResolver;
 import javax.xml.bind.annotation.XmlList;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import javax.xml.namespace.QName;
+import javax.xml.transform.Result;
 
 import com.sun.mirror.declaration.FieldDeclaration;
 import com.sun.mirror.declaration.MethodDeclaration;
@@ -57,6 +57,7 @@ import com.sun.xml.internal.bind.v2.model.core.Ref;
 import com.sun.xml.internal.bind.v2.model.core.TypeInfoSet;
 import com.sun.xml.internal.bind.v2.model.nav.Navigator;
 import com.sun.xml.internal.bind.v2.schemagen.XmlSchemaGenerator;
+import com.sun.xml.internal.txw2.output.ResultFactory;
 
 /**
  * @author Kohsuke Kawaguchi (kk@kohsuke.org)
@@ -71,6 +72,11 @@ final class JAXBModelImpl implements J2SJAXBModel {
 
     private final AnnotationReader reader;
 
+    /**
+     * Lazily created schema generator.
+     */
+    private XmlSchemaGenerator xsdgen;
+
     /**
      * Look up table from an externally visible {@link Reference} object
      * to our internal format.
@@ -160,21 +166,29 @@ final class JAXBModelImpl implements J2SJAXBModel {
     }
 
     public void generateSchema(SchemaOutputResolver outputResolver, ErrorListener errorListener) throws IOException {
-        XmlSchemaGenerator xsdgen
-            = new XmlSchemaGenerator( types.getNavigator(), types );
+        getSchemaGenerator().write(outputResolver,errorListener);
+    }
 
-        for (Map.Entry e : additionalElementDecls.entrySet()) {
-            Reference value = e.getValue();
-            if(value!=null) {
-                NonElement typeInfo = refMap.get(value);
-                if(typeInfo==null)
-                    throw new IllegalArgumentException(e.getValue()+" was not specified to JavaCompiler.bind");
-                xsdgen.add(e.getKey(),!(value.type instanceof PrimitiveType),typeInfo);
-            } else {
-                xsdgen.add(e.getKey(),false,null);
+    public void generateEpisodeFile(Result output) {
+        getSchemaGenerator().writeEpisodeFile(ResultFactory.createSerializer(output));
+    }
+
+    private synchronized XmlSchemaGenerator getSchemaGenerator() {
+        if(xsdgen==null) {
+            xsdgen = new XmlSchemaGenerator( types.getNavigator(), types );
+
+            for (Map.Entry e : additionalElementDecls.entrySet()) {
+                Reference value = e.getValue();
+                if(value!=null) {
+                    NonElement typeInfo = refMap.get(value);
+                    if(typeInfo==null)
+                        throw new IllegalArgumentException(e.getValue()+" was not specified to JavaCompiler.bind");
+                    xsdgen.add(e.getKey(),!(value.type instanceof PrimitiveType),typeInfo);
+                } else {
+                    xsdgen.add(e.getKey(),false,null);
+                }
             }
         }
-
-        xsdgen.write(outputResolver);
+        return xsdgen;
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/JavaCompilerImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/JavaCompilerImpl.java
index 4c91985b9b4..9f8fe42f0ff 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/JavaCompilerImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/JavaCompilerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.api.impl.j2s;
 
 import java.util.Collection;
@@ -65,8 +64,8 @@ public class JavaCompilerImpl implements JavaCompiler {
             new ModelBuilder(
                 InlineAnnotationReaderImpl.theInstance,
                 new APTNavigator(env),
-                defaultNamespaceRemap
-            );
+                Collections.emptyMap(),
+                defaultNamespaceRemap );
 
         builder.setErrorHandler(new ErrorHandlerImpl(env.getMessager()));
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/Messages.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/Messages.java
index 9bcad5eae27..f20ae0091e9 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/Messages.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/Messages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.api.impl.j2s;
 
 import java.text.MessageFormat;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/Messages.properties b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/Messages.properties
index 8d1c8b69c3f..a36f23969e7 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/Messages.properties
@@ -1 +1,26 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
  
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/AbstractMappingImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/AbstractMappingImpl.java
index 33dd3737108..7e59811f034 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/AbstractMappingImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/AbstractMappingImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.api.impl.s2j;
 
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/BeanMappingImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/BeanMappingImpl.java
index 78fe662cfa7..dbd22d02fbb 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/BeanMappingImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/BeanMappingImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.api.impl.s2j;
 
 import java.util.List;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/DowngradingErrorHandler.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/DowngradingErrorHandler.java
index 2b5424e9773..0cefde91141 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/DowngradingErrorHandler.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/DowngradingErrorHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.api.impl.s2j;
 
 import org.xml.sax.ErrorHandler;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementAdapter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementAdapter.java
index b06930c3b10..5ae047dce4d 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementAdapter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.api.impl.s2j;
 
 import javax.xml.bind.JAXBElement;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementCollectionAdapter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementCollectionAdapter.java
index 73ad223cdca..9b5130bbb0b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementCollectionAdapter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementCollectionAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.api.impl.s2j;
 
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementMappingImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementMappingImpl.java
index 27d6f3747fd..d6bd0078a1a 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementMappingImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementMappingImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.api.impl.s2j;
 
 import java.util.List;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementSingleAdapter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementSingleAdapter.java
index f1c58448dc1..9b0914c131f 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementSingleAdapter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementSingleAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.api.impl.s2j;
 
 import javax.xml.bind.JAXBElement;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/JAXBModelImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/JAXBModelImpl.java
index db33507ee9e..8b84218bdc3 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/JAXBModelImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/JAXBModelImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.api.impl.s2j;
 
 import java.util.ArrayList;
@@ -34,6 +33,7 @@ import java.util.Map;
 import javax.xml.namespace.QName;
 
 import com.sun.codemodel.internal.JCodeModel;
+import com.sun.codemodel.internal.JClass;
 import com.sun.tools.internal.xjc.Plugin;
 import com.sun.tools.internal.xjc.api.ErrorListener;
 import com.sun.tools.internal.xjc.api.JAXBModel;
@@ -82,6 +82,13 @@ final class JAXBModelImpl implements S2JJAXBModel {
         return outline.getCodeModel();
     }
 
+    public List getAllObjectFactories() {
+        List r = new ArrayList();
+        for (PackageOutline pkg : outline.getAllPackageContexts()) {
+            r.add(pkg.objectFactory());
+        }
+        return r;
+    }
 
     public final Mapping get(QName elementName) {
         return byXmlName.get(elementName);
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/PropertyImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/PropertyImpl.java
index d4da9e69242..24a7cd023f8 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/PropertyImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/PropertyImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.api.impl.s2j;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/SchemaCompilerImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/SchemaCompilerImpl.java
index 76cd41609e0..c45c55a9e09 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/SchemaCompilerImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/SchemaCompilerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.api.impl.s2j;
 
 import java.net.MalformedURLException;
@@ -44,9 +43,11 @@ import com.sun.tools.internal.xjc.Options;
 import com.sun.tools.internal.xjc.api.ClassNameAllocator;
 import com.sun.tools.internal.xjc.api.ErrorListener;
 import com.sun.tools.internal.xjc.api.SchemaCompiler;
+import com.sun.tools.internal.xjc.api.SpecVersion;
 import com.sun.tools.internal.xjc.model.Model;
 import com.sun.tools.internal.xjc.outline.Outline;
 import com.sun.tools.internal.xjc.reader.internalizer.DOMForest;
+import com.sun.tools.internal.xjc.reader.internalizer.SCDBasedBindingSet;
 import com.sun.tools.internal.xjc.reader.xmlschema.parser.XMLSchemaInternalizationLogic;
 import com.sun.xml.internal.bind.unmarshaller.DOMScanner;
 import com.sun.xml.internal.xsom.XSSchemaSet;
@@ -80,7 +81,7 @@ public final class SchemaCompilerImpl extends ErrorReceiver implements SchemaCom
 
     protected final Options opts = new Options();
 
-    protected final DOMForest forest;
+    protected @NotNull DOMForest forest;
 
     /**
      * Set to true once an error is found.
@@ -88,9 +89,8 @@ public final class SchemaCompilerImpl extends ErrorReceiver implements SchemaCom
     private boolean hadError;
 
     public SchemaCompilerImpl() {
-        forest = new DOMForest(new XMLSchemaInternalizationLogic());
         opts.compatibilityMode = Options.EXTENSION;
-        forest.setErrorHandler(this);
+        resetSchema();
 
         if(System.getProperty("xjc-api.test")!=null) {
             opts.debugMode = true;
@@ -142,6 +142,12 @@ public final class SchemaCompilerImpl extends ErrorReceiver implements SchemaCom
         }
     }
 
+    public void setTargetVersion(SpecVersion version) {
+        if(version==null)
+            version = SpecVersion.LATEST;
+        opts.target = version;
+    }
+
     public void parseSchema(String systemId, XMLStreamReader reader) throws XMLStreamException {
         checkAbsoluteness(systemId);
         forest.parse(systemId,reader,true);
@@ -183,6 +189,12 @@ public final class SchemaCompilerImpl extends ErrorReceiver implements SchemaCom
         opts.classNameAllocator = allocator;
     }
 
+    public void resetSchema() {
+        forest = new DOMForest(new XMLSchemaInternalizationLogic());
+        forest.setErrorHandler(this);
+        forest.setEntityResolver(opts.entityResolver);
+    }
+
 
     public JAXBModelImpl bind() {
         // this has been problematic. turn it off.
@@ -190,7 +202,7 @@ public final class SchemaCompilerImpl extends ErrorReceiver implements SchemaCom
 //            return null;
 
         // internalization
-        forest.transform();
+        SCDBasedBindingSet scdBasedBindingSet = forest.transform(opts.isExtensionMode());
 
         if(!NO_CORRECTNESS_CHECK) {
             // correctness check
@@ -206,7 +218,7 @@ public final class SchemaCompilerImpl extends ErrorReceiver implements SchemaCom
         ModelLoader gl = new ModelLoader(opts,codeModel,this);
 
         try {
-            XSSchemaSet result = gl.createXSOM(forest);
+            XSSchemaSet result = gl.createXSOM(forest, scdBasedBindingSet);
             if(result==null)
                 return null;
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/TypeAndAnnotationImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/TypeAndAnnotationImpl.java
index f1baf829225..d5b8e5d34aa 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/TypeAndAnnotationImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/TypeAndAnnotationImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.api.impl.s2j;
 
 import javax.xml.bind.annotation.XmlAttachmentRef;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/package.html b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/package.html
index 1b17d19d9b6..8bdd2e235a0 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/package.html
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/package.html
@@ -1,3 +1,27 @@
+
 
 implementation of the XJC API for schema to java.
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/package.html b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/package.html
index 4ffeb746b1f..69fe3734d5b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/package.html
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/package.html
@@ -1,3 +1,27 @@
+
 
 API for programatic invocation of XJC and schemagen.
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/APTClassLoader.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/APTClassLoader.java
index 4ddff3363cf..f945cac8677 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/APTClassLoader.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/APTClassLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.api.util;
 
 import java.io.ByteArrayOutputStream;
@@ -33,6 +32,8 @@ import java.net.URL;
 import java.net.URLClassLoader;
 import java.net.MalformedURLException;
 
+import com.sun.istack.internal.Nullable;
+
 /**
  * {@link ClassLoader} that loads APT and specified classes
  * both into the same classloader, so that they can reference each other.
@@ -52,9 +53,9 @@ public final class APTClassLoader extends URLClassLoader {
      * @param packagePrefixes
      *      The package prefixes that are forced to resolve within this class loader.
      * @param parent
-     *      The parent class loader to delegate to.
+     *      The parent class loader to delegate to. Null to indicate bootstrap classloader.
      */
-    public APTClassLoader(ClassLoader parent, String[] packagePrefixes) throws ToolsJarNotFoundException {
+    public APTClassLoader(@Nullable ClassLoader parent, String[] packagePrefixes) throws ToolsJarNotFoundException {
         super(getToolsJar(parent),parent);
         if(getURLs().length==0)
             // if tools.jar was found in our classloader, no need to create
@@ -114,11 +115,11 @@ public final class APTClassLoader extends URLClassLoader {
      * Returns a class loader that can load classes from JDK tools.jar.
      * @param parent
      */
-    private static URL[] getToolsJar(ClassLoader parent) throws ToolsJarNotFoundException {
+    private static URL[] getToolsJar(@Nullable ClassLoader parent) throws ToolsJarNotFoundException {
 
         try {
-            parent.loadClass("com.sun.tools.javac.Main");
-            parent.loadClass("com.sun.tools.apt.Main");
+            Class.forName("com.sun.tools.javac.Main",false,parent);
+            Class.forName("com.sun.tools.apt.Main",false,parent);
             return new URL[0];
             // we can already load them in the parent class loader.
             // so no need to look for tools.jar.
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/FilerCodeWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/FilerCodeWriter.java
index 0c9268b38b0..f4cea0ff5c1 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/FilerCodeWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/FilerCodeWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.api.util;
 
 import java.io.File;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/Messages.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/Messages.java
index ecedc62bf39..a943935873b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/Messages.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/Messages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.api.util;
 
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/Messages.properties b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/Messages.properties
index ed10953a884..c7ce9e677d5 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/Messages.properties
@@ -1,3 +1,28 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.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.)
  
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/ToolsJarNotFoundException.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/ToolsJarNotFoundException.java
index c48a69d86b7..3158dec0837 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/ToolsJarNotFoundException.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/ToolsJarNotFoundException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.api.util;
 
 import java.io.File;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/package.html b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/package.html
index 3bd340f1231..2b3c194efe1 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/package.html
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/package.html
@@ -1,3 +1,27 @@
+
 
   Utility code shared between JAXB and JAX-WS
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/ri/XmlIsSetWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/ri/XmlIsSetWriter.java
index 1f6e652055e..b6618094995 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/ri/XmlIsSetWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/ri/XmlIsSetWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.tools.internal.xjc.generator.annotation.ri;
 
 import com.sun.codemodel.internal.JAnnotationWriter;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/ri/XmlLocationWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/ri/XmlLocationWriter.java
index 6cbcd8755ad..620fd3b3cb4 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/ri/XmlLocationWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/ri/XmlLocationWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.tools.internal.xjc.generator.annotation.ri;
 
 import com.sun.codemodel.internal.JAnnotationWriter;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorOrderWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorOrderWriter.java
index bc234d03430..49482e6a50e 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorOrderWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorOrderWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.tools.internal.xjc.generator.annotation.spec;
 
 import javax.xml.bind.annotation.XmlAccessOrder;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorTypeWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorTypeWriter.java
index e35e2b59e66..aa55e1f7e3b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorTypeWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorTypeWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.tools.internal.xjc.generator.annotation.spec;
 
 import javax.xml.bind.annotation.XmlAccessType;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyAttributeWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyAttributeWriter.java
index dbdba1ad383..918e658c119 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyAttributeWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyAttributeWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.tools.internal.xjc.generator.annotation.spec;
 
 import javax.xml.bind.annotation.XmlAnyAttribute;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyElementWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyElementWriter.java
index c6c39f7f54e..c469715c476 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyElementWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyElementWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.tools.internal.xjc.generator.annotation.spec;
 
 import javax.xml.bind.annotation.XmlAnyElement;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttachmentRefWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttachmentRefWriter.java
index fb913838242..3feae208e72 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttachmentRefWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttachmentRefWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.tools.internal.xjc.generator.annotation.spec;
 
 import javax.xml.bind.annotation.XmlAttachmentRef;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttributeWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttributeWriter.java
index 31a18cd7d37..567bb6bc00f 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttributeWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttributeWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.tools.internal.xjc.generator.annotation.spec;
 
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementDeclWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementDeclWriter.java
index dc6874422c4..a03fe818e2f 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementDeclWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementDeclWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.tools.internal.xjc.generator.annotation.spec;
 
 import javax.xml.bind.annotation.XmlElementDecl;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java
index 0cf5aceb6ab..fc8acb1c5b8 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.tools.internal.xjc.generator.annotation.spec;
 
 import javax.xml.bind.annotation.XmlElementRef;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefsWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefsWriter.java
index 1ad6aee79fc..47e94575e14 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefsWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefsWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.tools.internal.xjc.generator.annotation.spec;
 
 import javax.xml.bind.annotation.XmlElementRefs;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWrapperWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWrapperWriter.java
index c2341ff8c9b..77bc793adac 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWrapperWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWrapperWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.tools.internal.xjc.generator.annotation.spec;
 
 import javax.xml.bind.annotation.XmlElementWrapper;
@@ -38,6 +36,8 @@ public interface XmlElementWrapperWriter
 
     XmlElementWrapperWriter namespace(String value);
 
+    XmlElementWrapperWriter required(boolean value);
+
     XmlElementWrapperWriter nillable(boolean value);
 
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWriter.java
index 714f8072229..314871a4f01 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.tools.internal.xjc.generator.annotation.spec;
 
 import javax.xml.bind.annotation.XmlElement;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementsWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementsWriter.java
index 0707c544d2a..7383791a472 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementsWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementsWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.tools.internal.xjc.generator.annotation.spec;
 
 import javax.xml.bind.annotation.XmlElements;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumValueWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumValueWriter.java
index 802510539d8..80c1dfabace 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumValueWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumValueWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.tools.internal.xjc.generator.annotation.spec;
 
 import javax.xml.bind.annotation.XmlEnumValue;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumWriter.java
index 60422ecafe3..23c197e9454 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.tools.internal.xjc.generator.annotation.spec;
 
 import javax.xml.bind.annotation.XmlEnum;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDREFWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDREFWriter.java
index b768d9fda42..4d04be3faa9 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDREFWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDREFWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.tools.internal.xjc.generator.annotation.spec;
 
 import javax.xml.bind.annotation.XmlIDREF;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDWriter.java
index 367633b6640..e04c6c8e4e6 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.tools.internal.xjc.generator.annotation.spec;
 
 import javax.xml.bind.annotation.XmlID;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlInlineBinaryDataWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlInlineBinaryDataWriter.java
index 7f5cb4ae326..abcf5b82f5b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlInlineBinaryDataWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlInlineBinaryDataWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.tools.internal.xjc.generator.annotation.spec;
 
 import javax.xml.bind.annotation.XmlInlineBinaryData;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlJavaTypeAdapterWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlJavaTypeAdapterWriter.java
index 3fa1c9f73d9..850db87f845 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlJavaTypeAdapterWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlJavaTypeAdapterWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.tools.internal.xjc.generator.annotation.spec;
 
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlListWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlListWriter.java
index 9427b61dbe8..eee0a598271 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlListWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlListWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.tools.internal.xjc.generator.annotation.spec;
 
 import javax.xml.bind.annotation.XmlList;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMimeTypeWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMimeTypeWriter.java
index 8cc20db72c4..ecb545530ed 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMimeTypeWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMimeTypeWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.tools.internal.xjc.generator.annotation.spec;
 
 import javax.xml.bind.annotation.XmlMimeType;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMixedWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMixedWriter.java
index ec2f889e0ef..becdb29c0b8 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMixedWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMixedWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.tools.internal.xjc.generator.annotation.spec;
 
 import javax.xml.bind.annotation.XmlMixed;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlNsWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlNsWriter.java
index a034b11f5dc..14c14b1589c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlNsWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlNsWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.tools.internal.xjc.generator.annotation.spec;
 
 import javax.xml.bind.annotation.XmlNs;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRegistryWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRegistryWriter.java
index 3751af0b90c..aee953c2ffa 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRegistryWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRegistryWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.tools.internal.xjc.generator.annotation.spec;
 
 import javax.xml.bind.annotation.XmlRegistry;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRootElementWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRootElementWriter.java
index c2e123b80af..8197ca1ce90 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRootElementWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRootElementWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.tools.internal.xjc.generator.annotation.spec;
 
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypeWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypeWriter.java
index 04a2bd962e0..b4b2a4d2aee 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypeWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypeWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.tools.internal.xjc.generator.annotation.spec;
 
 import javax.xml.bind.annotation.XmlSchemaType;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypesWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypesWriter.java
index 2d6fbd7fafa..8137b66d746 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypesWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypesWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.tools.internal.xjc.generator.annotation.spec;
 
 import javax.xml.bind.annotation.XmlSchemaTypes;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaWriter.java
index f52b5360b5c..596ed15e0d1 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.tools.internal.xjc.generator.annotation.spec;
 
 import javax.xml.bind.annotation.XmlNsForm;
@@ -35,6 +33,8 @@ public interface XmlSchemaWriter
 {
 
 
+    XmlSchemaWriter location(String value);
+
     XmlSchemaWriter namespace(String value);
 
     XmlNsWriter xmlns();
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSeeAlsoWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSeeAlsoWriter.java
new file mode 100644
index 00000000000..f99907ed34b
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSeeAlsoWriter.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.tools.internal.xjc.generator.annotation.spec;
+
+import javax.xml.bind.annotation.XmlSeeAlso;
+import com.sun.codemodel.internal.JAnnotationWriter;
+import com.sun.codemodel.internal.JType;
+
+public interface XmlSeeAlsoWriter
+    extends JAnnotationWriter
+{
+
+
+    XmlSeeAlsoWriter value(Class value);
+
+    XmlSeeAlsoWriter value(JType value);
+
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTransientWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTransientWriter.java
index 1f2c67ac08a..89f41d00d01 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTransientWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTransientWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.tools.internal.xjc.generator.annotation.spec;
 
 import javax.xml.bind.annotation.XmlTransient;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTypeWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTypeWriter.java
index 2f04dbc8724..9ca700beebc 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTypeWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTypeWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.tools.internal.xjc.generator.annotation.spec;
 
 import javax.xml.bind.annotation.XmlType;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlValueWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlValueWriter.java
index 9aaf50e9ca2..d475f86f83c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlValueWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlValueWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.tools.internal.xjc.generator.annotation.spec;
 
 import javax.xml.bind.annotation.XmlValue;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java
index 297063bae3c..4227e8080e0 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,14 @@
 
 package com.sun.tools.internal.xjc.generator.bean;
 
+import static com.sun.tools.internal.xjc.outline.Aspect.EXPOSED;
+
 import java.io.Serializable;
 import java.net.URL;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
@@ -65,12 +68,14 @@ import com.sun.codemodel.internal.JVar;
 import com.sun.codemodel.internal.fmt.JStaticJavaFile;
 import com.sun.tools.internal.xjc.AbortException;
 import com.sun.tools.internal.xjc.ErrorReceiver;
+import com.sun.tools.internal.xjc.api.SpecVersion;
 import com.sun.tools.internal.xjc.generator.annotation.spec.XmlAnyAttributeWriter;
 import com.sun.tools.internal.xjc.generator.annotation.spec.XmlEnumValueWriter;
 import com.sun.tools.internal.xjc.generator.annotation.spec.XmlEnumWriter;
 import com.sun.tools.internal.xjc.generator.annotation.spec.XmlJavaTypeAdapterWriter;
 import com.sun.tools.internal.xjc.generator.annotation.spec.XmlMimeTypeWriter;
 import com.sun.tools.internal.xjc.generator.annotation.spec.XmlRootElementWriter;
+import com.sun.tools.internal.xjc.generator.annotation.spec.XmlSeeAlsoWriter;
 import com.sun.tools.internal.xjc.generator.annotation.spec.XmlTypeWriter;
 import com.sun.tools.internal.xjc.generator.bean.field.FieldRenderer;
 import com.sun.tools.internal.xjc.model.CAdapter;
@@ -83,6 +88,7 @@ import com.sun.tools.internal.xjc.model.CEnumLeafInfo;
 import com.sun.tools.internal.xjc.model.CPropertyInfo;
 import com.sun.tools.internal.xjc.model.CTypeRef;
 import com.sun.tools.internal.xjc.model.Model;
+import com.sun.tools.internal.xjc.model.CClassRef;
 import com.sun.tools.internal.xjc.outline.Aspect;
 import com.sun.tools.internal.xjc.outline.ClassOutline;
 import com.sun.tools.internal.xjc.outline.EnumConstantOutline;
@@ -94,6 +100,7 @@ import com.sun.tools.internal.xjc.util.CodeModelClassFactory;
 import com.sun.xml.internal.bind.v2.model.core.PropertyInfo;
 import com.sun.xml.internal.bind.v2.runtime.SwaRefAdapter;
 import com.sun.xml.internal.xsom.XmlString;
+import com.sun.istack.internal.NotNull;
 
 /**
  * Generates fields and accessors.
@@ -169,9 +176,9 @@ public final class BeanGenerator implements Outline
 
         // build enum classes
         for( CEnumLeafInfo p : model.enums().values() )
-            enums.put( p, generateEnum(p) );
+            enums.put( p, generateEnumDef(p) );
 
-        JPackage[] packages = getUsedPackages(Aspect.EXPOSED);
+        JPackage[] packages = getUsedPackages(EXPOSED);
 
         // generates per-package code and remember the results as contexts.
         for( JPackage pkg : packages )
@@ -198,11 +205,16 @@ public final class BeanGenerator implements Outline
                 // use the specified super class
                 model.strategy._extends(cc,getClazz(superClass));
             } else {
-                // use the default one, if any
-                if( model.rootClass!=null && cc.implClass._extends().equals(OBJECT) )
-                    cc.implClass._extends(model.rootClass);
-                if( model.rootInterface!=null)
-                    cc.ref._implements(model.rootInterface);
+                CClassRef refSuperClass = cc.target.getRefBaseClass();
+                if(refSuperClass!=null) {
+                    cc.implClass._extends(refSuperClass.toType(this,EXPOSED));
+                } else {
+                    // use the default one, if any
+                    if( model.rootClass!=null && cc.implClass._extends().equals(OBJECT) )
+                        cc.implClass._extends(model.rootClass);
+                    if( model.rootInterface!=null)
+                        cc.ref._implements(model.rootInterface);
+                }
             }
         }
 
@@ -210,6 +222,9 @@ public final class BeanGenerator implements Outline
         for( ClassOutlineImpl co : getClasses() )
             generateClassBody(co);
 
+        for( EnumOutline eo : enums.values() )
+            generateEnumBody(eo);
+
         // create factories for the impl-less elements
         for( CElementInfo ei : model.getAllElements())
             getPackageContext(ei._package()).objectFactoryGenerator().populate(ei);
@@ -302,7 +317,7 @@ public final class BeanGenerator implements Outline
         }
 
         public JClassContainer onPackage(JPackage pkg) {
-            return model.strategy.getPackage(pkg,Aspect.EXPOSED);
+            return model.strategy.getPackage(pkg, EXPOSED);
         }
     };
 
@@ -465,16 +480,19 @@ public final class BeanGenerator implements Outline
         // [RESULT]
         // @XmlType(name="foo", targetNamespace="bar://baz")
         XmlTypeWriter xtw = cc.implClass.annotate2(XmlTypeWriter.class);
-        QName typeName = cc.target.getTypeName();
-        if(typeName==null) {
-            xtw.name("");
-        } else {
-            xtw.name(typeName.getLocalPart());
-            final String typeNameURI = typeName.getNamespaceURI();
-            if(!typeNameURI.equals(mostUsedNamespaceURI)) // only generate if necessary
-                xtw.namespace(typeNameURI);
-        }
+        writeTypeName(cc.target.getTypeName(), xtw, mostUsedNamespaceURI);
 
+        if(model.options.target.isLaterThan(SpecVersion.V2_1)) {
+            // @XmlSeeAlso
+            Iterator subclasses = cc.target.listSubclasses();
+            if(subclasses.hasNext()) {
+                XmlSeeAlsoWriter saw = cc.implClass.annotate2(XmlSeeAlsoWriter.class);
+                while (subclasses.hasNext()) {
+                    CClassInfo s = subclasses.next();
+                    saw.value(getClazz(s).implRef);
+                }
+            }
+        }
 
         if(target.isElement()) {
             String namespaceURI = target.getElementName().getNamespaceURI();
@@ -513,6 +531,17 @@ public final class BeanGenerator implements Outline
         cc._package().objectFactoryGenerator().populate(cc);
     }
 
+    private void writeTypeName(QName typeName, XmlTypeWriter xtw, String mostUsedNamespaceURI) {
+        if(typeName ==null) {
+            xtw.name("");
+        } else {
+            xtw.name(typeName.getLocalPart());
+            final String typeNameURI = typeName.getNamespaceURI();
+            if(!typeNameURI.equals(mostUsedNamespaceURI)) // only generate if necessary
+                xtw.namespace(typeNameURI);
+        }
+    }
+
     /**
      * Generates an attribute wildcard property on a class.
      */
@@ -547,24 +576,43 @@ public final class BeanGenerator implements Outline
 
 
 
-    private EnumOutline generateEnum(CEnumLeafInfo e) {
+    /**
+     * Generates the minimum {@link JDefinedClass} skeleton
+     * without filling in its body.
+     */
+    private EnumOutline generateEnumDef(CEnumLeafInfo e) {
         JDefinedClass type;
 
+        type = getClassFactory().createClass(
+            getContainer(e.parent, EXPOSED),e.shortName,e.getLocator(), ClassType.ENUM);
+        type.javadoc().append(e.javadoc);
+
+        return new EnumOutline(e, type) {
+            @Override
+            public @NotNull Outline parent() {
+                return BeanGenerator.this;
+            }
+        };
+    }
+
+    private void generateEnumBody(EnumOutline eo) {
+        JDefinedClass type = eo.clazz;
+        CEnumLeafInfo e = eo.target;
+
+        XmlTypeWriter xtw = type.annotate2(XmlTypeWriter.class);
+        writeTypeName(e.getTypeName(), xtw,
+                eo._package().getMostUsedNamespaceURI());
+
+        JCodeModel codeModel = model.codeModel;
+
         // since constant values are never null, no point in using the boxed types.
-        JType baseExposedType = e.base.toType(this,Aspect.EXPOSED).unboxify();
+        JType baseExposedType = e.base.toType(this, EXPOSED).unboxify();
         JType baseImplType = e.base.toType(this,Aspect.IMPLEMENTATION).unboxify();
 
 
-        type = getClassFactory().createClass(
-            getContainer(e.parent,Aspect.EXPOSED),e.shortName,e.getLocator(), ClassType.ENUM);
-        type.javadoc().append(e.javadoc);
-
         XmlEnumWriter xew = type.annotate2(XmlEnumWriter.class);
         xew.value(baseExposedType);
 
-        JCodeModel codeModel = model.codeModel;
-
-        EnumOutline enumOutline = new EnumOutline(e, type) {};
 
         boolean needsValue = e.needsValueField();
 
@@ -600,7 +648,7 @@ public final class BeanGenerator implements Outline
             if( mem.javadoc!=null )
                 constRef.javadoc().append(mem.javadoc);
 
-            enumOutline.constants.add(new EnumConstantOutline(mem,constRef){});
+            eo.constants.add(new EnumConstantOutline(mem,constRef){});
         }
 
 
@@ -644,11 +692,16 @@ public final class BeanGenerator implements Outline
 
                 JInvocation ex = JExpr._new(codeModel.ref(IllegalArgumentException.class));
 
+                JExpression strForm;
                 if(baseExposedType.isPrimitive()) {
-                    m.body()._throw(ex.arg(codeModel.ref(String.class).staticInvoke("valueOf").arg($v)));
+                    strForm = codeModel.ref(String.class).staticInvoke("valueOf").arg($v);
+                } else
+                if(baseExposedType==codeModel.ref(String.class)){
+                    strForm = $v;
                 } else {
-                    m.body()._throw(ex.arg($v.invoke("toString")));
+                    strForm = $v.invoke("toString");
                 }
+                m.body()._throw(ex.arg(strForm));
             }
         } else {
             // [RESULT]
@@ -660,13 +713,10 @@ public final class BeanGenerator implements Outline
             JMethod m = type.method(JMod.PUBLIC|JMod.STATIC, type, "fromValue" );
             m.body()._return( JExpr.invoke("valueOf").arg(m.param(String.class,"v")));
         }
-
-        return enumOutline;
     }
 
 
 
-
     /**
      * Determines the FieldRenderer used for the given FieldUse,
      * then generates the field declaration and accessor methods.
@@ -701,7 +751,7 @@ public final class BeanGenerator implements Outline
                 // [RESULT]
                 // @XmlJavaTypeAdapter( Foo.class )
                 XmlJavaTypeAdapterWriter xjtw = field.annotate2(XmlJavaTypeAdapterWriter.class);
-                xjtw.value(adapter.adapterType.toType(this,Aspect.EXPOSED));
+                xjtw.value(adapter.adapterType.toType(this, EXPOSED));
             }
         }
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ClassOutlineImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ClassOutlineImpl.java
index b8393314b16..f9b272e00af 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ClassOutlineImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ClassOutlineImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.generator.bean;
 
 import com.sun.codemodel.internal.JClass;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/DualObjectFactoryGenerator.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/DualObjectFactoryGenerator.java
index bd5d54ec44e..23f6f184352 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/DualObjectFactoryGenerator.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/DualObjectFactoryGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.generator.bean;
 
 import com.sun.codemodel.internal.JDefinedClass;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ElementOutlineImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ElementOutlineImpl.java
index c664535cbcb..710a00c0f05 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ElementOutlineImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ElementOutlineImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.generator.bean;
 
 import javax.xml.bind.JAXBElement;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ImplStructureStrategy.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ImplStructureStrategy.java
index 32562e4ec66..662842e2cdd 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ImplStructureStrategy.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ImplStructureStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 /*
  * Use is subject to the license terms.
  */
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties
index 1faab354937..74557b48a32 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties
@@ -1,3 +1,28 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
 METHOD_COLLISION = \
 	The "{0}" method is defined on both "{1}" and "{2}" and is causing a collision.
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/Messages.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/Messages.java
index e0ebad2a6cd..770de6f47dc 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/Messages.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/Messages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/MethodWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/MethodWriter.java
index 20f29477a4b..3f632dd0416 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/MethodWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/MethodWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 /*
  * Use is subject to the license terms.
  */
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGenerator.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGenerator.java
index 670e456456b..421538cfb09 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGenerator.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.generator.bean;
 
 import com.sun.codemodel.internal.JDefinedClass;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGeneratorImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGeneratorImpl.java
index fed89929bf5..3018be0e26a 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGeneratorImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGeneratorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.generator.bean;
 
 import java.util.Collection;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/PackageOutlineImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/PackageOutlineImpl.java
index 6c2cc764291..cb93c0c88ae 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/PackageOutlineImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/PackageOutlineImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.generator.bean;
 
 import java.util.Collections;
@@ -49,6 +48,7 @@ import com.sun.tools.internal.xjc.model.CTypeRef;
 import com.sun.tools.internal.xjc.model.CValuePropertyInfo;
 import com.sun.tools.internal.xjc.model.Model;
 import com.sun.tools.internal.xjc.outline.PackageOutline;
+import com.sun.tools.internal.xjc.outline.Aspect;
 
 /**
  * {@link PackageOutline} enhanced with schema2java specific
@@ -178,7 +178,7 @@ final class PackageOutlineImpl implements PackageOutline {
         // generate package-info.java
         // we won't get this far if the user specified -npa
         if(!mostUsedNamespaceURI.equals("") || elementFormDefault==XmlNsForm.QUALIFIED) {
-            XmlSchemaWriter w = _package.annotate2(XmlSchemaWriter.class);
+            XmlSchemaWriter w = _model.strategy.getPackage(_package, Aspect.IMPLEMENTATION).annotate2(XmlSchemaWriter.class);
             if(!mostUsedNamespaceURI.equals(""))
                 w.namespace(mostUsedNamespaceURI);
             if(elementFormDefault==XmlNsForm.QUALIFIED)
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/PrivateObjectFactoryGenerator.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/PrivateObjectFactoryGenerator.java
index 6f0584ce6ed..216c2d6b2a4 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/PrivateObjectFactoryGenerator.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/PrivateObjectFactoryGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.generator.bean;
 
 import javax.xml.bind.JAXBContext;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/PublicObjectFactoryGenerator.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/PublicObjectFactoryGenerator.java
index 2f75af85e52..3cdc3c0b85f 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/PublicObjectFactoryGenerator.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/PublicObjectFactoryGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.generator.bean;
 
 import com.sun.codemodel.internal.JPackage;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractField.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractField.java
index 21c8e502a13..a1c7b51c4f1 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractField.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractField.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.generator.bean.field;
 
 import java.util.ArrayList;
@@ -50,6 +49,7 @@ import com.sun.tools.internal.xjc.generator.annotation.spec.XmlElementRefWriter;
 import com.sun.tools.internal.xjc.generator.annotation.spec.XmlElementRefsWriter;
 import com.sun.tools.internal.xjc.generator.annotation.spec.XmlElementWriter;
 import com.sun.tools.internal.xjc.generator.annotation.spec.XmlElementsWriter;
+import com.sun.tools.internal.xjc.generator.annotation.spec.XmlSchemaTypeWriter;
 import com.sun.tools.internal.xjc.generator.bean.ClassOutlineImpl;
 import com.sun.tools.internal.xjc.model.CAttributePropertyInfo;
 import com.sun.tools.internal.xjc.model.CElement;
@@ -142,6 +142,12 @@ abstract class AbstractField implements FieldOutline {
         }
 
         outline.parent().generateAdapterIfNecessary(prop,field);
+
+        QName st = prop.getSchemaType();
+        if(st!=null)
+            field.annotate2(XmlSchemaTypeWriter.class)
+                .name(st.getLocalPart())
+                .namespace(st.getNamespaceURI());
     }
 
     private void annotateReference(JAnnotatable field) {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractFieldWithVar.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractFieldWithVar.java
index 0e16b82a126..917f3e39e2b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractFieldWithVar.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractFieldWithVar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.generator.bean.field;
 
 import com.sun.codemodel.internal.JBlock;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractListField.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractListField.java
index 086eb42d01f..a34af24dff4 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractListField.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractListField.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.generator.bean.field;
 
 import java.util.List;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ArrayField.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ArrayField.java
index 095040be6cf..bc264001349 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ArrayField.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ArrayField.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.generator.bean.field;
 
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ConstField.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ConstField.java
index 8cc189262eb..7cebce90a9c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ConstField.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ConstField.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.generator.bean.field;
 
 import com.sun.codemodel.internal.JBlock;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ConstFieldRenderer.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ConstFieldRenderer.java
index 1a4aa02e80d..17786f875bc 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ConstFieldRenderer.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ConstFieldRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.generator.bean.field;
 
 import com.sun.tools.internal.xjc.generator.bean.ClassOutlineImpl;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/DefaultFieldRenderer.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/DefaultFieldRenderer.java
index c756faf103b..42fc0b301ba 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/DefaultFieldRenderer.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/DefaultFieldRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.generator.bean.field;
 
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRenderer.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRenderer.java
index 7f1345942c3..5b5e8b6da97 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRenderer.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRendererFactory.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRendererFactory.java
index cd7423d7318..6d5eea6ebfb 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRendererFactory.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRendererFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.generator.bean.field;
 
 import com.sun.tools.internal.xjc.Options;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/GenericFieldRenderer.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/GenericFieldRenderer.java
index 1888eb87444..e89acb2f9b0 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/GenericFieldRenderer.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/GenericFieldRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.generator.bean.field;
 
 import java.lang.reflect.Constructor;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetField.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetField.java
index 1630594113a..baf5c474c79 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetField.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetField.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.generator.bean.field;
 
 import com.sun.codemodel.internal.JBlock;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetFieldRenderer.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetFieldRenderer.java
index 8cd0d4c1f94..7ab6dd909ac 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetFieldRenderer.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetFieldRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.generator.bean.field;
 
 import com.sun.tools.internal.xjc.generator.bean.ClassOutlineImpl;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle.properties b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle.properties
index a77b6a329e1..77f632889cc 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle.properties
@@ -1,3 +1,28 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
 DEFAULT_SETTER_JAVADOC = \
         Sets the value of the {0} property.
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/Messages.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/Messages.java
index e654ef6e51e..61fa6ea95e1 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/Messages.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/Messages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.generator.bean.field;
 
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SingleField.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SingleField.java
index 99b7c910d28..a2b3ab492a9 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SingleField.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SingleField.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.generator.bean.field;
 
 import java.util.List;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SinglePrimitiveAccessField.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SinglePrimitiveAccessField.java
index ef470b31044..ebd640e0252 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SinglePrimitiveAccessField.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SinglePrimitiveAccessField.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.generator.bean.field;
 
 import com.sun.tools.internal.xjc.generator.bean.ClassOutlineImpl;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UnboxedField.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UnboxedField.java
index 8fa55daf3df..a50638ee34c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UnboxedField.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UnboxedField.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.generator.bean.field;
 
 import com.sun.codemodel.internal.JBlock;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListField.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListField.java
index 0c8c856bae9..bf3fddd24c9 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListField.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListField.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.generator.bean.field;
 
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListFieldRenderer.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListFieldRenderer.java
index bf2a24d5f20..b393538bbcc 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListFieldRenderer.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListFieldRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.generator.bean.field;
 
 import com.sun.codemodel.internal.JClass;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/package.html b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/package.html
index d8eed5a5efe..7810671cb4a 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/package.html
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/package.html
@@ -1,3 +1,27 @@
+
 
    
 FieldRenderer and its implementation classes.
 Unless you are deriving from these classes to define your own custom renderer,
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/package-info.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/package-info.java
index a3d1e5634c4..5025c1a0a07 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/package-info.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 /**
  * 
    Code Generator
    .
  *
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/util/BlockReference.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/util/BlockReference.java
index ec192b562dd..0b7706d0d6d 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/util/BlockReference.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/util/BlockReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.generator.util;
 
 import com.sun.codemodel.internal.JBlock;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/util/ExistingBlockReference.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/util/ExistingBlockReference.java
index 73c2fcd8f4d..7ad5d31f219 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/util/ExistingBlockReference.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/util/ExistingBlockReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.generator.util;
 
 import com.sun.codemodel.internal.JBlock;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/util/LazyBlockReference.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/util/LazyBlockReference.java
index a71fd2374a3..dd7487f9f80 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/util/LazyBlockReference.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/util/LazyBlockReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.generator.util;
 
 import com.sun.codemodel.internal.JBlock;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/util/WhitespaceNormalizer.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/util/WhitespaceNormalizer.java
index aab57e86b23..c96b669edef 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/util/WhitespaceNormalizer.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/util/WhitespaceNormalizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.generator.util;
 
 import com.sun.codemodel.internal.JCodeModel;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/Value.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/AbstractCElement.java
similarity index 58%
rename from jaxws/src/share/classes/com/sun/tools/internal/txw2/model/Value.java
rename to jaxws/src/share/classes/com/sun/tools/internal/xjc/model/AbstractCElement.java
index 60d8bd40be6..46ef108aa22 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/Value.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/AbstractCElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,44 +22,43 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+package com.sun.tools.internal.xjc.model;
 
-package com.sun.tools.internal.txw2.model;
+import javax.xml.bind.annotation.XmlTransient;
+
+import com.sun.xml.internal.xsom.XSComponent;
 
-import com.sun.codemodel.JDefinedClass;
-import com.sun.codemodel.JType;
-import com.sun.tools.internal.txw2.model.prop.Prop;
 import org.xml.sax.Locator;
 
-import java.util.Set;
-
 /**
- * A constant value.
+ * Partial default implementation of {@link CElement}.
  *
  * @author Kohsuke Kawaguchi
  */
-public class Value extends Leaf implements Text {
-    /**
-     * The underlying datatype, in case
-     * we need to revert to {@link Data}.
-     */
-    public final JType type;
-    /**
-     * Constant name.
-     */
-    public final String name;
+abstract class AbstractCElement extends AbstractCTypeInfoImpl implements CElement {
 
-    public Value(Locator location, JType type, String name) {
-        super(location);
-        this.type = type;
-        this.name = name;
+    /**
+     * The location in the source file where this class was declared.
+     */
+    @XmlTransient
+    private final Locator locator;
+
+    private boolean isAbstract;
+
+    protected AbstractCElement(Model model, XSComponent source, Locator locator, CCustomizations customizations) {
+        super(model, source, customizations);
+        this.locator = locator;
     }
 
-    void generate(JDefinedClass clazz, NodeSet nset, Set props) {
-        createDataMethod(clazz,type,nset,props);
+    public Locator getLocator() {
+        return locator;
     }
 
-    public JType getDatatype(NodeSet nset) {
-        // TODO: enum support
-        return type;
+    public boolean isAbstract() {
+        return isAbstract;
+    }
+
+    public void setAbstract() {
+        isAbstract = true;
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/AbstractCTypeInfoImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/AbstractCTypeInfoImpl.java
index baa2db46dc8..c3df0c3a822 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/AbstractCTypeInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/AbstractCTypeInfoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,19 +22,17 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model;
 
 import javax.activation.MimeType;
 
-import com.sun.codemodel.internal.JCodeModel;
 import com.sun.codemodel.internal.JExpression;
+import com.sun.tools.internal.xjc.outline.Outline;
 import com.sun.xml.internal.bind.v2.model.annotation.Locatable;
 import com.sun.xml.internal.bind.v2.model.core.ID;
 import com.sun.xml.internal.bind.v2.runtime.Location;
 import com.sun.xml.internal.xsom.XSComponent;
 import com.sun.xml.internal.xsom.XmlString;
-import com.sun.tools.internal.xjc.outline.Outline;
 
 /**
  * Partial implementation of {@link CTypeInfo}.
@@ -69,10 +67,6 @@ abstract class AbstractCTypeInfoImpl implements CTypeInfo {
         return null;
     }
 
-    public final CTypeInfo getInfo() {
-        return this;
-    }
-
     public final ID idUse() {
         return ID.NONE;
     }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/XmlNode.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/AutoClassNameAllocator.java
similarity index 50%
rename from jaxws/src/share/classes/com/sun/tools/internal/txw2/model/XmlNode.java
rename to jaxws/src/share/classes/com/sun/tools/internal/xjc/model/AutoClassNameAllocator.java
index d1bf96139ed..b94cf858223 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/XmlNode.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/AutoClassNameAllocator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,54 +22,49 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+package com.sun.tools.internal.xjc.model;
 
-package com.sun.tools.internal.txw2.model;
-
-import org.xml.sax.Locator;
-
-import javax.xml.namespace.QName;
-import java.util.HashSet;
 import java.util.Set;
-import java.util.Stack;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.HashSet;
+
+import com.sun.tools.internal.xjc.api.ClassNameAllocator;
 
 /**
- * Either an {@link Element} or {@link Attribute}.
+ * {@link ClassNameAllocator} filter that performs automatic name conflict resolution.
  *
  * @author Kohsuke Kawaguchi
  */
-public abstract class XmlNode extends WriterNode {
-    /**
-     * Name of the attribute/element.
-     *
-     * In TXW, we ignore all infinite names.
-     * (finite name class will be expanded to a list of {@link XmlNode}s.
-     */
-    public final QName name;
+public class AutoClassNameAllocator implements ClassNameAllocator {
+    private final ClassNameAllocator core;
 
-    protected XmlNode(Locator location, QName name, Leaf leaf) {
-        super(location, leaf);
-        this.name = name;
+    private final Map> names = new HashMap>();
+
+    public AutoClassNameAllocator(ClassNameAllocator core) {
+        this.core = core;
     }
 
-    /**
-     * Expand all refs and collect all children.
-     */
-    protected final Set collectChildren() {
-        Set result = new HashSet();
+    public String assignClassName(String packageName, String className) {
+        className = determineName(packageName, className);
+        if(core!=null)
+            className = core.assignClassName(packageName,className);
+        return className;
+    }
 
-        Stack work = new Stack();
-        work.push(this);
-
-        while(!work.isEmpty()) {
-            for( Leaf l : work.pop() ) {
-                if( l instanceof Ref ) {
-                    work.push( ((Ref)l).def );
-                } else {
-                    result.add(l);
-                }
-            }
+    private String determineName(String packageName, String className) {
+        Set s = names.get(packageName);
+        if(s==null) {
+            s = new HashSet();
+            names.put(packageName,s);
         }
 
-        return result;
+        if(s.add(className))
+            return className;
+
+        for(int i=2;true;i++) {
+            if(s.add(className+i))
+                return className+i;
+        }
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CAdapter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CAdapter.java
index 21639e03435..6b5a820f8f1 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CAdapter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model;
 
 import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CArrayInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CArrayInfo.java
index f3b26fa2acc..7e66732629b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CArrayInfo.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CArrayInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model;
 
 import javax.xml.namespace.QName;
@@ -67,6 +66,11 @@ public final class CArrayInfo extends AbstractCTypeInfoImpl implements ArrayInfo
         return false;
     }
 
+    @Deprecated // guaranteed to return this
+    public CNonElement getInfo() {
+        return this;
+    }
+
     public JType toType(Outline o, Aspect aspect) {
         return itemType.toType(o,aspect).array();
     }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CAttributePropertyInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CAttributePropertyInfo.java
index 814002d5fc1..3024044a248 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CAttributePropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CAttributePropertyInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model;
 
 import javax.xml.namespace.QName;
@@ -32,6 +31,7 @@ import com.sun.tools.internal.xjc.model.nav.NType;
 import com.sun.xml.internal.bind.v2.model.core.AttributePropertyInfo;
 import com.sun.xml.internal.bind.v2.model.core.PropertyKind;
 import com.sun.xml.internal.xsom.XSComponent;
+import com.sun.istack.internal.Nullable;
 
 import org.xml.sax.Locator;
 
@@ -45,9 +45,16 @@ public final class CAttributePropertyInfo extends CSingleTypePropertyInfo implem
     private final QName attName;
     private final boolean isRequired;
 
+    /**
+     * @param type
+     *      Represents the bound type of this attribute.
+     * @param typeName
+     *      XML Schema type name of this attribute. Optional for other schema languages.
+     */
     public CAttributePropertyInfo(String name, XSComponent source, CCustomizations customizations,
-                                  Locator locator, QName attName, TypeUse type, boolean required ) {
-        super(name, type, source, customizations, locator);
+                                  Locator locator, QName attName, TypeUse type, @Nullable QName typeName,
+                                  boolean required ) {
+        super(name, type, typeName, source, customizations, locator);
         isRequired = required;
         this.attName = attName;
     }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CBuiltinLeafInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CBuiltinLeafInfo.java
index f10ae647322..86bf6074175 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CBuiltinLeafInfo.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CBuiltinLeafInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model;
 
 import java.awt.*;
@@ -113,10 +112,19 @@ public abstract class CBuiltinLeafInfo extends BuiltinLeafInfoImpl
      * Since {@link CBuiltinLeafInfo} represents a default binding,
      * it is never a collection.
      */
+    @Deprecated
     public final boolean isCollection() {
         return false;
     }
 
+    /**
+     * Guaranteed to return this.
+     */
+    @Deprecated
+    public CNonElement getInfo() {
+        return this;
+    }
+
     public ID idUse() {
         return id;
     }
@@ -128,17 +136,11 @@ public abstract class CBuiltinLeafInfo extends BuiltinLeafInfoImpl
         return null;
     }
 
-    /**
-     * By definition, a default handling doesn't need any adapter.
-     */
+    @Deprecated
     public final CAdapter getAdapterUse() {
         return null;
     }
 
-    public final CBuiltinLeafInfo getInfo() {
-        return this;
-    }
-
     public Locator getLocator() {
         return Model.EMPTY_LOCATOR;
     }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/Text.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CClass.java
similarity index 78%
rename from jaxws/src/share/classes/com/sun/tools/internal/txw2/model/Text.java
rename to jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CClass.java
index 03ac0756b01..2d53b72819e 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/Text.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,19 +22,14 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-package com.sun.tools.internal.txw2.model;
-
-import com.sun.codemodel.JType;
+package com.sun.tools.internal.xjc.model;
 
 /**
- * Implemented by {@link Leaf}s that map to PCDATA in XML.
+ * Either {@link CClassInfo} or {@link CClassRef}.
  *
  * @author Kohsuke Kawaguchi
  */
-public interface Text {
-    /**
-     * Obtains the Java class of this {@link Text}.
-     */
-    JType getDatatype(NodeSet nset);
+public interface CClass extends CNonElement, CElement {
+    // how can anything be CNonElement and CElement at the same time, you may ask.
+
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CClassInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CClassInfo.java
index 73b1e562b70..a1ca008c16c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CClassInfo.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CClassInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,24 +22,25 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlID;
 import javax.xml.bind.annotation.XmlIDREF;
-import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.namespace.QName;
 
 import com.sun.codemodel.internal.JClass;
 import com.sun.codemodel.internal.JCodeModel;
 import com.sun.codemodel.internal.JPackage;
+import com.sun.istack.internal.Nullable;
 import com.sun.tools.internal.xjc.model.nav.NClass;
 import com.sun.tools.internal.xjc.model.nav.NType;
 import com.sun.tools.internal.xjc.outline.Aspect;
@@ -58,19 +59,34 @@ import org.xml.sax.Locator;
  *
  * @author Kohsuke Kawaguchi
  */
-public final class CClassInfo extends AbstractCTypeInfoImpl implements ClassInfo, CClassInfoParent, CElement, CNonElement, NClass, CTypeInfo {
+public final class CClassInfo extends AbstractCElement implements ClassInfo, CClassInfoParent, CClass, NClass {
 
     @XmlIDREF
-    private CClassInfo baseClass;
+    private CClass baseClass;
+
+    /**
+     * List of all subclasses, together with {@link #nextSibling}.
+     *
+     * If this class has no sub-class, this field is null. Otherwise,
+     * this field points to a sub-class of this class. From there you can enumerate
+     * all the sub-classes by using {@link #nextSibling}.
+     */
+    private CClassInfo firstSubclass;
+
+    /**
+     * @see #firstSubclass
+     */
+    private CClassInfo nextSibling = null;
 
     /**
      * @see #getTypeName()
      */
     private final QName typeName;
+
     /**
-     * Can be null.
+     * If this class also gets {@link XmlRootElement}, the class name.
      */
-    private final QName elementName;
+    private final @Nullable QName elementName;
 
     private boolean isOrdered = true;
 
@@ -92,18 +108,10 @@ public final class CClassInfo extends AbstractCTypeInfoImpl implements ClassInfo
      */
     public final String shortName;
 
-    /**
-     * The location in the source file where this class was declared.
-     */
-    @XmlTransient
-    private final Locator location;
-
-    private boolean isAbstract;
-
     /**
      * Optional user-specified implementation override class.
      */
-    private String implClass;
+    private @Nullable String implClass;
 
     /**
      * The {@link Model} object to which this bean belongs.
@@ -121,11 +129,10 @@ public final class CClassInfo extends AbstractCTypeInfoImpl implements ClassInfo
     }
 
     public CClassInfo(Model model,CClassInfoParent p, String shortName, Locator location, QName typeName, QName elementName, XSComponent source, CCustomizations customizations) {
-        super(model,source,customizations);
+        super(model,source,location,customizations);
         this.model = model;
         this.parent = p;
         this.shortName = model.allocator.assignClassName(parent,shortName);
-        this.location = location;
         this.typeName = typeName;
         this.elementName = elementName;
 
@@ -133,7 +140,7 @@ public final class CClassInfo extends AbstractCTypeInfoImpl implements ClassInfo
     }
 
     public CClassInfo(Model model,JCodeModel cm, String fullName, Locator location, QName typeName, QName elementName, XSComponent source, CCustomizations customizations) {
-        super(model,source,customizations);
+        super(model,source,location,customizations);
         this.model = model;
         int idx = fullName.indexOf('.');
         if(idx<0) {
@@ -143,17 +150,12 @@ public final class CClassInfo extends AbstractCTypeInfoImpl implements ClassInfo
             this.parent = model.getPackage(cm._package(fullName.substring(0,idx)));
             this.shortName = model.allocator.assignClassName(parent,fullName.substring(idx+1));
         }
-        this.location = location;
         this.typeName = typeName;
         this.elementName = elementName;
 
         model.add(this);
     }
 
-    public Locator getLocator() {
-        return location;
-    }
-
     public boolean hasAttributeWildcard() {
         return hasAttributeWildcard;
     }
@@ -163,7 +165,7 @@ public final class CClassInfo extends AbstractCTypeInfoImpl implements ClassInfo
     }
 
     public boolean hasSubClasses() {
-        throw new UnsupportedOperationException();
+        return firstSubclass!=null;
     }
 
     /**
@@ -237,10 +239,12 @@ public final class CClassInfo extends AbstractCTypeInfoImpl implements ClassInfo
         return properties;
     }
 
+    public boolean hasValueProperty() {
+        throw new UnsupportedOperationException();
+    }
+
     /**
      * Gets a propery by name.
-     *
-     * TODO: consider moving this up to {@link ClassInfo}
      */
     public CPropertyInfo getProperty(String name) {
         // TODO: does this method need to be fast?
@@ -258,6 +262,14 @@ public final class CClassInfo extends AbstractCTypeInfoImpl implements ClassInfo
         return elementName!=null;
     }
 
+    /**
+     * Guaranteed to return this.
+     */
+    @Deprecated
+    public CNonElement getInfo() {
+        return this;
+    }
+
     public Element asElement() {
         if(isElement())
             return this;
@@ -329,20 +341,75 @@ public final class CClassInfo extends AbstractCTypeInfoImpl implements ClassInfo
         properties.add(prop);
     }
 
-    public void setBaseClass(CClassInfo base) {
+    /**
+     * This method accepts both {@link CClassInfo} (which means the base class
+     * is also generated), or {@link CClassRef} (which means the base class is
+     * already generated and simply referenced.)
+     *
+     * The latter is treated somewhat special --- from the rest of the model
+     * this external base class is invisible. This modeling might need more
+     * thoughts to get right.
+     */
+    public void setBaseClass(CClass base) {
         assert baseClass==null;
         assert base!=null;
         baseClass = base;
+
+        assert nextSibling==null;
+        if (base instanceof CClassInfo) {
+            CClassInfo realBase = (CClassInfo) base;
+            this.nextSibling = realBase.firstSubclass;
+            realBase.firstSubclass = this;
+        }
     }
 
+    /**
+     * This inherited version returns null if this class extends from {@link CClassRef}.
+     *
+     * @see #getRefBaseClass()
+     */
     public CClassInfo getBaseClass() {
-        return baseClass;
+        if (baseClass instanceof CClassInfo) {
+            return (CClassInfo) baseClass;
+        } else {
+            return null;
+        }
+    }
+
+    public CClassRef getRefBaseClass() {
+        if (baseClass instanceof CClassRef) {
+            return (CClassRef) baseClass;
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Enumerates all the sub-classes of this class.
+     */
+    public Iterator listSubclasses() {
+        return new Iterator() {
+            CClassInfo cur = firstSubclass;
+            public boolean hasNext() {
+                return cur!=null;
+            }
+
+            public CClassInfo next() {
+                CClassInfo r = cur;
+                cur = cur.nextSibling;
+                return r;
+            }
+
+            public void remove() {
+                throw new UnsupportedOperationException();
+            }
+        };
     }
 
     public CClassInfo getSubstitutionHead() {
-        CClassInfo c=baseClass;
+        CClassInfo c=getBaseClass();
         while(c!=null && !c.isElement())
-            c=c.baseClass;
+            c=c.getBaseClass();
         return c;
     }
 
@@ -403,12 +470,4 @@ public final class CClassInfo extends AbstractCTypeInfoImpl implements ClassInfo
     public String toString() {
         return fullName();
     }
-
-    public void setAbstract() {
-        isAbstract = true;
-    }
-
-    public boolean isAbstract() {
-        return isAbstract;
-    }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CClassInfoParent.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CClassInfoParent.java
index 72093e6d85c..63b3138fd47 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CClassInfoParent.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CClassInfoParent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model;
 
 import com.sun.codemodel.internal.JPackage;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CClassRef.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CClassRef.java
new file mode 100644
index 00000000000..7dfc6c48acd
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CClassRef.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.tools.internal.xjc.model;
+
+import javax.xml.namespace.QName;
+
+import com.sun.codemodel.internal.JClass;
+import com.sun.tools.internal.xjc.model.nav.NClass;
+import com.sun.tools.internal.xjc.model.nav.NType;
+import com.sun.tools.internal.xjc.outline.Aspect;
+import com.sun.tools.internal.xjc.outline.Outline;
+import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIClass;
+import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIEnum;
+import com.sun.xml.internal.xsom.XSComponent;
+
+/**
+ * Refernece to an existing class.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public final class CClassRef extends AbstractCElement implements NClass, CClass {
+
+    private final String fullyQualifiedClassName;
+
+    /**
+     *
+     * @param decl
+     *      The {@link BIClass} declaration that has {@link BIClass#getExistingClassRef()}
+     */
+    public CClassRef(Model model, XSComponent source, BIClass decl, CCustomizations customizations) {
+        super(model, source, decl.getLocation(), customizations);
+        fullyQualifiedClassName = decl.getExistingClassRef();
+        assert fullyQualifiedClassName!=null;
+    }
+
+    /**
+     *
+     * @param decl
+     *      The {@link BIClass} declaration that has {@link BIEnum#ref}
+     */
+    public CClassRef(Model model, XSComponent source, BIEnum decl, CCustomizations customizations) {
+        super(model, source, decl.getLocation(), customizations);
+        fullyQualifiedClassName = decl.ref;
+        assert fullyQualifiedClassName!=null;
+    }
+
+    public void setAbstract() {
+        // assume that the referenced class is marked as abstract to begin with.
+    }
+
+    public boolean isAbstract() {
+        // no way to find out for sure
+        return false;
+    }
+
+    public NType getType() {
+        return this;
+    }
+
+    /**
+     * Cached for both performance and single identity.
+     */
+    private JClass clazz;
+
+    public JClass toType(Outline o, Aspect aspect) {
+        if(clazz==null)
+            clazz = o.getCodeModel().ref(fullyQualifiedClassName);
+        return clazz;
+    }
+
+    public String fullName() {
+        return fullyQualifiedClassName;
+    }
+
+    public QName getTypeName() {
+        return null;
+    }
+
+    /**
+     * Guaranteed to return this.
+     */
+    @Deprecated
+    public CNonElement getInfo() {
+        return this;
+    }
+
+// are these going to bite us?
+//    we can compute some of them, but not all.
+
+    public CElement getSubstitutionHead() {
+        return null;
+    }
+
+    public CClassInfo getScope() {
+        return null;
+    }
+
+    public QName getElementName() {
+        return null;
+    }
+
+    public boolean isBoxedType() {
+        return false;
+    }
+
+    public boolean isSimpleType() {
+        return false;
+    }
+
+
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CCustomizable.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CCustomizable.java
index 3e6160d8080..0a33748d5a0 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CCustomizable.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CCustomizable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model;
 
 import com.sun.tools.internal.xjc.Plugin;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CCustomizations.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CCustomizations.java
index 83c255fdb99..429b3400cca 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CCustomizations.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CCustomizations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model;
 
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CDefaultValue.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CDefaultValue.java
index 6a3b077ce97..fe1c30a090d 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CDefaultValue.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CDefaultValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model;
 
 import com.sun.codemodel.internal.JExpression;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CElement.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CElement.java
index 8d9a30a63a1..496cba404e6 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CElement.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model;
 
 import com.sun.tools.internal.xjc.model.nav.NClass;
@@ -30,11 +29,11 @@ import com.sun.tools.internal.xjc.model.nav.NType;
 import com.sun.xml.internal.bind.v2.model.core.Element;
 
 /**
- * Either {@link CElementInfo} or {@link CClassInfo}.
+ * Either {@link CElementInfo}, {@link CClassInfo}, or {@link CClassRef}.
  *
  * @author Kohsuke Kawaguchi
  */
-public interface CElement extends CTypeInfo, Element, CClassInfoParent {
+public interface CElement extends CTypeInfo, Element {
     /**
      * Marks this element as an abstract element.
      */
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CElementInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CElementInfo.java
index 9b346fe1906..91de79cc680 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CElementInfo.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CElementInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model;
 
 import java.util.Collection;
@@ -33,25 +32,24 @@ import java.util.Set;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.namespace.QName;
 
 import com.sun.codemodel.internal.JPackage;
 import com.sun.codemodel.internal.JType;
+import com.sun.istack.internal.Nullable;
+import static com.sun.tools.internal.xjc.model.CElementPropertyInfo.CollectionMode.NOT_REPEATED;
+import static com.sun.tools.internal.xjc.model.CElementPropertyInfo.CollectionMode.REPEATED_VALUE;
 import com.sun.tools.internal.xjc.model.nav.NClass;
 import com.sun.tools.internal.xjc.model.nav.NType;
 import com.sun.tools.internal.xjc.model.nav.NavigatorImpl;
 import com.sun.tools.internal.xjc.outline.Aspect;
 import com.sun.tools.internal.xjc.outline.Outline;
 import com.sun.xml.internal.bind.v2.model.core.ElementInfo;
-import com.sun.xml.internal.xsom.XSComponent;
+import com.sun.xml.internal.xsom.XSElementDecl;
 import com.sun.xml.internal.xsom.XmlString;
 
 import org.xml.sax.Locator;
 
-import static com.sun.tools.internal.xjc.model.CElementPropertyInfo.CollectionMode.REPEATED_VALUE;
-import static com.sun.tools.internal.xjc.model.CElementPropertyInfo.CollectionMode.NOT_REPEATED;
-
 /**
  * {@link ElementInfo} implementation for the compile-time model.
  *
@@ -61,8 +59,8 @@ import static com.sun.tools.internal.xjc.model.CElementPropertyInfo.CollectionMo
  *
  * @author Kohsuke Kawaguchi
  */
-public final class CElementInfo extends AbstractCTypeInfoImpl
-    implements ElementInfo, CElement, CTypeInfo, NType, CClassInfoParent {
+public final class CElementInfo extends AbstractCElement
+    implements ElementInfo, NType, CClassInfoParent {
 
     private final QName tagName;
 
@@ -87,14 +85,6 @@ public final class CElementInfo extends AbstractCTypeInfoImpl
      */
     public final CClassInfoParent parent;
 
-    /**
-     * The location in the source file where this class was declared.
-     */
-    @XmlTransient
-    private final Locator location;
-
-    private boolean isAbstract;
-
     private CElementInfo substitutionHead;
 
     /**
@@ -113,15 +103,14 @@ public final class CElementInfo extends AbstractCTypeInfoImpl
      * Creates an element in the given parent.
      *
      * 
    
-     * When using this construction, {@link #initContentType(TypeUse, XSComponent, XmlString)}
+     * When using this construction, {@link #initContentType(TypeUse, XSElementDecl, XmlString)}
      * must not be invoked.
      */
-    public CElementInfo(Model model,QName tagName, CClassInfoParent parent, TypeUse contentType, XmlString defaultValue, XSComponent source, CCustomizations customizations, Locator location ) {
-        super(model,source,customizations);
+    public CElementInfo(Model model,QName tagName, CClassInfoParent parent, TypeUse contentType, XmlString defaultValue, XSElementDecl source, CCustomizations customizations, Locator location ) {
+        super(model,source,location,customizations);
         this.tagName = tagName;
         this.model = model;
         this.parent = parent;
-        this.location = location;
         if(contentType!=null)
             initContentType(contentType, source, defaultValue);
 
@@ -133,7 +122,7 @@ public final class CElementInfo extends AbstractCTypeInfoImpl
      *
      * 
    
      * When using this construction, the caller must use
-     * {@link #initContentType(TypeUse, XSComponent, XmlString)} to fill in the content type
+     * {@link #initContentType(TypeUse, XSElementDecl, XmlString)} to fill in the content type
      * later.
      *
      * This is to avoid a circular model construction dependency between buidling a type
@@ -145,16 +134,16 @@ public final class CElementInfo extends AbstractCTypeInfoImpl
         this.className = className;
     }
 
-    public void initContentType(TypeUse contentType, XSComponent source, XmlString defaultValue) {
+    public void initContentType(TypeUse contentType, @Nullable XSElementDecl source, XmlString defaultValue) {
         assert this.property==null; // must not be called twice
 
         this.property = new CElementPropertyInfo("Value",
                 contentType.isCollection()?REPEATED_VALUE:NOT_REPEATED,
                 contentType.idUse(),
                 contentType.getExpectedMimeType(),
-                source,null,location,true);
+                source,null,getLocator(),true);
         this.property.setAdapter(contentType.getAdapterUse());
-        property.getTypes().add(new CTypeRef((CNonElement)contentType.getInfo(),tagName,true,defaultValue));
+        property.getTypes().add(new CTypeRef(contentType.getInfo(),tagName,CTypeRef.getSimpleTypeName(source), true,defaultValue));
         this.type = NavigatorImpl.createParameterizedType(
             NavigatorImpl.theInstance.ref(JAXBElement.class),
             getContentInMemoryType() );
@@ -230,14 +219,6 @@ public final class CElementInfo extends AbstractCTypeInfoImpl
         return b.toString();
     }
 
-    public void setAbstract() {
-        isAbstract = true;
-    }
-
-    public boolean isAbstract() {
-        return isAbstract;
-    }
-
     public CElementInfo getSubstitutionHead() {
         return substitutionHead;
     }
@@ -293,8 +274,4 @@ public final class CElementInfo extends AbstractCTypeInfoImpl
     public boolean hasClass() {
         return className!=null;
     }
-
-    public Locator getLocator() {
-        return location;
-    }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CElementPropertyInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CElementPropertyInfo.java
index a9dd6df85ed..fe2f3a2e01f 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CElementPropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CElementPropertyInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,12 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model;
 
 import java.util.AbstractList;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import javax.activation.MimeType;
 import javax.xml.namespace.QName;
@@ -103,6 +103,19 @@ public final class CElementPropertyInfo extends CPropertyInfo implements Element
         return ref;
     }
 
+    public QName getSchemaType() {
+        if(types.size()!=1)
+            // if more than one kind is here, can't produce @XmlSchemaType.
+            // TODO: is it allowed to have one generated if types
+            return null;
+
+        CTypeRef t = types.get(0);
+        if(needsExplicitTypeName(t.getTarget(),t.typeName))
+            return t.typeName;
+        else
+            return null;
+    }
+
     /**
      * XJC never uses the wrapper element. Always return null.
      */
@@ -111,6 +124,11 @@ public final class CElementPropertyInfo extends CPropertyInfo implements Element
         return null;
     }
 
+    public boolean isCollectionRequired() {
+        // in XJC, we never recognize a nillable collection pattern, so this is always false.
+        return false;
+    }
+
     public boolean isCollectionNillable() {
         // in XJC, we never recognize a nillable collection pattern, so this is always false.
         return false;
@@ -181,4 +199,14 @@ public final class CElementPropertyInfo extends CPropertyInfo implements Element
 
         public boolean isRepeated() { return col; }
     }
+
+    @Override
+    public QName collectElementNames(Map table) {
+        for (CTypeRef t : types) {
+            QName n = t.getTagName();
+            if(table.containsKey(n))    return n;
+            table.put(n, this);
+        }
+        return null;
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CEnumConstant.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CEnumConstant.java
index ea788cd2f46..fb16c02b860 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CEnumConstant.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CEnumConstant.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model;
 
 import com.sun.tools.internal.xjc.model.nav.NClass;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CEnumLeafInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CEnumLeafInfo.java
index 0a8d010c29e..5d0ff49ce34 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CEnumLeafInfo.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CEnumLeafInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model;
 
 import java.util.Collection;
@@ -118,7 +117,7 @@ public final class CEnumLeafInfo implements EnumLeafInfo, NClass,
                          Locator _sourceLocator) {
         this.model = model;
         this.parent = container;
-        this.shortName = shortName;
+        this.shortName = model.allocator.assignClassName(parent,shortName);
         this.base = base;
         this.members = _members;
         this.source = source;
@@ -232,15 +231,18 @@ public final class CEnumLeafInfo implements EnumLeafInfo, NClass,
         return null;
     }
 
+    @Deprecated
     public boolean isCollection() {
         return false;
     }
 
+    @Deprecated
     public CAdapter getAdapterUse() {
         return null;
     }
 
-    public CTypeInfo getInfo() {
+    @Deprecated
+    public CNonElement getInfo() {
         return this;
     }
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CNonElement.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CNonElement.java
index a8856abd061..a6471ca5e62 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CNonElement.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CNonElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model;
 
 import com.sun.tools.internal.xjc.model.nav.NClass;
@@ -30,7 +29,30 @@ import com.sun.tools.internal.xjc.model.nav.NType;
 import com.sun.xml.internal.bind.v2.model.core.NonElement;
 
 /**
+ * {@link NonElement} at compile-time.
+ *
+ * 
    
+ * This interface implements {@link TypeUse} so that a {@link CNonElement}
+ * instance can be used as a {@link TypeUse} instance.
+ *
  * @author Kohsuke Kawaguchi
  */
-public interface CNonElement extends NonElement, CTypeInfo {
+public interface CNonElement extends NonElement, TypeUse, CTypeInfo {
+    /**
+     * Guaranteed to return this.
+     */
+    @Deprecated
+    CNonElement getInfo();
+
+    /**
+     * Guaranteed to return false.
+     */
+    @Deprecated
+    boolean isCollection();
+
+    /**
+     * Guaranteed to return null.
+     */
+    @Deprecated
+    CAdapter getAdapterUse();
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CPluginCustomization.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CPluginCustomization.java
index 6858f69fafa..b1c505f5026 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CPluginCustomization.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CPluginCustomization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model;
 
 import com.sun.tools.internal.xjc.Plugin;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java
index 5577daef587..ec2b75f5b46 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,14 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model;
 
 import java.util.Collection;
+import java.util.Map;
+import java.lang.annotation.Annotation;
 
 import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import javax.xml.namespace.QName;
 
@@ -41,12 +43,15 @@ import com.sun.tools.internal.xjc.model.nav.NType;
 import com.sun.xml.internal.bind.api.impl.NameConverter;
 import com.sun.xml.internal.bind.v2.model.core.PropertyInfo;
 import com.sun.xml.internal.bind.v2.runtime.RuntimeUtil;
+import com.sun.xml.internal.bind.v2.WellKnownNamespace;
 import com.sun.xml.internal.xsom.XSComponent;
 
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.Locator;
 
 /**
+ * Model of a property to be generated.
+ *
  * @author Kohsuke Kawaguchi
  */
 public abstract class CPropertyInfo implements PropertyInfo, CCustomizable {
@@ -91,10 +96,6 @@ public abstract class CPropertyInfo implements PropertyInfo, CCust
     public CDefaultValue defaultValue;
 
     private final CCustomizations customizations;
-    /**
-     * @see #getSchemaType()
-     */
-    public QName schemaType;
 
     protected CPropertyInfo(String name, boolean collection, XSComponent source,
                             CCustomizations customizations, Locator locator) {
@@ -270,10 +271,6 @@ public abstract class CPropertyInfo implements PropertyInfo, CCust
         return customizations;
     }
 
-    public QName getSchemaType() {
-        return schemaType;
-    }
-
     /**
      * @deprecated if you are calling this method directly, there's something wrong.
      */
@@ -282,4 +279,54 @@ public abstract class CPropertyInfo implements PropertyInfo, CCust
     }
 
     public abstract  V accept( CPropertyVisitor visitor );
+
+    /**
+     * Checks if the given {@link TypeUse} would need an explicit {@link XmlSchemaType}
+     * annotation with the given type name.
+     */
+    protected static boolean needsExplicitTypeName(TypeUse type, QName typeName) {
+        if(typeName==null)
+            // this is anonymous type. can't have @XmlSchemaType
+            return false;
+
+        if(!typeName.getNamespaceURI().equals(WellKnownNamespace.XML_SCHEMA))
+            // if we put application-defined type name, it will be undefined
+            // by the time we generate a schema.
+            return false;
+
+        if(type.isCollection())
+            // there's no built-in binding for a list simple type,
+            // so any collection type always need @XmlSchemaType
+            return true;
+
+        QName itemType = type.getInfo().getTypeName();
+        if(itemType==null)
+            // this is somewhat strange case, as it means the bound type is anonymous
+            // but it's eventually derived by a named type and used.
+            // but we can certainly use typeName as @XmlSchemaType value here
+            return true;
+
+        // if it's the default type name for this item, then no need
+        return !itemType.equals(typeName);
+    }
+
+    /**
+     * Puts the element names that this property possesses to the map,
+     * so that we can find two properties that own the same element name,
+     * which is an error.
+     *
+     * @return
+     *      null if no conflict was found. Otherwise return the QName that has the collision.
+     */
+    public QName collectElementNames(Map table) {
+        return null;
+    }
+
+    public final  A readAnnotation(Class annotationType) {
+        throw new UnsupportedOperationException();
+    }
+
+    public final boolean hasAnnotation(Class annotationType) {
+        throw new UnsupportedOperationException();
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CPropertyVisitor.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CPropertyVisitor.java
index 8e5c9d68800..49b0bb9dc45 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CPropertyVisitor.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CPropertyVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CReferencePropertyInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CReferencePropertyInfo.java
index ae686bcb500..38973b12377 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CReferencePropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CReferencePropertyInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,12 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model;
 
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.Map;
 
 import javax.activation.MimeType;
 import javax.xml.bind.annotation.W3CDomHandler;
@@ -187,4 +187,25 @@ public final class CReferencePropertyInfo extends CPropertyInfo implements Refer
         // in XJC, we never recognize a nillable collection pattern, so this is always false.
         return false;
     }
+
+    public boolean isCollectionRequired() {
+        // in XJC, we never recognize a nillable collection pattern, so this is always false.
+        return false;
+    }
+
+    // reference property cannot have a type.
+    public QName getSchemaType() {
+        return null;
+    }
+
+    @Override
+    public QName collectElementNames(Map table) {
+        for (CElement e : elements) {
+            QName n = e.getElementName();
+            if(table.containsKey(n))
+                return n;
+            table.put(n,this);
+        }
+        return null;
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CSingleTypePropertyInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CSingleTypePropertyInfo.java
index e8bf71007d9..25936bdb6bb 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CSingleTypePropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CSingleTypePropertyInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,28 +22,49 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model;
 
 import java.util.Collections;
 import java.util.List;
 
 import javax.activation.MimeType;
+import javax.xml.namespace.QName;
 
+import com.sun.xml.internal.bind.v2.WellKnownNamespace;
 import com.sun.xml.internal.bind.v2.model.core.ID;
 import com.sun.xml.internal.xsom.XSComponent;
 
 import org.xml.sax.Locator;
 
 /**
+ * {@link CPropertyInfo} backed by a single {@link TypeUse}.
+ *
  * @author Kohsuke Kawaguchi
  */
 abstract class CSingleTypePropertyInfo extends CPropertyInfo {
     protected final TypeUse type;
 
-    protected CSingleTypePropertyInfo(String name, TypeUse type, XSComponent source, CCustomizations customizations, Locator locator) {
+    private final QName schemaType;
+
+    /**
+     *
+     * @param typeName
+     *      XML Schema type name of this property's single value. Optional
+     *      for other schema languages. This is used to determine if we should
+     *      generate {@link @XmlSchemaType} annotation to improve the roundtrip.
+     */
+    protected CSingleTypePropertyInfo(String name, TypeUse type, QName typeName, XSComponent source, CCustomizations customizations, Locator locator) {
         super(name, type.isCollection(), source, customizations, locator);
         this.type = type;
+
+        if(needsExplicitTypeName(type,typeName))
+            schemaType = typeName;
+        else
+            schemaType = null;
+    }
+
+    public QName getSchemaType() {
+        return schemaType;
     }
 
     public final ID id() {
@@ -59,7 +80,7 @@ abstract class CSingleTypePropertyInfo extends CPropertyInfo {
     }
 
     public final CNonElement getTarget() {
-        CNonElement r = (CNonElement)type.getInfo();
+        CNonElement r = type.getInfo();
         assert r!=null;
         return r;
     }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CTypeInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CTypeInfo.java
index ba9dc24d39a..66a1dacadff 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CTypeInfo.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CTypeInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model;
 
 import com.sun.codemodel.internal.JClass;
@@ -40,13 +39,9 @@ import com.sun.xml.internal.xsom.XmlString;
  * {@link TypeInfo} at the compile-time.
  * Either {@link CClassInfo}, {@link CBuiltinLeafInfo}, or {@link CElementInfo}.
  *
- * 
    
- * This interface implements {@link TypeUse} so that a {@link CTypeInfo}
- * instance can be used as a {@link TypeUse} instance.
- *
  * @author Kohsuke Kawaguchi
  */
-public interface CTypeInfo extends TypeInfo, TypeUse, CCustomizable {
+public interface CTypeInfo extends TypeInfo, CCustomizable {
 
     /**
      * Returns the {@link JClass} that represents the class being bound,
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CTypeRef.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CTypeRef.java
index a9e7c668eca..a4e183f4ce8 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CTypeRef.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CTypeRef.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model;
 
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -30,10 +29,13 @@ import javax.xml.namespace.QName;
 
 import com.sun.tools.internal.xjc.model.nav.NClass;
 import com.sun.tools.internal.xjc.model.nav.NType;
+import com.sun.tools.internal.xjc.reader.xmlschema.BGMBuilder;
 import com.sun.xml.internal.bind.v2.model.core.PropertyInfo;
 import com.sun.xml.internal.bind.v2.model.core.TypeRef;
 import com.sun.xml.internal.bind.v2.runtime.RuntimeUtil;
 import com.sun.xml.internal.xsom.XmlString;
+import com.sun.xml.internal.xsom.XSElementDecl;
+import com.sun.istack.internal.Nullable;
 
 /**
  * {@link TypeRef} for XJC.
@@ -53,15 +55,34 @@ public final class CTypeRef implements TypeRef {
 
     private final QName elementName;
 
+    /**
+     * XML Schema type name of {@link #type}, if available.
+     */
+    /*package*/ final @Nullable QName typeName;
+
     private final boolean nillable;
     public final XmlString defaultValue;
 
-    public CTypeRef(CNonElement type, QName elementName, boolean nillable, XmlString defaultValue) {
+    public CTypeRef(CNonElement type, XSElementDecl decl) {
+        this(type, BGMBuilder.getName(decl),getSimpleTypeName(decl), decl.isNillable(), decl.getDefaultValue() );
+
+    }
+
+    public static QName getSimpleTypeName(XSElementDecl decl) {
+        if(decl==null)  return null;
+        QName typeName = null;
+        if(decl.getType().isSimpleType())
+            typeName = BGMBuilder.getName(decl.getType());
+        return typeName;
+    }
+
+    public CTypeRef(CNonElement type, QName elementName, QName typeName, boolean nillable, XmlString defaultValue) {
         assert type!=null;
         assert elementName!=null;
 
         this.type = type;
         this.elementName = elementName;
+        this.typeName = typeName;
         this.nillable = nillable;
         this.defaultValue = defaultValue;
     }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CValuePropertyInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CValuePropertyInfo.java
index 316225d2c8e..105ce6502cc 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CValuePropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CValuePropertyInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,9 +22,10 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model;
 
+import javax.xml.namespace.QName;
+
 import com.sun.tools.internal.xjc.model.nav.NClass;
 import com.sun.tools.internal.xjc.model.nav.NType;
 import com.sun.xml.internal.bind.v2.model.core.PropertyKind;
@@ -39,8 +40,8 @@ import org.xml.sax.Locator;
  * @author Kohsuke Kawaguchi
  */
 public final class CValuePropertyInfo extends CSingleTypePropertyInfo implements ValuePropertyInfo {
-    public CValuePropertyInfo(String name, XSComponent source, CCustomizations customizations, Locator locator, TypeUse type) {
-        super(name, type, source, customizations, locator);
+    public CValuePropertyInfo(String name, XSComponent source, CCustomizations customizations, Locator locator, TypeUse type, QName typeName) {
+        super(name, type, typeName, source, customizations, locator);
     }
 
     public final PropertyKind kind() {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CWildcardTypeInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CWildcardTypeInfo.java
index 793797f4986..f5cbf4b2079 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CWildcardTypeInfo.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CWildcardTypeInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model;
 
 import com.sun.codemodel.internal.JType;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/ClassNameAllocatorWrapper.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/ClassNameAllocatorWrapper.java
index 4fc69362c02..bf7188ad202 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/ClassNameAllocatorWrapper.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/ClassNameAllocatorWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model;
 
 import com.sun.codemodel.internal.JPackage;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/Constructor.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/Constructor.java
index 1b139a0b14e..a1752d2ddde 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/Constructor.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/Constructor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/Model.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/Model.java
index f9d3062802f..d53d7970136 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/Model.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/Model.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model;
 
 import java.util.Collections;
@@ -59,8 +58,11 @@ import com.sun.xml.internal.bind.v2.model.core.Ref;
 import com.sun.xml.internal.bind.v2.model.core.TypeInfoSet;
 import com.sun.xml.internal.bind.v2.model.nav.Navigator;
 import com.sun.xml.internal.bind.v2.util.FlattenIterator;
+import com.sun.xml.internal.xsom.XSComponent;
+import com.sun.xml.internal.xsom.XSSchemaSet;
 
 import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
 import org.xml.sax.helpers.LocatorImpl;
 
 /**
@@ -73,7 +75,7 @@ import org.xml.sax.helpers.LocatorImpl;
  *
  * @author Kohsuke Kawaguchi
  */
-public final class Model implements TypeInfoSet {
+public final class Model implements TypeInfoSet, CCustomizable {
 
     /**
      * Generated beans.
@@ -124,12 +126,25 @@ public final class Model implements TypeInfoSet {
      */
     private boolean packageLevelAnnotations = true;
 
+    /**
+     * If this model was built from XML Schema, this field
+     * stores the root object of the parse schema model.
+     * Otherwise null.
+     *
+     * @sine 2.1.1
+     */
+    public final XSSchemaSet schemaComponent;
+
+    private CCustomizations gloablCustomizations = new CCustomizations();
+
     /**
      * @param nc
      *      Usually this should be set in the constructor, but we do allow this parameter
      *      to be initially null, and then set later.
+     * @param schemaComponent
+     *      The source schema model, if this is built from XSD.
      */
-    public Model( Options opts, JCodeModel cm, NameConverter nc, ClassNameAllocator allocator ) {
+    public Model( Options opts, JCodeModel cm, NameConverter nc, ClassNameAllocator allocator, XSSchemaSet schemaComponent ) {
         this.options = opts;
         this.codeModel = cm;
         this.nameConverter = nc;
@@ -138,7 +153,11 @@ public final class Model implements TypeInfoSet {
 
         elementMappings.put(null,new HashMap());
 
+        if(opts.automaticNameConflictResolution)
+            allocator = new AutoClassNameAllocator(allocator);
         this.allocator = new ClassNameAllocatorWrapper(allocator);
+        this.schemaComponent = schemaComponent;
+        this.gloablCustomizations.setParent(this,this);
     }
 
     public void setNameConverter(NameConverter nameConverter) {
@@ -254,9 +273,13 @@ public final class Model implements TypeInfoSet {
 
         Outline o = BeanGenerator.generate(this, ehf);
 
-        // run extensions
-        for( Plugin ma : opt.activePlugins )
-            ma.run(o,opt,ehf);
+        try {// run extensions
+            for( Plugin ma : opt.activePlugins )
+                ma.run(o,opt,ehf);
+        } catch (SAXException e) {
+            // fatal error. error should have been reported
+            return null;
+        }
 
         // check for unused plug-in customizations.
         // these can be only checked after the plug-ins run, so it's here.
@@ -377,6 +400,32 @@ public final class Model implements TypeInfoSet {
         return allElements;
     }
 
+    /**
+     * @deprecated
+     *      Always return null. Perhaps you are interested in {@link #schemaComponent}?
+     */
+    public XSComponent getSchemaComponent() {
+        return null;
+    }
+
+    /**
+     * @deprecated
+     *      No line number available for the "root" component.
+     */
+    public Locator getLocator() {
+        LocatorImpl r = new LocatorImpl();
+        r.setLineNumber(-1);
+        r.setColumnNumber(-1);
+        return r;
+    }
+
+    /**
+     * Gets the global customizations.
+     */
+    public CCustomizations getCustomizations() {
+        return gloablCustomizations;
+    }
+
     /**
      * Not implemented in the compile-time model.
      */
@@ -384,6 +433,10 @@ public final class Model implements TypeInfoSet {
         return Collections.emptyMap();
     }
 
+    public Map getSchemaLocations() {
+        return Collections.emptyMap();
+    }
+
     public XmlNsForm getElementFormDefault(String nsUri) {
         throw new UnsupportedOperationException();
     }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/Multiplicity.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/Multiplicity.java
index 4cdbd4b53d7..f1068818e87 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/Multiplicity.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/Multiplicity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model;
 
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/Populatable.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/Populatable.java
index 16a35726242..62b8a1467f2 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/Populatable.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/Populatable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model;
 
 import com.sun.tools.internal.xjc.outline.Outline;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/SymbolSpace.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/SymbolSpace.java
index 40f41c2f5dc..b5eb7f8c700 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/SymbolSpace.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/SymbolSpace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model;
 
 import com.sun.codemodel.internal.JCodeModel;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/TypeUse.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/TypeUse.java
index 9fae4acd18e..fa224d49b08 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/TypeUse.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/TypeUse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,10 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model;
 
 import javax.activation.MimeType;
 
-import com.sun.codemodel.internal.JCodeModel;
 import com.sun.codemodel.internal.JExpression;
 import com.sun.tools.internal.xjc.model.nav.NType;
 import com.sun.tools.internal.xjc.outline.Outline;
@@ -59,7 +57,7 @@ public interface TypeUse {
     /**
      * Individual item type.
      */
-    CTypeInfo getInfo();
+    CNonElement getInfo();
 
     /**
      * Whether the referenced type (individual item type in case of collection)
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/TypeUseFactory.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/TypeUseFactory.java
index 72b1c0212c0..4f414bb53f7 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/TypeUseFactory.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/TypeUseFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model;
 
 import javax.activation.MimeType;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/TypeUseImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/TypeUseImpl.java
index 6e95644e2a6..9b034b35896 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/TypeUseImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/TypeUseImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model;
 
 import javax.activation.MimeType;
@@ -43,14 +42,14 @@ import com.sun.xml.internal.xsom.XmlString;
  * @author Kohsuke Kawaguchi
  */
 final class TypeUseImpl implements TypeUse {
-    private final CTypeInfo coreType;
+    private final CNonElement coreType;
     private final boolean collection;
     private final CAdapter adapter;
     private final ID id;
     private final MimeType expectedMimeType;
 
 
-    public TypeUseImpl(CTypeInfo itemType, boolean collection, ID id, MimeType expectedMimeType, CAdapter adapter) {
+    public TypeUseImpl(CNonElement itemType, boolean collection, ID id, MimeType expectedMimeType, CAdapter adapter) {
         this.coreType = itemType;
         this.collection = collection;
         this.id = id;
@@ -62,7 +61,7 @@ final class TypeUseImpl implements TypeUse {
         return collection;
     }
 
-    public CTypeInfo getInfo() {
+    public CNonElement getInfo() {
         return coreType;
     }
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNClass.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNClass.java
index 0603f4e346c..8ccdba727f9 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNClass.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model.nav;
 
 import java.lang.reflect.Modifier;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java
index 2ad35ea6594..40f5ac1a881 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model.nav;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NClass.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NClass.java
index 30cfff6840d..e8076cea26e 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NClass.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model.nav;
 
 import com.sun.codemodel.internal.JClass;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NClassByJClass.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NClassByJClass.java
index 65cb95101d4..88f41e6d9f3 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NClassByJClass.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NClassByJClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model.nav;
 
 import com.sun.codemodel.internal.JClass;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NParameterizedType.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NParameterizedType.java
index 1ba875ced02..798b9a4c29c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NParameterizedType.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NParameterizedType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model.nav;
 
 import com.sun.codemodel.internal.JClass;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NType.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NType.java
index 095d242f514..8f5d459caff 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NType.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model.nav;
 
 import com.sun.codemodel.internal.JType;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java
index b968b7d023f..2361d123837 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.model.nav;
 
 import java.lang.reflect.Type;
@@ -308,7 +307,7 @@ public final class NavigatorImpl implements Navigator {
         throw new UnsupportedOperationException();
     }
 
-    public boolean isOverriding(Void method) {
+    public boolean isOverriding(Void method,NClass clazz) {
         throw new UnsupportedOperationException();
     }
 
@@ -319,4 +318,8 @@ public final class NavigatorImpl implements Navigator {
     public boolean isTransient(Void f) {
         throw new UnsupportedOperationException();
     }
+
+    public boolean isInnerClass(NClass clazz) {
+        throw new UnsupportedOperationException();
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/package.html b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/package.html
index 8812e8e3c63..fff7cc55b2c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/package.html
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/package.html
@@ -1,3 +1,27 @@
+
 
   
    
     Compile-time representation of Java type system.
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/package-info.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/package-info.java
index 87be0188746..ba5a17b63fc 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/package-info.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 /**
  * Implementation of the {@link com.sun.xml.internal.bind.v2.model.core} package for XJC.
  *
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/Aspect.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/Aspect.java
index a257a3ac6e6..533cb0cbb80 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/Aspect.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/Aspect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.outline;
 
 import com.sun.tools.internal.xjc.generator.bean.ImplStructureStrategy;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/ClassOutline.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/ClassOutline.java
index ac93ebf76f3..48dafb4f982 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/ClassOutline.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/ClassOutline.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 /*
  * Use is subject to the license terms.
  */
@@ -34,6 +33,7 @@ import com.sun.codemodel.internal.JClass;
 import com.sun.codemodel.internal.JDefinedClass;
 import com.sun.tools.internal.xjc.model.CClassInfo;
 import com.sun.tools.internal.xjc.model.CPropertyInfo;
+import com.sun.istack.internal.NotNull;
 
 /**
  * Outline object that provides per-{@link CClassInfo} information
@@ -48,19 +48,19 @@ public abstract class ClassOutline {
     /**
      * A {@link Outline} that encloses all the class outlines.
      */
-    public abstract Outline parent();
+    public abstract @NotNull Outline parent();
 
     /**
      * {@link PackageOutline} that contains this class.
      */
-    public PackageOutline _package() {
+    public @NotNull PackageOutline _package() {
         return parent().getPackageContext(ref._package());
     }
 
     /**
      * This {@link ClassOutline} holds information about this {@link CClassInfo}.
      */
-    public final CClassInfo target;
+    public final @NotNull CClassInfo target;
 
     /**
      * The exposed aspect of the a bean.
@@ -70,13 +70,13 @@ public abstract class ClassOutline {
      * Usually this is the public content interface, but
      * it could be the same as the implClass.
      */
-    public final JDefinedClass ref;
+    public final @NotNull JDefinedClass ref;
 
     /**
      * The implementation aspect of a bean.
      * The actual place where fields/methods should be generated into.
      */
-    public final JDefinedClass implClass;
+    public final @NotNull JDefinedClass implClass;
 
     /**
      * The implementation class that shall be used for reference.
@@ -87,7 +87,7 @@ public abstract class ClassOutline {
      * 
    
      * This is the type that needs to be used for generating fields.
      */
-    public final JClass implRef;
+    public final @NotNull JClass implRef;
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/ElementOutline.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/ElementOutline.java
index c2c95d332a4..c0e489f9f9c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/ElementOutline.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/ElementOutline.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.outline;
 
 import com.sun.codemodel.internal.JDefinedClass;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/EnumConstantOutline.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/EnumConstantOutline.java
index bdc52c464ea..4bc3df8182e 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/EnumConstantOutline.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/EnumConstantOutline.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.outline;
 
 import com.sun.codemodel.internal.JEnumConstant;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/EnumOutline.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/EnumOutline.java
index 4224294eae9..76e02218b82 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/EnumOutline.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/EnumOutline.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.outline;
 
 import java.util.ArrayList;
@@ -30,6 +29,7 @@ import java.util.List;
 
 import com.sun.codemodel.internal.JDefinedClass;
 import com.sun.tools.internal.xjc.model.CEnumLeafInfo;
+import com.sun.istack.internal.NotNull;
 
 /**
  * Outline object that provides per-{@link CEnumLeafInfo} information
@@ -56,6 +56,19 @@ public abstract class EnumOutline {
      */
     public final List constants = new ArrayList();
 
+    /**
+     * {@link PackageOutline} that contains this class.
+     */
+    public @NotNull
+    PackageOutline _package() {
+        return parent().getPackageContext(clazz._package());
+    }
+
+    /**
+     * A {@link Outline} that encloses all the class outlines.
+     */
+    public abstract @NotNull Outline parent();
+
     protected EnumOutline(CEnumLeafInfo target, JDefinedClass clazz) {
         this.target = target;
         this.clazz = clazz;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/FieldAccessor.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/FieldAccessor.java
index db240497e1d..76528e53ac4 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/FieldAccessor.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/FieldAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.outline;
 
 import com.sun.codemodel.internal.JBlock;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/FieldOutline.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/FieldOutline.java
index d326d967808..8f2db6d38e9 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/FieldOutline.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/FieldOutline.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.outline;
 
 import com.sun.codemodel.internal.JExpression;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/Outline.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/Outline.java
index 7145bb62762..eeda0ab8b65 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/Outline.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/Outline.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.outline;
 
 import java.util.Collection;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/PackageOutline.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/PackageOutline.java
index 1dfd4d339e7..78ae6d6d78c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/PackageOutline.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/PackageOutline.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.outline;
 
 import java.util.Set;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/package.html b/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/package.html
index 0f20e338d97..c0df67872cc 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/package.html
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/package.html
@@ -1,3 +1,27 @@
+
 
   Provides the outline of the generated Java source code so that
   additional processings (such as adding more annotations) can be
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/package-info.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/package-info.java
index 04dbd8b0354..88129889a26 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/package-info.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 /**
  * 
    Schema to Java compiler
    .
  *
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/AbstractExtensionBindingChecker.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/AbstractExtensionBindingChecker.java
new file mode 100644
index 00000000000..4fd4a8a164e
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/AbstractExtensionBindingChecker.java
@@ -0,0 +1,202 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.tools.internal.xjc.reader;
+
+import java.util.Set;
+import java.util.HashSet;
+
+import com.sun.tools.internal.xjc.util.SubtreeCutter;
+import com.sun.tools.internal.xjc.Options;
+import com.sun.tools.internal.xjc.Plugin;
+import com.sun.xml.internal.bind.v2.util.EditDistance;
+
+import org.xml.sax.helpers.NamespaceSupport;
+import org.xml.sax.Locator;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.SAXException;
+
+/**
+ * Common code between {@code DTDExtensionBindingChecker} and {@link ExtensionBindingChecker}.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public abstract class AbstractExtensionBindingChecker extends SubtreeCutter {
+    /** Remembers in-scope namespace bindings. */
+    protected final NamespaceSupport nsSupport = new NamespaceSupport();
+
+    /**
+     * Set of namespace URIs that designates enabled extensions.
+     */
+    protected final Set enabledExtensions = new HashSet();
+
+    private final Set recognizableExtensions = new HashSet();
+
+    private Locator locator;
+
+    /**
+     * Namespace URI of the target schema language. Elements in this
+     * namespace are always allowed.
+     */
+    protected final String schemaLanguage;
+
+    /**
+     * If false, any use of extensions is reported as an error.
+     */
+    protected final boolean allowExtensions;
+
+    private final Options options;
+
+    /**
+     * @param handler
+     *      This error handler will receive detected errors.
+     */
+    public AbstractExtensionBindingChecker( String schemaLanguage, Options options, ErrorHandler handler ) {
+        this.schemaLanguage = schemaLanguage;
+        this.allowExtensions = options.compatibilityMode!=Options.STRICT;
+        this.options = options;
+        setErrorHandler(handler);
+
+        for (Plugin plugin : options.getAllPlugins())
+            recognizableExtensions.addAll(plugin.getCustomizationURIs());
+        recognizableExtensions.add(Const.XJC_EXTENSION_URI);
+    }
+
+    /**
+     * Verify that the given URI is indeed a valid extension namespace URI,
+     * and if so enable it.
+     * 
    
+     * This method does all the error handling.
+     */
+    protected final void checkAndEnable(String uri) throws SAXException {
+        if( !isRecognizableExtension(uri) ) {
+            String nearest = EditDistance.findNearest(uri, recognizableExtensions);
+            // not the namespace URI we know of
+            error( Messages.ERR_UNSUPPORTED_EXTENSION.format(uri,nearest) );
+        } else
+        if( !isSupportedExtension(uri) ) {
+            // recognizable but not not supported, meaning
+            // the plug-in isn't enabled
+
+            // look for plug-in that handles this URI
+            Plugin owner = null;
+            for( Plugin p : options.getAllPlugins() ) {
+                if(p.getCustomizationURIs().contains(uri)) {
+                    owner = p;
+                    break;
+                }
+            }
+            if(owner!=null)
+                // we know the plug-in that supports this namespace, but it's not enabled
+                error( Messages.ERR_PLUGIN_NOT_ENABLED.format(owner.getOptionName(),uri));
+            else {
+                // this shouldn't happen, but be defensive...
+                error( Messages.ERR_UNSUPPORTED_EXTENSION.format(uri) );
+            }
+        }
+
+        // as an error recovery enable this namespace URI anyway.
+        enabledExtensions.add(uri);
+    }
+
+    /**
+     * If the tag name belongs to a plugin namespace-wise, check its local name
+     * to make sure it's correct.
+     */
+    protected final void verifyTagName(String namespaceURI, String localName, String qName) throws SAXException {
+        if(options.pluginURIs.contains(namespaceURI)) {
+            // make sure that this is a valid tag name
+            boolean correct = false;
+            for( Plugin p : options.activePlugins ) {
+                if(p.isCustomizationTagName(namespaceURI,localName)) {
+                    correct = true;
+                    break;
+                }
+            }
+            if(!correct) {
+                error( Messages.ERR_ILLEGAL_CUSTOMIZATION_TAGNAME.format(qName) );
+                startCutting();
+            }
+        }
+    }
+
+    /**
+     * Checks if the given namespace URI is supported as the extension
+     * bindings.
+     */
+    protected final boolean isSupportedExtension( String namespaceUri ) {
+        return namespaceUri.equals(Const.XJC_EXTENSION_URI) || options.pluginURIs.contains(namespaceUri);
+    }
+
+    /**
+     * Checks if the given namespace URI can be potentially recognized
+     * by this XJC.
+     */
+    protected final boolean isRecognizableExtension( String namespaceUri ) {
+        return recognizableExtensions.contains(namespaceUri);
+    }
+
+
+    public void setDocumentLocator(Locator locator) {
+        super.setDocumentLocator(locator);
+        this.locator = locator;
+    }
+
+    public void startDocument() throws SAXException {
+        super.startDocument();
+
+        nsSupport.reset();
+        enabledExtensions.clear();
+    }
+
+    public void startPrefixMapping(String prefix, String uri) throws SAXException {
+        super.startPrefixMapping(prefix, uri);
+        nsSupport.pushContext();
+        nsSupport.declarePrefix(prefix,uri);
+    }
+
+    public void endPrefixMapping(String prefix) throws SAXException {
+        super.endPrefixMapping(prefix);
+        nsSupport.popContext();
+    }
+
+
+    /**
+     * Reports an error and returns the created SAXParseException
+     */
+    protected final SAXParseException error( String msg ) throws SAXException {
+        SAXParseException spe = new SAXParseException( msg, locator );
+        getErrorHandler().error(spe);
+        return spe;
+    }
+
+    /**
+     * Reports a warning.
+     */
+    protected final void warning( String msg ) throws SAXException {
+        SAXParseException spe = new SAXParseException( msg, locator );
+        getErrorHandler().warning(spe);
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/Const.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/Const.java
index dc0e83f70d7..ed934cfbff7 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/Const.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/Const.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader;
 
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/ExtensionBindingChecker.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/ExtensionBindingChecker.java
index 1cbaac44d4f..4a9eccb0eaf 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/ExtensionBindingChecker.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/ExtensionBindingChecker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,25 +22,16 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader;
 
-import java.util.HashSet;
-import java.util.Set;
 import java.util.StringTokenizer;
 
 import com.sun.tools.internal.xjc.Options;
 import com.sun.tools.internal.xjc.Plugin;
 
 import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
 import org.xml.sax.ErrorHandler;
-import org.xml.sax.Locator;
 import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.helpers.DefaultHandler;
-import org.xml.sax.helpers.NamespaceSupport;
-import org.xml.sax.helpers.XMLFilterImpl;
 
 /**
  * This filter checks jaxb:extensionBindingPrefix and
@@ -61,93 +52,18 @@ import org.xml.sax.helpers.XMLFilterImpl;
  * that the RI recognizes.
  * To add new URI, modify the isSupportedExtension method.
  *
-
  * @author
  *     Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
  */
-public final class ExtensionBindingChecker extends XMLFilterImpl {
-
-    /** Remembers in-scope namespace bindings. */
-    private final NamespaceSupport nsSupport = new NamespaceSupport();
+public final class ExtensionBindingChecker extends AbstractExtensionBindingChecker {
 
     /**
      * Number of the elements encountered. Used to detect the root element.
      */
     private int count=0;
 
-    /**
-     * Set of namespace URIs that designates enabled extensions.
-     */
-    private final Set enabledExtensions = new HashSet();
-
-    private final Set recognizableExtensions = new HashSet();
-
-    private Locator locator;
-
-    /**
-     * When we are pruning a sub tree, this field holds the depth of
-     * elements that are being cut. Used to resume event forwarding.
-     *
-     * As long as this value is 0, we will pass through data.
-     */
-    private int cutDepth=0;
-
-    /**
-     * This object will receive SAX events while a sub tree is being
-     * pruned.
-     */
-    private static final ContentHandler stub = new DefaultHandler();
-
-    /**
-     * This field remembers the user-specified ContentHandler.
-     * So that we can restore it once the sub tree is completely pruned.
-     */
-    private ContentHandler next;
-
-    /**
-     * Namespace URI of the target schema language. Elements in this
-     * namespace are always allowed.
-     */
-    private final String schemaLanguage;
-
-    /**
-     * If false, any use of extensions is reported as an error.
-     */
-    private final boolean allowExtensions;
-
-    private final Options options;
-
-    /**
-     * @param handler
-     *      This error handler will receive detected errors.
-     */
-    public ExtensionBindingChecker( String schemaLanguage, Options options, ErrorHandler handler ) {
-        this.schemaLanguage = schemaLanguage;
-        this.allowExtensions = options.compatibilityMode!=Options.STRICT;
-        this.options = options;
-        setErrorHandler(handler);
-
-        for (Plugin plugin : options.getAllPlugins())
-            recognizableExtensions.addAll(plugin.getCustomizationURIs());
-        recognizableExtensions.add(Const.XJC_EXTENSION_URI);
-    }
-
-    /**
-     * Checks if the given namespace URI is supported as the extension
-     * bindings.
-     */
-    private boolean isSupportedExtension( String namespaceUri ) {
-        if(namespaceUri.equals(Const.XJC_EXTENSION_URI))
-            return true;
-        return options.pluginURIs.contains(namespaceUri);
-    }
-
-    /**
-     * Checks if the given namespace URI can be potentially recognized
-     * by this XJC.
-     */
-    private boolean isRecognizableExtension( String namespaceUri ) {
-        return recognizableExtensions.contains(namespaceUri);
+    public ExtensionBindingChecker(String schemaLanguage, Options options, ErrorHandler handler) {
+        super(schemaLanguage, options, handler);
     }
 
     /**
@@ -170,31 +86,15 @@ public final class ExtensionBindingChecker extends XMLFilterImpl {
     }
 
 
-
     public void startDocument() throws SAXException {
         super.startDocument();
-
         count=0;
-        cutDepth=0;
-        nsSupport.reset();
-        enabledExtensions.clear();
-    }
-
-    public void startPrefixMapping(String prefix, String uri) throws SAXException {
-        super.startPrefixMapping(prefix, uri);
-        nsSupport.pushContext();
-        nsSupport.declarePrefix(prefix,uri);
-    }
-
-    public void endPrefixMapping(String prefix) throws SAXException {
-        super.endPrefixMapping(prefix);
-        nsSupport.popContext();
     }
 
     public void startElement(String namespaceURI, String localName, String qName, Attributes atts)
         throws SAXException {
 
-        if( cutDepth==0 ) {
+        if(!isCutting()) {
             String v = atts.getValue(Const.JAXB_NSURI,"extensionBindingPrefixes");
             if(v!=null) {
                 if(count!=0)
@@ -209,38 +109,11 @@ public final class ExtensionBindingChecker extends XMLFilterImpl {
                 while(tokens.hasMoreTokens()) {
                     String prefix = tokens.nextToken();
                     String uri = nsSupport.getURI(prefix);
-                    if( uri==null ) {
+                    if( uri==null )
                         // undeclared prefix
                         error( Messages.ERR_UNDECLARED_PREFIX.format(prefix) );
-                    } else {
-                        if( !isRecognizableExtension(uri) )
-                            // not the namespace URI we know of
-                            error( Messages.ERR_UNSUPPORTED_EXTENSION.format(prefix) );
-                        else
-                        if( !isSupportedExtension(uri) ) {
-                            // recognizable but not not supported, meaning
-                            // the plug-in isn't enabled
-
-                            // look for plug-in that handles this URI
-                            Plugin owner = null;
-                            for( Plugin p : options.getAllPlugins() ) {
-                                if(p.getCustomizationURIs().contains(uri)) {
-                                    owner = p;
-                                    break;
-                                }
-                            }
-                            if(owner!=null)
-                                // we know the plug-in that supports this namespace, but it's not enabled
-                                error( Messages.ERR_PLUGIN_NOT_ENABLED.format(owner.getOptionName(),uri));
-                            else {
-                                // this shouldn't happen, but be defensive...
-                                error( Messages.ERR_UNSUPPORTED_EXTENSION.format(prefix) );
-                            }
-                        }
-
-                        // as an error recovery enable this namespace URI anyway.
-                        enabledExtensions.add(uri);
-                    }
+                    else
+                        checkAndEnable(uri);
                 }
             }
 
@@ -251,71 +124,12 @@ public final class ExtensionBindingChecker extends XMLFilterImpl {
                     // isn't the user forgetting @jaxb:extensionBindingPrefixes?
                     warning( Messages.ERR_SUPPORTED_EXTENSION_IGNORED.format(namespaceURI) );
                 }
-                super.setContentHandler(stub);
-                cutDepth=1;
-            }
-            else
-            if(options.pluginURIs.contains(namespaceURI)) {
-                // make sure that this is a valid tag name
-                boolean correct = false;
-                for( Plugin p : options.activePlugins ) {
-                    if(p.isCustomizationTagName(namespaceURI,localName)) {
-                        correct = true;
-                        break;
-                    }
-                }
-                if(!correct) {
-                    error( Messages.ERR_ILLEGAL_CUSTOMIZATION_TAGNAME.format(qName) );
-                    super.setContentHandler(stub);
-                    cutDepth=1;
-                }
-            }
-        } else
-            cutDepth++;
+                startCutting();
+            } else
+                verifyTagName(namespaceURI, localName, qName);
+        }
 
         count++;
         super.startElement(namespaceURI, localName, qName, atts);
     }
-
-    public void endElement(String namespaceURI, String localName, String qName) throws SAXException {
-        super.endElement(namespaceURI, localName, qName);
-
-        if( cutDepth!=0 ) {
-            cutDepth--;
-            if( cutDepth == 0 )
-                // pruning completed. restore the user handler
-                super.setContentHandler(next);
-        }
-    }
-
-    public void setDocumentLocator(Locator locator) {
-        super.setDocumentLocator(locator);
-        this.locator = locator;
-    }
-
-    public void setContentHandler(ContentHandler handler) {
-        next = handler;
-        // changes take effect immediately unless the sub-tree is being pruned
-        if(getContentHandler()!=stub)
-            super.setContentHandler(handler);
-    }
-
-
-    /**
-     * Reports an error and returns the created SAXParseException
-     */
-    private SAXParseException error( String msg ) throws SAXException {
-        SAXParseException spe = new SAXParseException( msg, locator );
-        getErrorHandler().error(spe);
-        return spe;
-    }
-
-    /**
-     * Reports a warning.
-     */
-    private void warning( String msg ) throws SAXException {
-        SAXParseException spe = new SAXParseException( msg, locator );
-        getErrorHandler().warning(spe);
-    }
-
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle.properties b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle.properties
index 97907cf32f2..33f28c47813 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle.properties
@@ -1,3 +1,28 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
 #
 # Message resource file
 #
@@ -14,7 +39,7 @@ ERR_VENDOR_EXTENSION_DISALLOWED_IN_STRICT_MODE = \
     vendor extension bindings (jaxb:extensionBindingPrefixes) are not allowed in the strict mode. Use -extension.
 
 ERR_UNSUPPORTED_EXTENSION = \
-	Unsupported binding namespace "{0}"
+	Unsupported binding namespace "{0}". Perhaps you meant "{1}"?
 
 ERR_SUPPORTED_EXTENSION_IGNORED = \
 	Binding declaration namespace "{0}" will be ignored because it is \
@@ -30,7 +55,10 @@ ERR_CLASS_NOT_FOUND = \
 	Make this class available via the -classpath option.
 	
 DUPLICATE_PROPERTY = \
-    Property "{0}" is already defined.
+    Property "{0}" is already defined. Use <jaxb:property> to resolve this conflict.
+
+DUPLICATE_ELEMENT = \
+    Element "{0}" shows up in more than one properties.
 
 DUPLICATE_PROPERTY_LOC = \
     (related to above error) another definition is given here.
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/Messages.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/Messages.java
index a79954f99a6..6242882ed2e 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/Messages.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/Messages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,6 @@
  * have any questions.
  */
 
-
 package com.sun.tools.internal.xjc.reader;
 
 import java.text.MessageFormat;
@@ -32,8 +31,9 @@ import java.util.ResourceBundle;
 /**
  * Formats error messages.
  */
-enum Messages {
+public enum Messages {
     DUPLICATE_PROPERTY, // 1 arg
+    DUPLICATE_ELEMENT, // 1 arg
 
     ERR_UNDECLARED_PREFIX,
     ERR_UNEXPECTED_EXTENSION_BINDING_PREFIXES,
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/ModelChecker.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/ModelChecker.java
index fafd9c527c1..be36dde9e21 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/ModelChecker.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/ModelChecker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader;
 
 import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+
+import javax.xml.namespace.QName;
 
 import com.sun.tools.internal.xjc.ErrorReceiver;
 import com.sun.tools.internal.xjc.model.CClassInfo;
@@ -54,6 +57,7 @@ public final class ModelChecker {
 
     private void check( CClassInfo ci ) {
         List props = ci.getProperties();
+        Map collisionTable = new HashMap();
 
         OUTER:
         for( int i=0; i1 || !parent.mul.isAtMostOnce()) {
-                if(target.getAdapterUse()!=null || target.idUse()!=ID.NONE)
-                    return Mode.MUST_BE_REFERENCE;
-            }
-
-            // nillable and optional at the same time. needs an element wrapper to distinguish those
-            // two states. But this is not a hard requirement.
-            if(nillable && parent.mul.isOptional())
-                return Mode.CAN_BE_TYPEREF;
-
-            return Mode.SHOULD_BE_TYPEREF;
-        }
-
-        protected boolean isListOfValues() {
-            return target.isCollection();
-        }
-
-        protected ID id() {
-            return target.idUse();
-        }
-
-        protected MimeType getExpectedMimeType() {
-            return target.getExpectedMimeType();
-        }
-    }
-
-    private static TypeUse bindToType(XSElementDecl decl) {
-        SimpleTypeBuilder stb = Ring.get(SimpleTypeBuilder.class);
-        stb.refererStack.push(decl);
-        TypeUse r = Ring.get(ClassSelector.class).bindToType(decl.getType());
-        stb.refererStack.pop();
-        return r;
-    }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/Ring.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/Ring.java
index cdeedeec217..faff8881533 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/Ring.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/Ring.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader;
 
 import java.lang.reflect.Constructor;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/TypeUtil.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/TypeUtil.java
index 5643aa4f5e1..e1cc9da8623 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/TypeUtil.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/TypeUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader;
 
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/Util.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/Util.java
index cb4b8146ce6..82ef7b1864b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/Util.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/Util.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader;
 
 import java.io.File;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Block.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Block.java
index e4c66f1c66d..68ae2e5c9d2 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Block.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Block.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.dtd;
 
 import java.util.LinkedHashSet;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Element.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Element.java
index 676549aad3a..d4b631e03b6 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Element.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Element.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.dtd;
 
 import java.util.ArrayList;
@@ -35,7 +34,7 @@ import javax.xml.namespace.QName;
 import com.sun.tools.internal.xjc.model.CBuiltinLeafInfo;
 import com.sun.tools.internal.xjc.model.CClassInfo;
 import com.sun.tools.internal.xjc.model.CElementPropertyInfo;
-import com.sun.tools.internal.xjc.model.CNonElement;
+import static com.sun.tools.internal.xjc.model.CElementPropertyInfo.CollectionMode.*;
 import com.sun.tools.internal.xjc.model.CPropertyInfo;
 import com.sun.tools.internal.xjc.model.CReferencePropertyInfo;
 import com.sun.tools.internal.xjc.model.CTypeRef;
@@ -49,10 +48,6 @@ import com.sun.xml.internal.dtdparser.DTDEventListener;
 
 import org.xml.sax.Locator;
 
-import static com.sun.tools.internal.xjc.model.CElementPropertyInfo.CollectionMode.NOT_REPEATED;
-import static com.sun.tools.internal.xjc.model.CElementPropertyInfo.CollectionMode.REPEATED_VALUE;
-import static com.sun.tools.internal.xjc.model.CElementPropertyInfo.CollectionMode.REPEATED_ELEMENT;
-
 /**
  * DTD Element.
  *
@@ -238,7 +233,7 @@ final class Element extends Term implements Comparable {
 
             if(ci!=null) {
                 // if this element is mapped to a class, just put one property
-                CValuePropertyInfo p = new CValuePropertyInfo("value", null,null/*TODO*/,locator,getConversion());
+                CValuePropertyInfo p = new CValuePropertyInfo("value", null,null/*TODO*/,locator,getConversion(),null);
                 ci.addProperty(p);
             }
             return;
@@ -288,7 +283,7 @@ final class Element extends Term implements Comparable {
                 for( Element e : b.elements ) {
                     CClassInfo child = owner.getOrCreateElement(e.name).getClassInfo();
                     assert child!=null; // we are requiring them to be classes.
-                    p.getTypes().add(new CTypeRef(child,new QName("",e.name),false,null));
+                    p.getTypes().add(new CTypeRef(child,new QName("",e.name),null,false,null));
                 }
             } else {
                 // single property
@@ -306,7 +301,7 @@ final class Element extends Term implements Comparable {
                 p = new CElementPropertyInfo(propName,
                     refType.isCollection()?REPEATED_VALUE:NOT_REPEATED, ID.NONE, null, null,null/*TODO*/, locator, !b.isOptional );
 
-                p.getTypes().add(new CTypeRef((CNonElement)refType.getInfo(),new QName("",name),false,null));
+                p.getTypes().add(new CTypeRef(refType.getInfo(),new QName("",name),null,false,null));
             }
             ci.addProperty(p);
         }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle.properties b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle.properties
index f0e9960a0ef..237fb9f67f2 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle.properties
@@ -1,3 +1,28 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
 TDTDReader.NoRootElement = \
 	No root element was specified.
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Messages.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Messages.java
index 93aae3c434f..8410a43ef92 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Messages.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Messages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/ModelGroup.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/ModelGroup.java
index 1f83d887f0c..587eeb0f89d 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/ModelGroup.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/ModelGroup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.dtd;
 
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Occurence.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Occurence.java
index 41924a345ff..72a37c11fef 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Occurence.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Occurence.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.dtd;
 
 import java.util.List;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/TDTDReader.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/TDTDReader.java
index 0829ba3ee65..57b182594f6 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/TDTDReader.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/TDTDReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.dtd;
 
 import java.io.IOException;
@@ -101,14 +100,13 @@ public class TDTDReader extends DTDHandlerBase
                 ErrorReceiverFilter ef = new ErrorReceiverFilter(errorReceiver);
 
                 JCodeModel cm = new JCodeModel();
-                Model model = new Model(opts,cm,NameConverter.standard,opts.classNameAllocator);
+                Model model = new Model(opts,cm,NameConverter.standard,opts.classNameAllocator,null);
 
                 Ring.add(cm);
                 Ring.add(model);
                 Ring.add(ErrorReceiver.class,ef);
 
-                TDTDReader reader = new TDTDReader( ef, opts.entityResolver,
-                    opts, bindingInfo);
+                TDTDReader reader = new TDTDReader( ef, opts, bindingInfo);
 
                 DTDParser parser = new DTDParser();
                 parser.setDtdHandler(reader);
@@ -139,19 +137,16 @@ public class TDTDReader extends DTDHandlerBase
             return null;
         }
     }
-    protected TDTDReader(ErrorReceiver errorReceiver, EntityResolver entityResolver, Options opts, InputSource _bindInfo)
+    protected TDTDReader(ErrorReceiver errorReceiver, Options opts, InputSource _bindInfo)
         throws AbortException {
-        this.entityResolver = entityResolver;
+        this.entityResolver = opts.entityResolver;
         this.errorReceiver = new ErrorReceiverFilter(errorReceiver);
-        this.opts = opts;
         bindInfo = new BindInfo(model,_bindInfo, this.errorReceiver);
         classFactory = new CodeModelClassFactory(errorReceiver);
     }
 
     private final EntityResolver entityResolver;
 
-    private final Options opts;
-
     /**
      * binding information.
      *
@@ -161,8 +156,6 @@ public class TDTDReader extends DTDHandlerBase
      */
     final BindInfo bindInfo;
 
-    private final JCodeModel codeModel = Ring.get(JCodeModel.class);
-
     final Model model = Ring.get(Model.class);
 
     private final CodeModelClassFactory classFactory;
@@ -194,6 +187,8 @@ public class TDTDReader extends DTDHandlerBase
 
         // check XJC extensions and realize them
         model.serialVersionUID = bindInfo.getSerialVersionUID();
+        if(model.serialVersionUID!=null)
+            model.serializable=true;
         model.rootClass = bindInfo.getSuperClass();
         model.rootInterface = bindInfo.getSuperInterface();
 
@@ -217,7 +212,7 @@ public class TDTDReader extends DTDHandlerBase
 
         for( BIInterface decl : bindInfo.interfaces() ) {
             final JDefinedClass intf = classFactory.createInterface(
-                                getTargetPackage(), decl.name(), copyLocator() );
+                                bindInfo.getTargetPackage(), decl.name(), copyLocator() );
             decls.put(decl,intf);
             fromName.put(decl.name(),new InterfaceAcceptor() {
                 public void implement(JClass c) {
@@ -264,11 +259,7 @@ public class TDTDReader extends DTDHandlerBase
 
 
     JPackage getTargetPackage() {
-        // "-p" takes precedence over everything else
-        if(opts.defaultPackage!=null)
-            return codeModel._package(opts.defaultPackage);
-        else
-            return bindInfo.getTargetPackage();
+        return bindInfo.getTargetPackage();
     }
 
 
@@ -331,7 +322,7 @@ public class TDTDReader extends DTDHandlerBase
             use = builtinConversions.get(attributeType);
 
         CPropertyInfo r = new CAttributePropertyInfo(
-            propName, null,null/*TODO*/, copyLocator(), qname, use, required );
+            propName, null,null/*TODO*/, copyLocator(), qname, use, null, required );
 
         if(defaultValue!=null)
             r.defaultValue = CDefaultValue.create( use, new XmlString(defaultValue) );
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Term.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Term.java
index 975a9f5b9eb..8f114f40671 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Term.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Term.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.dtd;
 
 import java.util.List;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIAttribute.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIAttribute.java
index a47c7274861..22fe1cc0d7e 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIAttribute.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.dtd.bindinfo;
 
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConstructor.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConstructor.java
index a04d70760c2..60a0f5acbea 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConstructor.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConstructor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.dtd.bindinfo;
 
 import java.util.ArrayList;
@@ -83,7 +82,7 @@ public class BIConstructor
 
     /** Gets the location where this declaration is declared. */
     public Locator getSourceLocation() {
-        return DOM4JLocator.getLocationInfo(dom);
+        return DOMLocator.getLocationInfo(dom);
     }
 
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIContent.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIContent.java
index f1529a0489f..87d0db860aa 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIContent.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIContent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.dtd.bindinfo;
 
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConversion.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConversion.java
index a66e71a2d7a..010675792b6 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConversion.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConversion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.dtd.bindinfo;
 
 import com.sun.tools.internal.xjc.model.TypeUse;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIElement.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIElement.java
index ea695d93852..231526b4781 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIElement.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.dtd.bindinfo;
 
 import java.util.ArrayList;
@@ -115,7 +114,7 @@ public final class BIElement
      * Gets the source location where this element is declared.
      */
     public Locator getLocation() {
-        return DOM4JLocator.getLocationInfo(e);
+        return DOMLocator.getLocationInfo(e);
     }
 
 
@@ -268,6 +267,6 @@ public final class BIElement
 
     /** Gets the location where this declaration is declared. */
     public Locator getSourceLocation() {
-        return DOM4JLocator.getLocationInfo(e);
+        return DOMLocator.getLocationInfo(e);
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIEnumeration.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIEnumeration.java
index 3b9382a63bc..37b1af588f7 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIEnumeration.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIEnumeration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.dtd.bindinfo;
 
 import java.util.ArrayList;
@@ -75,7 +74,7 @@ public final class BIEnumeration implements BIConversion
                 CBuiltinLeafInfo.STRING,
                 buildMemberList(parent.model,dom),
                 null, null/*TODO*/,
-                DOM4JLocator.getLocationInfo(dom)));
+                DOMLocator.getLocationInfo(dom)));
     }
 
     /** Creates an element-local enumeration declaration. */
@@ -91,7 +90,7 @@ public final class BIEnumeration implements BIConversion
                 CBuiltinLeafInfo.STRING,
                 buildMemberList(parent.parent.model,dom),
                 null, null/*TODO*/,
-                DOM4JLocator.getLocationInfo(dom) ));
+                DOMLocator.getLocationInfo(dom) ));
     }
 
     private static List buildMemberList( Model model, Element dom ) {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIInterface.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIInterface.java
index 5cc68f8fc4b..268f8304741 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIInterface.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIInterface.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.dtd.bindinfo;
 
 import java.util.StringTokenizer;
@@ -77,7 +76,7 @@ public final class BIInterface
 
     /** Gets the location where this declaration is declared. */
     public Locator getSourceLocation() {
-        return DOM4JLocator.getLocationInfo(dom);
+        return DOMLocator.getLocationInfo(dom);
     }
 
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIUserConversion.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIUserConversion.java
index 35edd57a5c9..2afc54e763f 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIUserConversion.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIUserConversion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.dtd.bindinfo;
 
 import java.io.IOException;
@@ -49,8 +48,6 @@ import com.sun.tools.internal.xjc.model.CAdapter;
 import com.sun.tools.internal.xjc.model.CBuiltinLeafInfo;
 import com.sun.tools.internal.xjc.model.TypeUse;
 import com.sun.tools.internal.xjc.model.TypeUseFactory;
-import com.sun.tools.internal.xjc.reader.Ring;
-import com.sun.tools.internal.xjc.reader.xmlschema.ClassSelector;
 
 import org.w3c.dom.Element;
 import org.xml.sax.InputSource;
@@ -112,7 +109,7 @@ public class BIUserConversion implements BIConversion
 
     /** Gets the location where this declaration is declared. */
     public Locator getSourceLocation() {
-        return DOM4JLocator.getLocationInfo(e);
+        return DOMLocator.getLocationInfo(e);
     }
 
     /** Gets the conversion name. */
@@ -153,7 +150,7 @@ public class BIUserConversion implements BIConversion
         if(parse==null)  parse="new";
 
         String print = DOMUtil.getAttribute(e,"print");
-        if(print==null)  parse="toString";
+        if(print==null)  print="toString";
 
         JDefinedClass adapter = generateAdapter(owner.codeModel, parse, print, t.boxify());
 
@@ -168,7 +165,7 @@ public class BIUserConversion implements BIConversion
         int id = 1;
         while(adapter==null) {
             try {
-                JPackage pkg = Ring.get(ClassSelector.class).getClassScope().getOwnerPackage();
+                JPackage pkg = owner.getTargetPackage();
                 adapter = pkg._class("Adapter"+id);
             } catch (JClassAlreadyExistsException e) {
                 // try another name in search for an unique name.
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BindInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BindInfo.java
index 1a0d97fdc18..41fb6126e0f 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BindInfo.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BindInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.dtd.bindinfo;
 
 import java.io.IOException;
@@ -44,6 +43,8 @@ import com.sun.istack.internal.SAXParseException2;
 import com.sun.tools.internal.xjc.AbortException;
 import com.sun.tools.internal.xjc.ErrorReceiver;
 import com.sun.tools.internal.xjc.SchemaCache;
+import com.sun.tools.internal.xjc.model.CCustomizations;
+import com.sun.tools.internal.xjc.model.CPluginCustomization;
 import com.sun.tools.internal.xjc.model.Model;
 import com.sun.tools.internal.xjc.reader.Const;
 import com.sun.tools.internal.xjc.util.CodeModelClassFactory;
@@ -74,8 +75,7 @@ public class BindInfo
     private final String defaultPackage;
 
     public BindInfo(Model model, InputSource source, ErrorReceiver _errorReceiver) throws AbortException {
-
-        this( model, parse(source,_errorReceiver), _errorReceiver);
+        this( model, parse(model,source,_errorReceiver), _errorReceiver);
     }
 
     public BindInfo(Model model, Document _dom, ErrorReceiver _errorReceiver) {
@@ -88,6 +88,9 @@ public class BindInfo
 
         this.defaultPackage = model.options.defaultPackage;
 
+        // copy global customizations to the model
+        model.getCustomizations().addAll(getGlobalCustomizations());
+
         // process element declarations
         for( Element ele : DOMUtil.getChildElements(dom,"element")) {
             BIElement e = new BIElement(this,ele);
@@ -193,8 +196,14 @@ public class BindInfo
         return c;
     }
 
-    /** Gets the specified package name (options/@package). */
+    /**
+     * Gets the specified package name (options/@package).
+     */
     public JPackage getTargetPackage() {
+        if(model.options.defaultPackage!=null)
+            // "-p" takes precedence over everything else
+            return codeModel._package(model.options.defaultPackage);
+
         String p;
         if( defaultPackage!=null )
             p = defaultPackage;
@@ -236,6 +245,24 @@ public class BindInfo
         return interfaces.values();
     }
 
+    /**
+     * Gets the list of top-level {@link CPluginCustomization}s.
+     */
+    private CCustomizations getGlobalCustomizations() {
+        CCustomizations r=null;
+        for( Element e : DOMUtil.getChildElements(dom) ) {
+            if(!model.options.pluginURIs.contains(e.getNamespaceURI()))
+                continue;   // this isn't a plugin customization
+            if(r==null)
+                r = new CCustomizations();
+            r.add(new CPluginCustomization(e, DOMLocator.getLocationInfo(e)));
+        }
+
+        if(r==null)     r = CCustomizations.EMPTY;
+        return new CCustomizations(r);
+    }
+
+
 
 
 //
@@ -265,12 +292,14 @@ public class BindInfo
      * Parses an InputSource into dom4j Document.
      * Returns null in case of an exception.
      */
-    private static Document parse( InputSource is, ErrorReceiver receiver ) throws AbortException {
+    private static Document parse( Model model, InputSource is, ErrorReceiver receiver ) throws AbortException {
         try {
             ValidatorHandler validator = bindingFileSchema.newValidator();
 
             // set up the pipe line as :
-            //   parser->validator->factory
+            //              /-> extensionChecker -> validator
+            //   parser-> -<
+            //              \-> DOM builder
             SAXParserFactory pf = SAXParserFactory.newInstance();
             pf.setNamespaceAware(true);
             DOMBuilder builder = new DOMBuilder();
@@ -279,7 +308,11 @@ public class BindInfo
             validator.setErrorHandler(controller);
             XMLReader reader = pf.newSAXParser().getXMLReader();
             reader.setErrorHandler(controller);
-            reader.setContentHandler(new ForkContentHandler(validator,builder));
+
+            DTDExtensionBindingChecker checker = new DTDExtensionBindingChecker("", model.options, controller);
+            checker.setContentHandler(validator);
+
+            reader.setContentHandler(new ForkContentHandler(checker,builder));
 
             reader.parse(is);
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMBuilder.java
index 7ae8e694842..9829568d353 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMBuilder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.dtd.bindinfo;
 
 import javax.xml.parsers.ParserConfigurationException;
@@ -48,6 +47,6 @@ final class DOMBuilder extends SAX2DOMEx {
 
     public void startElement(String namespace, String localName, String qName, Attributes attrs) {
         super.startElement(namespace, localName, qName, attrs);
-        DOM4JLocator.setLocationInfo(getCurrentElement(),locator);
+        DOMLocator.setLocationInfo(getCurrentElement(),locator);
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOM4JLocator.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMLocator.java
similarity index 95%
rename from jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOM4JLocator.java
rename to jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMLocator.java
index 9f04a1c053f..53eb5fa007a 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOM4JLocator.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMLocator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,10 +28,9 @@ package com.sun.tools.internal.xjc.reader.dtd.bindinfo;
 import org.w3c.dom.Element;
 import org.xml.sax.Locator;
 
-class DOM4JLocator
-{
+class DOMLocator {
     private static final String locationNamespace =
-        "http://www.sun.com/xmlns/jaxb/dom4j-location";
+        "http://www.sun.com/xmlns/jaxb/dom-location";
     private static final String systemId    = "systemid";
     private static final String column      = "column";
     private static final String line        = "line";
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMUtil.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMUtil.java
index a5ffd3f304b..dc121ac243a 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMUtil.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.dtd.bindinfo;
 
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DTDExtensionBindingChecker.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DTDExtensionBindingChecker.java
new file mode 100644
index 00000000000..cd0822f9569
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DTDExtensionBindingChecker.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.tools.internal.xjc.reader.dtd.bindinfo;
+
+import com.sun.tools.internal.xjc.Options;
+import com.sun.tools.internal.xjc.reader.AbstractExtensionBindingChecker;
+import com.sun.tools.internal.xjc.reader.Const;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLFilter;
+
+/**
+ * {@link XMLFilter} that checks the use of extension namespace URIs
+ * (to see if they have corresponding plugins), and otherwise report an error.
+ *
+ * 
    
+ * This code also masks the recognized extensions from the validator that
+ * will be plugged as the next component to this.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+final class DTDExtensionBindingChecker extends AbstractExtensionBindingChecker {
+    public DTDExtensionBindingChecker(String schemaLanguage, Options options, ErrorHandler handler) {
+        super(schemaLanguage, options, handler);
+    }
+
+    /**
+     * Returns true if the elements with the given namespace URI
+     * should be blocked by this filter.
+     */
+    private boolean needsToBePruned( String uri ) {
+        if( uri.equals(schemaLanguage) )
+            return false;
+        if( uri.equals(Const.JAXB_NSURI) )
+            return false;
+        if( uri.equals(Const.XJC_EXTENSION_URI) )
+            return false;
+        // we don't want validator to see extensions that we understand ,
+        // because they will complain.
+        // OTOH, if  this is an extension that we didn't understand,
+        // we want the validator to report an error
+        return enabledExtensions.contains(uri);
+    }
+
+
+
+    public void startElement(String uri, String localName, String qName, Attributes atts)
+        throws SAXException {
+
+        if( !isCutting() ) {
+            if(!uri.equals("")) {
+                // "" is the standard namespace
+                checkAndEnable(uri);
+
+                verifyTagName(uri, localName, qName);
+
+                if(needsToBePruned(uri))
+                    startCutting();
+            }
+        }
+
+        super.startElement(uri, localName, qName, atts);
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle.properties b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle.properties
index a6343d1e917..dc662e63d47 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle.properties
@@ -1,3 +1,27 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
 
 BIConstructor.UndefinedField = \
 	Property "{0}" is declared in the  declaration \
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/Messages.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/Messages.java
index 6536bc70177..9fcd10feff7 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/Messages.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/Messages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.rng b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.rng
index 2e639f5727a..a71e45ba580 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.rng
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.rng
@@ -1,4 +1,28 @@
 
+
 
-
 
 
    Object Model that represents DTD binding information.
    
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/xjc.xsd b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/xjc.xsd
index 2fceabdf0d7..e80bb2a994b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/xjc.xsd
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/xjc.xsd
@@ -1,7 +1,6 @@
 
-
 
-
 
   
   
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Choice.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Choice.java
index e5832220590..91be85a49b3 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Choice.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Choice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.gbind;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ConnectedComponent.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ConnectedComponent.java
index 0061dba5ea3..29759c9b041 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ConnectedComponent.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ConnectedComponent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.gbind;
 
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Element.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Element.java
index c07ed088b23..4e647394547 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Element.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Element.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.gbind;
 
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -51,8 +50,8 @@ public abstract class Element extends Expression implements ElementSet {
      * we represent an edge e1 -> e2 by {@code e1.foreEdges.contains(e2)}
      * and {@code e2.backEdges.contains(e1)}.
      */
-    final Set foreEdges = new HashSet();
-    final Set backEdges = new HashSet();
+    final Set foreEdges = new LinkedHashSet();
+    final Set backEdges = new LinkedHashSet();
 
     /**
      * Previous element in the DFS post-order traveral
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSet.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSet.java
index 08cdfc6c472..6e73c920f79 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSet.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.gbind;
 
 import java.util.Collections;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSets.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSets.java
index bbce4a94e6c..4711260359d 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSets.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSets.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,9 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.gbind;
 
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 
 /**
  * Factory methods for {@link ElementSet}.
@@ -53,7 +52,7 @@ public final class ElementSets {
      *
      * This isn't particularly efficient or anything, but it will do for now.
      */
-    private static final class MultiValueSet extends HashSet implements ElementSet {
+    private static final class MultiValueSet extends LinkedHashSet implements ElementSet {
         public MultiValueSet(ElementSet lhs, ElementSet rhs) {
             addAll(lhs);
             addAll(rhs);
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Expression.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Expression.java
index efd6bb02e21..9583157837e 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Expression.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Expression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.gbind;
 
 import java.util.Set;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Graph.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Graph.java
index c3d0bce6490..c612fddbd81 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Graph.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Graph.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.gbind;
 
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/OneOrMore.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/OneOrMore.java
index 5a5e2ab24a4..4be389204fb 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/OneOrMore.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/OneOrMore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.gbind;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Sequence.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Sequence.java
index 1a7888c2546..aa628cbe871 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Sequence.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Sequence.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.gbind;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/SinkNode.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/SinkNode.java
index a58803b0da1..ded5a787c95 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/SinkNode.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/SinkNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.gbind;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/SourceNode.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/SourceNode.java
index 96584b297f6..c96d78a654c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/SourceNode.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/SourceNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.gbind;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/package.html b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/package.html
index ab9a91b1933..a8676fb057b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/package.html
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/package.html
@@ -1,3 +1,27 @@
+
 
 
     Binary expressions are left-associative. IOW, ((A,B),C) instead of (A,(B,C))
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java
index 55b57d2e46b..1fc6f40b87f 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,10 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.internalizer;
 
 import java.io.IOException;
+import java.io.File;
 import java.net.URI;
 import java.net.URISyntaxException;
 
@@ -83,8 +83,13 @@ public abstract class AbstractReferenceFinderImpl extends XMLFilterImpl {
             // but don't mark this document as a root.
             parent.parse(ref,false);
         } catch( URISyntaxException e ) {
+            String msg = e.getMessage();
+            if(new File(relativeRef).exists()) {
+                msg = Messages.format(Messages.ERR_FILENAME_IS_NOT_URI)+' '+msg;
+            }
+
             SAXParseException spe = new SAXParseException2(
-                Messages.format(Messages.ERR_UNABLE_TO_PARSE,relativeRef,e.getMessage()),
+                Messages.format(Messages.ERR_UNABLE_TO_PARSE,relativeRef, msg),
                 locator, e );
 
             fatalError(spe);
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/ContentHandlerNamespacePrefixAdapter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/ContentHandlerNamespacePrefixAdapter.java
index aa9c991415d..0cc0003a25f 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/ContentHandlerNamespacePrefixAdapter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/ContentHandlerNamespacePrefixAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.internalizer;
 
 import javax.xml.XMLConstants;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMBuilder.java
index 96bb428b6fd..d88c1578f08 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMBuilder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.internalizer;
 
 import java.util.Set;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java
index 03fe2e27ffb..81803a28b27 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.internalizer;
 
 import java.io.IOException;
@@ -55,11 +54,11 @@ import javax.xml.transform.sax.SAXSource;
 import javax.xml.validation.SchemaFactory;
 
 import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.XMLStreamReaderToContentHandler;
 import com.sun.tools.internal.xjc.ErrorReceiver;
 import com.sun.tools.internal.xjc.reader.Const;
 import com.sun.tools.internal.xjc.reader.xmlschema.parser.SchemaConstraintChecker;
 import com.sun.tools.internal.xjc.util.ErrorReceiverFilter;
-import com.sun.tools.internal.xjc.util.XMLStreamReaderToContentHandler;
 import com.sun.xml.internal.bind.marshaller.DataWriter;
 import com.sun.xml.internal.xsom.parser.JAXPParser;
 import com.sun.xml.internal.xsom.parser.XMLParser;
@@ -202,6 +201,18 @@ public final class DOMForest {
         return Collections.unmodifiableSet(rootDocuments);
     }
 
+    /**
+     * Picks one document at random and returns it.
+     */
+    public Document getOneDocument() {
+        for (Document dom : core.values()) {
+            if (!dom.getDocumentElement().getNamespaceURI().equals(Const.JAXB_NSURI))
+                return dom;
+        }
+        // we should have caught this error very early on
+        throw new AssertionError();
+    }
+
     /**
      * Checks the correctness of the XML Schema documents and return true
      * if it's OK.
@@ -407,7 +418,7 @@ public final class DOMForest {
             throw new IllegalArgumentException("system id cannot be null");
         core.put( systemId, dom );
 
-        new XMLStreamReaderToContentHandler(parser,getParserHandler(dom)).bridge();
+        new XMLStreamReaderToContentHandler(parser,getParserHandler(dom),false,false).bridge();
 
         return dom;
     }
@@ -417,9 +428,13 @@ public final class DOMForest {
      *
      * This method should be called only once, only after all the
      * schemas are parsed.
+     *
+     * @return
+     *      the returned bindings need to be applied after schema
+     *      components are built.
      */
-    public void transform() {
-        Internalizer.transform(this);
+    public SCDBasedBindingSet transform(boolean enableSCD) {
+        return Internalizer.transform(this,enableSCD);
     }
 
     /**
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestParser.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestParser.java
index 418293807b2..d5c25c5638e 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestParser.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.internalizer;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestScanner.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestScanner.java
index 3f9b639a000..af3c4231ebc 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestScanner.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestScanner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.internalizer;
 
 import com.sun.xml.internal.bind.unmarshaller.DOMScanner;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/InternalizationLogic.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/InternalizationLogic.java
index 30283009734..efe192b17bb 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/InternalizationLogic.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/InternalizationLogic.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.internalizer;
 
 import org.w3c.dom.Element;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/Internalizer.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/Internalizer.java
index b2d71efe708..bee1dc83496 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/Internalizer.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/Internalizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.internalizer;
 
 import java.net.MalformedURLException;
@@ -31,6 +30,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.text.ParseException;
 
 import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathConstants;
@@ -38,10 +38,13 @@ import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 
 import com.sun.istack.internal.SAXParseException2;
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
 import com.sun.tools.internal.xjc.ErrorReceiver;
 import com.sun.tools.internal.xjc.reader.Const;
 import com.sun.tools.internal.xjc.util.DOMUtils;
 import com.sun.xml.internal.bind.v2.util.EditDistance;
+import com.sun.xml.internal.xsom.SCD;
 
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
@@ -55,8 +58,9 @@ import org.xml.sax.SAXParseException;
 
 /**
  * Internalizes external binding declarations.
+ *
  * 
    
- * The static "transform" method is the entry point.
+ * The {@link #transform(DOMForest,boolean)} method is the entry point.
  *
  * @author
  *     Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
@@ -69,15 +73,23 @@ class Internalizer {
 
     /**
      * Internalize all <jaxb:bindings> customizations in the given forest.
+     *
+     * @return
+     *      if the SCD support is enabled, the return bindings need to be applied
+     *      after schema components are parsed.
+     *      If disabled, the returned binding set will be empty.
+     *      SCDs are only for XML Schema, and doesn't make any sense for other
+     *      schema languages.
      */
-    static void transform( DOMForest forest ) {
-        new Internalizer( forest ).transform();
+    static SCDBasedBindingSet transform( DOMForest forest, boolean enableSCD ) {
+        return new Internalizer( forest, enableSCD ).transform();
     }
 
 
-    private Internalizer( DOMForest forest ) {
+    private Internalizer( DOMForest forest, boolean enableSCD ) {
         this.errorHandler = forest.getErrorHandler();
         this.forest = forest;
+        this.enableSCD = enableSCD;
     }
 
     /**
@@ -90,18 +102,25 @@ class Internalizer {
      */
     private ErrorReceiver errorHandler;
 
+    /**
+     * If true, the SCD-based target selection is supported.
+     */
+    private boolean enableSCD;
 
 
-    private void transform() {
+    private SCDBasedBindingSet transform() {
 
+        // either target nodes are conventional DOM nodes (as per spec),
         Map targetNodes = new HashMap();
+        // ... or it will be schema components by means of SCD (RI extension)
+        SCDBasedBindingSet scd = new SCDBasedBindingSet(forest);
 
         //
         // identify target nodes for all 
         //
         for (Element jaxbBindings : forest.outerMostBindings) {
             // initially, the inherited context is itself
-            buildTargetNodeMap(jaxbBindings, jaxbBindings, targetNodes);
+            buildTargetNodeMap(jaxbBindings, jaxbBindings, null, targetNodes, scd);
         }
 
         //
@@ -110,6 +129,8 @@ class Internalizer {
         for (Element jaxbBindings : forest.outerMostBindings) {
             move(jaxbBindings, targetNodes);
         }
+
+        return scd;
     }
 
     /**
@@ -125,6 +146,8 @@ class Internalizer {
                 continue;
             if( a.getLocalName().equals("schemaLocation"))
                 continue;
+            if( a.getLocalName().equals("scd") )
+                continue;
 
             // TODO: flag error for this undefined attribute
         }
@@ -133,9 +156,19 @@ class Internalizer {
     /**
      * Determines the target node of the "bindings" element
      * by using the inherited target node, then put
-     * the result into the "result" map.
+     * the result into the "result" map and the "scd" map.
+     *
+     * @param inheritedTarget
+     *      The current target node. This always exists, even if
+     *      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
+     *      specify the target via SCD, then this parameter represents that context.
      */
-    private void buildTargetNodeMap( Element bindings, Node inheritedTarget, Map result ) {
+    private void buildTargetNodeMap( Element bindings, @NotNull Node inheritedTarget,
+                                     @Nullable SCDBasedBindingSet.Target inheritedSCD,
+                                     Map result, SCDBasedBindingSet scdResult ) {
         // start by the inherited target
         Node target = inheritedTarget;
 
@@ -153,7 +186,7 @@ class Internalizer {
                     new URL( forest.getSystemId(bindings.getOwnerDocument()) ),
                     schemaLocation ).toExternalForm();
             } catch( MalformedURLException e ) {
-                ;   // continue with the original schemaLocation value
+                // continue with the original schemaLocation value
             }
 
             target = forest.get(schemaLocation);
@@ -165,6 +198,8 @@ class Internalizer {
 
                 return; // abort processing this 
             }
+
+            target = ((Document)target).getDocumentElement();
         }
 
         // look for @node
@@ -178,51 +213,69 @@ class Internalizer {
                 nlst = (NodeList)xpath.evaluate(nodeXPath,target,XPathConstants.NODESET);
             } catch (XPathExpressionException e) {
                 reportError( bindings,
-                    Messages.format(Messages.ERR_XPATH_EVAL,e.getMessage()),
-                    e );
+                    Messages.format(Messages.ERR_XPATH_EVAL,e.getMessage()), e );
                 return; // abort processing this 
             }
 
             if( nlst.getLength()==0 ) {
                 reportError( bindings,
-                    Messages.format(Messages.NO_XPATH_EVAL_TO_NO_TARGET,
-                        nodeXPath) );
+                    Messages.format(Messages.NO_XPATH_EVAL_TO_NO_TARGET, nodeXPath) );
                 return; // abort
             }
 
             if( nlst.getLength()!=1 ) {
                 reportError( bindings,
-                    Messages.format(Messages.NO_XPATH_EVAL_TOO_MANY_TARGETS,
-                        nodeXPath,nlst.getLength()) );
+                    Messages.format(Messages.NO_XPATH_EVAL_TOO_MANY_TARGETS, nodeXPath,nlst.getLength()) );
                 return; // abort
             }
 
             Node rnode = nlst.item(0);
             if(!(rnode instanceof Element )) {
                 reportError( bindings,
-                    Messages.format(Messages.NO_XPATH_EVAL_TO_NON_ELEMENT,
-                        nodeXPath) );
+                    Messages.format(Messages.NO_XPATH_EVAL_TO_NON_ELEMENT, nodeXPath) );
                 return; // abort
             }
 
             if( !forest.logic.checkIfValidTargetNode(forest,bindings,(Element)rnode) ) {
                 reportError( bindings,
                     Messages.format(Messages.XPATH_EVAL_TO_NON_SCHEMA_ELEMENT,
-                        nodeXPath,
-                        rnode.getNodeName() ) );
+                        nodeXPath, rnode.getNodeName() ) );
                 return; // abort
             }
 
             target = rnode;
         }
 
+        // look for @scd
+        if( bindings.getAttributeNode("scd")!=null ) {
+            String scdPath = bindings.getAttribute("scd");
+            if(!enableSCD) {
+                // SCD selector was found, but it's not activated. report an error
+                // but recover by handling it anyway. this also avoids repeated error messages.
+                reportError(bindings,
+                    Messages.format(Messages.SCD_NOT_ENABLED));
+                enableSCD = true;
+            }
+
+            try {
+                inheritedSCD = scdResult.createNewTarget( inheritedSCD, bindings,
+                        SCD.create(scdPath, new NamespaceContextImpl(bindings)) );
+            } catch (ParseException e) {
+                reportError( bindings, Messages.format(Messages.ERR_SCD_EVAL,e.getMessage()),e );
+                return; // abort processing this bindings
+            }
+        }
+
         // update the result map
-        result.put( bindings, target );
+        if(inheritedSCD!=null)
+            inheritedSCD.addBinidng(bindings);
+        else
+            result.put( bindings, target );
 
         // look for child  and process them recursively
         Element[] children = DOMUtils.getChildElements( bindings, Const.JAXB_NSURI, "bindings" );
         for (Element value : children)
-            buildTargetNodeMap(value, target, result);
+            buildTargetNodeMap(value, target, inheritedSCD, result, scdResult);
     }
 
     /**
@@ -235,21 +288,20 @@ class Internalizer {
             // recover from the error by ignoring this node
             return;
 
-        Element[] children = DOMUtils.getChildElements(bindings);
-        for (Element item : children) {
-            if ("bindings".equals(item.getLocalName()))
-            // process child  recursively
+        for (Element item : DOMUtils.getChildElements(bindings)) {
+            String localName = item.getLocalName();
+
+            if ("bindings".equals(localName)) {
+                // process child  recursively
                 move(item, targetNodes);
-            else {
+            } else
+            if ("globalBindings".equals(localName)) {
+                //  always go to the root of document.
+                moveUnder(item,forest.getOneDocument().getDocumentElement());
+            } else {
                 if (!(target instanceof Element)) {
-                    if(target instanceof Document) {
-                        // we set the context node to the document when @schemaLocation is used.
-                        reportError(item,
-                                Messages.format(Messages.NO_CONTEXT_NODE_SPECIFIED));
-                    } else {
-                        reportError(item,
-                                Messages.format(Messages.CONTEXT_NODE_IS_NOT_ELEMENT));
-                    }
+                    reportError(item,
+                            Messages.format(Messages.CONTEXT_NODE_IS_NOT_ELEMENT));
                     return; // abort
                 }
 
@@ -258,6 +310,7 @@ class Internalizer {
                             Messages.format(Messages.ORPHANED_CUSTOMIZATION, item.getNodeName()));
                     return; // abort
                 }
+
                 // move this node under the target
                 moveUnder(item,(Element)target);
             }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/LocatorTable.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/LocatorTable.java
index dedf9ec907c..1bab8f95b16 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/LocatorTable.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/LocatorTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.internalizer;
 
 import java.util.HashMap;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle.properties b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle.properties
index 95bf7802809..5dd998a4175 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle.properties
@@ -1,3 +1,28 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
 #
 # Message resource file
 #
@@ -31,9 +56,6 @@ Internalizer.XPathEvaluatesToNonSchemaElement = \
 Internalizer.ContextNodeIsNotElement = \
 	Context node is not an element.
 
-Internalizer.NoContextNodeSpecified = \
-	A schema document is selected but @node is not specified. Maybe you meant node="/xs:schema"? 
-
 Internalizer.OrphanedCustomization = \
 	The "{0}" customization is not associated with any schema element.
 
@@ -48,4 +70,25 @@ Internalizer.TwoVersionAttributes = \
 
 ERR_GENERAL_SCHEMA_CORRECTNESS_ERROR = \
     We were unable to ensure the correctness of the schema: {0}
+
+SCD_NOT_ENABLED = \
+    Schema component designator support is disabled by default. Use the -extension switch to enable this vendor extension.
+
+ERR_SCD_EVAL = \
+    Invalid SCD: {0}
+
+ERR_SCD_EVALUATED_EMPTY = \
+    SCD "{0}" didn't match any schema component
+
+ERR_SCD_MATCHED_MULTIPLE_NODES = \
+    SCD "{0}" matched {1} schema components whereas only 1 is expected
+
+ERR_SCD_MATCHED_MULTIPLE_NODES_FIRST = \
+    (related to above) one of the matched schema components is defined here
+
+ERR_SCD_MATCHED_MULTIPLE_NODES_SECOND = \
+    (related to above) another matched schema component is defined here
+
+ERR_FILENAME_IS_NOT_URI = \
+    File name is not an URI.
  
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/Messages.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/Messages.java
index 270d3fc78f7..e9b50254876 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/Messages.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/Messages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,10 +51,20 @@ class Messages
         "Internalizer.XPathEvaluatesToNonElement";
     static final String XPATH_EVAL_TO_NON_SCHEMA_ELEMENT = // arg:2
         "Internalizer.XPathEvaluatesToNonSchemaElement";
+    static final String SCD_NOT_ENABLED = // arg:0
+        "SCD_NOT_ENABLED";
+    static final String ERR_SCD_EVAL = // arg: 1
+        "ERR_SCD_EVAL";
+    static final String ERR_SCD_EVALUATED_EMPTY = // arg:1
+        "ERR_SCD_EVALUATED_EMPTY";
+    static final String ERR_SCD_MATCHED_MULTIPLE_NODES = // arg:2
+        "ERR_SCD_MATCHED_MULTIPLE_NODES";
+    static final String ERR_SCD_MATCHED_MULTIPLE_NODES_FIRST = // arg:1
+        "ERR_SCD_MATCHED_MULTIPLE_NODES_FIRST";
+    static final String ERR_SCD_MATCHED_MULTIPLE_NODES_SECOND = // arg:1
+        "ERR_SCD_MATCHED_MULTIPLE_NODES_SECOND";
     static final String CONTEXT_NODE_IS_NOT_ELEMENT = // arg:0
         "Internalizer.ContextNodeIsNotElement";
-    static final String NO_CONTEXT_NODE_SPECIFIED = // arg:0
-            "Internalizer.NoContextNodeSpecified";
     static final String ERR_INCORRECT_VERSION = // arg:0
         "Internalizer.IncorrectVersion";
     static final String ERR_VERSION_NOT_FOUND = // arg:0
@@ -65,6 +75,8 @@ class Messages
         "Internalizer.OrphanedCustomization";
     static final String ERR_UNABLE_TO_PARSE = // arg:2
         "AbstractReferenceFinderImpl.UnableToParse";
+    static final String ERR_FILENAME_IS_NOT_URI = // arg:0
+        "ERR_FILENAME_IS_NOT_URI";
     static final String ERR_GENERAL_SCHEMA_CORRECTNESS_ERROR = // arg:1
         "ERR_GENERAL_SCHEMA_CORRECTNESS_ERROR";
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/NamespaceContextImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/NamespaceContextImpl.java
index f30a55011be..bc6d5129f2c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/NamespaceContextImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/NamespaceContextImpl.java
@@ -2,6 +2,32 @@
  * reserved comment block
  * DO NOT REMOVE OR ALTER!
  */
+/*
+ * Portions Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
+ */
 package com.sun.tools.internal.xjc.reader.internalizer;
 
 import java.util.Iterator;
@@ -45,6 +71,7 @@ final class NamespaceContextImpl implements NamespaceContext {
     public String getNamespaceURI(String prefix) {
         Node parent = e;
         String namespace = null;
+        final String prefixColon = prefix + ':';
 
         if (prefix.equals("xml")) {
             namespace = WellKnownNamespace.XML_NAMESPACE_URI;
@@ -55,7 +82,7 @@ final class NamespaceContextImpl implements NamespaceContext {
                     && (((type = parent.getNodeType()) == Node.ELEMENT_NODE)
                     || (type == Node.ENTITY_REFERENCE_NODE))) {
                 if (type == Node.ELEMENT_NODE) {
-                    if (parent.getNodeName().indexOf(prefix + ':') == 0)
+                    if (parent.getNodeName().startsWith(prefixColon))
                         return parent.getNamespaceURI();
                     NamedNodeMap nnm = parent.getAttributes();
 
@@ -81,6 +108,8 @@ final class NamespaceContextImpl implements NamespaceContext {
             }
         }
 
+        if(prefix.equals(""))
+            return "";  // default namespace
         return namespace;
     }
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java
new file mode 100644
index 00000000000..a4d87cf8146
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java
@@ -0,0 +1,245 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.tools.internal.xjc.reader.internalizer;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.UnmarshallerHandler;
+import javax.xml.validation.ValidatorHandler;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.SAXParseException2;
+import com.sun.tools.internal.xjc.ErrorReceiver;
+import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIDeclaration;
+import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BindInfo;
+import com.sun.tools.internal.xjc.util.ForkContentHandler;
+import com.sun.tools.internal.xjc.util.DOMUtils;
+import com.sun.xml.internal.xsom.SCD;
+import com.sun.xml.internal.xsom.XSAnnotation;
+import com.sun.xml.internal.xsom.XSComponent;
+import com.sun.xml.internal.xsom.XSSchemaSet;
+import com.sun.xml.internal.bind.v2.runtime.unmarshaller.UnmarshallerImpl;
+
+import org.w3c.dom.Element;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+
+/**
+ * Set of binding nodes that have target nodes specified via SCD.
+ *
+ * This is parsed during {@link Internalizer} works on the tree,
+ * but applying this has to wait for {@link XSSchemaSet} to be parsed.
+ *
+ * @author Kohsuke Kawaguchi
+ * @see SCD
+ */
+public final class SCDBasedBindingSet {
+
+    /**
+     * Represents the target schema component of the
+     * customization identified by SCD.
+     *
+     * @author Kohsuke Kawaguchi
+     */
+    final class Target {
+        /**
+         * SCDs can be specified via multiple steps, like:
+         *
+         * 
    
+         * <bindings scd="foo/bar">
+         *   <bindings scd="zot/xyz">
+         * 
+         *
+         * This field and {@link #nextSibling} form a single-linked list that
+         * represent the children that shall be evaluated within this target.
+         * Think of it as {@code List}.
+         */
+        private Target firstChild;
+        private final Target nextSibling;
+
+        /**
+         * Compiled SCD.
+         */
+        private final @NotNull SCD scd;
+
+        /**
+         * The element on which SCD was found.
+         */
+        private final @NotNull Element src;
+
+        /**
+         * Bindings that apply to this SCD.
+         */
+        private final List bindings = new ArrayList();
+
+        private Target(Target parent, Element src, SCD scd) {
+            if(parent==null) {
+                this.nextSibling = topLevel;
+                topLevel = this;
+            } else {
+                this.nextSibling = parent.firstChild;
+                parent.firstChild = this;
+            }
+            this.src = src;
+            this.scd = scd;
+        }
+
+        /**
+         * Adds a new binding declaration to be associated to the schema component
+         * identified by {@link #scd}.
+         */
+        void addBinidng(Element binding) {
+            bindings.add(binding);
+        }
+
+        /**
+         * Applies bindings to the schema component for this and its siblings.
+         */
+        private void applyAll(Collection contextNode) {
+            for( Target self=this; self!=null; self=self.nextSibling )
+                self.apply(contextNode);
+        }
+
+        /**
+         * Applies bindings to the schema component for just this node.
+         */
+        private void apply(Collection contextNode) {
+            // apply the SCD...
+            Collection childNodes = scd.select(contextNode);
+            if(childNodes.isEmpty()) {
+                // no node matched
+                if(src.getAttributeNode("if-exists")!=null) {
+                    // if this attribute exists, it's not an error if SCD didn't match.
+                    return;
+                }
+
+                reportError( src, Messages.format(Messages.ERR_SCD_EVALUATED_EMPTY,scd) );
+                return;
+            }
+
+            if(firstChild!=null)
+                    firstChild.applyAll(childNodes);
+
+            if(!bindings.isEmpty()) {
+                // error to match more than one components
+                Iterator itr = childNodes.iterator();
+                XSComponent target = itr.next();
+                if(itr.hasNext()) {
+                    reportError( src, Messages.format(Messages.ERR_SCD_MATCHED_MULTIPLE_NODES,scd,childNodes.size()) );
+                    errorReceiver.error( target.getLocator(), Messages.format(Messages.ERR_SCD_MATCHED_MULTIPLE_NODES_FIRST) );
+                    errorReceiver.error( itr.next().getLocator(), Messages.format(Messages.ERR_SCD_MATCHED_MULTIPLE_NODES_SECOND) );
+                }
+
+                // apply bindings to the target
+                for (Element binding : bindings) {
+                    for (Element item : DOMUtils.getChildElements(binding)) {
+                        String localName = item.getLocalName();
+
+                        if ("bindings".equals(localName))
+                            continue;   // this should be already in Target.bindings of some SpecVersion.
+
+                        try {
+                            new DOMForestScanner(forest).scan(item,loader);
+                            BIDeclaration decl = (BIDeclaration)unmarshaller.getResult();
+
+                            // add this binding to the target
+                            XSAnnotation ann = target.getAnnotation(true);
+                            BindInfo bi = (BindInfo)ann.getAnnotation();
+                            if(bi==null) {
+                                bi = new BindInfo();
+                                ann.setAnnotation(bi);
+                            }
+                            bi.addDecl(decl);
+                        } catch (SAXException e) {
+                            // the error should have already been reported.
+                        } catch (JAXBException e) {
+                            // if validation didn't fail, then unmarshalling can't go wrong
+                            throw new AssertionError(e);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private Target topLevel;
+
+    /**
+     * The forest where binding elements came from. Needed to report line numbers for errors.
+     */
+    private final DOMForest forest;
+
+
+    // variables used only during the apply method
+    //
+    private ErrorReceiver errorReceiver;
+    private UnmarshallerHandler unmarshaller;
+    private ForkContentHandler loader; // unmarshaller+validator
+
+    SCDBasedBindingSet(DOMForest forest) {
+        this.forest = forest;
+    }
+
+    Target createNewTarget(Target parent, Element src, SCD scd) {
+        return new Target(parent,src,scd);
+    }
+
+    /**
+     * Applies the additional binding customizations.
+     */
+    public void apply(XSSchemaSet schema, ErrorReceiver errorReceiver) {
+        if(topLevel!=null) {
+            this.errorReceiver = errorReceiver;
+            UnmarshallerImpl u = BindInfo.getJAXBContext().createUnmarshaller();
+            this.unmarshaller = u.getUnmarshallerHandler();
+            ValidatorHandler v = BindInfo.bindingFileSchema.newValidator();
+            v.setErrorHandler(errorReceiver);
+            loader = new ForkContentHandler(v,unmarshaller);
+
+            topLevel.applyAll(schema.getSchemas());
+
+            this.loader = null;
+            this.unmarshaller = null;
+            this.errorReceiver = null;
+        }
+    }
+
+    private void reportError( Element errorSource, String formattedMsg ) {
+        reportError( errorSource, formattedMsg, null );
+    }
+
+    private void reportError( Element errorSource,
+                              String formattedMsg, Exception nestedException ) {
+
+        SAXParseException e = new SAXParseException2( formattedMsg,
+            forest.locatorTable.getStartLocation(errorSource),
+            nestedException );
+        errorReceiver.error(e);
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/VersionChecker.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/VersionChecker.java
index 1170d47bb7c..f022451af4f 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/VersionChecker.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/VersionChecker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,9 +22,12 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.internalizer;
 
+import java.util.Set;
+import java.util.HashSet;
+import java.util.Arrays;
+
 import com.sun.tools.internal.xjc.reader.Const;
 
 import org.xml.sax.Attributes;
@@ -118,7 +121,7 @@ public class VersionChecker extends XMLFilterImpl {
         }
 
         // if present, the value must be either 1.0 or 2.0
-        if( version!=null && !version.equals("1.0") && !version.equals("2.0") ) {
+        if( version!=null && !VERSIONS.contains(version) ) {
             SAXParseException e = new SAXParseException(
                 Messages.format(Messages.ERR_INCORRECT_VERSION),rootTagStart);
             getErrorHandler().error(e);
@@ -130,4 +133,6 @@ public class VersionChecker extends XMLFilterImpl {
         this.locator = locator;
     }
 
+    private static final Set VERSIONS = new HashSet(Arrays.asList("1.0","2.0","2.1"));
+
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/WhitespaceStripper.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/WhitespaceStripper.java
index c55813d52eb..f8fe96c1c9c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/WhitespaceStripper.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/WhitespaceStripper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,10 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * @(#)$Id: WhitespaceStripper.java,v 1.2 2005/04/29 19:56:57 kohsuke Exp $
+ */
+
 
 package com.sun.tools.internal.xjc.reader.internalizer;
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/package.html b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/package.html
index 259b4fff0ef..5b9d6659c8d 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/package.html
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/package.html
@@ -1 +1,25 @@
+
 
    internalization of external binding files and <jaxb:bindings> customizations.
    
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/package.html b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/package.html
index d355bc87c0d..d0da4ff37bd 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/package.html
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/package.html
@@ -1 +1,25 @@
+
 
    Front-end that reads schema(s) and produce BGM.
    
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/BindStyle.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/BindStyle.java
index 63f23b747c7..9d5a3df55e0 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/BindStyle.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/BindStyle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.relaxng;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/ContentModelBinder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/ContentModelBinder.java
index 53fd3f86abc..887b1270170 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/ContentModelBinder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/ContentModelBinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.relaxng;
 
 import javax.xml.namespace.QName;
@@ -116,7 +115,7 @@ final class ContentModelBinder extends DPatternWalker {
 
         CAttributePropertyInfo ap = new CAttributePropertyInfo(
            calcName(p), null,null/*TODO*/, p.getLocation(), name,
-                p.getChild().accept(compiler.typeUseBinder),
+                p.getChild().accept(compiler.typeUseBinder), null,
                 !insideOptional);
         clazz.addProperty(ap);
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DatatypeLib.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DatatypeLib.java
index 8aabe5545f2..3633252bdb9 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DatatypeLib.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DatatypeLib.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.relaxng;
 
 import java.util.HashMap;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DefineFinder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DefineFinder.java
index 32f28614174..f5823ddb16e 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DefineFinder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DefineFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.relaxng;
 
 import java.util.HashSet;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/NameCalculator.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/NameCalculator.java
index e45fecf92d8..807ba2a7099 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/NameCalculator.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/NameCalculator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.relaxng;
 
 import com.sun.xml.internal.rngom.digested.DPatternWalker;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGCompiler.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGCompiler.java
index c532e373096..7a7e0c8552b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGCompiler.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGCompiler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.relaxng;
 
 import java.util.ArrayList;
@@ -112,7 +111,7 @@ public final class RELAXNGCompiler {
     public RELAXNGCompiler(DPattern grammar, JCodeModel codeModel, Options opts) {
         this.grammar = grammar;
         this.opts = opts;
-        this.model = new Model(opts,codeModel, NameConverter.smart,opts.classNameAllocator);
+        this.model = new Model(opts,codeModel, NameConverter.smart,opts.classNameAllocator,null);
 
         datatypes.put("",DatatypeLib.BUILTIN);
         datatypes.put(WellKnownNamespaces.XML_SCHEMA_DATATYPES,DatatypeLib.XMLSCHEMA);
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGInternalizationLogic.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGInternalizationLogic.java
index 18e7ee85433..5291df74e4d 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGInternalizationLogic.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGInternalizationLogic.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.relaxng;
 
 import com.sun.tools.internal.xjc.reader.Const;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RawTypeSetBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RawTypeSetBuilder.java
index 04a70764aba..056b54155af 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RawTypeSetBuilder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RawTypeSetBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.relaxng;
 
 import java.util.HashSet;
@@ -131,7 +130,7 @@ public final class RawTypeSetBuilder extends DPatternWalker {
         }
 
         protected CTypeRef toTypeRef(CElementPropertyInfo ep) {
-            return new CTypeRef(ci,ci.getElementName(),false,null);
+            return new CTypeRef(ci,ci.getElementName(),ci.getTypeName(),false,null);
         }
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypePatternBinder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypePatternBinder.java
index 18d6da45437..8e585653dfd 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypePatternBinder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypePatternBinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.relaxng;
 
 import java.util.HashSet;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypeUseBinder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypeUseBinder.java
index 8ab880de439..3dfc3e0350c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypeUseBinder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypeUseBinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.relaxng;
 
 import com.sun.tools.internal.xjc.model.CBuiltinLeafInfo;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Abstractifier.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Abstractifier.java
index 89511e527f6..946d7391bfb 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Abstractifier.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Abstractifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
-import com.sun.tools.internal.xjc.model.CClassInfo;
 import com.sun.tools.internal.xjc.model.CElement;
 import com.sun.xml.internal.xsom.XSComplexType;
 import com.sun.xml.internal.xsom.XSElementDecl;
@@ -40,8 +38,8 @@ class Abstractifier extends ClassBinderFilter {
         super(core);
     }
 
-    public CClassInfo complexType(XSComplexType xs) {
-        CClassInfo ci = (CClassInfo)super.complexType(xs);
+    public CElement complexType(XSComplexType xs) {
+        CElement ci = super.complexType(xs);
         if(ci!=null && xs.isAbstract())
             ci.setAbstract();
         return ci;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BGMBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BGMBuilder.java
index f3c2f3f39d5..b6e50401724 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BGMBuilder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BGMBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import java.util.ArrayList;
@@ -39,6 +38,7 @@ import javax.xml.transform.TransformerFactory;
 import com.sun.codemodel.internal.JCodeModel;
 import com.sun.codemodel.internal.fmt.JTextFile;
 import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
 import com.sun.tools.internal.xjc.ErrorReceiver;
 import com.sun.tools.internal.xjc.Options;
 import com.sun.tools.internal.xjc.generator.bean.field.FieldRendererFactory;
@@ -56,10 +56,10 @@ import com.sun.tools.internal.xjc.util.CodeModelClassFactory;
 import com.sun.tools.internal.xjc.util.ErrorReceiverFilter;
 import com.sun.xml.internal.bind.DatatypeConverterImpl;
 import com.sun.xml.internal.bind.api.impl.NameConverter;
-import com.sun.xml.internal.bind.v2.WellKnownNamespace;
 import com.sun.xml.internal.xsom.XSAnnotation;
 import com.sun.xml.internal.xsom.XSAttributeUse;
 import com.sun.xml.internal.xsom.XSComponent;
+import com.sun.xml.internal.xsom.XSDeclaration;
 import com.sun.xml.internal.xsom.XSParticle;
 import com.sun.xml.internal.xsom.XSSchema;
 import com.sun.xml.internal.xsom.XSSchemaSet;
@@ -92,13 +92,13 @@ public class BGMBuilder extends BindingComponent {
 
             Ring.add(XSSchemaSet.class,_schemas);
             Ring.add(codeModel);
-            Model model = new Model(opts, codeModel, null/*set later*/, opts.classNameAllocator);
+            Model model = new Model(opts, codeModel, null/*set later*/, opts.classNameAllocator, _schemas);
             Ring.add(model);
             Ring.add(ErrorReceiver.class,ef);
             Ring.add(CodeModelClassFactory.class,new CodeModelClassFactory(ef));
 
             BGMBuilder builder = new BGMBuilder(opts.defaultPackage,opts.defaultPackage2,
-                opts.compatibilityMode==Options.EXTENSION,opts.getFieldRendererFactory());
+                opts.isExtensionMode(),opts.getFieldRendererFactory());
             builder._build();
 
             if(ef.hadError())   return null;
@@ -179,6 +179,9 @@ public class BGMBuilder extends BindingComponent {
         for( XSSchema s : schemas.getSchemas() ) {
             BindInfo bi = getBindInfo(s);
 
+            // collect all global customizations
+            model.getCustomizations().addAll(bi.toCustomizationList());
+
             BIGlobalBinding gb = bi.get(BIGlobalBinding.class);
             if(gb==null)
                 continue;
@@ -276,22 +279,27 @@ public class BGMBuilder extends BindingComponent {
         SimpleTypeBuilder stb = Ring.get(SimpleTypeBuilder.class);
 
         for( XSSchema s : Ring.get(XSSchemaSet.class).getSchemas() ) {
+            BISchemaBinding sb = getBindInfo(s).get(BISchemaBinding.class);
+
+            if(sb!=null && !sb.map) {
+                sb.markAsAcknowledged();
+                continue;       // no mapping for this package
+            }
+
             getClassSelector().pushClassScope( new CClassInfoParent.Package(
                 getClassSelector().getPackage(s.getTargetNamespace())) );
 
-            if(!s.getTargetNamespace().equals(WellKnownNamespace.XML_SCHEMA)) {
-                checkMultipleSchemaBindings(s);
-                processPackageJavadoc(s);
-                populate(s.getAttGroupDecls());
-                populate(s.getAttributeDecls());
-                populate(s.getElementDecls());
-                populate(s.getModelGroupDecls());
-            }
+            checkMultipleSchemaBindings(s);
+            processPackageJavadoc(s);
+            populate(s.getAttGroupDecls(),s);
+            populate(s.getAttributeDecls(),s);
+            populate(s.getElementDecls(),s);
+            populate(s.getModelGroupDecls(),s);
 
             // fill in typeUses
             for (XSType t : s.getTypes().values()) {
                 stb.refererStack.push(t);
-                model.typeUses().put( new QName(t.getTargetNamespace(),t.getName()), cs.bindToType(t) );
+                model.typeUses().put( getName(t), cs.bindToType(t,s) );
                 stb.refererStack.pop();
             }
 
@@ -323,10 +331,10 @@ public class BGMBuilder extends BindingComponent {
      * Calls {@link ClassSelector} for each item in the iterator
      * to populate class items if there is any.
      */
-    private void populate( Map col ) {
+    private void populate( Map col, XSSchema schema ) {
         ClassSelector cs = getClassSelector();
         for( XSComponent sc : col.values() )
-            cs.bindToType(sc);
+            cs.bindToType(sc,schema);
     }
 
     /**
@@ -471,8 +479,8 @@ public class BGMBuilder extends BindingComponent {
      * If the component is mapped to a type, this method needs to return true.
      * See the chart at the class javadoc.
      */
-    public void ying( XSComponent sc ) {
-        if(sc.apply(toPurple)==true || getClassSelector().bindToType(sc)!=null)
+    public void ying( XSComponent sc, @Nullable XSComponent referer ) {
+        if(sc.apply(toPurple)==true || getClassSelector().bindToType(sc,referer)!=null)
             sc.visit(purple);
         else
             sc.visit(green);
@@ -503,4 +511,42 @@ public class BGMBuilder extends BindingComponent {
         }
         return refFinder.getReferer(c);
     }
+
+    /**
+     * Returns the QName of the declaration.
+     * @return null
+     *      if the declaration is anonymous.
+     */
+    public static QName getName(XSDeclaration decl) {
+        String local = decl.getName();
+        if(local==null) return null;
+        return new QName(decl.getTargetNamespace(),local);
+    }
+
+    /**
+     * Derives a name from a schema component.
+     *
+     * This method handles prefix/suffix modification and
+     * XML-to-Java name conversion.
+     *
+     * @param name
+     *      The base name. This should be things like element names
+     *      or type names.
+     * @param comp
+     *      The component from which the base name was taken.
+     *      Used to determine how names are modified.
+     */
+    public String deriveName( String name, XSComponent comp ) {
+        XSSchema owner = comp.getOwnerSchema();
+
+        name = getNameConverter().toClassName(name);
+
+        if( owner!=null ) {
+            BISchemaBinding sb = getBindInfo(owner).get(BISchemaBinding.class);
+
+            if(sb!=null)    name = sb.mangleClassName(name,comp);
+        }
+
+        return name;
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindBlue.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindBlue.java
index 67792a9f6a0..8ce51518d25 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindBlue.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindBlue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import com.sun.xml.internal.xsom.XSAttGroupDecl;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindGreen.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindGreen.java
index 1cc5f14a266..6955f040ce1 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindGreen.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindGreen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import java.util.Iterator;
@@ -57,14 +56,14 @@ public final class BindGreen extends ColorBinder {
         // inline
         Iterator itr = cont.iterateDeclaredAttributeUses();
         while(itr.hasNext())
-            builder.ying((XSAttributeUse)itr.next());
+            builder.ying((XSAttributeUse)itr.next(),cont);
         itr = cont.iterateAttGroups();
         while(itr.hasNext())
-            builder.ying((XSAttGroupDecl)itr.next());
+            builder.ying((XSAttGroupDecl)itr.next(),cont);
 
         XSWildcard w = cont.getAttributeWildcard();
         if(w!=null)
-            builder.ying(w);
+            builder.ying(w,cont);
     }
 
     public void complexType(XSComplexType ct) {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindPurple.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindPurple.java
index 4ad103f7108..34d83c801cf 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindPurple.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindPurple.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import com.sun.tools.internal.xjc.model.CClassInfo;
 import com.sun.tools.internal.xjc.model.CDefaultValue;
 import com.sun.tools.internal.xjc.model.CPropertyInfo;
 import com.sun.tools.internal.xjc.model.TypeUse;
+import com.sun.tools.internal.xjc.model.CClass;
 import com.sun.tools.internal.xjc.reader.Ring;
 import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIProperty;
 import com.sun.xml.internal.xsom.XSAttGroupDecl;
@@ -103,7 +103,7 @@ public class BindPurple extends ColorBinder {
 
 
     public void complexType(XSComplexType ct) {
-        CClassInfo ctBean = selector.bindToType(ct, false);
+        CClass ctBean = selector.bindToType(ct,null,false);
         if(getCurrentBean()!=ctBean)
             // in some case complex type and element binds to the same class
             // don't make it has-a. Just make it is-a.
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindRed.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindRed.java
index fc92e31a7f3..f2c86a80614 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindRed.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindRed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import com.sun.tools.internal.xjc.reader.Ring;
@@ -75,7 +74,7 @@ public final class BindRed extends ColorBinder {
     public void elementDecl(XSElementDecl e) {
         SimpleTypeBuilder stb = Ring.get(SimpleTypeBuilder.class);
         stb.refererStack.push(e);    // referer is element
-        builder.ying(e.getType());
+        builder.ying(e.getType(),e);
         stb.refererStack.pop();
     }
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindYellow.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindYellow.java
index 9fc9a754bd4..af35fc592e7 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindYellow.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindYellow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import com.sun.xml.internal.xsom.XSAttGroupDecl;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindingComponent.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindingComponent.java
index a8845276f68..2338c976a57 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindingComponent.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindingComponent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import com.sun.tools.internal.xjc.reader.Ring;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinder.java
index 391d1911b8e..1683145fecd 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import com.sun.tools.internal.xjc.model.CClassInfo;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinderFilter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinderFilter.java
index abe2ac3fa57..4bfcc209588 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinderFilter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinderFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import com.sun.tools.internal.xjc.model.CElement;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassSelector.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassSelector.java
index de268d69a99..49be164ef0b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassSelector.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import java.io.StringWriter;
@@ -44,6 +43,8 @@ import com.sun.tools.internal.xjc.model.CElement;
 import com.sun.tools.internal.xjc.model.CElementInfo;
 import com.sun.tools.internal.xjc.model.CTypeInfo;
 import com.sun.tools.internal.xjc.model.TypeUse;
+import com.sun.tools.internal.xjc.model.CClass;
+import com.sun.tools.internal.xjc.model.CNonElement;
 import com.sun.tools.internal.xjc.reader.Ring;
 import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIProperty;
 import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BISchemaBinding;
@@ -63,12 +64,12 @@ import com.sun.xml.internal.xsom.util.ComponentNameFunction;
 import org.xml.sax.Locator;
 
 /**
- * Manages association between XSComponents and generated
- * content interfaces.
+ * Manages association between {@link XSComponent}s and generated
+ * {@link CTypeInfo}s.
  *
  * 
    
- * All the content interfaces are created, registered, and
- * maintained in this class.
+ * This class determines which component is mapped to (or is not mapped to)
+ * what types.
  *
  * @author
  *     Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
@@ -229,11 +230,11 @@ public final class ClassSelector extends BindingComponent {
     /**
      * Checks if the given component is bound to a class.
      */
-    public final CElement isBound( XSElementDecl x ) {
+    public final CElement isBound( XSElementDecl x, XSComponent referer ) {
         CElementInfo r = boundElements.get(x);
         if(r!=null)
             return r;
-        return bindToType(x);
+        return bindToType(x,referer);
     }
 
     /**
@@ -241,11 +242,8 @@ public final class ClassSelector extends BindingComponent {
      * If so, build that type and return that object.
      * If it is not being mapped to a type item, return null.
      */
-    public CTypeInfo bindToType( XSComponent sc ) {
-//        TypeToken t = domBinder.bind(sc);
-//        if(t!=null)     return t;
-//        else            return _bindToClass(sc,false);
-        return _bindToClass(sc,false);
+    public CTypeInfo bindToType( XSComponent sc, XSComponent referer ) {
+        return _bindToClass(sc,referer,false);
     }
 
     //
@@ -254,38 +252,40 @@ public final class ClassSelector extends BindingComponent {
     // and making the bindToType invocation more type safe.
     //
 
-    public CElement bindToType( XSElementDecl e ) {
-        return (CElement)_bindToClass(e,false);
+    public CElement bindToType( XSElementDecl e, XSComponent referer ) {
+        return (CElement)_bindToClass(e,referer,false);
     }
 
-    public CClassInfo bindToType( XSComplexType t ) {
-        return bindToType(t,false);
-    }
-
-    public CClassInfo bindToType( XSComplexType t, boolean cannotBeDelayed ) {
+    public CClass bindToType( XSComplexType t, XSComponent referer, boolean cannotBeDelayed ) {
         // this assumption that a complex type always binds to a ClassInfo
         // does not hold for xs:anyType --- our current approach of handling
         // this idiosynchracy is to make sure that xs:anyType doesn't use
         // this codepath.
-        return (CClassInfo)_bindToClass(t,cannotBeDelayed);
+        return (CClass)_bindToClass(t,referer,cannotBeDelayed);
     }
 
-    public TypeUse bindToType( XSType t ) {
+    public TypeUse bindToType( XSType t, XSComponent referer ) {
         if(t instanceof XSSimpleType) {
             return Ring.get(SimpleTypeBuilder.class).build((XSSimpleType)t);
         } else
-            return _bindToClass(t,false);
+            return (CNonElement)_bindToClass(t,referer,false);
     }
 
     /**
+     * The real meat of the "bindToType" code.
+     *
      * @param cannotBeDelayed
      *      if the binding of the body of the class cannot be defered
      *      and needs to be done immediately. If the flag is false,
      *      the binding of the body will be done later, to avoid
      *      cyclic binding problem.
+     * @param referer
+     *      The component that refers to sc. This can be null,
+     *      if figuring out the referer is too hard, in which case
+     *      the error message might be less user friendly.
      */
     // TODO: consider getting rid of "cannotBeDelayed"
-    CTypeInfo _bindToClass( @NotNull XSComponent sc, boolean cannotBeDelayed ) {
+    CTypeInfo _bindToClass( @NotNull XSComponent sc, XSComponent referer, boolean cannotBeDelayed ) {
         // check if this class is already built.
         if(!bindMap.containsKey(sc)) {
             // craete a bind task
@@ -309,6 +309,23 @@ public final class ClassSelector extends BindingComponent {
             if(bean==null)
                 return null;
 
+            // can this namespace generate a class?
+            if (bean instanceof CClassInfo) {
+                XSSchema os = sc.getOwnerSchema();
+                BISchemaBinding sb = builder.getBindInfo(os).get(BISchemaBinding.class);
+                if(sb!=null && !sb.map) {
+                    // nope
+                    getErrorReporter().error(sc.getLocator(),
+                        Messages.ERR_REFERENCE_TO_NONEXPORTED_CLASS, sc.apply( new ComponentNameFunction() ) );
+                    getErrorReporter().error(sb.getLocation(),
+                        Messages.ERR_REFERENCE_TO_NONEXPORTED_CLASS_MAP_FALSE, os.getTargetNamespace() );
+                    if(referer!=null)
+                        getErrorReporter().error(referer.getLocator(),
+                            Messages.ERR_REFERENCE_TO_NONEXPORTED_CLASS_REFERER, referer.apply( new ComponentNameFunction() ) );
+                }
+            }
+
+
             queueBuild( sc, bean );
         }
 
@@ -425,6 +442,7 @@ public final class ClassSelector extends BindingComponent {
 
         BISchemaBinding sb =
             builder.getBindInfo(s).get(BISchemaBinding.class);
+        if(sb!=null)    sb.markAsAcknowledged();
 
         String name = null;
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/CollisionInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/CollisionInfo.java
index 958267b26f1..ccd1c851bd8 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/CollisionInfo.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/CollisionInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,10 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * @(#)$Id: CollisionInfo.java,v 1.1 2005/04/15 20:09:53 kohsuke Exp $
+ */
+
 
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ColorBinder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ColorBinder.java
index efed1df63b7..bfd0d615029 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ColorBinder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ColorBinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,10 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import com.sun.tools.internal.xjc.model.CClassInfo;
 import com.sun.tools.internal.xjc.model.CPropertyInfo;
-import com.sun.tools.internal.xjc.model.CTypeInfo;
-import com.sun.tools.internal.xjc.model.TypeUse;
 import com.sun.tools.internal.xjc.reader.Ring;
 import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIProperty;
 import com.sun.xml.internal.xsom.XSAnnotation;
@@ -55,20 +52,13 @@ abstract class ColorBinder extends BindingComponent implements XSVisitor {
         return selector.getCurrentRoot();
     }
 
-    protected CTypeInfo boundToType(XSComponent sc) {
-        if(sc==selector.getCurrentRoot())    return null;
-        return selector.bindToType(sc);
-    }
-
-
-
 
     protected final void createSimpleTypeProperty(XSSimpleType type,String propName) {
         BIProperty prop = BIProperty.getCustomization(type);
 
         SimpleTypeBuilder stb = Ring.get(SimpleTypeBuilder.class);
         // since we are building the simple type here, use buildDef
-        CPropertyInfo p = prop.createValueProperty(propName,false,type,stb.buildDef(type));
+        CPropertyInfo p = prop.createValueProperty(propName,false,type,stb.buildDef(type),BGMBuilder.getName(type));
         getCurrentBean().addProperty(p);
     }
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultClassBinder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultClassBinder.java
index e4c722be6ba..8cf50cb7b09 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultClassBinder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultClassBinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,9 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema;
+import static com.sun.tools.internal.xjc.reader.xmlschema.BGMBuilder.getName;
+
 import java.util.Set;
 
 import javax.xml.namespace.QName;
@@ -35,6 +36,7 @@ import com.sun.istack.internal.Nullable;
 import com.sun.tools.internal.xjc.ErrorReceiver;
 import com.sun.tools.internal.xjc.model.CClassInfo;
 import com.sun.tools.internal.xjc.model.CClassInfoParent;
+import com.sun.tools.internal.xjc.model.CClassRef;
 import com.sun.tools.internal.xjc.model.CCustomizations;
 import com.sun.tools.internal.xjc.model.CElement;
 import com.sun.tools.internal.xjc.model.CElementInfo;
@@ -44,7 +46,9 @@ import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIClass;
 import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIGlobalBinding;
 import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BISchemaBinding;
 import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BindInfo;
-import com.sun.xml.internal.bind.v2.TODO;
+import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIXSubstitutable;
+import com.sun.tools.internal.xjc.reader.xmlschema.ct.ComplexTypeFieldBuilder;
+import com.sun.tools.internal.xjc.reader.xmlschema.ct.ComplexTypeBindingMode;
 import com.sun.xml.internal.xsom.XSAnnotation;
 import com.sun.xml.internal.xsom.XSAttGroupDecl;
 import com.sun.xml.internal.xsom.XSAttributeDecl;
@@ -66,6 +70,8 @@ import com.sun.xml.internal.xsom.XSType;
 import com.sun.xml.internal.xsom.XSWildcard;
 import com.sun.xml.internal.xsom.XSXPath;
 
+import org.xml.sax.Locator;
+
 /**
  * Default classBinder implementation. Honors <jaxb:class> customizations
  * and default bindings.
@@ -107,6 +113,8 @@ final class DefaultClassBinder implements ClassBinder
         if(type.isGlobal()) {
             QName tagName = null;
             String className = deriveName(type);
+            Locator loc = type.getLocator();
+
             if(getGlobalBinding().isSimpleMode()) {
                 // in the simple mode, we may optimize it away
                 XSElementDecl referer = getSoleElementReferer(type);
@@ -114,8 +122,9 @@ final class DefaultClassBinder implements ClassBinder
                     // if a global element contains
                     // a collpsable complex type, we bind this element to a named one
                     // and collapses element and complex type.
-                    tagName = new QName(referer.getTargetNamespace(),referer.getName());
+                    tagName = getName(referer);
                     className = deriveName(referer);
+                    loc = referer.getLocator();
                 }
             }
 
@@ -123,7 +132,7 @@ final class DefaultClassBinder implements ClassBinder
 
             JPackage pkg = selector.getPackage(type.getTargetNamespace());
 
-            return new CClassInfo(model,pkg,className,type.getLocator(),getTypeName(type),tagName,type,bi.toCustomizationList());
+            return new CClassInfo(model,pkg,className, loc,getTypeName(type),tagName,type,bi.toCustomizationList());
         } else {
             XSElementDecl element = type.getScope();
 
@@ -140,11 +149,11 @@ final class DefaultClassBinder implements ClassBinder
                 // which creates unnecessary classes
                 return new CClassInfo( model, selector.getClassScope(),
                     deriveName(element), element.getLocator(), null,
-                    new QName(element.getTargetNamespace(),element.getName()), element, bi.toCustomizationList() );
+                    getName(element), element, bi.toCustomizationList() );
             }
 
 
-            CElement parentType = selector.isBound(element);
+            CElement parentType = selector.isBound(element,type);
 
             String className;
             CClassInfoParent scope;
@@ -154,7 +163,7 @@ final class DefaultClassBinder implements ClassBinder
              && parentType instanceof CElementInfo
              && ((CElementInfo)parentType).hasClass() ) {
                 // special case where we put a nested 'Type' element
-                scope = parentType;
+                scope = (CElementInfo)parentType;
                 className = "Type";
             } else {
                 // since the parent element isn't bound to a type, merge the customizations associated to it, too.
@@ -171,15 +180,11 @@ final class DefaultClassBinder implements ClassBinder
         }
     }
 
-    private QName getTypeName(XSType type) {
-        return new QName(type.getTargetNamespace(),type.getName());
-    }
-
     private QName getTypeName(XSComplexType type) {
         if(type.getRedefinedBy()!=null)
             return null;
         else
-            return getTypeName((XSType)type);
+            return getName(type);
     }
 
     /**
@@ -200,6 +205,14 @@ final class DefaultClassBinder implements ClassBinder
             // because nillable needs JAXBElement to represent correctly
             return false;
 
+        BIXSubstitutable bixSubstitutable = builder.getBindInfo(decl).get(BIXSubstitutable.class);
+        if(bixSubstitutable !=null) {
+            // see https://jaxb.dev.java.net/issues/show_bug.cgi?id=289
+            // this customization forces non-collapsing behavior.
+            bixSubstitutable.markAsAcknowledged();
+            return false;
+        }
+
         if( getGlobalBinding().isSimpleMode() && decl.isGlobal()) {
             // in the simple mode, we do more aggressive optimization, and get rid of
             // a complex type class if it's only used once from a global element
@@ -247,14 +260,14 @@ final class DefaultClassBinder implements ClassBinder
         CElement r = allow(decl,decl.getName());
 
         if(r==null) {
-            QName tagName = new QName(decl.getTargetNamespace(),decl.getName());
+            QName tagName = getName(decl);
             CCustomizations custs = builder.getBindInfo(decl).toCustomizationList();
 
             if(decl.isGlobal()) {
                 if(isCollapsable(decl)) {
                     // we want the returned type to be built as a complex type,
                     // so the binding cannot be delayed.
-                    return selector.bindToType(decl.getType().asComplexType(),true);
+                    return selector.bindToType(decl.getType().asComplexType(),decl,true);
                 } else {
                     String className = null;
                     if(getGlobalBinding().isGenerateElementClass())
@@ -266,7 +279,7 @@ final class DefaultClassBinder implements ClassBinder
                     selector.boundElements.put(decl,cei);
 
                     stb.refererStack.push(decl);    // referer is element
-                    cei.initContentType( selector.bindToType(decl.getType()), decl, decl.getDefaultValue() );
+                    cei.initContentType( selector.bindToType(decl.getType(),decl), decl, decl.getDefaultValue() );
                     stb.refererStack.pop();
                     r = cei;
                 }
@@ -276,7 +289,7 @@ final class DefaultClassBinder implements ClassBinder
         // have the substitution member derive from the substitution head
         XSElementDecl top = decl.getSubstAffiliation();
         if(top!=null) {
-            CElement topci = selector.bindToType(top);
+            CElement topci = selector.bindToType(top,decl);
 
             if(r instanceof CClassInfo && topci instanceof CClassInfo)
                 ((CClassInfo)r).setBaseClass((CClassInfo)topci);
@@ -284,8 +297,6 @@ final class DefaultClassBinder implements ClassBinder
                 ((CElementInfo)r).setSubstitutionHead((CElementInfo)topci);
         }
 
-        TODO.checkSpec();
-
         return r;
     }
 
@@ -309,7 +320,7 @@ final class DefaultClassBinder implements ClassBinder
 
         if(getGlobalBinding().isSimpleTypeSubstitution() && type.isGlobal()) {
             return new CClassInfo(model,selector.getClassScope(),
-                    deriveName(type), type.getLocator(), getTypeName(type), null, type, null );
+                    deriveName(type), type.getLocator(), getName(type), null, type, null );
         }
 
         return never();
@@ -394,7 +405,30 @@ final class DefaultClassBinder implements ClassBinder
 
         decl.markAsAcknowledged();
 
-        // determine the package to put this class in.
+        // first consider binding to the class reference.
+        String ref = decl.getExistingClassRef();
+        if(ref!=null) {
+            if(!JJavaName.isFullyQualifiedClassName(ref)) {
+                Ring.get(ErrorReceiver.class).error( decl.getLocation(),
+                    Messages.format(Messages.ERR_INCORRECT_CLASS_NAME,ref) );
+                // recover by ignoring @ref
+            } else {
+                if(component instanceof XSComplexType) {
+                    // UGLY UGLY UGLY
+                    // since we are not going to bind this complex type, we need to figure out
+                    // its binding mode without actually binding it (and also expose this otherwise
+                    // hidden mechanism into this part of the code.)
+                    //
+                    // this code is potentially dangerous as the base class might have been bound
+                    // in different ways. To be correct, we need to figure out how the content type
+                    // would have been bound, from the schema.
+                    Ring.get(ComplexTypeFieldBuilder.class).recordBindingMode(
+                        (XSComplexType)component, ComplexTypeBindingMode.NORMAL
+                    );
+                }
+                return new CClassRef(model, component, decl, bindInfo.toCustomizationList() );
+            }
+        }
 
         String clsName = decl.getClassName();
         if(clsName==null) {
@@ -407,7 +441,7 @@ final class DefaultClassBinder implements ClassBinder
                 // recover by generating a pseudo-random name
                 defaultBaseName = "undefined"+component.hashCode();
             }
-            clsName = deriveName( defaultBaseName, component );
+            clsName = builder.deriveName( defaultBaseName, component );
         } else {
             if( !JJavaName.isJavaIdentifier(clsName) ) {
                 // not a valid Java class name
@@ -423,13 +457,12 @@ final class DefaultClassBinder implements ClassBinder
 
         if(component instanceof XSType) {
             XSType t = (XSType) component;
-            if(t.isGlobal())
-                typeName = new QName(t.getTargetNamespace(),t.getName());
+            typeName = getName(t);
         }
 
         if (component instanceof XSElementDecl) {
             XSElementDecl e = (XSElementDecl) component;
-            elementName = new QName(e.getTargetNamespace(),e.getName());
+            elementName = getName(e);
         }
 
         if (component instanceof XSElementDecl && !isCollapsable((XSElementDecl)component)) {
@@ -442,7 +475,7 @@ final class DefaultClassBinder implements ClassBinder
 
             stb.refererStack.push(component);    // referer is element
             cei.initContentType(
-                selector.bindToType(e.getType()),
+                selector.bindToType(e.getType(),e),
                 e,e.getDefaultValue());
             stb.refererStack.pop();
             return cei;
@@ -476,7 +509,7 @@ final class DefaultClassBinder implements ClassBinder
      * Use the name of the schema component as the default name.
      */
     private String deriveName( XSDeclaration comp ) {
-        return deriveName( comp.getName(), comp );
+        return builder.deriveName( comp.getName(), comp );
     }
 
     /**
@@ -485,38 +518,11 @@ final class DefaultClassBinder implements ClassBinder
      * deriving a default name.
      */
     private String deriveName( XSComplexType comp ) {
-        String seed = deriveName( comp.getName(), comp );
+        String seed = builder.deriveName( comp.getName(), comp );
         int cnt = comp.getRedefinedCount();
         for( ; cnt>0; cnt-- )
             seed = "Original"+seed;
         return seed;
     }
 
-    /**
-     * Derives a name from a schema component.
-     *
-     * This method handles prefix/suffix modification and
-     * XML-to-Java name conversion.
-     *
-     * @param name
-     *      The base name. This should be things like element names
-     *      or type names.
-     * @param comp
-     *      The component from which the base name was taken.
-     *      Used to determine how names are modified.
-     */
-    private String deriveName( String name, XSComponent comp ) {
-        XSSchema owner = comp.getOwnerSchema();
-
-        name = builder.getNameConverter().toClassName(name);
-
-        if( owner!=null ) {
-            BISchemaBinding sb = builder.getBindInfo(
-                owner).get(BISchemaBinding.class);
-
-            if(sb!=null)    name = sb.mangleClassName(name,comp);
-        }
-
-        return name;
-    }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultParticleBinder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultParticleBinder.java
index c174d74ada3..6558c122d1e 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultParticleBinder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultParticleBinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ErrorReporter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ErrorReporter.java
index c5ffb5506a5..e982dd7acd1 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ErrorReporter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ErrorReporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import com.sun.tools.internal.xjc.ErrorReceiver;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionBuilder.java
index 4e25af62c5b..80cbfc9a488 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionBuilder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import java.util.HashMap;
@@ -72,6 +71,7 @@ public final class ExpressionBuilder implements XSTermFunction {
     public Expression wildcard(XSWildcard wc) {
         if(wildcard==null)
             wildcard = new GWildcardElement();
+        wildcard.merge(wc);
         wildcard.particles.add(current);
         return wildcard;
     }
@@ -104,7 +104,7 @@ public final class ExpressionBuilder implements XSTermFunction {
     }
 
     public Element elementDecl(XSElementDecl decl) {
-        QName n = new QName(decl.getTargetNamespace(),decl.getName());
+        QName n = BGMBuilder.getName(decl);
 
         GElementImpl e = decls.get(n);
         if(e==null)
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionParticleBinder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionParticleBinder.java
index cdabcec4559..50ffbd3ac90 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionParticleBinder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionParticleBinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import java.util.Collection;
@@ -83,7 +82,9 @@ final class ExpressionParticleBinder extends ParticleBinder {
                 continue;
             }
             if(e instanceof GWildcardElement) {
-                rtsb.getRefs().add(new RawTypeSetBuilder.WildcardRef(WildcardMode.SKIP));
+                GWildcardElement w = (GWildcardElement)e;
+                rtsb.getRefs().add(new RawTypeSetBuilder.WildcardRef(
+                    w.isStrict() ? WildcardMode.STRICT : WildcardMode.SKIP));
                 continue;
             }
             assert false : e;   // no other kind should be here
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElement.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElement.java
index 076ee514d02..871e408bc38 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElement.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import java.util.HashSet;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElementImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElementImpl.java
index 6d21fbf6e28..2d151fa7808 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElementImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElementImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java
index a1c18b35cfc..e2bb5e2db5f 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,10 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import com.sun.tools.internal.xjc.reader.gbind.Element;
+import com.sun.xml.internal.xsom.XSWildcard;
 
 /**
  * {@link Element} that represents a wildcard,
@@ -33,6 +33,14 @@ import com.sun.tools.internal.xjc.reader.gbind.Element;
  * @author Kohsuke Kawaguchi
  */
 final class GWildcardElement extends GElement {
+
+    /**
+     * If true, bind to Object for eager JAXB unmarshalling.
+     * Otherwise bind to DOM (I hate "you can put both" semantics,
+     * so I'm not going to do that in this binding mode.)
+     */
+    private boolean strict = true;
+
     public String toString() {
         return "#any";
     }
@@ -40,4 +48,16 @@ final class GWildcardElement extends GElement {
     String getPropertyNameSeed() {
         return "any";
     }
+
+    public void merge(XSWildcard wc) {
+        switch(wc.getMode()) {
+        case XSWildcard.LAX:
+        case XSWildcard.SKIP:
+            strict = false;
+        }
+    }
+
+    public boolean isStrict() {
+        return strict;
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle.properties b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle.properties
index 4b5d824690f..2eccd9bfd70 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle.properties
@@ -1,3 +1,28 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
 #
 # Message resource file
 #
@@ -142,4 +167,15 @@ ERR_MULTIPLE_GLOBAL_BINDINGS = \
 
 ERR_MULTIPLE_GLOBAL_BINDINGS_OTHER = \
     (related to above) but one is already given at this location
+
+ERR_REFERENCE_TO_NONEXPORTED_CLASS = \
+    {0} is in a referenced schema and do not have the corresponding Java class specified by \
+     customization. Therefore it cannot be referenced from outside.
+
+ERR_REFERENCE_TO_NONEXPORTED_CLASS_MAP_FALSE = \
+    (related to above) The schema for namespace "{0}" (which includes the above component) is \
+    designated for reference only by this customization.
+
+ERR_REFERENCE_TO_NONEXPORTED_CLASS_REFERER = \
+    (related to above) The problematic schema component is referenced from this component: {0}
  
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Messages.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Messages.java
index 59f9a35640e..e0db71253aa 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Messages.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Messages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,6 @@
  * have any questions.
  */
 
-
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import java.text.MessageFormat;
@@ -137,4 +136,11 @@ public class Messages
         "ERR_MULTIPLE_GLOBAL_BINDINGS";
     public static final String ERR_MULTIPLE_GLOBAL_BINDINGS_OTHER =
         "ERR_MULTIPLE_GLOBAL_BINDINGS_OTHER";
+
+    public static final String ERR_REFERENCE_TO_NONEXPORTED_CLASS =
+        "ERR_REFERENCE_TO_NONEXPORTED_CLASS";
+    public static final String ERR_REFERENCE_TO_NONEXPORTED_CLASS_MAP_FALSE =
+        "ERR_REFERENCE_TO_NONEXPORTED_CLASS_MAP_FALSE";
+    public static final String ERR_REFERENCE_TO_NONEXPORTED_CLASS_REFERER =
+        "ERR_REFERENCE_TO_NONEXPORTED_CLASS_REFERER";
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MultiplicityCounter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MultiplicityCounter.java
index 9b53ac11663..898dba604e9 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MultiplicityCounter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MultiplicityCounter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import com.sun.tools.internal.xjc.model.Multiplicity;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ParticleBinder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ParticleBinder.java
index 4783215b2f0..f345ab1ed8e 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ParticleBinder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ParticleBinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import java.text.ParseException;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RawTypeSetBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RawTypeSetBuilder.java
index 4862e9abdb2..55d6a244aa6 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RawTypeSetBuilder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RawTypeSetBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import java.util.HashSet;
@@ -32,16 +31,22 @@ import javax.activation.MimeType;
 import javax.xml.namespace.QName;
 
 import com.sun.tools.internal.xjc.model.CAdapter;
+import com.sun.tools.internal.xjc.model.CClass;
 import com.sun.tools.internal.xjc.model.CClassInfo;
+import com.sun.tools.internal.xjc.model.CCustomizations;
 import com.sun.tools.internal.xjc.model.CElement;
 import com.sun.tools.internal.xjc.model.CElementInfo;
 import com.sun.tools.internal.xjc.model.CElementPropertyInfo;
 import com.sun.tools.internal.xjc.model.CReferencePropertyInfo;
 import com.sun.tools.internal.xjc.model.CTypeRef;
+import com.sun.tools.internal.xjc.model.Model;
 import com.sun.tools.internal.xjc.model.Multiplicity;
+import com.sun.tools.internal.xjc.model.TypeUse;
 import com.sun.tools.internal.xjc.reader.RawTypeSet;
 import com.sun.tools.internal.xjc.reader.Ring;
 import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIDom;
+import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIGlobalBinding;
+import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIXSubstitutable;
 import com.sun.xml.internal.bind.v2.model.core.ID;
 import com.sun.xml.internal.bind.v2.model.core.WildcardMode;
 import com.sun.xml.internal.xsom.XSElementDecl;
@@ -125,14 +130,15 @@ public class RawTypeSetBuilder implements XSTermVisitor {
 
     public void elementDecl(XSElementDecl decl) {
 
-        QName n = new QName(decl.getTargetNamespace(),decl.getName());
+        QName n = BGMBuilder.getName(decl);
         if(elementNames.add(n)) {
-            CElement elementBean = Ring.get(ClassSelector.class).bindToType(decl);
+            CElement elementBean = Ring.get(ClassSelector.class).bindToType(decl,null);
             if(elementBean==null)
-                refs.add(new RawTypeSet.XmlTypeRef(decl));
+                refs.add(new XmlTypeRef(decl));
             else {
-                if(elementBean instanceof CClassInfo)
-                    refs.add(new CClassInfoRef(decl,(CClassInfo)elementBean));
+                // yikes!
+                if(elementBean instanceof CClass)
+                    refs.add(new CClassRef(decl,(CClass)elementBean));
                 else
                     refs.add(new CElementInfoRef(decl,(CElementInfo)elementBean));
             }
@@ -187,21 +193,20 @@ public class RawTypeSetBuilder implements XSTermVisitor {
         }
     }
 
-
     /**
      * Reference to a class that maps from an element.
      */
-    public static final class CClassInfoRef extends RawTypeSet.Ref {
-        public final CClassInfo target;
+    public static final class CClassRef extends RawTypeSet.Ref {
+        public final CClass target;
         public final XSElementDecl decl;
 
-        CClassInfoRef(XSElementDecl decl, CClassInfo target) {
+        CClassRef(XSElementDecl decl, CClass target) {
             this.decl = decl;
             this.target = target;
         }
 
         protected CTypeRef toTypeRef(CElementPropertyInfo ep) {
-            return new CTypeRef(target,target.getElementName(),decl.isNillable(),decl.getDefaultValue());
+            return new CTypeRef(target,decl);
         }
 
         protected void toElementRef(CReferencePropertyInfo prop) {
@@ -228,7 +233,7 @@ public class RawTypeSetBuilder implements XSTermVisitor {
     /**
      * Reference to a class that maps from an element.
      */
-    public static final class CElementInfoRef extends RawTypeSet.Ref {
+    public final class CElementInfoRef extends RawTypeSet.Ref {
         public final CElementInfo target;
         public final XSElementDecl decl;
 
@@ -242,8 +247,7 @@ public class RawTypeSetBuilder implements XSTermVisitor {
             CAdapter a = target.getProperty().getAdapter();
             if(a!=null && ep!=null) ep.setAdapter(a);
 
-            return new CTypeRef(target.getContentType(),target.getElementName(),
-                decl.isNillable(),decl.getDefaultValue());
+            return new CTypeRef(target.getContentType(),decl);
         }
 
         protected void toElementRef(CReferencePropertyInfo prop) {
@@ -254,16 +258,22 @@ public class RawTypeSetBuilder implements XSTermVisitor {
             // if element substitution can occur, no way it can be mapped to a list of types
             if(decl.getSubstitutables().size()>1)
                 return RawTypeSet.Mode.MUST_BE_REFERENCE;
+            // BIXSubstitutable also simulates this effect. Useful for separate compilation
+            BIXSubstitutable subst = builder.getBindInfo(decl).get(BIXSubstitutable.class);
+            if(subst!=null) {
+                subst.markAsAcknowledged();
+                return RawTypeSet.Mode.MUST_BE_REFERENCE;
+            }
 
             // we have no place to put an adater if this thing maps to a type
             CElementPropertyInfo p = target.getProperty();
             // if we have an adapter or IDness, which requires special
             // annotation, and there's more than one element,
             // we have no place to put the special annotation, so we need JAXBElement.
-            if(parent.refs.size()>1 || !parent.mul.isAtMostOnce()) {
-                if(p.getAdapter()!=null || p.id()!=ID.NONE)
-                    return RawTypeSet.Mode.MUST_BE_REFERENCE;
-            }
+            if((parent.refs.size()>1 || !parent.mul.isAtMostOnce()) && p.id()!=ID.NONE)
+                return RawTypeSet.Mode.MUST_BE_REFERENCE;
+            if(parent.refs.size() > 1 && p.getAdapter() != null)
+                return RawTypeSet.Mode.MUST_BE_REFERENCE;
 
             return RawTypeSet.Mode.SHOULD_BE_TYPEREF;
         }
@@ -280,4 +290,83 @@ public class RawTypeSetBuilder implements XSTermVisitor {
             return target.getProperty().getExpectedMimeType();
         }
     }
+
+    /**
+     * References to a type. Could be global or local.
+     */
+    public static final class XmlTypeRef extends RawTypeSet.Ref {
+        private final XSElementDecl decl;
+        private final TypeUse target;
+
+        public XmlTypeRef(XSElementDecl decl) {
+            this.decl = decl;
+            SimpleTypeBuilder stb = Ring.get(SimpleTypeBuilder.class);
+            stb.refererStack.push(decl);
+            TypeUse r = Ring.get(ClassSelector.class).bindToType(decl.getType(),decl);
+            stb.refererStack.pop();
+            target = r;
+        }
+
+        protected CTypeRef toTypeRef(CElementPropertyInfo ep) {
+            if(ep!=null && target.getAdapterUse()!=null)
+                ep.setAdapter(target.getAdapterUse());
+            return new CTypeRef(target.getInfo(),decl);
+        }
+
+        /**
+         * The whole type set can be later bound to a reference property,
+         * in which case we need to generate additional code to wrap this
+         * type reference into an element class.
+         *
+         * This method generates such an element class and returns it.
+         */
+        protected void toElementRef(CReferencePropertyInfo prop) {
+            CClassInfo scope = Ring.get(ClassSelector.class).getCurrentBean();
+            Model model = Ring.get(Model.class);
+
+            CCustomizations custs = Ring.get(BGMBuilder.class).getBindInfo(decl).toCustomizationList();
+
+            if(target instanceof CClassInfo && Ring.get(BIGlobalBinding.class).isSimpleMode()) {
+                CClassInfo bean = new CClassInfo(model,scope,
+                                model.getNameConverter().toClassName(decl.getName()),
+                                decl.getLocator(), null, BGMBuilder.getName(decl), decl,
+                                custs);
+                bean.setBaseClass((CClassInfo)target);
+                prop.getElements().add(bean);
+            } else {
+                CElementInfo e = new CElementInfo(model,BGMBuilder.getName(decl),scope,target,
+                        decl.getDefaultValue(), decl, custs, decl.getLocator());
+                prop.getElements().add(e);
+            }
+        }
+
+        protected RawTypeSet.Mode canBeType(RawTypeSet parent) {
+            // if we have an adapter or IDness, which requires special
+            // annotation, and there's more than one element,
+            // we have no place to put the special annotation, so we need JAXBElement.
+            if((parent.refs.size()>1 || !parent.mul.isAtMostOnce()) && target.idUse()!=ID.NONE)
+                return RawTypeSet.Mode.MUST_BE_REFERENCE;
+            if(parent.refs.size() > 1 && target.getAdapterUse() != null)
+                return RawTypeSet.Mode.MUST_BE_REFERENCE;
+
+            // nillable and optional at the same time. needs an element wrapper to distinguish those
+            // two states. But this is not a hard requirement.
+            if(decl.isNillable() && parent.mul.isOptional())
+                return RawTypeSet.Mode.CAN_BE_TYPEREF;
+
+            return RawTypeSet.Mode.SHOULD_BE_TYPEREF;
+        }
+
+        protected boolean isListOfValues() {
+            return target.isCollection();
+        }
+
+        protected ID id() {
+            return target.idUse();
+        }
+
+        protected MimeType getExpectedMimeType() {
+            return target.getExpectedMimeType();
+        }
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RefererFinder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RefererFinder.java
index 6538872dafa..fbbe569a0d6 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RefererFinder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RefererFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import java.util.HashMap;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/SimpleTypeBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/SimpleTypeBuilder.java
index 39fc39ddac5..b72a03b0fdc 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/SimpleTypeBuilder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/SimpleTypeBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import java.io.StringWriter;
@@ -38,13 +37,14 @@ import java.util.Set;
 import java.util.Stack;
 
 import javax.activation.MimeTypeParseException;
-import javax.xml.namespace.QName;
 
 import com.sun.codemodel.internal.JJavaName;
 import com.sun.codemodel.internal.util.JavadocEscapeWriter;
+import com.sun.tools.internal.xjc.ErrorReceiver;
 import com.sun.tools.internal.xjc.model.CBuiltinLeafInfo;
 import com.sun.tools.internal.xjc.model.CClassInfo;
 import com.sun.tools.internal.xjc.model.CClassInfoParent;
+import com.sun.tools.internal.xjc.model.CClassRef;
 import com.sun.tools.internal.xjc.model.CEnumConstant;
 import com.sun.tools.internal.xjc.model.CEnumLeafInfo;
 import com.sun.tools.internal.xjc.model.CNonElement;
@@ -328,7 +328,7 @@ public final class SimpleTypeBuilder extends BindingComponent {
             return conv.getTypeUse(type);
         }
 
-        // look for enum customization, which is noather user specified conversion
+        // look for enum customization, which is another user specified conversion
         BIEnum en = info.get(BIEnum.class);
         if( en!=null ) {
             en.markAsAcknowledged();
@@ -346,6 +346,19 @@ public final class SimpleTypeBuilder extends BindingComponent {
                     // recover by ignoring this customization
                     return null;
                 }
+
+                // reference?
+                if(en.ref!=null) {
+                    if(!JJavaName.isFullyQualifiedClassName(en.ref)) {
+                        Ring.get(ErrorReceiver.class).error( en.getLocation(),
+                            Messages.format(Messages.ERR_INCORRECT_CLASS_NAME, en.ref) );
+                        // recover by ignoring @ref
+                        return null;
+                    }
+
+                    return new CClassRef(model, type, en, info.toCustomizationList() );
+                }
+
                 // list and union cannot be mapped to a type-safe enum,
                 // so in this stage we can safely cast it to XSRestrictionSimpleType
                 return bindToTypeSafeEnum( (XSRestrictionSimpleType)type,
@@ -386,7 +399,7 @@ public final class SimpleTypeBuilder extends BindingComponent {
             }
         }
 
-        return getClassSelector()._bindToClass(type,false);
+        return (CNonElement)getClassSelector()._bindToClass(type,null,false);
     }
 
     /**
@@ -512,8 +525,9 @@ public final class SimpleTypeBuilder extends BindingComponent {
             }
             className = type.getName();
         }
+
         // we apply name conversion in any case
-        className = builder.getNameConverter().toClassName(className);
+        className = builder.deriveName(className,type);
 
         {// compute Javadoc
             StringWriter out = new StringWriter();
@@ -536,7 +550,7 @@ public final class SimpleTypeBuilder extends BindingComponent {
         if(use.isCollection())
             return null;    // can't bind a list to enum constant
 
-        CNonElement baseDt = (CNonElement)use.getInfo();   // for now just ignore that case
+        CNonElement baseDt = use.getInfo();   // for now just ignore that case
 
         if(baseDt instanceof CClassInfo)
             return null;    // can't bind to an enum if the base is a class, since we don't have the value constrctor
@@ -571,18 +585,13 @@ public final class SimpleTypeBuilder extends BindingComponent {
             }
         }
 
-        QName typeName = null;
-        if(type.isGlobal())
-            typeName = new QName(type.getTargetNamespace(),type.getName());
-
-
         // use the name of the simple type as the name of the class.
         CClassInfoParent scope;
         if(type.isGlobal())
             scope = new CClassInfoParent.Package(getClassSelector().getPackage(type.getTargetNamespace()));
         else
             scope = getClassSelector().getClassScope();
-        CEnumLeafInfo xducer = new CEnumLeafInfo( model, typeName, scope,
+        CEnumLeafInfo xducer = new CEnumLeafInfo( model, BGMBuilder.getName(type), scope,
             className, baseDt, memberList, type,
             builder.getBindInfo(type).toCustomizationList(), loc );
         xducer.javadoc = javadoc;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/UnusedCustomizationChecker.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/UnusedCustomizationChecker.java
index 9a424a16b98..e425d273614 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/UnusedCustomizationChecker.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/UnusedCustomizationChecker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import java.util.HashSet;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/WildcardNameClassBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/WildcardNameClassBuilder.java
index 2710125fb3b..774ab969a46 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/WildcardNameClassBuilder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/WildcardNameClassBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AbstractDeclarationImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AbstractDeclarationImpl.java
index f45c12c48ee..e72dec4564c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AbstractDeclarationImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AbstractDeclarationImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.bindinfo;
 
 import java.util.Collection;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AnnotationParserFactoryImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AnnotationParserFactoryImpl.java
index 210738c426a..c5de503b8e0 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AnnotationParserFactoryImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AnnotationParserFactoryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.bindinfo;
 
-import java.util.Collections;
-
-import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
 import javax.xml.bind.UnmarshallerHandler;
@@ -37,8 +33,6 @@ import javax.xml.validation.ValidatorHandler;
 import com.sun.tools.internal.xjc.Options;
 import com.sun.tools.internal.xjc.SchemaCache;
 import com.sun.tools.internal.xjc.reader.Const;
-import com.sun.xml.internal.bind.api.TypeReference;
-import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
 import com.sun.xml.internal.xsom.parser.AnnotationContext;
 import com.sun.xml.internal.xsom.parser.AnnotationParser;
 import com.sun.xml.internal.xsom.parser.AnnotationParserFactory;
@@ -69,44 +63,9 @@ public class AnnotationParserFactoryImpl implements AnnotationParserFactory {
      */
     private ValidatorHandler validator;
 
-    /**
-     * Lazily parsed schema for the binding file.
-     */
-    private static final SchemaCache bindingFileSchema = new SchemaCache(AnnotationParserFactoryImpl.class.getResource("binding.xsd"));
-
-    /**
-     * Lazily prepared {@link JAXBContext}.
-     */
-    private static JAXBContextImpl customizationContext;
-
-    private static JAXBContextImpl getJAXBContext() {
-        synchronized(AnnotationParserFactoryImpl.class) {
-            try {
-                if(customizationContext==null)
-                    customizationContext = new JAXBContextImpl(
-                        new Class[] {
-                            BindInfo.class, // for xs:annotation
-                            BIClass.class,
-                            BIConversion.User.class,
-                            BIConversion.UserAdapter.class,
-                            BIDom.class,
-                            BIXDom.class,
-                            BIEnum.class,
-                            BIEnumMember.class,
-                            BIGlobalBinding.class,
-                            BIProperty.class,
-                            BISchemaBinding.class
-                        }, Collections.emptyList(), null, false);
-                return customizationContext;
-            } catch (JAXBException e) {
-                throw new AssertionError(e);
-            }
-        }
-    }
-
     public AnnotationParser create() {
         return new AnnotationParser() {
-            private Unmarshaller u = getJAXBContext().createUnmarshaller();
+            private Unmarshaller u = BindInfo.getJAXBContext().createUnmarshaller();
 
             private UnmarshallerHandler handler;
 
@@ -139,7 +98,7 @@ public class AnnotationParserFactoryImpl implements AnnotationParserFactory {
                         && getSideHandler()==null) {
                             // set up validator
                             if(validator==null)
-                                validator = bindingFileSchema.newValidator();
+                                validator = BindInfo.bindingFileSchema.newValidator();
                             validator.setErrorHandler(errorHandler);
                             startForking(uri,localName,qName,atts,new ValidatorProtecter(validator));
                         }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIClass.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIClass.java
index 4e32c916dbe..fc80bf467a4 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIClass.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.bindinfo;
 
 import javax.xml.bind.annotation.XmlAttribute;
@@ -32,8 +31,7 @@ import javax.xml.namespace.QName;
 
 import com.sun.tools.internal.xjc.reader.Const;
 import com.sun.xml.internal.bind.api.impl.NameConverter;
-
-import org.xml.sax.Locator;
+import com.sun.istack.internal.Nullable;
 
 /**
  * Class declaration.
@@ -49,14 +47,6 @@ import org.xml.sax.Locator;
  */
 @XmlRootElement(name="class")
 public final class BIClass extends AbstractDeclarationImpl {
-
-    public BIClass( Locator loc, String _className, String _implClass, String _javadoc ) {
-        super(loc);
-        this.className = _className;
-        this.javadoc = _javadoc;
-        this.userSpecifiedImplClass = _implClass;
-    }
-
     protected BIClass() {
     }
 
@@ -65,13 +55,14 @@ public final class BIClass extends AbstractDeclarationImpl {
 
     /**
      * Gets the specified class name, or null if not specified.
+     * (Not a fully qualified name.)
      *
      * @return
      *      Returns a class name. The caller should NOT
      *      apply XML-to-Java name conversion to the name
      *      returned from this method.
      */
-    public String getClassName() {
+    public @Nullable String getClassName() {
         if( className==null )   return null;
 
         BIGlobalBinding gb = getBuilder().getGlobalBinding();
@@ -95,6 +86,20 @@ public final class BIClass extends AbstractDeclarationImpl {
         return userSpecifiedImplClass;
     }
 
+    @XmlAttribute(name="ref")
+    private String ref;
+
+    /**
+     * Reference to the existing class, or null.
+     * Fully qualified name.
+     *
+     * 
    
+     * Caller needs to perform error check on this.
+     */
+    public String getExistingClassRef() {
+        return ref;
+    }
+
     @XmlElement
     private String javadoc;
     /**
@@ -105,7 +110,14 @@ public final class BIClass extends AbstractDeclarationImpl {
 
     public QName getName() { return NAME; }
 
+    public void setParent(BindInfo p) {
+        super.setParent(p);
+        // if this specifies a reference to external class,
+        // then it's OK even if noone actually refers this class.
+        if(ref!=null)
+            markAsAcknowledged();
+    }
+
     /** Name of this declaration. */
-    public static final QName NAME = new QName(
-        Const.JAXB_NSURI, "class" );
+    public static final QName NAME = new QName( Const.JAXB_NSURI, "class" );
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIConversion.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIConversion.java
index 265ffe15e0e..42d82d5259f 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIConversion.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIConversion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.bindinfo;
 
 import javax.xml.bind.DatatypeConverter;
@@ -42,6 +41,7 @@ import com.sun.codemodel.internal.JMod;
 import com.sun.codemodel.internal.JPackage;
 import com.sun.codemodel.internal.JType;
 import com.sun.codemodel.internal.JVar;
+import com.sun.codemodel.internal.JConditional;
 import com.sun.tools.internal.xjc.ErrorReceiver;
 import com.sun.tools.internal.xjc.model.CAdapter;
 import com.sun.tools.internal.xjc.model.CBuiltinLeafInfo;
@@ -233,6 +233,10 @@ public abstract class BIConversion extends AbstractDeclarationImpl {
 
                 // RESULT: .()
                 inv = $value.invoke(printMethod);
+
+                // check value is not null ... if(value == null) return null;
+                JConditional jcon = marshal.body()._if($value.eq(JExpr._null()));
+                jcon._then()._return(JExpr._null());
             } else {
                 // RESULT: .()
                 if(this.printMethod==null) {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDeclaration.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDeclaration.java
index 77fab0f0b77..4a13c201f51 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDeclaration.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDeclaration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.bindinfo;
 
 import java.util.Collection;
@@ -52,7 +51,9 @@ public interface BIDeclaration {
      *
      * 
    
      * This method can be only called from {@link BindInfo},
-     * and only once.
+     * and only once. This is a good opportunity to do some
+     * follow-up initialization after JAXB unmarshalling
+     * populated {@link BIDeclaration}.
      */
     void setParent( BindInfo parent );
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDom.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDom.java
index 553cbd95519..ae45fb188ba 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDom.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.bindinfo;
 
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnum.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnum.java
index 643e8b99a81..2ede1361844 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnum.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnum.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.bindinfo;
 
 import java.util.HashMap;
@@ -62,7 +61,13 @@ public final class BIEnum extends AbstractDeclarationImpl {
 
     /** Gets the specified class name, or null if not specified. */
     @XmlAttribute(name="name")
-    public final String className = null;
+    public String className = null;
+
+    /**
+     * @see BIClass#getExistingClassRef()
+     */
+    @XmlAttribute(name="ref")
+    public String ref;
 
     /**
      * Gets the javadoc comment specified in the customization.
@@ -90,6 +95,11 @@ public final class BIEnum extends AbstractDeclarationImpl {
         super.setParent(p);
         for( BIEnumMember mem : members.values() )
             mem.setParent(p);
+
+        // if this specifies a reference to external class,
+        // then it's OK even if noone actually refers this class.
+        if(ref!=null)
+            markAsAcknowledged();
     }
 
     /** Name of this declaration. */
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnumMember.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnumMember.java
index 1696771f885..0a3a6579b70 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnumMember.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnumMember.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.bindinfo;
 
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java
index 062516eba6c..469547452cb 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.bindinfo;
 
 import java.util.Collections;
@@ -133,6 +132,10 @@ public final class BIGlobalBinding extends AbstractDeclarationImpl {
         return simpleMode!=null;
     }
 
+    public boolean isRestrictionFreshType() {
+        return treatRestrictionLikeNewType !=null;
+    }
+
     public EnumMemberMode getEnumMemberMode() {
         return generateEnumMemberName;
     }
@@ -270,6 +273,12 @@ public final class BIGlobalBinding extends AbstractDeclarationImpl {
     @XmlElement(name="simple",namespace=Const.XJC_EXTENSION_URI)
     String simpleMode = null;
 
+    /**
+     * Handles complex type restriction as if it were a new type.
+     */
+    @XmlElement(name="treatRestrictionLikeNewType",namespace=Const.XJC_EXTENSION_URI)
+    String treatRestrictionLikeNewType = null;
+
     /**
      * True to generate a class for elements by default.
      */
@@ -279,6 +288,11 @@ public final class BIGlobalBinding extends AbstractDeclarationImpl {
     @XmlElement(namespace=Const.XJC_EXTENSION_URI)
     Boolean generateElementProperty = null;
 
+    @XmlAttribute(name="generateElementProperty")     // for JAXB unmarshaller
+    private void setGenerateElementPropertyStd(boolean value) {
+        generateElementProperty = value;
+    }
+
     @XmlAttribute
     boolean choiceContentProperty = false;
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIProperty.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIProperty.java
index 8026848797c..d2b3b4309ec 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIProperty.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.bindinfo;
 
 import java.util.Collection;
@@ -280,7 +279,7 @@ public final class BIProperty extends AbstractDeclarationImpl {
     }
 
     public CValuePropertyInfo createValueProperty(String defaultName,boolean forConstant,
-        XSComponent source,TypeUse tu) {
+        XSComponent source,TypeUse tu, QName typeName) {
 
         markAsAcknowledged();
         constantPropertyErrorCheck();
@@ -292,7 +291,7 @@ public final class BIProperty extends AbstractDeclarationImpl {
                 name = JJavaName.getPluralForm(name);
         }
 
-        return wrapUp(new CValuePropertyInfo(name, source,getCustomizations(source),source.getLocator(), tu ),source);
+        return wrapUp(new CValuePropertyInfo(name, source,getCustomizations(source),source.getLocator(), tu, typeName ),source);
     }
 
     public CAttributePropertyInfo createAttributeProperty( XSAttributeUse use, TypeUse tu ) {
@@ -312,12 +311,12 @@ public final class BIProperty extends AbstractDeclarationImpl {
                 name = JJavaName.getPluralForm(name);
         }
 
-        QName n = new QName(use.getDecl().getTargetNamespace(),use.getDecl().getName());
-
         markAsAcknowledged();
         constantPropertyErrorCheck();
 
-        return wrapUp(new CAttributePropertyInfo(name,use,getCustomizations(use),use.getLocator(), n, tu, use.isRequired() ),use);
+        return wrapUp(new CAttributePropertyInfo(name,use,getCustomizations(use),use.getLocator(),
+                BGMBuilder.getName(use.getDecl()), tu,
+                BGMBuilder.getName(use.getDecl().getType()), use.isRequired() ),use);
     }
 
     /**
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISchemaBinding.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISchemaBinding.java
index 210ea4ee4c7..f0ab6e0001b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISchemaBinding.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISchemaBinding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.bindinfo;
 
 import javax.xml.bind.annotation.XmlAttribute;
@@ -78,6 +77,14 @@ public final class BISchemaBinding extends AbstractDeclarationImpl {
     @XmlElement(name="package")
     private PackageInfo packageInfo = new PackageInfo();
 
+    /**
+     * 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="..."/>)
+     */
+    @XmlAttribute(name="map")
+    public boolean map = true;
+
     /**
      * Default naming rule, that doesn't change the name.
      */
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISerializable.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISerializable.java
index 954878cb3da..5c641df0abf 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISerializable.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISerializable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.bindinfo;
 
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXDom.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXDom.java
index 5e70e34bd15..c7ad95cca59 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXDom.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXDom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.bindinfo;
 
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXPluginCustomization.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXPluginCustomization.java
index e9808c32db6..9e3a54742af 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXPluginCustomization.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXPluginCustomization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.bindinfo;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/prop/XmlItemProp.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXSubstitutable.java
similarity index 61%
rename from jaxws/src/share/classes/com/sun/tools/internal/txw2/model/prop/XmlItemProp.java
rename to jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXSubstitutable.java
index aad2a5ec2e6..d1637516d63 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/prop/XmlItemProp.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXSubstitutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,37 +22,26 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+package com.sun.tools.internal.xjc.reader.xmlschema.bindinfo;
 
-package com.sun.tools.internal.txw2.model.prop;
-
-import com.sun.codemodel.JType;
-
+import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.namespace.QName;
 
+import com.sun.tools.internal.xjc.reader.Const;
+
 /**
- * Common implementation between elements and attributes.
+ * Forces a non-collapsing behavior to allow extension schemas
+ * to perform element substitutions.
+ *
+ * See https://jaxb.dev.java.net/issues/show_bug.cgi?id=289
  *
  * @author Kohsuke Kawaguchi
+ * @since 2.1.1
  */
-abstract class XmlItemProp extends Prop {
-    private final QName name;
-    private final JType type;
+@XmlRootElement(name="substitutable",namespace= Const.XJC_EXTENSION_URI)
+public final class BIXSubstitutable extends AbstractDeclarationImpl {
+    public final QName getName() { return NAME; }
 
-    public XmlItemProp(QName name, JType valueType) {
-        this.name = name;
-        this.type = valueType;
-    }
-
-    public final boolean equals(Object o) {
-        if (this.getClass()!=o.getClass()) return false;
-
-        XmlItemProp that = (XmlItemProp)o;
-
-        return this.name.equals(that.name)
-            && this.type.equals(that.type);
-    }
-
-    public final int hashCode() {
-        return name.hashCode()*29 + type.hashCode();
-    }
+    /** Name of the conversion declaration. */
+    public static final QName NAME = new QName(Const.XJC_EXTENSION_URI,"substitutable");
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BindInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BindInfo.java
index 09f889ebfed..cfc7d759e7f 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BindInfo.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BindInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.bindinfo;
 
 import java.io.FilterWriter;
@@ -30,9 +29,12 @@ import java.io.IOException;
 import java.io.StringWriter;
 import java.io.Writer;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
 import javax.xml.bind.annotation.XmlAnyElement;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlMixed;
@@ -44,14 +46,17 @@ import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
 import com.sun.codemodel.internal.JDocComment;
+import com.sun.tools.internal.xjc.SchemaCache;
 import com.sun.tools.internal.xjc.model.CCustomizations;
 import com.sun.tools.internal.xjc.model.CPluginCustomization;
 import com.sun.tools.internal.xjc.model.Model;
 import com.sun.tools.internal.xjc.reader.Ring;
 import com.sun.tools.internal.xjc.reader.xmlschema.BGMBuilder;
 import com.sun.xml.internal.bind.annotation.XmlLocation;
+import com.sun.xml.internal.bind.api.TypeReference;
 import com.sun.xml.internal.bind.marshaller.MinimumEscapeHandler;
 import com.sun.xml.internal.bind.v2.WellKnownNamespace;
+import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
 import com.sun.xml.internal.xsom.XSComponent;
 
 import org.w3c.dom.Element;
@@ -304,4 +309,40 @@ public final class BindInfo implements Iterable {
     /** An instance with the empty contents. */
     public final static BindInfo empty = new BindInfo();
 
+    /**
+     * Lazily prepared {@link JAXBContext}.
+     */
+    private static JAXBContextImpl customizationContext;
+
+    public static JAXBContextImpl getJAXBContext() {
+        synchronized(AnnotationParserFactoryImpl.class) {
+            try {
+                if(customizationContext==null)
+                    customizationContext = new JAXBContextImpl(
+                        new Class[] {
+                            BindInfo.class, // for xs:annotation
+                            BIClass.class,
+                            BIConversion.User.class,
+                            BIConversion.UserAdapter.class,
+                            BIDom.class,
+                            BIXDom.class,
+                            BIXSubstitutable.class,
+                            BIEnum.class,
+                            BIEnumMember.class,
+                            BIGlobalBinding.class,
+                            BIProperty.class,
+                            BISchemaBinding.class
+                        }, Collections.emptyList(),
+                            Collections.emptyMap(), null, false, null, false, false);
+                return customizationContext;
+            } catch (JAXBException e) {
+                throw new AssertionError(e);
+            }
+        }
+    }
+
+    /**
+     * Lazily parsed schema for the binding file.
+     */
+    public static final SchemaCache bindingFileSchema = new SchemaCache(BindInfo.class.getResource("binding.xsd"));
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/CollectionTypeAttribute.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/CollectionTypeAttribute.java
index c61e323dc13..3e98bdad897 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/CollectionTypeAttribute.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/CollectionTypeAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.bindinfo;
 
 import javax.xml.bind.annotation.XmlTransient;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/DomHandlerEx.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/DomHandlerEx.java
index 8a65a4ce942..031542476cc 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/DomHandlerEx.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/DomHandlerEx.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.bindinfo;
 
 import javax.xml.bind.ValidationEventHandler;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/EnumMemberMode.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/EnumMemberMode.java
index c48a8ac7e34..812ebc6c904 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/EnumMemberMode.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/EnumMemberMode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.bindinfo;
 
 import javax.xml.bind.annotation.XmlEnum;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/ForkingFilter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/ForkingFilter.java
index 34308f84ca0..f2b747ba657 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/ForkingFilter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/ForkingFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.bindinfo;
 
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/LocalScoping.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/LocalScoping.java
index 7ab528a03f3..1644ddc2f1f 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/LocalScoping.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/LocalScoping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.bindinfo;
 
 import javax.xml.bind.annotation.XmlEnumValue;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle.properties b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle.properties
index 0c9db62e416..d1029bf35d6 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle.properties
@@ -1,3 +1,28 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
 #
 # Message resource file
 #
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/Messages.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/Messages.java
index 7dc85497104..fa1a1867c63 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/Messages.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/Messages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/OptionalPropertyMode.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/OptionalPropertyMode.java
index dfccd35729a..d94459ef8f6 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/OptionalPropertyMode.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/OptionalPropertyMode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.bindinfo;
 
 import javax.xml.bind.annotation.XmlEnumValue;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.rng b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.rng
index d8de4abbb4b..3386af62475 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.rng
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.rng
@@ -1,4 +1,28 @@
 
+
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.xsd b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.xsd
index 77b8cd130f1..f746a880842 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.xsd
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.xsd
@@ -1,7 +1,6 @@
 
-
 
-
 
 
   
   
+  
+    
+      
+        
+      
+      
+       
+    
+  
   
   
     
@@ -46,6 +53,7 @@
         
         
         
+        
         
         
         
@@ -114,6 +122,7 @@
       
       
       
+      
       
       
     
@@ -129,6 +138,7 @@
         
         
       
+      
     
   
   
@@ -141,13 +151,13 @@
   
   
     
-      
-        
-        
-        
-        
-        
-      
+      
+        
+        
+        
+        
+        
+      
     
   
   
@@ -190,6 +200,7 @@
       
       
       
+      
     
   
   
@@ -250,6 +261,7 @@
         
       
       
+      
     
   
   
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package-info.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package-info.java
index 2a4c6cfdf27..3facd392e0b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package-info.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 @XmlSchema(elementFormDefault = QUALIFIED, namespace=Const.JAXB_NSURI)
 package com.sun.tools.internal.xjc.reader.xmlschema.bindinfo;
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package.html b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package.html
index 4e0c1cb731e..af2b0a5fb82 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package.html
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package.html
@@ -1,3 +1,27 @@
+
 
 Object Model that represents customization declarations.
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xjc.xsd b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xjc.xsd
index 585b480ded4..4536da0babb 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xjc.xsd
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xjc.xsd
@@ -1,7 +1,6 @@
 
-
 
-
 
   
   
@@ -34,6 +32,9 @@
   
     
   
+  
+    
+  
   
     
   
@@ -43,6 +44,9 @@
   
     
   
+  
+    
+  
   
     
   
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xs.xsd b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xs.xsd
index 2796ebdd74f..379174c20a3 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xs.xsd
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xs.xsd
@@ -1,7 +1,6 @@
 
-
 
-
 
   
   
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/CTBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/CTBuilder.java
index b96d1a7676c..dedf737818a 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/CTBuilder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/CTBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.ct;
 
 import com.sun.tools.internal.xjc.ErrorReceiver;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ChoiceContentComplexTypeBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ChoiceContentComplexTypeBuilder.java
index 1cfbaac7bef..24317a39f27 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ChoiceContentComplexTypeBuilder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ChoiceContentComplexTypeBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.ct;
 
 import java.util.Collections;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeBindingMode.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeBindingMode.java
index 2880fcec322..dc9e40c65c0 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeBindingMode.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeBindingMode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.ct;
 
 /**
@@ -31,7 +30,7 @@ package com.sun.tools.internal.xjc.reader.xmlschema.ct;
  * @author
  *     Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
  */
-enum ComplexTypeBindingMode {
+public enum ComplexTypeBindingMode {
 
     /**
      * Neither FALLBACK nor NOMOREEXTENSION.
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeFieldBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeFieldBuilder.java
index 61175547c85..ddf7f382b70 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeFieldBuilder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeFieldBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.ct;
 
 import java.util.HashMap;
@@ -87,7 +86,7 @@ public final class ComplexTypeFieldBuilder extends BindingComponent {
      * For this reason, we have to record how each complex type is being
      * bound.
      */
-    protected void recordBindingMode( XSComplexType type, ComplexTypeBindingMode flag ) {
+    public void recordBindingMode( XSComplexType type, ComplexTypeBindingMode flag ) {
         // it is an error to override the flag.
         Object o = complexTypeBindingModes.put(type,flag);
         assert o==null;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ExtendedComplexTypeBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ExtendedComplexTypeBuilder.java
index 1341a849614..3b851cd5afe 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ExtendedComplexTypeBuilder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ExtendedComplexTypeBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.ct;
 
 import java.util.HashMap;
@@ -30,6 +29,7 @@ import java.util.Iterator;
 import java.util.Map;
 
 import com.sun.tools.internal.xjc.model.CClassInfo;
+import com.sun.tools.internal.xjc.model.CClass;
 import com.sun.tools.internal.xjc.reader.xmlschema.WildcardNameClassBuilder;
 import com.sun.xml.internal.xsom.XSAttributeUse;
 import com.sun.xml.internal.xsom.XSComplexType;
@@ -73,7 +73,7 @@ final class ExtendedComplexTypeBuilder extends CTBuilder {
         XSComplexType baseType = ct.getBaseType().asComplexType();
 
         // build the base class
-        CClassInfo baseClass = selector.bindToType(baseType,true);
+        CClass baseClass = selector.bindToType(baseType,ct,true);
         assert baseClass!=null;   // global complex type must map to a class
 
         selector.getCurrentBean().setBaseClass(baseClass);
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/FreshComplexTypeBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/FreshComplexTypeBuilder.java
index 9e110688de3..6863b81353c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/FreshComplexTypeBuilder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/FreshComplexTypeBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.ct;
 
 import com.sun.tools.internal.xjc.model.CPropertyInfo;
@@ -30,6 +29,7 @@ import com.sun.tools.internal.xjc.model.TypeUse;
 import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIProperty;
 import static com.sun.tools.internal.xjc.reader.xmlschema.ct.ComplexTypeBindingMode.FALLBACK_CONTENT;
 import static com.sun.tools.internal.xjc.reader.xmlschema.ct.ComplexTypeBindingMode.NORMAL;
+import com.sun.tools.internal.xjc.reader.xmlschema.BGMBuilder;
 import com.sun.xml.internal.xsom.XSComplexType;
 import com.sun.xml.internal.xsom.XSContentType;
 import com.sun.xml.internal.xsom.XSModelGroup;
@@ -63,7 +63,7 @@ final class FreshComplexTypeBuilder extends CTBuilder {
                 simpleTypeBuilder.refererStack.pop();
 
                 BIProperty prop = BIProperty.getCustomization(ct);
-                CPropertyInfo p = prop.createValueProperty("Value",false,ct,use);
+                CPropertyInfo p = prop.createValueProperty("Value",false,ct,use, BGMBuilder.getName(st));
                 selector.getCurrentBean().addProperty(p);
             }
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle.properties b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle.properties
index cdbb96d5f29..3f46f175ae7 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle.properties
@@ -1,3 +1,28 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
 ERR_NO_FURTHER_EXTENSION = \
     Base complex type "{0}" is derived by restriction, while this complex type "{1}" \
     is derived by extension. This is not currently handled by XJC, but we are \
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/Messages.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/Messages.java
index 49b2bfc0c37..a0369dc7cbc 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/Messages.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/Messages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.ct;
 
 import java.text.MessageFormat;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedComplexTypeBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedComplexTypeBuilder.java
index 96f5a8b0ab4..963350e23db 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedComplexTypeBuilder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedComplexTypeBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.ct;
 
 import com.sun.tools.internal.xjc.model.CBuiltinLeafInfo;
@@ -66,7 +65,7 @@ final class MixedComplexTypeBuilder extends CTBuilder {
         CPropertyInfo p;
 
         if(contentType.asEmpty()!=null) {
-            p = prop.createValueProperty("Content",false,ct,CBuiltinLeafInfo.STRING);
+            p = prop.createValueProperty("Content",false,ct,CBuiltinLeafInfo.STRING,null);
         } else {
             RawTypeSet ts = RawTypeSetBuilder.build(contentType.asParticle(),false);
             p = prop.createReferenceProperty("Content",false,ct,ts, true);
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/RestrictedComplexTypeBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/RestrictedComplexTypeBuilder.java
index 3b00a772008..35fce946ae7 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/RestrictedComplexTypeBuilder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/RestrictedComplexTypeBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,9 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.ct;
 
-import com.sun.tools.internal.xjc.model.CClassInfo;
+import com.sun.tools.internal.xjc.model.CClass;
 import com.sun.xml.internal.xsom.XSComplexType;
 import com.sun.xml.internal.xsom.XSType;
 
@@ -46,10 +45,17 @@ final class RestrictedComplexTypeBuilder extends CTBuilder {
     }
 
     public void build(XSComplexType ct) {
+        if(bgmBuilder.getGlobalBinding().isRestrictionFreshType()) {
+            // handle derivation-by-restriction like a whole new type
+            new FreshComplexTypeBuilder().build(ct);
+            return;
+        }
+
+
         XSComplexType baseType = ct.getBaseType().asComplexType();
 
         // build the base class
-        CClassInfo baseClass = selector.bindToType(baseType,true);
+        CClass baseClass = selector.bindToType(baseType,ct,true);
         assert baseClass!=null;   // global complex type must map to a class
 
         selector.getCurrentBean().setBaseClass(baseClass);
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/STDerivedComplexTypeBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/STDerivedComplexTypeBuilder.java
index d53fb2e96d3..9679f1c7306 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/STDerivedComplexTypeBuilder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/STDerivedComplexTypeBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,12 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.ct;
 
 import com.sun.tools.internal.xjc.model.CPropertyInfo;
 import com.sun.tools.internal.xjc.model.TypeUse;
 import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIProperty;
+import com.sun.tools.internal.xjc.reader.xmlschema.BGMBuilder;
 import com.sun.xml.internal.xsom.XSComplexType;
 import com.sun.xml.internal.xsom.XSSimpleType;
 import com.sun.xml.internal.xsom.XSType;
@@ -60,7 +60,7 @@ final class STDerivedComplexTypeBuilder extends CTBuilder {
         simpleTypeBuilder.refererStack.pop();
 
         BIProperty prop = BIProperty.getCustomization(ct);
-        CPropertyInfo p = prop.createValueProperty("Value",false,baseType,use);
+        CPropertyInfo p = prop.createValueProperty("Value",false,baseType,use, BGMBuilder.getName(baseType));
         selector.getCurrentBean().addProperty(p);
 
         // adds attributes and we are through.
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/CustomizationContextChecker.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/CustomizationContextChecker.java
index efe86a6c14f..4c431ea2fda 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/CustomizationContextChecker.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/CustomizationContextChecker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.parser;
 
 import java.util.HashSet;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/IncorrectNamespaceURIChecker.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/IncorrectNamespaceURIChecker.java
index 4677fa92d30..2446d96fbbe 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/IncorrectNamespaceURIChecker.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/IncorrectNamespaceURIChecker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.parser;
 
 import com.sun.tools.internal.xjc.reader.Const;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/LSInputSAXWrapper.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/LSInputSAXWrapper.java
index da990acfe08..457c78be513 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/LSInputSAXWrapper.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/LSInputSAXWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.parser;
 
 import java.io.InputStream;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle.properties b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle.properties
index a620ea12a92..258adfc3f5c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle.properties
@@ -1,3 +1,28 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
 #
 # Message resource file
 #
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/Messages.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/Messages.java
index 981adf27832..6c3fd1c2b8c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/Messages.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/Messages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java
index a12967c0951..c6afff0f971 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.parser;
 
 import java.io.File;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/XMLSchemaInternalizationLogic.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/XMLSchemaInternalizationLogic.java
index 1ab176a5e99..16eb8649be9 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/XMLSchemaInternalizationLogic.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/XMLSchemaInternalizationLogic.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.reader.xmlschema.parser;
 
 import com.sun.tools.internal.xjc.reader.internalizer.AbstractReferenceFinderImpl;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java
index e71064f908b..31f0430c2ae 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.runtime;
 
 import java.util.ArrayList;
@@ -93,7 +92,7 @@ public class JAXBContextFactory {
 
                 // if we find one, tell the real JAXB provider to
                 // load foo.bar.impl.ObjectFactory
-                name = name.substring(name.length()-DOT_OBJECT_FACTORY.length())+IMPL_DOT_OBJECT_FACTORY;
+                name = name.substring(0,name.length()-DOT_OBJECT_FACTORY.length())+IMPL_DOT_OBJECT_FACTORY;
 
                 try {
                     c = c.getClassLoader().loadClass(name);
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java
index 899b4543c0f..42e4f2d7780 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.runtime;
 
 import javax.xml.bind.DatatypeConverter;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/runtime/package.html b/jaxws/src/share/classes/com/sun/tools/internal/xjc/runtime/package.html
index 9b87fa74f8d..2182eb648c5 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/runtime/package.html
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/runtime/package.html
@@ -1,3 +1,27 @@
+
 
   Code generated into the user's packages in certain compilation mode.
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/CodeModelClassFactory.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/CodeModelClassFactory.java
index e5e8a141a52..a20f5ea4588 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/CodeModelClassFactory.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/CodeModelClassFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.util;
 
 import com.sun.codemodel.internal.ClassType;
@@ -117,6 +116,12 @@ public final class CodeModelClassFactory {
                         name, cls.name() ), null ) );
             }
 
+            if(Util.equals((Locator)cls.metadata,source)) {
+                errorReceiver.error( new SAXParseException(
+                    Messages.format( Messages.ERR_CHAMELEON_SCHEMA_GONE_WILD ),
+                    source ));
+            }
+
             return createDummyClass(parent);
         }
     }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/DOMUtils.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/DOMUtils.java
index f5f94b5a76d..0999bea98b5 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/DOMUtils.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/DOMUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,6 @@
  * have any questions.
  */
 
-
 /*
  * DOMUtils.java
  *
@@ -46,6 +45,7 @@ import org.w3c.dom.NodeList;
 /**
  *
  * @author  Vivek Pandey
+ * @version 1.0
  *
  */
 public class DOMUtils {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/ErrorReceiverFilter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/ErrorReceiverFilter.java
index df7b0c4fd63..52d9689da02 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/ErrorReceiverFilter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/ErrorReceiverFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.util;
 
 import com.sun.tools.internal.xjc.ErrorReceiver;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/ForkContentHandler.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/ForkContentHandler.java
index 60f2ab562da..35872f3b61a 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/ForkContentHandler.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/ForkContentHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.util;
 
 import org.xml.sax.Attributes;
@@ -35,6 +34,7 @@ import org.xml.sax.SAXException;
  * two ContentHandlers.
  *
  *
+ * @version     $Id: ForkContentHandler.java,v 1.1 2005/05/23 17:04:58 kohsuke Exp $
  * @author  Kohsuke KAWAGUCHI
  */
 public class ForkContentHandler implements ContentHandler {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/ForkEntityResolver.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/ForkEntityResolver.java
index becf369a9fa..4fbe5c132ba 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/ForkEntityResolver.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/ForkEntityResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.util;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/MessageBundle.properties b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/MessageBundle.properties
index df19627ad42..5b80e3f6c9f 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/MessageBundle.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/MessageBundle.properties
@@ -1,3 +1,28 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
 #
 # Message resource file
 #
@@ -19,4 +44,10 @@ ERR_INVALID_CLASSNAME = \
 CodeModelClassFactory.CaseSensitivityCollision = \
 	This error is caused because on Windows you cannot have both "{0}.java" and "{1}.java" \
 	in the same directory.
+
+ERR_CHAMELEON_SCHEMA_GONE_WILD = \
+    (Relevant to above error) This confusing error happened most likely because the schema uses a technique called \
+    "chameleon schema", which causes a single definition to be loaded multiple times into \
+    different namespaces. See http://forums.java.net/jive/thread.jspa?threadID=18631 for \
+    more about this.
  
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/Messages.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/Messages.java
index b00af65936a..d8fe2c76aaa 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/Messages.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/Messages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,4 +51,7 @@ class Messages
 
     static final String ERR_CASE_SENSITIVITY_COLLISION = // 2 args
         "CodeModelClassFactory.CaseSensitivityCollision";
+
+    static final String ERR_CHAMELEON_SCHEMA_GONE_WILD = // no argts
+        "ERR_CHAMELEON_SCHEMA_GONE_WILD";
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/MimeTypeRange.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/MimeTypeRange.java
index 5f814aa4108..2bc02c60134 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/MimeTypeRange.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/MimeTypeRange.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.util;
 
 import java.text.ParseException;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/NamespaceContextAdapter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/NamespaceContextAdapter.java
index 3c622532bae..c15163df5e5 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/NamespaceContextAdapter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/NamespaceContextAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.util;
 
 import java.util.Collections;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/NullStream.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/NullStream.java
index 03f50e8ac39..88d15c4b858 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/NullStream.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/NullStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.util;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/ReadOnlyAdapter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/ReadOnlyAdapter.java
index db32e2434a4..e7dec2bf5ed 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/ReadOnlyAdapter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/ReadOnlyAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.util;
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/StringCutter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/StringCutter.java
index 414344f160d..5fe712268c3 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/StringCutter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/StringCutter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.util;
 
 import java.text.ParseException;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/SubtreeCutter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/SubtreeCutter.java
new file mode 100644
index 00000000000..6139ec9e448
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/SubtreeCutter.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.tools.internal.xjc.util;
+
+import org.xml.sax.helpers.XMLFilterImpl;
+import org.xml.sax.helpers.DefaultHandler;
+import org.xml.sax.XMLFilter;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
+import org.xml.sax.Attributes;
+
+/**
+ * {@link XMLFilter} that can cut sub-trees.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public abstract class SubtreeCutter extends XMLFilterImpl {
+    /**
+     * When we are pruning a sub tree, this field holds the depth of
+     * elements that are being cut. Used to resume event forwarding.
+     *
+     * As long as this value is 0, we will pass through data.
+     */
+    private int cutDepth=0;
+
+
+    /**
+     * This object will receive SAX events while a sub tree is being
+     * pruned.
+     */
+    private static final ContentHandler stub = new DefaultHandler();
+
+    /**
+     * This field remembers the user-specified ContentHandler.
+     * So that we can restore it once the sub tree is completely pruned.
+     */
+    private ContentHandler next;
+
+
+    public void startDocument() throws SAXException {
+        cutDepth=0;
+        super.startDocument();
+    }
+
+    public boolean isCutting() {
+        return cutDepth>0;
+    }
+
+    /**
+     * Starts cutting a sub-tree. Should be called from within the
+     * {@link #startElement(String, String, String, Attributes)} implementation
+     * before the execution is passed to {@link SubtreeCutter#startElement(String, String, String, Attributes)} .
+     * The current element will be cut.
+     */
+    public void startCutting() {
+        super.setContentHandler(stub);
+        cutDepth=1;
+    }
+
+    public void setContentHandler(ContentHandler handler) {
+        next = handler;
+        // changes take effect immediately unless the sub-tree is being pruned
+        if(getContentHandler()!=stub)
+            super.setContentHandler(handler);
+    }
+
+    public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
+        if(cutDepth>0)
+            cutDepth++;
+        super.startElement(uri, localName, qName, atts);
+    }
+
+    public void endElement(String namespaceURI, String localName, String qName) throws SAXException {
+        super.endElement(namespaceURI, localName, qName);
+
+        if( cutDepth!=0 ) {
+            cutDepth--;
+            if( cutDepth == 1 ) {
+                // pruning completed. restore the user handler
+                super.setContentHandler(next);
+                cutDepth=0;
+            }
+        }
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/Util.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/Util.java
index 0b8d77f1c98..9ee724f1bf4 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/Util.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/Util.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,9 +22,10 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.util;
 
+import org.xml.sax.Locator;
+
 
 /**
  * Other miscellaneous utility methods.
@@ -40,7 +41,7 @@ public final class Util {
      * that doesn't throw an exception even if a property cannot be
      * read.
      */
-    public static final String getSystemProperty( String name ) {
+    public static String getSystemProperty( String name ) {
         try {
             return System.getProperty(name);
         } catch( SecurityException e ) {
@@ -48,11 +49,27 @@ public final class Util {
         }
     }
 
+    /**
+     * Compares if two {@link Locator}s point to the exact same position.
+     */
+    public static boolean equals(Locator lhs, Locator rhs) {
+        return lhs.getLineNumber()==rhs.getLineNumber()
+        && lhs.getColumnNumber()==rhs.getColumnNumber()
+        && equals(lhs.getSystemId(),rhs.getSystemId())
+        && equals(lhs.getPublicId(),rhs.getPublicId());
+    }
+
+    private static boolean equals(String lhs, String rhs) {
+        if(lhs==null && rhs==null)  return true;
+        if(lhs==null || rhs==null)  return false;
+        return lhs.equals(rhs);
+    }
+
     /**
      * Calls the other getSystemProperty method with
      * "[clazz].[name].
      */
-    public static final String getSystemProperty( Class clazz, String name ) {
+    public static String getSystemProperty( Class clazz, String name ) {
         return getSystemProperty( clazz.getName()+'.'+name );
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/XMLStreamReaderToContentHandler.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/XMLStreamReaderToContentHandler.java
deleted file mode 100644
index 33b49f05654..00000000000
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/XMLStreamReaderToContentHandler.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.tools.internal.xjc.util;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
-
-/**
- * This is a simple utility class that adapts StAX events from an
- * {@link javax.xml.stream.XMLStreamReader} to SAX events on a
- * {@link org.xml.sax.ContentHandler}, bridging between the two
- * parser technologies.
- *
- * @author Ryan.Shoemaker@Sun.COM
- */
-public class XMLStreamReaderToContentHandler {
-
-    // StAX event source
-    private final XMLStreamReader staxStreamReader;
-
-    // SAX event sink
-    private final ContentHandler saxHandler;
-
-    /**
-     * Construct a new StAX to SAX adapter that will convert a StAX event
-     * stream into a SAX event stream.
-     *
-     * @param staxCore
-     *                StAX event source
-     * @param saxCore
-     *                SAXevent sink
-     */
-    public XMLStreamReaderToContentHandler(XMLStreamReader staxCore, ContentHandler saxCore) {
-        staxStreamReader = staxCore;
-        saxHandler = saxCore;
-    }
-
-    /*
-     * @see StAXReaderToContentHandler#bridge()
-     */
-    public void bridge() throws XMLStreamException {
-
-        try {
-            // remembers the nest level of elements to know when we are done.
-            int depth=0;
-
-            // if the parser is at the start tag, proceed to the first element
-            int event = staxStreamReader.getEventType();
-            if(event == XMLStreamConstants.START_DOCUMENT) {
-                // nextTag doesn't correctly handle DTDs
-                while( !staxStreamReader.isStartElement() )
-                    event = staxStreamReader.next();
-            }
-
-
-            if( event!=XMLStreamConstants.START_ELEMENT)
-                throw new IllegalStateException("The current event is not START_ELEMENT\n but " + event);
-
-            handleStartDocument();
-
-            do {
-                // These are all of the events listed in the javadoc for
-                // XMLEvent.
-                // The spec only really describes 11 of them.
-                switch (event) {
-                    case XMLStreamConstants.START_ELEMENT :
-                        depth++;
-                        handleStartElement();
-                        break;
-                    case XMLStreamConstants.END_ELEMENT :
-                        handleEndElement();
-                        depth--;
-                        break;
-                    case XMLStreamConstants.CHARACTERS :
-                        handleCharacters();
-                        break;
-                    case XMLStreamConstants.ENTITY_REFERENCE :
-                        handleEntityReference();
-                        break;
-                    case XMLStreamConstants.PROCESSING_INSTRUCTION :
-                        handlePI();
-                        break;
-                    case XMLStreamConstants.COMMENT :
-                        handleComment();
-                        break;
-                    case XMLStreamConstants.DTD :
-                        handleDTD();
-                        break;
-                    case XMLStreamConstants.ATTRIBUTE :
-                        handleAttribute();
-                        break;
-                    case XMLStreamConstants.NAMESPACE :
-                        handleNamespace();
-                        break;
-                    case XMLStreamConstants.CDATA :
-                        handleCDATA();
-                        break;
-                    case XMLStreamConstants.ENTITY_DECLARATION :
-                        handleEntityDecl();
-                        break;
-                    case XMLStreamConstants.NOTATION_DECLARATION :
-                        handleNotationDecl();
-                        break;
-                    case XMLStreamConstants.SPACE :
-                        handleSpace();
-                        break;
-                    default :
-                        throw new InternalError("processing event: " + event);
-                }
-
-                event=staxStreamReader.next();
-            } while (depth!=0);
-
-            handleEndDocument();
-        } catch (SAXException e) {
-            throw new XMLStreamException(e);
-        }
-    }
-
-    private void handleEndDocument() throws SAXException {
-        saxHandler.endDocument();
-    }
-
-    private void handleStartDocument() throws SAXException {
-        saxHandler.setDocumentLocator(new Locator() {
-            public int getColumnNumber() {
-                return staxStreamReader.getLocation().getColumnNumber();
-            }
-            public int getLineNumber() {
-                return staxStreamReader.getLocation().getLineNumber();
-            }
-            public String getPublicId() {
-                return staxStreamReader.getLocation().getPublicId();
-            }
-            public String getSystemId() {
-                return staxStreamReader.getLocation().getSystemId();
-            }
-        });
-        saxHandler.startDocument();
-    }
-
-    private void handlePI() throws XMLStreamException {
-        try {
-            saxHandler.processingInstruction(
-                staxStreamReader.getPITarget(),
-                staxStreamReader.getPIData());
-        } catch (SAXException e) {
-            throw new XMLStreamException(e);
-        }
-    }
-
-    private void handleCharacters() throws XMLStreamException {
-        try {
-            saxHandler.characters(
-                staxStreamReader.getTextCharacters(),
-                staxStreamReader.getTextStart(),
-                staxStreamReader.getTextLength() );
-        } catch (SAXException e) {
-            throw new XMLStreamException(e);
-        }
-    }
-
-    private void handleEndElement() throws XMLStreamException {
-        QName qName = staxStreamReader.getName();
-
-        try {
-            // fire endElement
-            saxHandler.endElement(
-                qName.getNamespaceURI(),
-                qName.getLocalPart(),
-                qName.toString());
-
-            // end namespace bindings
-            int nsCount = staxStreamReader.getNamespaceCount();
-            for (int i = nsCount - 1; i >= 0; i--) {
-                String prefix = staxStreamReader.getNamespacePrefix(i);
-                if (prefix == null) { // true for default namespace
-                    prefix = "";
-                }
-                saxHandler.endPrefixMapping(prefix);
-            }
-        } catch (SAXException e) {
-            throw new XMLStreamException(e);
-        }
-    }
-
-    private void handleStartElement() throws XMLStreamException {
-
-        try {
-            // start namespace bindings
-            int nsCount = staxStreamReader.getNamespaceCount();
-            for (int i = 0; i < nsCount; i++) {
-                saxHandler.startPrefixMapping(
-                    fixNull(staxStreamReader.getNamespacePrefix(i)),
-                    fixNull(staxStreamReader.getNamespaceURI(i)));
-            }
-
-            // fire startElement
-            QName qName = staxStreamReader.getName();
-            String prefix = qName.getPrefix();
-            String rawname;
-            if(prefix==null || prefix.length()==0)
-                rawname = qName.getLocalPart();
-            else
-                rawname = prefix + ':' + qName.getLocalPart();
-            Attributes attrs = getAttributes();
-            saxHandler.startElement(
-                qName.getNamespaceURI(),
-                qName.getLocalPart(),
-                rawname,
-                attrs);
-        } catch (SAXException e) {
-            throw new XMLStreamException(e);
-        }
-    }
-
-    private static String fixNull(String s) {
-        if(s==null)     return "";
-        else            return s;
-    }
-
-    /**
-     * Get the attributes associated with the given START_ELEMENT or ATTRIBUTE
-     * StAXevent.
-     *
-     * @return the StAX attributes converted to an org.xml.sax.Attributes
-     */
-    private Attributes getAttributes() {
-        AttributesImpl attrs = new AttributesImpl();
-
-        int eventType = staxStreamReader.getEventType();
-        if (eventType != XMLStreamConstants.ATTRIBUTE
-            && eventType != XMLStreamConstants.START_ELEMENT) {
-            throw new InternalError(
-                "getAttributes() attempting to process: " + eventType);
-        }
-
-        // in SAX, namespace declarations are not part of attributes by default.
-        // (there's a property to control that, but as far as we are concerned
-        // we don't use it.) So don't add xmlns:* to attributes.
-
-        // gather non-namespace attrs
-        for (int i = 0; i < staxStreamReader.getAttributeCount(); i++) {
-            String uri = staxStreamReader.getAttributeNamespace(i);
-            if(uri==null)   uri="";
-            String localName = staxStreamReader.getAttributeLocalName(i);
-            String prefix = staxStreamReader.getAttributePrefix(i);
-            String qName;
-            if(prefix==null || prefix.length()==0)
-                qName = localName;
-            else
-                qName = prefix + ':' + localName;
-            String type = staxStreamReader.getAttributeType(i);
-            String value = staxStreamReader.getAttributeValue(i);
-
-            attrs.addAttribute(uri, localName, qName, type, value);
-        }
-
-        return attrs;
-    }
-
-    private void handleNamespace() {
-        // no-op ???
-        // namespace events don't normally occur outside of a startElement
-        // or endElement
-    }
-
-    private void handleAttribute() {
-        // no-op ???
-        // attribute events don't normally occur outside of a startElement
-        // or endElement
-    }
-
-    private void handleDTD() {
-        // no-op ???
-        // it seems like we need to pass this info along, but how?
-    }
-
-    private void handleComment() {
-        // no-op ???
-    }
-
-    private void handleEntityReference() {
-        // no-op ???
-    }
-
-    private void handleSpace() {
-        // no-op ???
-        // this event is listed in the javadoc, but not in the spec.
-    }
-
-    private void handleNotationDecl() {
-        // no-op ???
-        // this event is listed in the javadoc, but not in the spec.
-    }
-
-    private void handleEntityDecl() {
-        // no-op ???
-        // this event is listed in the javadoc, but not in the spec.
-    }
-
-    private void handleCDATA() {
-        // no-op ???
-        // this event is listed in the javadoc, but not in the spec.
-    }
-}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/writer/SignatureWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/writer/SignatureWriter.java
index fcd5f889dd6..e1e441a7b1c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/writer/SignatureWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/writer/SignatureWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.tools.internal.xjc.writer;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/AccessorFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/AccessorFactory.java
new file mode 100644
index 00000000000..fa600a8dd76
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/AccessorFactory.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.bind;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
+import javax.xml.bind.JAXBException;
+
+/**
+ * A means to allow the user to provide customized Accessor
+ * to be used by JAXB.
+ */
+public interface AccessorFactory {
+    /**
+     * Access a field of the class.
+     *
+     * @param bean the class to be processed.
+     * @param f 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.
+     */
+    Accessor createFieldAccessor(Class bean, Field f, boolean readOnly) throws JAXBException;
+
+    /**
+     * Access a property of the class.
+     *
+     * @param bean the class to be processed
+     * @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.
+     */
+    Accessor createPropertyAccessor(Class bean, Method getter, Method setter) throws JAXBException;
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/AccessorFactoryImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/AccessorFactoryImpl.java
new file mode 100644
index 00000000000..8569e14ecf1
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/AccessorFactoryImpl.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.bind;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
+import com.sun.xml.internal.bind.api.AccessorException;
+
+public class AccessorFactoryImpl implements AccessorFactory {
+
+    private static AccessorFactoryImpl instance = null;
+    private AccessorFactoryImpl(){}
+    public static synchronized AccessorFactoryImpl getInstance(){
+        if (instance == null)
+            instance = new AccessorFactoryImpl();
+        return instance;
+    }
+
+    /**
+     * Access a field of the class.
+     *
+     * @param bean the class to be processed.
+     * @param f 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
+                ? new Accessor.ReadOnlyFieldReflection(field)
+                : new Accessor.FieldReflection(field);
+    }
+
+    /**
+     * Access a property of the class.
+     *
+     * @param bean the class to be processed
+     * @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) {
+            return new Accessor.SetterOnlyReflection(setter);
+        }
+        if (setter == null) {
+            return new Accessor.GetterOnlyReflection(getter);
+        }
+        return new Accessor.GetterSetterReflection(getter, setter);
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/Data.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/AnyTypeAdapter.java
similarity index 63%
rename from jaxws/src/share/classes/com/sun/tools/internal/txw2/model/Data.java
rename to jaxws/src/share/classes/com/sun/xml/internal/bind/AnyTypeAdapter.java
index 93f5accb575..08659a9c93d 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/Data.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/AnyTypeAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,35 +22,31 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+package com.sun.xml.internal.bind;
 
-package com.sun.tools.internal.txw2.model;
-
-import com.sun.codemodel.JDefinedClass;
-import com.sun.codemodel.JType;
-import com.sun.tools.internal.txw2.model.prop.Prop;
-import org.xml.sax.Locator;
-
-import java.util.Set;
+import javax.xml.bind.annotation.adapters.XmlAdapter;
 
 /**
+ * {@link XmlAdapter} useful for mapping interfaces.
+ *
+ * See The JAXB user's guide
+ * for more about this adapter class.
+ *
  * @author Kohsuke Kawaguchi
+ * @since JAXB 2.1
  */
-public class Data extends Leaf implements Text {
+public final class AnyTypeAdapter extends XmlAdapter {
     /**
-     * The Java representation of the datatype.
+     * Noop. Just returns the object given as the argument.
      */
-    public final JType type;
-
-    public Data(Locator location, JType type) {
-        super(location);
-        this.type = type;
+    public Object unmarshal(Object v) {
+        return v;
     }
 
-    public JType getDatatype(NodeSet nset) {
-        return type;
-    }
-
-    void generate(JDefinedClass clazz, NodeSet nset, Set props) {
-        createDataMethod(clazz,type,nset,props);
+    /**
+     * Noop. Just returns the object given as the argument.
+     */
+    public Object marshal(Object v) {
+        return v;
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/CycleRecoverable.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/CycleRecoverable.java
new file mode 100644
index 00000000000..11bec2e4e52
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/CycleRecoverable.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.bind;
+
+import javax.xml.bind.Marshaller;
+
+/**
+ * Optional interface that can be implemented by JAXB-bound objects
+ * to handle cycles in the object graph.
+ *
+ * 
    
+ * As discussed in 
+ * the users' guide, normally a cycle in the object graph causes the marshaller to report an error,
+ * and when an error is found, the JAXB RI recovers by cutting the cycle arbitrarily.
+ * This is not always a desired behavior.
+ *
+ * 
    
+ * Implementing this interface allows user application to change this behavior.
+ * Also see this related discussion.
+ *
+ * @since JAXB 2.1 EA2
+ * @author Kohsuke Kawaguchi
+ */
+public interface CycleRecoverable {
+    /**
+     * Called when a cycle is detected by the JAXB RI marshaller
+     * to nominate a new object to be marshalled instead.
+     *
+     * @param context
+     *      This object is provided by the JAXB RI to inform
+     *      the object about the marshalling process that's going on.
+     *
+     *
+     * @return
+     *      the object to be marshalled instead of this object.
+     *      Or return null to indicate that the JAXB RI should behave
+     *      just like when your object does not implement {@link CycleRecoverable}
+     *      (IOW, cut the cycle arbitrarily and try to go on.)
+     */
+    Object onCycleDetected(Context context);
+
+    /**
+     * This interface is implemented by the JAXB RI to provide
+     * information about the on-going marshalling process.
+     *
+     * 
    
+     * We may add more methods in the future, so please do not
+     * implement this interface in your application.
+     */
+    public interface Context {
+        /**
+         * Returns the marshaller object that's doing the marshalling.
+         *
+         * @return
+         *      always non-null.
+         */
+        Marshaller getMarshaller();
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java
index 6bc55f8e64e..826d986de0f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind;
 
 import java.math.BigDecimal;
@@ -53,6 +52,7 @@ import com.sun.xml.internal.bind.v2.TODO;
  * This class is responsible for whitespace normalization.
  *
  * @author 
    • Ryan Shoemaker, Sun Microsystems, Inc.
    
+ * @version $Revision: 1.9 $
  * @since JAXB1.0
  */
 public final class DatatypeConverterImpl implements DatatypeConverterInterface {
@@ -535,28 +535,48 @@ public final class DatatypeConverterImpl implements DatatypeConverterInterface {
     }
 
     /**
-     * computes the length of binary data.
+     * computes the length of binary data speculatively.
      *
-     * This function also performs format check.
-     * @return    -1        if format is illegal.
+     * 
    
+     * Our requirement is to create byte[] of the exact length to store the binary data.
+     * If we do this in a straight-forward way, it takes two passes over the data.
+     * Experiments show that this is a non-trivial overhead (35% or so is spent on
+     * the first pass in calculating the length.)
      *
+     * 
    
+     * So the approach here is that we compute the length speculatively, without looking
+     * at the whole contents. The obtained speculative value is never less than the
+     * actual length of the binary data, but it may be bigger. So if the speculation
+     * goes wrong, we'll pay the cost of reallocation and buffer copying.
+     *
+     * 
    
+     * If the base64 text is tightly packed with no indentation nor illegal char
+     * (like what most web services produce), then the speculation of this method
+     * will be correct, so we get the performance benefit.
      */
-    private static int calcLength( String text ) {
+    private static int guessLength( String text ) {
         final int len = text.length();
-        int base64count=0;
-        int i;
 
-        for( i=0; i=0; j-- ) {
+            byte code = decodeMap[text.charAt(j)];
+            if(code==PADDING)
+                continue;
+            if(code==-1)
+                // most likely this base64 text is indented. go with the upper bound
+                return text.length()/4*3;
+            break;
         }
 
-        return (base64count/4)*3+Math.max(0,(base64count%4)-1);
+        j++;    // text.charAt(j) is now at some base64 char, so +1 to make it the size
+        int padSize = len-j;
+        if(padSize >2) // something is wrong with base64. be safe and go with the upper bound
+            return text.length()/4*3;
+
+        // so far this base64 looks like it's unindented tightly packed base64.
+        // take a chance and create an array with the expected size
+        return text.length()/4*3-padSize;
     }
 
     /**
@@ -569,9 +589,8 @@ public final class DatatypeConverterImpl implements DatatypeConverterInterface {
      *      because JIT can inline a lot of string access (with data of 1K chars, it was twice as fast)
      */
     public static byte[] _parseBase64Binary(String text) {
-        final int outlen = calcLength(text);
-        if( outlen==-1 )    return null;
-        final byte[] out = new byte[outlen];
+        final int buflen = guessLength(text);
+        final byte[] out = new byte[buflen];
         int o=0;
 
         final int len = text.length();
@@ -584,6 +603,7 @@ public final class DatatypeConverterImpl implements DatatypeConverterInterface {
         for( i=0; i value();
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/annotation/XmlIsSet.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/annotation/XmlIsSet.java
index 996e6ea432d..7280ffe93df 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/annotation/XmlIsSet.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/annotation/XmlIsSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.annotation;
 
 import java.lang.annotation.Retention;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/annotation/XmlLocation.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/annotation/XmlLocation.java
index bc0a78ddd73..c091c3b0573 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/annotation/XmlLocation.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/annotation/XmlLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.annotation;
 
 import java.lang.annotation.Retention;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/AccessorException.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/AccessorException.java
index ef66bfa2492..cd1b80a34ab 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/AccessorException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/AccessorException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.api;
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/Bridge.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/Bridge.java
index 049b05406a1..acd89c323b9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/Bridge.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/Bridge.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.api;
 
 import java.io.InputStream;
@@ -71,6 +70,15 @@ public abstract class Bridge {
 
     protected final JAXBContextImpl context;
 
+    /**
+     * Gets the {@link JAXBRIContext} to which this object belongs.
+     *
+     * @since 2.1
+     */
+    public @NotNull JAXBRIContext getContext() {
+        return context;
+    }
+
     /**
      *
      * @throws JAXBException
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/BridgeContext.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/BridgeContext.java
index 60fc478ec3d..112f8f62e51 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/BridgeContext.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/BridgeContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.api;
 
 import javax.xml.bind.ValidationEventHandler;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/ClassResolver.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/ClassResolver.java
new file mode 100644
index 00000000000..211ef894b38
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/ClassResolver.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.bind.api;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.bind.ValidationEventHandler;
+import javax.xml.bind.annotation.XmlAnyElement;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+
+/**
+ * Dynamically locates classes to represent elements discovered during the unmarshalling.
+ *
+ * 
    
+ * THIS INTERFACE IS SUBJECT TO CHANGE WITHOUT NOTICE.
+ *
+ * 
    Background
    
+ * 
    
+ * {@link JAXBContext#newInstance(Class...)} requires that application informs JAXB
+ * about all the classes that it may see in the instance document. While this allows
+ * JAXB to take time to optimize the unmarshalling, it is sometimes inconvenient
+ * for applications.
+ *
+ * 
    
+ * This is where {@link ClassResolver} comes to resucue.
+ *
+ * 
    
+ * A {@link ClassResolver} instance can be specified on {@link Unmarshaller} via
+ * {@link Unmarshaller#setProperty(String, Object)} as follows:
+ *
+ * 
    + * unmarshaller.setProperty( ClassResolver.class.getName(), new MyClassResolverImpl() );
+ * 
    
+ *
+ * 
    
+ * When an {@link Unmarshaller} encounters (i) an unknown root element or (ii) unknown
+ * elements where unmarshaller is trying to unmarshal into {@link XmlAnyElement} with
+ * lax=true, unmarshaller calls {@link #resolveElementName(String, String)}
+ * method to see if the application may be able to supply a class that corresponds
+ * to that class.
+ *
+ * 
    
+ * When a {@link Class} is returned, a new {@link JAXBContext} is created with
+ * all the classes known to it so far, plus a new class returned. This operation
+ * may fail (for example because of some conflicting annotations.) This failure
+ * is handled just like {@link Exception}s thrown from
+ * {@link ClassResolver#resolveElementName(String, String)}.
+ *
+ * @author Kohsuke Kawaguchi
+ * @since 2.1
+ */
+public abstract class ClassResolver {
+    /**
+     * JAXB calls this method when it sees an unknown element.
+     *
+     * 
    
+     * See the class javadoc for details.
+     *
+     * @param nsUri
+     *      Namespace URI of the unknown element. Can be empty but never null.
+     * @param localName
+     *      Local name of the unknown element. Never be empty nor null.
+     *
+     * @return
+     *      If a non-null class is returned, it will be used to unmarshal this element.
+     *      If null is returned, the resolution is assumed to be failed, and
+     *      the unmarshaller will behave as if there was no {@link ClassResolver}
+     *      to begin with (that is, to report it to {@link ValidationEventHandler},
+     *      then move on.)
+     *
+     * @throws Exception
+     *      Throwing any {@link RuntimeException} causes the unmarshaller to stop
+     *      immediately. The exception will be propagated up the call stack.
+     *      Throwing any other checked {@link Exception} results in the error
+     *      reproted to {@link ValidationEventHandler} (just like any other error
+     *      during the unmarshalling.)
+     */
+    public abstract @Nullable Class resolveElementName(@NotNull String nsUri, @NotNull String localName) throws Exception;
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/CompositeStructure.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/CompositeStructure.java
index e49b4ab613a..acb2b87881e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/CompositeStructure.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/CompositeStructure.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.api;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/pept/Delegate.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/ErrorListener.java
similarity index 53%
rename from jaxws/src/share/classes/com/sun/xml/internal/ws/pept/Delegate.java
rename to jaxws/src/share/classes/com/sun/xml/internal/bind/api/ErrorListener.java
index 2bcced979ce..586f73704b7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/pept/Delegate.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/ErrorListener.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,44 +22,34 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/** Java interface "Delegate.java" generated from Poseidon for UML.
- *  Poseidon for UML is developed by Gentleware.
- *  Generated with velocity template engine.
- */
-package com.sun.xml.internal.ws.pept;
+package com.sun.xml.internal.bind.api;
 
-import com.sun.xml.internal.ws.pept.presentation.MessageStruct;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.SAXParseException;
 
 /**
+ * Implemented by the driver of the compiler engine to handle
+ * errors found during the compiliation.
+ *
  * 
    
+ * This class implements {@link ErrorHandler} so it can be
+ * passed to anywhere where {@link ErrorHandler} is expected.
  *
- * @author Dr. Harold Carr
- * 
    
- */
-public interface Delegate {
-
-  ///////////////////////////////////////
-  // operations
-
-/**
  * 
    
- * Does ...
- * 
    
+ * However, to make the error handling easy (and make it work
+ * with visitor patterns nicely), this interface is not allowed
+ * to abort the processing. It merely receives errors.
  *
- * @return a MessageStruct with ...
- * 
    
+ * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @since 2.1 EA2
  */
-    public MessageStruct getMessageStruct();
-/**
- * 
    
- * Does ...
- * 
    
- *
- * 
    
- *
- * @param message ...
- * 
    
- */
-    public void send(MessageStruct message);
-
-} // end Delegate
+public interface ErrorListener extends ErrorHandler {
+    void error(SAXParseException exception);
+    void fatalError(SAXParseException exception);
+    void warning(SAXParseException exception);
+    /**
+     * Used to report possibly verbose information that
+     * can be safely ignored.
+     */
+    void info(SAXParseException exception);
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/JAXBRIContext.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/JAXBRIContext.java
index 6d6064baacd..a759940d61b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/JAXBRIContext.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/JAXBRIContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,25 +22,28 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.api;
 
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.SchemaOutputResolver;
+import javax.xml.bind.annotation.XmlAttachmentRef;
 import javax.xml.namespace.QName;
+import javax.xml.transform.Result;
 
 import com.sun.istack.internal.NotNull;
 import com.sun.istack.internal.Nullable;
 import com.sun.xml.internal.bind.api.impl.NameConverter;
+import com.sun.xml.internal.bind.v2.ContextFactory;
+import com.sun.xml.internal.bind.v2.model.annotation.RuntimeAnnotationReader;
 import com.sun.xml.internal.bind.v2.model.nav.Navigator;
 
 /**
@@ -54,6 +57,7 @@ import com.sun.xml.internal.bind.v2.model.nav.Navigator;
  *     Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
  */
 public abstract class JAXBRIContext extends JAXBContext {
+
     protected JAXBRIContext() {}
 
     /**
@@ -69,36 +73,47 @@ public abstract class JAXBRIContext extends JAXBContext {
      * @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 JAXBRIContext newInstance(@NotNull Class[] classes, @Nullable Collection typeRefs, @Nullable String defaultNamespaceRemap, boolean c14nSupport ) throws JAXBException {
-        try {
-            Class c = Class.forName("com.sun.xml.internal.bind.v2.ContextFactory");
-            Method method = c.getMethod("createContext",Class[].class,Collection.class,String.class,boolean.class);
-            Object o = method.invoke(null,classes,typeRefs,defaultNamespaceRemap,c14nSupport);
-            return (JAXBRIContext)o;
-        } catch (ClassNotFoundException e) {
-            throw new JAXBException(e);
-        } catch (NoSuchMethodException e) {
-            throw new JAXBException(e);
-        } catch (IllegalAccessException e) {
-            throw new JAXBException(e);
-        } catch (InvocationTargetException e) {
-            Throwable te = e.getTargetException();
-            if(te instanceof JAXBException)
-                throw (JAXBException)te;
-            if(te instanceof RuntimeException)
-                throw (RuntimeException)te;
-            if(te instanceof Error)
-                throw (Error)te;
-            throw new JAXBException(e);
-        }
+    public static JAXBRIContext newInstance(@NotNull Class[] classes,
+       @Nullable Collection typeRefs,
+       @Nullable Map subclassReplacements,
+       @Nullable String defaultNamespaceRemap, boolean c14nSupport,
+       @Nullable RuntimeAnnotationReader ar) throws JAXBException {
+        return ContextFactory.createContext(classes, typeRefs, subclassReplacements,
+                defaultNamespaceRemap, c14nSupport, ar, false, false);
     }
 
+    /**
+     * @deprecated
+     *      Compatibility with older versions.
+     */
+    public static JAXBRIContext newInstance(@NotNull Class[] classes,
+        @Nullable Collection typeRefs,
+        @Nullable String defaultNamespaceRemap, boolean c14nSupport ) throws JAXBException {
+        return newInstance(classes,typeRefs, Collections.emptyMap(),
+                defaultNamespaceRemap,c14nSupport,null);
+    }
+
+    /**
+     * Returns true if this context includes a class
+     * that has {@link XmlAttachmentRef}.
+     *
+     * @since 2.1
+     */
+    public abstract boolean hasSwaRef();
+
     /**
      * If the given object is bound to an element in XML by JAXB,
      * returns the element name.
@@ -233,6 +248,21 @@ public abstract class JAXBRIContext extends JAXBContext {
      */
     public abstract @NotNull String getBuildId();
 
+    /**
+     * Generates the episode file that represents the binding known to this {@link JAXBContext},
+     * so that XJC can later do separate compilation.
+     *
+     * 
    
+     * Episode file is really just a JAXB customization file, except that currently
+     * we use the RI-specific SCD to refer to schema components.
+     *
+     * @param output
+     *      This receives the generated episode file.
+     *
+     * @since 2.1
+     */
+    public abstract void generateEpisode(Result output);
+
     /**
      * Computes a Java identifier from a local name.
      *
@@ -244,12 +274,10 @@ public abstract class JAXBRIContext extends JAXBContext {
      * Accordingly, this method may return an identifier that collides with reserved words.
      *
      * 
    
-     * Use {@link JJavaName#isJavaIdentifier(String)} to check for such collision.
+     * Use JJavaName.isJavaIdentifier(String) to check for such collision.
      *
      * @return
      *      Typically, this method returns "nameLikeThis".
-     *
-     * @see JJavaName#isJavaIdentifier(String)
      */
     public static @NotNull String mangleNameToVariableName(@NotNull String localName) {
         return NameConverter.standard.toVariableName(localName);
@@ -268,6 +296,21 @@ public abstract class JAXBRIContext extends JAXBContext {
         return NameConverter.standard.toClassName(localName);
     }
 
+    /**
+     * Computes a Java class name from a local name.
+     *
+     * 
    
+     * This method faithfully implements the name mangling rule as specified in the JAXB spec.
+     * This method works like {@link #mangleNameToClassName(String)} except that it looks
+     * for "getClass" and returns something else.
+     *
+     * @return
+     *      Typically, this method returns "NameLikeThis".
+     */
+    public static @NotNull String mangleNameToPropertyName(@NotNull String localName) {
+        return NameConverter.standard.toPropertyName(localName);
+    }
+
     /**
      * Gets the parameterization of the given base type.
      *
@@ -337,10 +380,47 @@ public abstract class JAXBRIContext extends JAXBContext {
      */
     public static final String CANONICALIZATION_SUPPORT = "com.sun.xml.internal.bind.c14n";
 
+    /**
+     * The property that you can specify to {@link JAXBContext#newInstance}
+     * to allow unmarshaller to honor xsi:nil anywhere, even if they are
+     * not specifically allowed by the schema.
+     *
+     * @since 2.1.3
+     */
+    public static final String TREAT_EVERYTHING_NILLABLE = "com.sun.xml.internal.bind.treatEverythingNillable";
+
+    /**
+     * The property that you can specify to {@link JAXBContext#newInstance}
+     * to use alternative {@link RuntimeAnnotationReader} implementation.
+     *
+     * @since 2.1 EA2
+     */
+    public static final String ANNOTATION_READER = RuntimeAnnotationReader.class.getName();
+
     /**
      * Marshaller/Unmarshaller property to enable XOP processing.
      *
      * @since 2.0 EA2
      */
     public static final String ENABLE_XOP = "com.sun.xml.internal.bind.XOP";
+
+    /**
+     * The property that you can specify to {@link JAXBContext#newInstance}
+     * to specify specific classes that replace the reference to generic classes.
+     *
+     * 
    
+     * See the release notes for more details about this feature.
+     *
+     * @since 2.1 EA2
+     */
+    public static final String SUBCLASS_REPLACEMENTS = "com.sun.xml.internal.bind.subclassReplacements";
+
+    /**
+     * The property that you can specify to {@link JAXBContext#newInstance}
+     * enable support of XmlAccessorFactory annotation in the {@link JAXBContext}.
+     *
+     * @since 2.1 EA2
+     */
+    public static final String XMLACCESSORFACTORY_SUPPORT = "com.sun.xml.internal.bind.XmlAccessorFactory";
+
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/RawAccessor.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/RawAccessor.java
index ad6ae5fef68..a6622707257 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/RawAccessor.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/RawAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.api;
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/TypeReference.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/TypeReference.java
index 480694c7e22..6c439ea945d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/TypeReference.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/TypeReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.api;
 
 import java.lang.annotation.Annotation;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/impl/NameConverter.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/impl/NameConverter.java
index 3cce7e18af9..59f6e53226b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/impl/NameConverter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/impl/NameConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.api.impl;
 
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/impl/NameUtil.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/impl/NameUtil.java
index 619204afe25..39103f23c46 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/impl/NameUtil.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/impl/NameUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.api.impl;
 
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/package-info.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/package-info.java
index 3992e0e6cba..6aee4d4838f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/package-info.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 /**
  * 
    Runtime API for the JAX-WS RI
    .
  *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/CharacterEscapeHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/CharacterEscapeHandler.java
index bab4534a7bd..3c0bc14aacf 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/CharacterEscapeHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/CharacterEscapeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.marshaller;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/DataWriter.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/DataWriter.java
index a74cde41547..17e7600f9c6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/DataWriter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/DataWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 //@@3RD PARTY CODE@@
 
 // DataWriter.java - XML writer for data-oriented files.
@@ -93,6 +92,7 @@ import org.xml.sax.SAXException;
  *
  * @since 1.0
  * @author David Megginson, david@megginson.com
+ * @version 0.2
  * @see XMLWriter
  */
 public class DataWriter extends XMLWriter
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/DumbEscapeHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/DumbEscapeHandler.java
index a696ff3a640..0048bdbc88f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/DumbEscapeHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/DumbEscapeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.marshaller;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/Messages.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/Messages.java
index 21dfe8beadc..a0ff82b1029 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/Messages.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/Messages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/Messages.properties b/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/Messages.properties
index 4c15aa04aa2..783d617783d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/Messages.properties
@@ -1,3 +1,28 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
 #
 # don't modify nor delete anything for backward compatibility
 #
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/MinimumEscapeHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/MinimumEscapeHandler.java
index b0bf37e7a31..ee3517dc00b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/MinimumEscapeHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/MinimumEscapeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,10 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * @(#)$Id: MinimumEscapeHandler.java,v 1.1 2005/04/15 20:03:47 kohsuke Exp $
+ */
+
 
 package com.sun.xml.internal.bind.marshaller;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java
index d7dc75e41cc..095faecabec 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.marshaller;
 
 import java.io.OutputStream;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/NioEscapeHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/NioEscapeHandler.java
index e9d787a2777..0a5d3ca0f20 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/NioEscapeHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/NioEscapeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.marshaller;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/SAX2DOMEx.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/SAX2DOMEx.java
index 24dc2bfc062..73e019edc4d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/SAX2DOMEx.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/SAX2DOMEx.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/XMLWriter.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/XMLWriter.java
index d0089a09a9b..8bf89aacd42 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/XMLWriter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/XMLWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 // @@3RD PARTY CODE@@
 
 // XMLWriter.java - serialize an XML document.
@@ -248,6 +247,7 @@ import org.xml.sax.helpers.XMLFilterImpl;
  * character data.
    
  *
  * @author David Megginson, david@megginson.com
+ * @version 0.2
  * @since JAXB1.0
  * @see org.xml.sax.XMLFilter
  * @see org.xml.sax.ContentHandler
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/unmarshaller/DOMScanner.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/unmarshaller/DOMScanner.java
index 51c5bd649f9..85a95df1079 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/unmarshaller/DOMScanner.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/unmarshaller/DOMScanner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.unmarshaller;
 
 import java.util.Enumeration;
@@ -55,6 +54,7 @@ import org.xml.sax.helpers.NamespaceSupport;
  * classes like this.
  *
  * @author 
    • Kohsuke Kawaguchi, Sun Microsystems, Inc.
    
+ * @version $Revision: 1.6 $ $Date: 2006/04/24 15:27:52 $
  * @since JAXB1.0
  */
 public class DOMScanner implements LocatorEx,InfosetScanner/* --- but can't do this to protect 1.0 clients, or can I? */
@@ -97,9 +97,9 @@ public class DOMScanner implements LocatorEx,InfosetScanner/* --- but can'
 
     public void scan( Element e) throws SAXException {
         setCurrentLocation( e );
-        receiver.startDocument();
 
         receiver.setDocumentLocator(locator);
+        receiver.startDocument();
 
         NamespaceSupport nss = new NamespaceSupport();
         buildNamespaceSupport( nss, e.getParentNode() );
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/unmarshaller/InfosetScanner.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/unmarshaller/InfosetScanner.java
index 8523893c42e..b3069ad0672 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/unmarshaller/InfosetScanner.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/unmarshaller/InfosetScanner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.unmarshaller;
 
 import javax.xml.bind.Binder;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages.java
index 8df8e1a2282..99009a78d34 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages.properties b/jaxws/src/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages.properties
index 39c705aa5de..40447941cef 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages.properties
@@ -1,3 +1,28 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
 #
 # don't modify nor delete anything for backward compatibility
 #
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/unmarshaller/Patcher.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/unmarshaller/Patcher.java
index 97ed179526f..b1f1fe812e8 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/unmarshaller/Patcher.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/unmarshaller/Patcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.unmarshaller;
 
 import org.xml.sax.SAXException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/util/AttributesImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/util/AttributesImpl.java
index 2b1ab195484..939042f3bbd 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/util/AttributesImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/util/AttributesImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 org.xml.sax.Attributes;
  * @since JAXB1.0
  * @since SAX 2.0
  * @author David Megginson
+ * @version 2.0.1 (sax2r2)
  */
 public class AttributesImpl implements Attributes
 {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/util/ValidationEventLocatorExImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/util/ValidationEventLocatorExImpl.java
index a0aa0b6e083..ac3d3652529 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/util/ValidationEventLocatorExImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/util/ValidationEventLocatorExImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,10 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * @(#)$Id: ValidationEventLocatorExImpl.java,v 1.1 2005/04/15 20:03:50 kohsuke Exp $
+ */
+
 
 package com.sun.xml.internal.bind.util;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/util/Which.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/util/Which.java
index 7699edffa4e..8e2217d4d07 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/util/Which.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/util/Which.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,10 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * @(#)$Id: Which.java,v 1.1 2005/04/15 20:03:51 kohsuke Exp $
+ */
+
 
 package com.sun.xml.internal.bind.util;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/ClassFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/ClassFactory.java
index 98c44277b70..1320dd64d8f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/ClassFactory.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/ClassFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2;
 
 import java.lang.reflect.Constructor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/ContextFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/ContextFactory.java
index 597672aeb42..0ef92f5979f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/ContextFactory.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/ContextFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2;
 
 import java.io.BufferedReader;
@@ -35,14 +34,18 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.StringTokenizer;
+import java.util.logging.Level;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 
 import com.sun.istack.internal.FinalArrayList;
+import com.sun.xml.internal.bind.Util;
 import com.sun.xml.internal.bind.api.JAXBRIContext;
 import com.sun.xml.internal.bind.api.TypeReference;
+import com.sun.xml.internal.bind.v2.model.annotation.RuntimeAnnotationReader;
 import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
+import com.sun.xml.internal.bind.v2.util.TypeCast;
 
 /**
  * This class is responsible for producing RI JAXBContext objects.  In
@@ -72,12 +75,35 @@ public class ContextFactory {
         if(c14nSupport==null)
             c14nSupport = false;
 
+        Boolean allNillable = getPropertyValue(properties,JAXBRIContext.TREAT_EVERYTHING_NILLABLE,Boolean.class);
+        if(allNillable==null)
+            allNillable = false;
+
+        Boolean xmlAccessorFactorySupport = getPropertyValue(properties,
+           JAXBRIContext.XMLACCESSORFACTORY_SUPPORT,Boolean.class);
+        if(xmlAccessorFactorySupport==null){
+            xmlAccessorFactorySupport = false;
+            Util.getClassLogger().log(Level.FINE, "Property " +
+                JAXBRIContext.XMLACCESSORFACTORY_SUPPORT +
+                "is not active.  Using JAXB's implementation");
+        }
+
+        RuntimeAnnotationReader ar = getPropertyValue(properties,JAXBRIContext.ANNOTATION_READER,RuntimeAnnotationReader.class);
+
+        Map subclassReplacements;
+        try {
+            subclassReplacements = TypeCast.checkedCast(
+                getPropertyValue(properties, JAXBRIContext.SUBCLASS_REPLACEMENTS, Map.class), Class.class, Class.class);
+        } catch (ClassCastException e) {
+            throw new JAXBException(Messages.INVALID_TYPE_IN_MAP.format(),e);
+        }
 
         if(!properties.isEmpty()) {
             throw new JAXBException(Messages.UNSUPPORTED_PROPERTY.format(properties.keySet().iterator().next()));
         }
 
-        return createContext(classes,Collections.emptyList(),defaultNsUri,c14nSupport);
+        return createContext(classes,Collections.emptyList(),
+                subclassReplacements,defaultNsUri,c14nSupport,ar,xmlAccessorFactorySupport,allNillable);
     }
 
     /**
@@ -94,11 +120,12 @@ public class ContextFactory {
             return type.cast(o);
     }
 
-    /**
-     * Used from the JAXB RI runtime API, invoked via reflection.
-     */
-    public static JAXBContext createContext( Class[] classes, Collection typeRefs, String defaultNsUri, boolean c14nSupport ) throws JAXBException {
-        return new JAXBContextImpl(classes,typeRefs,defaultNsUri,c14nSupport);
+    public static JAXBRIContext createContext( Class[] classes,
+            Collection typeRefs, Map subclassReplacements,
+            String defaultNsUri, boolean c14nSupport, RuntimeAnnotationReader ar,
+            boolean xmlAccessorFactorySupport, boolean allNillable) throws JAXBException {
+        return new JAXBContextImpl(classes,typeRefs,subclassReplacements,defaultNsUri,
+                c14nSupport,ar, xmlAccessorFactorySupport,allNillable);
     }
 
     /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/Messages.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/Messages.java
index a598a9eb421..0f9e6d1c237 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/Messages.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/Messages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,7 @@ enum Messages {
     UNSUPPORTED_PROPERTY,   // 1 arg
     BROKEN_CONTEXTPATH,     // 1 arg
     NO_DEFAULT_CONSTRUCTOR_IN_INNER_CLASS, // 1 arg
+    INVALID_TYPE_IN_MAP, // 0args
     ;
 
     private static final ResourceBundle rb = ResourceBundle.getBundle(Messages.class.getName());
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/Messages.properties b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/Messages.properties
index 19092484603..5cb7d62ebc5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/Messages.properties
@@ -1,3 +1,27 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
 
 ILLEGAL_ENTRY = \
     illegal entry: "{0}", entries should be of the form "ClassName" or "OuterClass.InnerClass", not "ClassName.class" or "fully.qualified.ClassName"
@@ -16,4 +40,7 @@ BROKEN_CONTEXTPATH = \
 
 NO_DEFAULT_CONSTRUCTOR_IN_INNER_CLASS = \
     "{0}" is an inner class, and therefore it can never have a default no-argument constructor. Add 'static'.
+
+INVALID_TYPE_IN_MAP = \
+    Map contains a wrong type
  
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/TODO.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/TODO.java
index 6b353d3315f..2d24ec987f4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/TODO.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/TODO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/WellKnownNamespace.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/WellKnownNamespace.java
index 1c0007cad00..781c8257ad6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/WellKnownNamespace.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/WellKnownNamespace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2;
 
 /**
@@ -55,6 +54,7 @@ public abstract class WellKnownNamespace {
 
     public static final String XML_MIME_URI = "http://www.w3.org/2005/05/xmlmime";
 
+    public static final String JAXB = "http://java.sun.com/xml/ns/jaxb";
 
 //    public static final QName XSI_NIL = new QName(XML_SCHEMA_INSTANCE,"nil");
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/bytecode/ClassTailor.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/bytecode/ClassTailor.java
index a8015f73ac7..f0d7902b2ef 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/bytecode/ClassTailor.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/bytecode/ClassTailor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.bytecode;
 
 import java.io.ByteArrayOutputStream;
@@ -49,7 +48,7 @@ public final class ClassTailor {
     /**
      * Returns the class name in the JVM format (such as "java/lang/String")
      */
-    public static final String toVMClassName( Class c ) {
+    public static String toVMClassName( Class c ) {
         assert !c.isPrimitive();
         if(c.isArray())
             // I have no idea why it is designed like this, but javap says so.
@@ -57,7 +56,7 @@ public final class ClassTailor {
         return c.getName().replace('.','/');
     }
 
-    public static final String toVMTypeName( Class c ) {
+    public static String toVMTypeName( Class c ) {
         if(c.isArray()) {
             // TODO: study how an array type is encoded.
             return '['+toVMTypeName(c.getComponentType());
@@ -79,7 +78,7 @@ public final class ClassTailor {
 
 
 
-    public static final byte[] tailor( Class templateClass, String newClassName, String... replacements ) {
+    public static byte[] tailor( Class templateClass, String newClassName, String... replacements ) {
         String vmname = toVMClassName(templateClass);
         return tailor(
             templateClass.getClassLoader().getResourceAsStream(vmname+".class"),
@@ -99,7 +98,7 @@ public final class ClassTailor {
      *      The search strings found in the constant pool will be replaced by the corresponding
      *      replacement string.
      */
-    public static final byte[] tailor( InputStream image, String templateClassName, String newClassName, String... replacements ) {
+    public static byte[] tailor( InputStream image, String templateClassName, String newClassName, String... replacements ) {
         DataInputStream in = new DataInputStream(image);
 
         try {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/bytecode/package.html b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/bytecode/package.html
index 3f5f97d00f7..2b066b088ce 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/bytecode/package.html
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/bytecode/package.html
@@ -1,3 +1,27 @@
+
 
 
   Code that deals with low level byte code manipulation.
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/doc-files/packages.png b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/doc-files/packages.png
deleted file mode 100644
index 366fe5b61f4f130c74485542e5c28d58c56ff48c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 37912
zcmeF4XIE-Xv#tR}6d5K=m@uLkF=L|45hLaV=A3gt{`$G9aXs(zhP^-RvBx;)!|Anz
z8G82Yu5ed%bwHLDrko{Ci^bxcnI2!USW%T=uybB{G`%u!v3&aU8h`p2A1?vEV-`z4$3^!d%Y%A-W_)DzeP853d{dty;%%3s
zoAE4JnqCq~mjf;pi)7nQgV)89!u=*rtzyj<`5t#pa{KgIVq3>T)>jz`h&)QcLeIIp
zh;(pQc4Sye?dz3N<&s2LI-^`$6ItJQTibX`=$YI}WHGJ>vic$ks-`KSANwoA&S|S(
z#KwtNFK)`^rgK_SoZljE39gb7|HySF`w6es+O{GSc4_5q#;Ex0BKcZ|SENufq?U8i
z1~;j&NJyq+QD0PPziiSA^1&`i{w$|j
ze11+qR@Pskj5D1}E6K}SdU718^DnJgtr428c~>gehhagLT{igsNnR|~W3kAWEJ+}+
z$FZiWRNgqo!5vgHSH^zy0r9Pde~ClO#wr~mBlavF<{Ue_#TBr#h{Av#3oZZ|h7J*Na+8^2909D~nRP
zGTXq-mh%hwmgaKFRSIbVK4-S_%pn<-QtKA0v;EjQ?a_iXjmZ_CR7MaYq1u&m+uIWH
zi{^-l)X~&UiG&bJA331vg=<>YngXfe%Gx=RIcXlQChMi#&MgKft$~_V
ztSoa|3cqDrzt_vt`r5Q&1xs>axGs_t$mP{qN~L^V^W}y~3w%qW9SVuuEI0*GaL!Pf
z$GrH`=S9od{Lie)B1&^K1_>xcCWd?7t4fbEpN{kOMw>`jza^4|)JUBJS=p8@yBD6u
zxvZRz4O^9_`R7sDr?n5$s$kp2atg&n`jw(H&Xw8Fo5LYS1?eeqnPHV=D3>pf%
zl)~IZV5shI;zA~6$fvZ>T*M&1!IaRZEKBwHg0$Bnm-~N-oHSL&E@e`doMMZZLe8YO
zNTghkgQyQuLMnOMleq_IFVg*UNE-F=8LRj4>4qjF+(;$(__C9Y4tVt=9
z@k(oCS>{TM0p0sQq8US7%Bo;-cY%e6=Vz#B7Y
zV2ks%urxZw)g0@4EX_rtQp2TCN$j*uH9>0}@W8%y*jqnbdJUXwde4X4i@fe0&2Ky`
zJVz6^BxXgtG9LFZ8pyLvjxcD_&pWFrQN^>DzeaujqR?|P?hLODOV`?nM8!5Fsgu^V
z%~=q4x|j!Di>sA+QLql(fMM^-D@Zc_jwqkWQ#Jtd<(A$nX?|C;vMv?DZh^?FJ2x}3
zuZ%C_qC?V$haFI3Jd~gSlQyKeh(}^dg2(0SUP{d~O*QOSv^+ew)oH_LO#XkDb%MI7Q)L?ah5jpBSZTSvygz4DJ7Zu
ztr|QDB*<`4z>Y43EnM~qqKgK8r-H(9^X|_w3`=A2$XKle4M%4r1ofP0a^Vaa;V|Nw
z6X-6;>XRsqri4#P3IAZda(f>{PNX%&HLVwyDyBL(G4izMJ%fSG?~7N*q4ndjl9G8p
zTGd$gc&hRxrC-KQko&Kc0I4}?!v@?RasVrfY`#%YGB^1XJAf#T4%K1Xdj#F!B90t*LkijpR+MwZ~WWz)nV?WmZ->lK!7n*jlfuM)FImPF0-Fwja%FJFBfu>xYMc>KFC{^
zT`cYjl|z%zwxjpw3~!!k+MXOoLqE7+xx9-~7J1?1OulTlTO-}%Ur=|+cv8-Mqz=j=
zaU;ft>Y1m6$8z4&`3Po_urCD
z?51HzYDMo2Txx;vnvl7niJdsU*cOTr!jrUwWe@%7PFwuJ91N=f2Kl>m=1uJC6G%y#
zmQGsf8?ez$!0$#9)x_W-o!WhROXZk!DT@e^^dp%|&9W>lQ~)x=v!2gJDGaRTaX1M@
zZb$V7sf#CX)Q1Y+sDA~jw06nx6B3h5Hg8;(BU97TS%A`&+#$e)(yBGf#T8@sVmI#rw^9&6adE`_v|Ca(MN#I-pVxGa}Mx+1;PQLGc|Qx9cT%h8(QQ
zs^vkShLD;JMcPlKtl*N9AV#xFgRl&Ur;8~kyk_~Mbp@NUi#=)JDu6X_pcMxeP
zYe1T#E5)s~>j`Hi-v|kiz}G=k)~pfq+Gxp2m%Zg6N$^IQwCCvMq*aQ_nKe=_GCN|2
zbC41+{!J@@*P~PVm7-C(jY@4yDh45Rj7|eJL%)iTJXt%ERTvQ`I^XxF<`bH=wC_vm
zVkl0pOj$vthw?JDl-J*7;AJE7a=or<^`CN@3fz3lH92$gda0hNZTt1>$^?hQ$bb@&
zLXrtA(l(DFi1g(k!3DsXf(QG1-{y?j3*YL{_JTl$qB+_UxT&Rdh*_D$1=-d!uETr8
zL3x6PZ>->0RCZMWAhKGblJy4l^<~4iQf`fm!Q>BMDD8QGu9xW}4xK|B@v4{`)EmBEH5DCo#Jm(Q_(9CYb2@=0D{R&bDP+F5IGA$F9=A^+=L=P
zZS3;t824V&N8~hP5oxr2NJ70C?HtSzTKJIG9^^n^mPx9pn!<7f3THS04(+V5w!9-8@*UU0(0-x$xcOwdW(f$AV7vZzbjJCa-ZkxWh=@N
zO`Do+amu8rW$y{SJ;)?iGYfN%U|ij2m6G;)eQns|gElm^%NJ`zng3Bl6FgkGT-N)~
z`LYBLRCsBwd=y**Ao>oT1FmLJV@*z3SuNS|-O+kY!~0?n-%LKqeg=v%pb|vyp}630
z6vM~+V@v**-a*CCVI?FI08fen1sR+`O1MnNRDF^0Z;qhnDd7lYOuSS~qDeo)RDDKP
z<764JM(E(qOWhzRxV?w6?N{gV7ozI5pCk35xC{Ui_$+CDgJ$(cHMs&ywPX^t+Kiyq
zaI4TO&i=|ItvglhZ%!q{n=BIvUzU;Lsi~HPc2JWJ%9*)qmt!R>Mrv8@
z@x+>h(|h_j;-NYl;wB%X(tfJd)uxgz(A!Kv~B1>>_7Qt&tO>jQ);(F*j
z1b02IG$)nCN^3{9>}s!=1uwk+AQ$hLK%$vUysgeZ*t?Bf)t!0*^LoFuAXLVNcL
zg0W3buJCA0D$7x*u9B%2nMqR*%2Es*e0HA7kQ76!G1Y(4CQMeTxXg^36`1?7qD7%=K>2En}mnqMHxZeUN#s#Eh^9?`9fp1i*a_Jt3$Dv|Z
z^$K!1VT32?(_ssr7nNy&RJ7I|8Mp4J5CntMQu|O-5hJo#)+L1r9xaoiX0fM1*Wctn
zBBw&?(0kABvaD7cB&gTUAhKO$@qM2RjG^5Mf%8tT^@&dj`L%#^K?)iSU_U93rQ}zH7Dsx
z?wrK9j0#01^BvWF)$4=?aQk@ci1ca8p-205PZXnI=pfFzgZmi;5*U^L$MRWF$duz#
z?3O&_PI~xOH=y~jUQ4t{9nyhhAKl7#duE^o8#G`{67qZ-F$LRXnFmtqKcsv|DhKK9
zriUFx);St_dnkTKb72`6sFJ0fV;P2GFnPHpKlRSm$8y1;P1`m?Y8jF@CT(<2
zq5t`n0R4SRpSUqRd>WC#i}BL!}2gJjhJy>$`E7Hu0$*
zE(hM#v$M*)X&k~(IcJ1`Dx9roz|$%Aq(D)^hk+TWU4*-({Jp)F>;W$a8=#G|4|QHs
z%5G93@f?n7V*U4gC21U498w8*HQp`N(l5lzTp
zs?2=I-l0ao27*d+NB1B%9P`Q|1+RyY-to!eAc5fBPJi?w7kaq|Es!0i`{XGG2#wqaePo)TBzJQuUWwiaWZ?8-YN%ilP_oH1JcZa=1Nd
zls_5$K3&SzCrH+jYa3;@0noW_m9G-Hu!!sG5ODJqXT(loGdd_CA3n$@&7Z|j3Mtn~
zC9#+y9we`bR~dGk^;RUf*qe06o{Pi_oQB$^{QUCV56I8qWSu2V_mK=4nM>kEuND=@
zP?+?|C+&M42Z1QyN6r$jJ(BG)g0h{a2!VL-iZiTEtnGNP7KBNdNA;tAF>80qgx9>B
zAw2Y5AN9srNIX^Uju1)S+T9HWIN)N7yKlCd@ko@#*^bw~p6sfQ9=((jIt0x$A^^EMf4nUzL=
zJ+PM$JkesxI>Lx{M7A}2SOf5x^sM}+v2l5>yQpf@zCYqqOCd)!>gF55rjh5_VZ+%|
za7{sR%bM6|!lNQF}$Qcuh4OHWL7QS2;SWM4Qf#L2>(0Bg`XGb|g{pz@*83
zTJ+SdJ%_U&$r_QMN16tVOFb{%Dl>RoiH6M?EapjI>_BqsC8tkupfu03Cl^=mDy{c4
zD9F2(8D>p--x!;_6k--UMB_7Q<@++Rg>p<)nY6&bSC|3q5uYFBN)vxm0~+Q&Caf95
ziRFTHD#6ugI((26b4@z*>nCs+n;rZDj;_ra9=U=6o%{>V7cj$6l-9LtK~uaF2H|Hs
z-aWbDb$J`ib@(RJN1u$G>phBXgP5AK*S=e&Fp7%KC!g!AlOhI#soBw#%njmu!u$DE
z1G+_0dMbt2G@|6o!NWy}TgSRQMO(hq^oP3OhiB+S!d=u|!EKfU6@a$brPK7kov#~l
z%z!@wY9X6nGyy$5@6777$uUO*8z2N2(F2kDUKhN-A(;cNsaB8in8R0-23Q6Va$w)D
z)WlkPQ}z1@&w20_<==Hq>NBdiD)lQk<~Ee2r0l|U-QrvvsF;RbJ($gB(4<0#u{5wj
z6aGrXSxn3ltv5m`cLr3VCPOH8Xuj)J*Agi3^_w+3el%BZ2azAqjH+|vwh-kopj=Zc
z&*h3(8Nx$jiYRf5CpC0#{56@mhaX>WvK~~~k?`PD
z4pKmJ&`bsy&|OW|2x3zD#;q>te{$^)0CZX5k$&0TZRFCeRP|D#q;-UwFLX4)TCP1H
zk{SFsV7RZbJx^?5buj=`+(mT;FiVI+cR*d%bo#DT=|wMQlPim^da=a~Jd6e<+j}RI
zby7QpwlE-cug}i#F>Xi)?1FEzoHH!15Rkp9S_h4aJE*LWU8
zofoI`;~X;mrnK$+fTSPx8R|ht_n#Z)+nw~dGob@%D;ucOWSWq=bzO}b)u(*ToqAl*
zcu;Sh8JOj)O{%yH5$diRs=3i5-PMsP4hruwX9gZTnHqOTlp7rCD?f0fhCf9>4Lo#6
zB9B2=*&cgn+85?xw^~HWn^WPNxAme=-97So1CHgZzci63*W!{Xu3yB$XqxolEe3c^
zG8Q(j5^+7Ks{MI1DbGt+R?S-}2aMftp!sqG1+WYQM&GPjny-?hZz{J3J95Ghk3ON5
zA;D5jnerMkfULQ25lbm7_~)hCRwQ-h68++BGsZe-zQ2V((1MXz`QOunmzO=PXw*Wm1HbZ&ZchG1Q+LR0dx34e7i8^ag{9pHlz!nGgDI
z-{@=CB1kvRqfs}M;^^q=Mym_jq1R_yby8N}ql3B^BfMcBNUp$&F$)Q$bQN2rxuf+u
z)!0TbPxaRO3Y}}ULd+TvR|wzYT$(5#{mvr;o$5+d$#+2#mJGE@?=!@aStjlm0r)&V
z9^H^Drb%g1J#~1?cI5nHQtrOfQZSLAQoHnLJ7lN*J&5Wp!N(S8EB5;HQi(e%l_)6^
zDa$=?hxUOhS+UU;S~d0BH8NacMveD>@>p_EHKJlBtSU99Ab!$EN`NN~AY2*d2@4Q#B}JmORp+c99s
z0mf7j4h!`7lfI~6Mqnmk7%J!bq61LUf3yT0QjC~wChy52Q`ZEb4(&s(;+7t)XLowL3VI0wi{J=b}n|crj
z;rz)mUVbMpediyKlN|m8k}*F@9>WcckHsyp)|>U3lk^_fwciTN74j(~*s7ARLfH<{
zzM_nrTFL8|rMQd~#mAW4@GZp-RgZU#{3_XMOxcMvf`4S=s~7E5`G3$l9i;2Yd<8urzB7w3
z6qM5+NDejzgVtBz3@J$_&$8;{>t7<06@Jy;Sc;svkhR<2d=B@FJe7G+=d2WWv-?V)
zEkFmV^}t=uB$v|xX$-Z=1`hzbPh3u@K(8tK=|RO=DT8kD%p9O0mW=82J>%$XMveCj
z#+Iukbx{~1x8fx(RYH?V7xbi+;9BZLj<}aoT={q&nkwX&DlIKKd;^k-^gIpsViaU@
zN3vJ4WTL$lGb~dJesv>0>A4VZ`H%vKuTyLZ?m&Iyjf0(f+V~0}#M4)4so(Ou>6=C=f
zH^lKS0}Ir#3m_Ejj!`OMqm=NudJMN^#j@L1qCG_a%x--D(m3?ww9rt{LmY%6=dq}F
zr+3XKGp*-D+p}!Ij-2&8RPmLL(gll@fbx?`b9C;u`#Fp=PTK`J8Qwz>^{iC
zfT;e^cZy*?dHX05StFenW0qJeGzT>0C+5^vH=;BERK1X4e}_Pl0n
zhzAr#CpyDF=pOu1=|Y5LV?lwi_&|EwrFtP7?-?~$tTE_Lon7u`?GP`?OHI;v=(Fxy
z#&1s)&kk--i{=8}INmPB>)dP841l_%R%9A4+4N|biSdHkWzSO5&S-(`*)`+sw@>q4
z1(QAm&6&rxXc{K71b3^YsN1SWs7hyiAP}yXQYo`Mc(PWr?y~w4R>VevSPZW)gR5We
zQMyxACg+Rxi<71STzFGyigJN&+K0N@gW3~qJ9=_uN?Q81WaX)7?P+96)43d@nn7-(o;qiwi-E{l-3`qpEbQF-m1Yva*z&F)Uc3Z6IowOU##PB*w_PP4|y1J
zA^_@U)92vtc0|>}Rv5La22!&iwOA@e*pFtwv)?qi0YR1z6c8$8mN1*^Wj}{|zAW)q
zh?SeF_oNi20Zz(xpg0c}$c_C}LX$|4)KGl=9S>wTVp`d?>W@2G*d0q3~L3dq%@AH1KGNKQkk4P6hk#K55NbJi;4ZItUc;IP;L3$bJ
zKfk27BQj<6|C-W1Ngaz5g_?R+(&Lu-50Rk;SnF7jRWl)n!Th{BaBq;;kT$j@^EgFK
zLsVMk&kn7s7MhmSZLTA1Wi!3nI-L$A+1s|xle_zwyYm8qYqSzedQ`93E!tYde^&dL
z1Zxp5mw46~7H^;{uG4{J>0m9Zvq>(gkt`Qrj+&xzLxEu~B$TFea{938k@-{U3CI~(
z#grN(l!D9zt|(^Ye;OkMB?55}d}
z77o6ZfmhUYC)fwFpswKSACdaP&pDCdnR7JpJcC11H7S?;fJZp{c5)wOP1
zIsF!d_tqz=G+0USFzDlcGI_CLO&rDnBgsy{czDq$6#?*8eTtB{%ecJ`t#!U!P?#^0
zG1y}Poxm3Ay!)&6;AjsQOj>1G!s@b=_EL3tafoj*%Z(hx+&F^%B_$t7<9?wu#v0N2
zZ(x`^q@ka42iZhKiowPQzmkBr|1k-U&&Zqq&~lTcQ4j*QZvD4};CnkM+Y
zExIs0lB_%Mr_2Oa0Gdv@P^*+o%p@UOW*Z@jOR1xr)+Xs{
zgmuf0vR+KXE3lz^^PA+hdO#JEN+j}+r|N-^yf3MZd}`NkTg5f1xtyoAL4?*oIWvH$
zJf6eMY)9QCFUvQrM4OJr+E5QQ`zy}ZZ+-4tnmXZQPxPdLStzSN(~3{Wv&zZ_oF_%D
zO0nEVr_PRVg3uCm)R|4ME2ov_tQdW}>Q2lE-EOe&07*1tJz3T^4jF`%#q
zCz++$-t->TebnL0N!c~DSBXW!N}drn@Lu~H$~GVqCUkRw^dhVV8Q$
zFNJBKNwf9e*)@uJzu1HSt*z8)&_*UzoV8x7qZ%ldCrdAGNXtu;@mM=>xxa?sdtD;HYyKM`=hPIQe`qwhm
z(vq5piJXn}$=lhMtoE9A*g+DL_LI(#>E%tTe*bHt)>^a9M!phyY|`F@`AYCPE6YX|
z7@FbiW3$blqsx1GYx7JN0GC`*bNu%b^!;C*`%0Q_y?WL}IW*=iiwCY{ey%sQy^J+j1a6XqFmt^U#R)0}0x
zJ523gy$h!6^olRvfho_p(~>AB(6GJxFs82qKTxL|gMSpND&JO=e7pAe&g*VF_NRC+
zx^@v4W*_KF4FQv{-Sjm*tLaJnns8ZA#;8E0hF@fz-X_&hK&*zmIfgwR)MbJ`l&DwHis^RtlSRd6Qhiuqmscqo(vtL~3u|l%cO?
z0<}Rci2B*i?0L=%_nPEhJxJWJ0jaX$OHFR5ZiNfDq6rQ)rIzz(QY0bDH!!J?888-8)F#B{y15q%c1^f45=~tw-mlWikOz
z?$69qrIScaZ;u29%xT3aZm9uz8Khp!(l(C~Nj+#)NLets6rq_B9aS2RP3xsWBYF)@
zOvGMIxOCR2TFgSdWh8o;2yT-13O!JA@k&-FD7!#9OELXUxm;lax*}B7FEP!d+I?X8
zTQ?r|_BZCUFq`h2iSB>O6^4dPEIy{EpQfU}KDUOsU&FlT8hy}P|MSNXq!8ur$n6JT
zMY5dr+{l5KKMh>36@ITi8K;+3kGP6qM;+HSN3UW;5#XF$nN$j;D{Qlsm{}_wmHbS3
z$)sZ&k*=?@vo0Nbr0OtR?
zJ@*?v?2usu?bG@;cdn5i7tvs#eq|rzpiMg(@jysaF#Gm50T^^+riqG=N={G;6d`!)
zPP?2vuJpUB1yDKkbqUpK2uaSQB=o0tarOVqd
zwZr4G4D8lC%Ti*2vOi6t5Pp*1y59rwm$$RMRREpt=jVvw43-{ll=XTe%`N#KS`
z9I3YoWfmL+t8=8gUR}g|erEk5ffmSQ7RPPA&$m}1zWL8z{
z#a4nP#|~X}yj7g7j}-G4rot|Sh&a-f96Ik2C$wC>0$GjT+$|@SowH1`?n#I9!AN{7
zGDcd6RZl`0qMmpFgRiL`y-0##R#kYDE_%#VP}Q6nMP0%PgN^Wiv}MKQxqLQgYJY-!die!EkS@>C|s)Gf7U=;&4A{g>A}i9kek+)%_K{CWPoLRBm?8
z?CKrXw<`_n_p5bQ&91gDtD+Qg<+W@M>(j~ge-QaaQZL?}B}UOyND>cxFt4w7w?KUd
z5_Q!0Ot+jpfPUvD+R3djq5$L`jUZ8#cv!w$nS8O#8vu~g`g5T^yzm~5qjnNw%`_mf
zPP+i}k>j5BdkBDU@EP7|36@8uMoA)H}i&l6uL*%td%E
zBN`TpsVFl!_NQJyWOGIlW*3PaOA710yxkCfkk`m;)*LzAy~@bKm~>bA
zp`H{BH|kZD3nu<{;H{oM6+o6Xi%~d-PgdV+On*b%EsJeF({Y6LswxPiYz{Z(!j5;H
zErg25sRIx9hl6^ZhLublifdgPn)c?PejjoknpRaX(2|8HIJb<<>zK#MTiVpqx0L+~
z$i$T*ue0{L?zgZp*>iHJD@#J+x~p8MM{;_%#9`!QCkoY4+u?Rd3VM01`_B9O;9u+H
zsztegAc0|USLf~O>{XfR;d@A2Q5+nnV*tfhye-q7xPp`3ZHAd;Ei{DG%f1{%a_&vr
zvM1zgU2M-poK#HxuT?+achZg0NcO#E)#RYHv?;Fb{`w9(i+C$4OBzaX%bb}>tuy%+
zt$^W0{HGTZ`{e^Ih>=G{O9efdJW+D;7v!`{1|3o6i@#_cWuB(nBn^&<%}kf#l^3;0
z;D}?U|#48t1ufp{Ke?LoT%ai#}znYC%AeG)AX$PmIId#BaRe8QKxJ=G8setREIXPp$h*_lAg
z4dqaa%&I0DgM)llq;jKU1Q}S;UIvL#u@fSaLwfuc+WpYCd{Mt~$MKWc)<6W-2i!yd
zGw7OvX(e6rE|Xg60t6qW6K`&m*=TqwG^~_c#gcv?$Mu7D@&{gc@dGrBY(WU#xFz?U
zkn62Sc49Us_U`^?DH*YrnP8Jjwc^rhOcr>3qe^gWo+mw$P?2fo4+Js9;8kf}sjdg)
z+^byIfqPOdYX>4BG>axyOK;q;dc?bln>p~3nQBHba@dwa?kit_Q(8u?H!juxO{R^%
z6Tlgh%G0N{xUTb3HM(#gU?z1*&h`tnv2uwjXNqsU5e-mQhUFzSJTDUqrh9o}DP<}#dYiB7
zg(Y5Z54)@3x^6wv-l#Kx4nYDCpa|4Awd8DDH|e3Sskk(a!kB7LgP4EFN*C+Unk
z5|X!%1Rx6xz|uAA{=Lr<D!lQ9o=Ujr^sVn8fRV{4ShP7R?@vGKq2qmoLhWK84o*4QKB
zPkNmj6tIPo|Ggnl*Z4pc1QgT}`Oo)@_1&cCot&{4btFm864cp1yte!Dp2t6(*LD*{
zsW;h+qVyj3#=uww^QgS5GQyq@zWM+gy`GuLt%eq0h|lxB>5ckQ>luS329o9bC$+zk+Mh=d;MY^U{;8Z|a0%lD!Hqq|%K3
zZo{xw;3m)18Q{24f>SpAvMccq%7$CI1~gJ65hl}jT6{{aVB$y`DzXOUJqLxuP>rEk
zr1KPz4e2W8s#lduQwO}x9l29Nu2ac@E6y$7^1f2=4OscuDU67-n4S>Wh1Q>IQo?wQ#*UOGi^HA
zxMI390b(FTzewaz(rWskeccrHWX?O<5gB!V
zzgwalJjqW(77Im4oW>maaO}c(Nhy&L1o}w4V5+7MXs_C$15;O&@uM;Jt__+f&g*n}
z|2f8pQn^T#Iw{Tkp*SWiflvJ4fINdN1ZqX|0xtZc7JIl%`?*j~twRwueNJ^b#|Bp`
zhS*~6O8w0WKl@hE5~4`3vs)50{iP$^PD>kGFI=@T=<~Kr$IEWq*9qpyP#R*ja>Uk6
z^rCPdPbJ=id?8~HgSydI%paAU~MfB0_->G8l{jdMD2Q+UTV1_x
z3&)ZIejH@y;J6`~EQuT|D`fqV)Ws35UbtmED48ANfHf}+g>AfNHxLTt-1tMLQ~(Ys
z)gVb;M7*U8Usg-rWF{GDsJ}3iqBrFr7(n;4v#eTbiN%*d8le2h7%Hp=gT*SWhOoiv
z!nWsK4@52asIpV{0@T?eoe5c-Eie$$X#9FDlld;<^^;K#&n?S5Viz-faOFMn;Lwl^KIF(?qY|Nk@oJdM
zAdX==k3HPi-Jaopsi)z|MU>S-FElHEycAar)4#<(S@+7wY7dBH(xA*{=>bL|lgg0T
z@KCmEsNAmV4NmqLP`JMYB|ln~)hSNpH$-Je6piE}q!V@~RcL2)Lo!u(%B5)!593FC
zrya)LUC60-sf(x=hVZ&)H@v$TJ5zuaVl8@H^K$M@*(
z3=gbB)U_v9UzRM;sh*6^J=$yh$(XyMEy4v*y!`y=qo_k4U-$(Qy4DMDqXSnpy^Auj
z-J1k-%eA_csgY!zG@KkTfmH~xe12n&O0JL&SvfT&Xc4;Dsuj;`U@TwNnZ=Ma
zXlJD0Yc(L-(-9o^3VDsreox;?U-stLckQGqc~6&XkgpRde&g%IhCD+O-6CwOUHsY9
zFHI&+wR@cXBZ(sNbToKrq9)9&*1bX8nX9u_go}MEQkV)k&JH+T;Yn`=H>VQEOHv<6
z%7L^re*urUAt@@6XA&6Fw%DF@h>&z4LFlasF}#wV?};sJ@Qe)B*KUCZLKW+zxl5Lk
zlSf2HL!_X20LPI;i8In-T#_x_$xdqdOQr}R8zdb7i;Ws4)2e*7gB{bxT2)4mGsJ@O
zR4|MDdtAJjY!9kCO@z}K%(iaHs1wCZrMdjizGjsSOgxS_pH-$y*qPu2byKaXUpJwI
zJ_~x(ck!;i9y@!5>&Crl`r4`Lw8J8HoRc4fO^#>cu7g~
z3)A1cUHno#{5&QnD8FxEd=V+Vj9
zn%sy>oT^g)tj|b8k$gAujer1`9Vz;y;+ld&>djqlqo}JCO>8+H>
zJFqt^_VUuLy{u6joF5o9g!`{j61Y4lckf65YWw9MU;NsbQo
zXMvq7H4>y|Z4nD|=!e3G%dz$!F6J1oKHdVAH&j>x9(9TC+jK`P4bCcNCle#Z3-+H0
ziE_G!o2k^Om}3!oqw?c=R$5WplA;3bw9_!tjZ^^y8Ah(wewFr1%DoEH!!6Q)aJT8oSlFi0^2fL2)ByjL
z*$K&I`r`nocDSR`RYl=H$*~{#Om4kHfBpa8|KFxhfy%kcC*cMau7+mI+!dVMviYsp8$XJ%)ZZ5}1@I54QOInOpScjLNGw!(&uk37>*++VeHKy6J
zl)Vb&d$m-iKVQA_HIl|=D10BS$Jy_9&O#q+NTs!qzqrI}0?b{W{K!j7bW6*y>A=RRz0r<#v?YXKei
zXah4rcq;mAR+hle9GIJH_~Cq&bjN-a+L(|kpJ{XliBTLOgiRLri#xyu+sC`kS|%t{
z!O3+E<5wTH9*}iSrPWIX#80PuQ#J_3mDk5*y@b`*cUlF>qs7%vRyT+Dr*CPK7zilq
zmb?uWH-wvc;W#viM_0BY2tz
zH@BL-drm5MaPNM`Bq}wu-2-g6G{S?O)4z4TR5|pITEUt|Bd?|NsU`xpuh&WJ6_U=4
zD5A8pTc*w=9l{+V8$G)%)zbEM>==`@ddKjt5m(-Ze1R8_6>?UlM`J34;DdBQOcH$N
zU|u&bJkW72HjN(A7dJ>5vs^8w+cM(i6<0a*wrH?>l#N2aJpd%G1?GMO2{UvkYZ|=x
zL{Cr((vn00S`BT|^Z-EBi3YtA7aL8`?r~hO44+gzqcmqaq7LVqaq4!-^!p_q&ShIxNG&QxQ+iV+W&#nbD(c4I-J3YvS
z1SIpWy6;h@0C&pbW`|z0)hWm2gk=;;IMoPaZ{(l_Qhjm)u3>&|C7Mt*TA_AnAe)h-
z$+-X|3EpPGgSXUI2&C!lSwC;}qx=~Wm9-xkXe%p|5l@13ecSv^gwl})wxGfyJq&Y}hn98hXc^1OR6jEhme;~sco+X#l;VR(`ZgI5lyXiz
zMk?>bZI|bXu?a0@EPH764xBT*tQ-j>-uMgxOLKCcmMF*=KXkMg=WvceA#0{
zs9!SFgG?uSK=N8ANw;>CL3$@LBW2j`UQirM))YAAa)jLR<{$)AQ$a9I0mErZqEf$85TRU@n(BYw@DO;gDS_4^E@R(uLGk1OqktK#JWcRe2pgW4Q&
zn2FSCvPnAk^y4%7+e<`Rp-BE(@}BA%txuE6qTl5uzs*F={-nzm7!aYDI(wt`b}H#&
zBWjV95y|}Pw+C40k`8>JU~9}0+_*Cj`xlXBTY*k^%-KqAS9gn!4lL?K`F|@_rM!
zO44OFXs9&ai0m6#)bO9m;wP}e!ziKJbdxTL_iJ(ZJ|E1v|M&7FZNy~!k2F^S`0pMv
zPY%i|n`+UIU5(&~n2H#YVy+&tNt!G&Ulo$DO5yVuMmC>1`5U>ano066iYsPomOhJ@
zt%En`^cwTnv`wV`zjFOI{BJcg7|2~@V!dCxrsG9mZ;5Mab>^~)GhRX4`!SvE>5^9f
z(SR=ZAfS@TnL5&1wu(=N;rN!BR-+o7F+!oJhYfVKd~RM#I-Ek5N&1sGzh+UfY6LX|
zi*#b>4ikBGjyDL8m5HSz*8^wcSd6JTDNm7unzS(QSoFzv2q!>UHjWk;yYzQnp5hMY
z-Lh|EE*q_BP=#oy)_E!wstzjY>ce(S-ie99t;ynwnM%8^KYCFxzV3D^##N?2YVA|B
zTg4v(l5PN&?vy3W1*$hWys+-W5KW9KMm!@{vx4zvA#iHq7)&*sg7os%7h{mHO`jy5K7||4(e#=)
z(&8D-qG`44-GLF~1^=woWWX!wm5-Z2#t5RB@|BY}tbM8<0K4%OZfHopca90vFoyJB
zyqOhScL5tiyJTSu^2W|)j%nrW-V|m@uJLrTBPKwN?!g*71;wc^fCxIcwH1F-X*SfZQ=MAH?BSL<6Xh*Bele5@G4~N=u&*PFP8oqU0@=NT1&Fp!v)PxFqY4dM3Dx
z@`l!6tfD%?Je&o*sKB*~t4A-ZH}1E}dJSFNEnw9o>a1AU7~399ef)JdUT03&xlm`|
zoX7&!xMYjUE86PMl%Tb8&W;W|UnMCku~(JWIex}R=fre0?=WJmDf*>LO-<4tG@y~r
zR{D5Gh=-;Ui)^K!POAnC_>l^#x0kFeq~z3v!(kDuTTlDPPPkcFMGs)xcESZNB$E-)Gmdpz^2U{cqPBgUqPjkS*0m2v_p^zW$=Rzl
zqJAcTl%uLiI>Ytd9^s(ns{C%LoPLl>#Fw;1Pgfc@hiKg*>ffzZGLP!pXJr;~f_!un
z=``A8%AB(M6J)s?ab_N~-}tU?%)=hA&|cGUt$q|*oT}{>Sv+^oi~IY;D^;7nxNo+t
zEJ~DgN?#WUKP3er*{BVC|J?ILmQ0ov2DJ*bN%znt`Al~n83h8J$_^&TOtItJFw~riaL!b;ZIB#xTutZ~NrnDLepuH|Tq>v>
z!P!KHlYo5e^^y~$#>LV;`jC|iN)o#;&OSA_&ghnOimJrquP
zpu@k*VJeJIN)Ej>x_VV+wnZ6r;71WCfxbz(Dt3N=xq9o85i~(lok>fj*B*Z)`2ZZ=7cr|2_gj{PYQKYky`oU=H=+ZE
zpXj!D=PG)8qtr=qTqbn#NJX??wxbq*g<SfDE=G<9&*F23@96{Im&OK~f;=5u}g@W~rYcEW6uuGw)B8
z{Lk-|>Fkx^|4Z4aMy~tX!c0Am!l3{2ir>#lD)S?0OwceyL8|)Xdw%fhX{1Dsa*>_h
zAF^wDWCA1j?8PmyZ__6+_D8W@2j-v1&@QoG^rN3N$YpaCVa_geCx1`P7#u@fRstuZ
z-j3yz?9OcUOjRXG3;h?r^}oV!*o_D$Qx<~vVqEo_)ft&~y7|?-qN_2LLQe>ec9Hu$zdnEY1jH5V}n{=Pi2i1U)W6$
z&MA)M?E44cTf@D$lv7Hb%CG!YN$Q;$8aED%R#V?v}KbY(iyJ4pB%>
zP17*(qco4Pc28C+5HRU0R6M%#y)+-3UKc&H@&7vyRn#%;>{IU7lq`ELUz?ob>oqxWIC?l<3
zoqpX0D_mQvF>BQYjLF2b*l(dJa(VYLu>;1S!jpQZI|s!$oTSPqO5%Pd>qZ8zn7Hqd
zfiS{8h;h=qUb)oG$nT_8`6Zq|h*q`XY&09S>Pj%CCny`Qs#2&O6X3*R4N97I=(VUi
zU)M8Z2y|$~?UbR1)PZELPA`?Ns<6oXHM`s2Ey&30V1rU}Z66noy)Gt(DE3BO!_HQ@
zytSM4p*d*uVd3O8!%%6xYN
zRR86$S2IAMy)}@i5osdPsKIyxby1PoK|pyi>653(z9rYwcekB&_{AC04|*VbHQHcB
zcGB(zCpE9AA?e1-#+CK(z0xdqSzupA=2vapbE|u8QI#H?!Yizf$w_MXMkdT-7q=59
zcf%OIiw#5rC#fL%fy&GwL3y|h-?ydMLQ$wsk#CgP{D4|
zSwQl7a(=JeE|tFNs7fTd-i1)2blwLPQ}OLQ<4BEl87+UP(>A}e87+-}Z$kmz)D*`T
zB;(d}wvsMfIt_V7^)d#Io3VqaVNSZ@B7->Lge`7UKU$`3@z_R|<$DmEhUU?5JA
zrv>1SGV`j5MrcaY4|b9#y^)pP@R?knNY|@$cHm}~S58RI;f~%gDXHxtIbM5DVT8-f
zuzV2@ixX#C3;3xyEn6Fw5>}>Kb;nkdYO3v*9Q5mK9o$P6S&;K0%iJ3(X?T^)n`F)o
z_#2nT_JS=9*#4C+PxKe3=B8M%g~Meohoo;9%-Sf-1#U?XlG|a?{d3biEBDauxXt&d
z4x>p&pLX$`99
zrePIuv72GWq_Up?Ml9`3igCyN8>Kyw-{k0ZJq7zMlm(WHj-x=~Zk^T%?Qt^fINrEs~Kb8pW?R25)Zify+)hfEWO(4;d!|DARA9mKz7&-Y6%f!cw6(!=~`UN
z0LkQ2qqFtvr8+)AFfDV1pW=du>Ttqgl14)HCy4*dQP%wVTmqB6`6}0(x*NlZRn=gX
z$)@_-2r}G<8gQRy|Mwn<{K~dUO0Nmi%o8S|u`r;6AC8up1>M{u9f%{T&sd7=W?}?1
zft1GQdFRXhdkx=4CwsO7+)kI03W_QpgSsy3K;Hti&i7=BrBk17ju;fBk#rXh{Gz|t
zo5VWgF++3QWi6%iQ@2K#3vkX{d0?goCdUy%$xK65AD8hYJ=)dar*x?MGzf$^kSM`}
zi9(MuN=Ba~tE=K%m-8w(pm^QLQ$2N?65Wp!vUV5c^{tL$Mck+7tuGH5+Lw5y&uKk=
z8)TmMrj_Y*l=_8vPg4_LeK_|0k_Uu%MpAqM2XVb4DLKzCAKA0yY~UNh|0RbkRj_d#
zMw)YdNQD<&^R%-|6!j~Ujz)W-l2&82YS(<=i8dgIS?L+BgduY!O}!(CkdrIUW2(%)
znZu8hWotA9p4`cD3ci?&7^{ZJbnWiG+HUrfk5r9$vM2Gc*P(_
zAt05JKD~B%zHIMF4O^L6g0`j09pA_6$ii#-Z4i
zuMLHaChB0qHYW1fD4qYOw)0?XV(H>IBu45(4J{}Eq&F!-t`rX?Xuv2^42VDyN&rEn
zCBUWRtG~bhgzLRu;GG9Ho6YX*%;|IH%o)YE-m;)NXw5MHY%;3wZM7N@Z3G^pD|{v!{#M2bZ}ei5`dWlaEbv&V>hf``y&qce$j|P
zgK0_Ce$IwVk#4u;s|+Q`ujef%@WADBrT#F+KavoE|&qaTtkawrP|g;S$m3yiN6EV|q&
z*Lx9T@VZ}at?P{Gp7~*Nx)XYYFH#%5kJk3PPQMcEy9}cygS@3S9H1hV(!oL+jR`w$
zE6c5DAmA^4yan;cw=;>^UAp%)Zsw$p-{}5T_L9o&Gz1*S9XZ(y2K*LAGRBUCALSbu
zscf^skBBCUq^2H?+ZvtjM7y5r=*ojqejrU*p|Yb3%sWCm4|~YjR>_d8gSZu(;J^)k
zqiH{V0oLQ3{jA-bEjT{2NYy-Ds45X&v;iKhikAAW%J^%eA=Z~D*qzEn7FY>nG~Wvs
zA7!9EJUnA!@ZsE+?<~V+pI>q>OY|?~milx4REVnX?&EO~V$*3YlDrPyJdN%>x9c}t
zKEFCx$0&J(D@OX9dE%aZ4H|h+5`3N4UL^u&urTff%yKyvUgUY>Mj#hy|7)sZsm4_X
zb#CbpBStH@(=u%`t_~Ks
zE{G)Opz^FAdxj#n^Qk8>>s)ed+@e@1J861OuP#myW`l-Fx=PN?)rReZ^bYMnz^mu~
zDU;StDh9P}iP3Sjr@A}8o-cJ-i|=*&@k-RKl&D=rm^CW_BO1rMq%|SrOUb(UM(fJs
z{ulJIBLlXoGa6Y_q*^!&VY-bF>sU^s{+(IMO~~40!k)X$^Xw~_zsP{amkk@9JqRm*
zssm{OtI1_K`Mv_!Ds%#OK_Lkv%Lf2^rPG?ld{9>SXEXJ}n3Jb`0as3ofzqvWfq~u*JT?a{}(_x3>hihUi(MIb&hj#vlDmMtt
z7H2e>ub-Skq(@rU%$sHkE7se^qV4lGxE!?N3A|j^cfd7O(>kZ4vm%fklv3_zOIl9&
zA9i+?s%?7Pqtb4lC?d>@UNqGDg
z>VvWmL*GC617(igeb{iuxp
z#b-RT*Jdp@o-DqKFMPisqezkMq$~sls<=GAfc)*U1kd}?unl!u(NyR&(ry=#QD`L>
zo5~-eQVC3+igWvN{-wFmcCs>oKBK@K6oEb~0Ds%cqTM&jyMXC_E_X1b`A|~44_%gT
zSy!J8BtJU3h1Dsu$VU-J#Ea$9Ube=dMuNKFtkVv?^ohmd{61xilaXK6(=St@7GrS@
z6y!WcPa!)KSGUE3Gpg(N2dBx5oi&b2oeu@b+s`ckmR8{yrx(BS~_vYLaE+ir&2sNzT|yZ~#bOEtVk
ztt$!gjEvYzpqrv`TiZZ@*#i3;R$E+T-xZR^Asz$5l`9_01?gmMDfJdSBldXysJuet
zT%}u3!~|D2NAiLTmECsk`^=CT8CwH+->?->^$KFLasb;JlyHV(ys;_KhBKQH1#IJ~
zZ%Q3`cYPj|{OI&;#`HPG94E?2S%+_{ugQg1WQ~(nSMED8-=S6QoRxp>$b8`0RvKPQ
zKNb~SHSV_)2wTYn|CtCS3@BpJobYl(G=8=pGr2G-hPUb2zyuZuO7_YwdOV`=lijN{Y
zQ_=)lJY0PIbH*Z__Rs8Mxivk=D>%aHLRYh1*}Mt~9|OvUk*LAB-h3!OSw+gsi8aF1
zXne1*npZuz%S~0YT}X}BaomnM8(0wNvdQ9|81u)rU2XRbs@nBo$!=(C2X5_%-{Rt?
zthsGNFS%o8$ae8>>t@Wp4*0okcWF;ww->y;i9Lb2M#;D%TsbdV)zE(&6+n++P&=+o
zcp4HX%Lx0wx@3~M@=dn*TUXg{oM|T_+!Rx;H_|ysO5X3$Rw0x$>3JcLI}N)N?L`$_
z+TQcqK)XaaRi(KehDG$@
zTvcwok|%o%_dqh#0&KhaF$m^oSh1PxO9V(hPKwZGU$ML*K6~EkcNU7PL^#Xp3_5rb
zTnlpM2)kL=0K^9-f;y_6lVMBIN^12aBY*^1K(%-j!;R2^(Hb_AbM}ghP3lTqCre9t)4c;Mgh_&k_G-uNZa&I+b&q=*86K6o;U$)FMPA>uND|i%9sL&w_#5bT`ta1=p{5s}3z_bi=~t3f;pV|MTY
z^Y#Fv-!(*6iomNl{kHzi#-u(SX2qG+=)?$C#X^<=@c``B*
zPA$ummZ`CP1`14-KS~ca+;M4@PAB+`kNHuwbVd5Avcs+c;Y@*Sc6)b~8wNUxNI7Yh
za}`bfcDu8L+0|p=m5W}X$vgn^-2P4hy>s6*&jb%%C8>r)5KgvF(x2-9-(
zF3aaH8PVxhCj8L@Ct;bkJoKbA)xy=@z2(O+Z+HXj=$>Y0&@RK!rY-EDauLt6ny#GP
z!0rY)VL8=>&C~>7(AMw{H?v~nF9{KgJGK>Ts}w%PDMVtSXY;bAd_qI66^#PXPps$fbT;-P3G!IL!$R{GfLM#uMJPDYdT@
zMIeDrc>na)Vy!JsW&(oQKjGKz;(t5qvDDlvo*a$_ybb{|y%EWRC6UCFrx5Kos+uy?
z?aX)4h10ASo_&nuGf{&y7Bp#=OK4OKJcfib|B-UEA_IcX_v`}6-DES?qXI`TGXXiB
zka@D$#sln^_6HCD_oiuR1o!UH#asuS!iZs*%{hSW3Dr;)wrBBe8(*e;GJar0rwb1(
OkFqfTIjk`K;{O3jw@cmt

diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/doc-files/packages.vsd b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/doc-files/packages.vsd
deleted file mode 100644
index db3bef49c9773ca159112459187bb09e52559fca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 97279
zcmeF42U`=%*T8pED1pZms){CbRC*DtC!tx9uBd222SGv?70p+Fe`hvC6!ijE@BiM{
z49;eDcIxSKW_A?`ipT}Az6p0Nw3hw~hAafK
z5cqdPV9ZMLw_`=D0c)M#E$clTeDY9=6gWD=lhoAmCns)7Dh2deHnY5)0@ol1|?
zdu-mP8&6Mq{@S;OV*~t7hK{!}4S%QB7x*3C=Thb{?IT@4EF^0B9MMn21h9g{5V43@
zOe`Um63d9?#Ph@p#EZlV;w9o`Vwe~qRuZd-)x;WNEwPSRPi!DwAzme3BQ_G7h|Ro`U7`XiN{kVEiG9R=;s8;J_8##*@d5E6
z@e%PcaftYYI7}QNjuOX+Qp)({6zdrOc50Z
zU-<8|luu?ju2I>kZK_OEJ*2Wub&(1j%@+t*bx;r@R{f%FY0$JjkEGLw`Go<8-u1cmE$`)}
zJTq*dMKqfdmVA;ac^#3bGAMnrXPzsISeJRKe4=A<>PDI(C?iuz=Qt*7@d9~6
z9wSft)1Ux63Tu;@z5MGSptNDAOMm}_XeOJze1X9C<+qV5T4;FLk>B+qt6WCg!LqSD!+>`*zO?X4!4w|7?;zLFb9WysIc
zx;B|#*j`y$Z{FXYcWn0qI?>^)4l#4#_b_PxY6~9*LC6Y?L*8(Ia2=
z@KudW*G$i}%9PDoN$>7+Y2a7W+Kz1`yOYoDS3%*E4gcREp!Ajv|NkM7#qXgW@Mp|2%gcnd%<^*<&wmC4{)|~>`8kW{
zKLY}P#w`DAeop}H=M=uZ-ek@@$8g`
z-x<-bx@IPq#d8J}zdCVRJk!5}jbD3prj^C>uSRdCy$qg5Mn-|Gc%MPqTRbNATR-+fIJ)F=
z`_L7so7`p@g08KggN_U}DC^Po-(sti9LN9@s@f8Y=x06XpAPX*&M
zgY;CroU-tl2X$IdW$=8;0sfZarycyM261MPo~oBq7C!T!P7A6mo==IHUt2tj=U)p?
zT01jHfB8s`G!@l8h%>2BIpFcg`S{Ba+VrOH*9|8LetsTeAj~YKo{_)nbc+TSaB$V@4WsZx;
zzpC*MJU>3DpL3uihn+G%FX;^aBxSytW`+Zg_Hwo~EoWNG^pfRg1B$=Ij03r&*9-`c
zC$P*<>+w9=@~=uC9at96C&TkmnEhqi7k)P#f
z1DrEpCIi&ti8Hiz95ct8J$cUY*0Oju&^rTWeggF~w00abKWYCjA02Nki)RD0tUv58
zY3Jt!j;q3-m;Xne9v@WJzx_7>e;lNLv%z0c{kwzu%l)dGH*Z!|RUwmq5`Oo7RYgU`
zPkPTh%I;SgGWjl^PeMSyR=l62$8X9USG?a8_|a`vKmQ0a-^+(#zL)*am(jPVWEAr1gs4Sj;1pYIF^hXW;iu^MVDvReIf&YXcUF?vP|63dUwzs{h
zQ&c~BM}NQMw*&pV_gVdX8VH_{_>MQ3<>%utadOTK(jPVWEAr1gsOvX6PTBw4QEB@LcW-e5xHxij_V$wa%fSCf@gppJm!H|nz^(a{X7O*=)YSZ>0FUVOY_F^3
z<>mdnW#{Q%!pA8_YtG#Nm3VeOxb!3BoHqX_C-IKs`ONzd$47O-@A7_A@wANkP4#bX
zGp+prc!u-8nSJK=IG%s)2E`droxx0IkbftUY3&cd^Qrh5arbxN`c2(4w3fllH%*=G
zHq%-b&jx@;z>vlB*+?o~DwlV`&o=iAjQ>Zr<(84!Wrae@od0y1Ps}A
z)lot@b^3p2hnr4zgHpC+7UwjUb$bF_aDJCZ?gWXIiJmi
zn!(I38AhhHehBC7i)RBp&W9~Z$8Y*4(jgyy
zSK}ufvpI97Q~jm;ao?f5jEMZsv;SEZgL16#U9fJ}I96$uVX7`t=aV;`!IZ^xxQG7SI1ito-^hW%2y$Vft@u
zF^lJaBUXO>n6h~O^)UT6wrE-B@OS8o!x{p_!?elBUjEe(c)GH^l8iJ=3|)!zZ_T`0
zSzq!w-lI6xiA^fk^4S
z16K25ZAV?ZZjq8Ft`RFBwhSfLlRNJ>7UGfdrJ*9v?4&DL>^&&WIVjCND1DwM!NpL1rDDhfw7IV4
zbQVcbPWWR5ow*N6J@gk^3^B^G#Zd0U#=M7(OvS?=!TqR+Ym3wgm1LR$Ylx(EQcTJh
zi+EOKOQXvrjc%!LZRxF*y73yRn~;)ECHV)XzGz*6lzHVn0B{%h#hqXLsl@tt{!_`d
zE1yavEEk{4YCB^oI4CWo_(AD8IVklXlm-q;g9oLdhXidmmlhe$n)jSkM
z`G&*8x$(Td;mP5p2b5{w5({1tJNmdzWWN28z^Jk+^!Z6jU&^*V6j>lz`tsLTAy6XX
zm&Fj!lA_>PNnB4rWWQ^h37JP
z5VUG-@wPc^uVaN%pAz_N?u!e6{54IMZg&eWP#%3
z%m4LhgnMNx+FnDFeEyyCfUl=nz
zlPQy*;=)fHUaPdDG%m6SBBiI-q`54SDq3K|^HXDY+eaAP=#WJBM%yc;y%|xuH-;#l
z@we38kQ>}uIeu=;1
zYz9Hu#sF7;XHbgCS6nP2uomA-8Av_be7@2DI<=7kLwhmtc2DzsSmeWJSr`k;hfP3d
zebo98Ls|lByX}>0a_6>N5y^CYvLR(HS6Xhh47EH-Iei{9^h*lbOG#>0tQ~D36IQ*}
zMQP%;5bEo-JN<)xYsxPZAVw)6{7@LiI_aclIN_cl!T7)>5FCS;LprnThfn$K5Nkkd
zBtJ@S>U`>2%Fs}{K#EPzRu7OyB`yz2Dgnnlwif&?gHN+GDWdx5A;YRTI7*z8`)OUJHLVgl#$Wt=Drc
zk(TxrtG~rz3FUWb{sg_}S@|GB4~O=zY;Ua1*od{sK{8Yts2#DWW58&jKkSCEV+N=l
zfzWBH7;{Y^Q#{nM^q?PFpNMy-Y+*C+xqns1G>vKqS(8{T_qj{b
z4AXt5!yGYFkjBb(w=Dq-md46amlRkQy3>`&L!P4-p2+LjVmq-K0BN=_k>8hGUr#N}
z?IgDVIaY$2UY14cgbNB1W=pqBiD#GmE&dyBh@GDNB@{Y@fMtU^vHdr!9lv-D=#cRF
zV)?_S5cpJP((+Ez>lOpgdxx#DY56sKK^x74NM{%0*w5TA!8#_y+R4}ONfILEmPse&
zex8$hVD8hGF_qEG*SYPrmXhl-vldxfSzlvst8qkt&=euv^0z+7L!0l3#
zv-%KpG0SD8i3d3Vq@Sq3)IV7?0vgqFm
z*}DaKL7%UzX$-@&Ae0mG1cSL%A-NQ~3vmT8>sOIUHgtxm31{w#l`y~@^1dnZa<_ZF
ziu|1Z^3HMzJqzXrtY@y=+2ugB*m*f+l7FczzW||9%0z?B^dWZ4wmlnSPr4E1rD9#6
zx?4)UR-OB0(49Lic45G>b9$=s?lwx!-FmspY%W9ODPyL(lv9QjCbso51OjtjK!9~G
zid5%WYP9k!goG)3RVATd9;SZ_ol0qMH{4X%RbBsBULzoA^z~EB^gM`utp*Uvo0@#J
z&299WiYFhYQHj_E9Xn6*fWU|CXF+L~LY0evnd*(m#nrk?_oDP?&)PL|{dQDbJQywO
zzg~DbR)y*O_*w9B{nJ31Wf!Cd3olpow)a*&mQZgM#6ihQy?CRvxTU&WiHMsA=Bi?4
zK*yEKvO!#1lT`WO9kUC@A%d$dMY0o3NX%{yL}$HsedF$2WfD8zlIWWv_m#2TFr!9K
zJ(}=LjqQckN8UbfSOYjvfG8IPBzlX#B3TVYcL%Gjgm=GB?%%ER^i+vFqbWwFf?vZZ
zdbXoG{~`iGf~<(+;{(kyxBRxUy1lzyy1OlTP#&VqzU0RHt(B!^*@-mFU5T`}N^4tW
zXk~6IDci}#ok(ADOE!{QGdnBE^;B~t5?fn~+?bW^$kxL4!q%QF%r{$fN6)+Wq@!JW
z)s{;lT_GDR3Snfj4rdT_Zql0vWlh-D~jNm6fPt$
zGn-acs?&P4XROg}*VKkrRvJ2akb5Insy9Pb67WimghC-*^lje<1Ae(rm+ROWbtAHU
zsZ~CE$6N(3-4~vYy$pF~$|U5y6+0(AdHJ+SL56RykIr}^1N2MBUE05>ouX4%pSYEC
zsc0^({0t`aDR1CNbMtnhR%WkwAmWiIS!=b22)OHh8Owhr+eHBk=GEYZNznvkuQjU!
zRzeqUYN;gram`AHl>YMMl`SrJq5!GABU{O}?dGXA&Nt>hTbbWkZW(U3WO+duCM#1V13lR7%guhoYc#^)CllX~@eW%okQh66^;XIT9=u
zXd$fuEr~4KQr%kxQ`){FIB-Mm^};{Zbz-rCAR`?*o(^L+*IP2r!@(X**j|}>8Jw|V
zVc<6!_}E9m^WhlRCGmLedAnhTP9NQq&d(E~$bQ?aLz|Ox{Pw&t&0=+4R5>9gVw39b4d_l3GF1p?ktCt46)`&ehVDu)K
zfL11hf>hKJl~k#MENVocubitQAmNHp)@hAGp?=4tA$4+-rg9Rc^u?s1n=d9!j#@Om
z;V%}AA5tt#d<7n+HXBhKy}9SCl&o6wfnT
zek(<^(c7UEjV8!Rvjl2CWA_+x2>KLqN9`V16;w7lh7aBnd2TR1o!67
zUJ9&*^0rDPe=GQuCZ4N(qCSm$<(Hg~`W?tJH+-!=Da_*%21S?8Dl}9Qh%!+yTqQS}T5)czg?xAd$DK^MQBA^dV@+4VgSNA(Pg?(4
zeSS|#U%w%pNO@zN+@oi89NcWB_Z#x)daDk^^C+O=NMg6tZbyxlF!{t?7iyGTjFL9~
z0GAikF3O6H2vHFsf~h_FB_}p=s8#9#%*)*!$e}QM*n0u6DgpfmSH7TI?tmOYT>a
z=!N6XJ(Xx+DJqq1p`DkuOf%HysY9k4r}jV3T3g-YvYr~Msbanp(^LEF
z&%GbxGJZbH^mlF93eY6w-(#_)Xg{SZ;7+Ul@zj27Xwk7Fs;)hVl)Z}$$rvzP@W{BE
z#@cN1ffc=L*uv`xZMR*ef|RcH>x0fU-rhg^7U5LgHCn
zbS`f2;(0d6lQJZ;*S8kmr?|X7Ms>%7OHeRBCxJJx@BbBqhd6-ZC$H$Otk&mTH)My-jc4D
z>@}FW2~SpsJnMTT(U1$8nZv;qm0>&dgobZu`49Q3P-UVcU!uV
z@~S05vW;+@gQyS*$cHzmX}BcOD&>Vbrf!Mnbu&l?wA#kfAa7hgdq(=-l0{%`F}na?
zS?YAv*@j%qz4cQx(dVMWt6D}z8=Crc1xP<0qAg`(n%xGmKx`6ela>3rG|ln8>78x=;KjPmn-(Uo=8-eMe4(xWc8aXspJ14-XQ0(W^68+qG1i4pnYEs)o^wJ7{NAI;@?sD1D+?iIwz^
zYwE5%N{&xfs#}AgL|yYx!eHg9*zhN!NG&`<1Ao2z+SDuoOx1Er+GA>EwkKFmcpDXa
zjkta&Lv((Cz;l!J5gGeLrZhJl8q-FFERp%v-6GwFu54(w)zp@RmTs5umQpCaPRjOm
zsjZ138G8>wAI-fRU?Nd@FqTSnJhCZ!Xh^?L8`5MT0k|4NdP@rJn<28C4M265xx(S^W}l(Xrog0NG&fM@J!Wl5_p%4E+e54plzsevf=c`sXtQ!v-$
zdMp#Z(ryc*S9Msftvi%7N}Ci=or}~dKGp%V`*8AeNC>yXOq5n-MR{K
zIw(Et06OtPYXIe&;lmq0Y`suYuYE%63`$$y5y07Pc^Q#u-m+?Ft=4IgYX&Ctf2>i3
z6(DJpxcDMrOFgPFV6r1|-&J5@-Ez6TUjPCmO6V1djV%3U$Ug-L9%$bt&8Go!APF7v
zAwcx-MY_4nsPodPD8GuK3MSl7+S$oZKTQ8b`30-KPd_R1bq&3X5QE`PpQ37&?*95inr}z~!5uWu_@3ksp`&rV6)O
zYey%Wsiirf{hORZoouGef6AW@C96N3H72@h1c~v*o$gjLKXj+t2VdOjE=jx7pS=9y
zPPZlPPG69;I~^(QELjoXgi4j@N(1Li!zAr$f158tB1uVk=(TK4Xt*C+GVOMXXg2YV
zwaUFqaIWX;!bo%Bb&$?Kmr*3Paj@I6Y|Jn6*Ij1OZb=^N1z5)8ic^j9w8S1i2@P!#
z=hwK?o#c0~NaA!T)>N;xu%!!4U`EK(OFt1oi6lS*9`lI5F~0J&OI)>|vod5I$IHZ0O1?V5jSrl&9662;{Hk$+SEPO542jbt
zQHk}(0!>Bksu14r^IyBa#k*iuksIf68cPoQE~Q1eon`s`{Y6$NZ=?(<9?F;C0^V(x
z*SNgBwiE`U*nR5kW(g@Q8Fj22chTRdv!va2MQiFSYHiNSxE@}tlUS8qQ#VrWde)fl
zzE{6&yE*M)yxWzzEd9!`0@&d$mHJ*O%S&f~9Br_>q`C`bh@mKt2ZL0?9j<>$BRs#y
z#SQ5-0B!ZO-UAC|2d&
z-3%<;uguvjmJ5>|EVg5nQdFl#qdL{EU+yfdxi7Apd3f9DhC>8{91V$?$!y~PQg>@F
zq*U|Vc=0i+4H!zy6#7Rmjb0k>&X+cq^*tZ<4aoiMK5PuOuNUETJ=cD-q`F<&HyKA<
zp03)i%cD}uU^WA_WXXV<)i|)*BsL+fbK|zUuZ!>E*=#V&ZYGby=0wOHufk2b+O21t
zDXJg0nnxtRAxAolz+A+{TO6r*gKZn?X)U=*N!+q?YavNa_cY2{-(KkBg)SC(Axf|e
zVm;3~C}pWleob6R4x1sgwO*HCyuCW0tBGEke`U+Y3`L}KR^}~~Fl#YP$185xjCYO8
zw)BtU^|kHA5w=p))+6c<*EW+J`{HTE>P`pKV$57kVVuzHdJIGZvbkA|ak%AX_l!kl
zb8yC!T)E?I7RUG8aao=x)Hggq``4v6*LAOZ9ip%|DHz1zmnU|K<7baeTpFcK8NB1U
zG&hb7;e-S~DNRl_H|qjj-0Ek)GZM{bsZm(Fc|g{+=)$N}$1}FA7XMMeCowYP5_h6-
zQbw957UKImBgt*d=+P*g{CO~Vds8>MileXHFKDCCpqv#S$KUoAA{`PLl;qaCnXP&2
zT%djGxvjnu{N1ri64!LALib!XXi9w?hq6p>4}-nJ>8{sGC#-s<7%H*YZzMPZ7QQv!
zXfiA#VUKyEFVZW{=wR2gLud3Lg(pzmtCh&<+{;)>hJ8{`eOpy(F0i)jvw0qxuwr*H
zp-GNUSeI=h$XBh239HR3BQ{fD>E;tR9&w4<$5gwGP{z+h2piE4(YiRd*Hn@7!<}+d
z8o~baopRlvz^`mqS@TwMGf&dn-^f}75b8u)a_p*rZ7&Cf0}1SM8wY-ZsTJwQwwRr5
zHnzjMv%Mg$NVq+`!9FVvLe!~{U61Bvic(+;aRJ7KmH=xyKDS}?0V0?s`h9Zn}!TFK|?R*c)^
zDdOqN3^F&RaHRq2JL@35H@ckN16tBdEu8D-A{~^($0RQHP;s2G@u}-*O;bsKtiqrx
zTpTu~I;0UdskU~RRR!T*Q1){+G_?=uy$)zKS1P3?#8amNPCOoqdyuRx>T+7cp>WW2
zOfO%BBUZ%&9%yue8y0a$+l;-RToi-OKy8Pp<5gC@9
zZ3O~y0yiLA=}{&GmraqA_AQeF>>gYNfOq7&&sD+H(mUv!!$|L-$3Qb3yVyp*>IwSt
zEASn;azn1rfTy|KT^+g{>My>~YoEt~n9sI1d*T5$9@vvI{^(_fFW%{L_j0Ls3ya_&
z#Ev>V&$cst=Y)#R;h>(8^US0~a$pd8ngp7z=y@DxwqIsL;#v#cs&~y+3^ds_%caSB
zw^Y1uFo0nuM#X=8o-#wC@guDcM{clq%0=yVyMeDcwU=qs2YTmURQwhN`iwy4yLDYqbmkWhQ$=
zeAV<1V!8?runrUH-DGKYc9UD>N|Z?|T040>nFrihv7)qrT(yTsJQ)f~w{3+3Wih)E
z`K?*kbRqtxelK)&v}f&ZUQLcVuJ_bdLD6zL5%~!@mjN*;@ATDx{>gg0S!li*4p2$E
zC(zjoQ8rXe%DJwW{SnXL3mHWfK}aVUWQ2#&)Sf$yoC2Ry&py!J*3r
z>z(LIGvGMjjKCeX5-AV}ER<3!bb}9i9eC!u!Y^nZ*FU&}SH?jhaeIMG
z4k|LJni|{KqpKb3%ef`Ygv?$Z+g9n7QK8Niqr|epdZY-fLh*!VJ?yGo$t|YGs0B^PXfv
zphpx!w}bwt?D<*N{LLZ>X#-z)(
z7_V(e=pI7%IX#w2?)iFgb%dle&+3&YYGdo-%$B0dRd(b8OP7YKWEGahL%POPa_QvR
zu#6{K)y1F7E*ZLqQ}rlchRwW5a@Jnk8M1AwuvgWx=2xwoMHgeCan@_VQkq{s@@(}+Xy&4LXYQk}
zq8O@y!gnmd5=A$Q_M?yv_C%?-N-lArLx%-xcjjG3Le~a5A9z{4J!3g3Md$jS`uaxm
z%__K(nUuttf$FA^yKmG;^*#tHeQo+=CpUQ(uwpux;B<7?N2bIK}RN|nLn3GBzRO0v&CzUv;
zB<7?N2bDxmD&3i7ktgP)5(kx#4`z_}q`F*ZysY*YtFt;Dt7y^Sq-S}k7pc&Mdg6pyt%+2N|`wn+vTW6X9nyc
z=^B*RYxZ}VRVT?pWMO{?CH3ZY!n#L8+a7A)lp;@i2qRIpy;Th~7V_8mTCW#Cp|s8E8oowT6V5_d_UQsVEV7-n>rFW}$v|~`L7oA)3s^x*~x92|l
z)WhcJMzt)&QyfvBl)<~|(QVj
zqCVN{8+p=aO~&$lsR8^xoFCY*S}S@UQm_wIwI}!OdX=xkTb^g?i`Y%vc-9@Et$l^5
zo&^dsx!thbxtv&;eJL)L;oJJmZwh(S!K!S8MF03ZzIR>h>&h=SZ-QdDbFLU^Xd9;qDE1SXv#b6k(x5M@@Fnn(jd0YH$g;9;F>HvrEJJb6n+G>jLD3g)3)1l9CS|2EjQ1$A%~)K
z_^zOYEhT{{hIbCb4XLtZ_5%vZ3$1fBWbmDEx@Wb_=BNoTl?k`G>@#sEtBW7AU~z4?
znX?jA75(Txn
zZCG-(#U67@f^{Feb+pk^SvY)?mKmTl9QQLgBHs|>(oeg}k1vDb(
zatk;oKDyt=`QNx%-0Bb%B%e1?%(@R{;G;b!auq!z$byCSU{7jBYEiYkZCj9<1MR%m
zwXi+c(3X3}T52t(;HXUOr+tMzokfc4WwDld5XND-wFv}Ss&fl7+~_Qtev0zY<$Akp
zj|t}|7{bmYsi?{^>l%10{5k=+Xkf$a;rpmLQ9H{4(0qZ>lqqaw6A}}(aC<(gDM%;M
z9Tj`!N1(Jv4;vwk5NDlDapoWHcAoGr=&M22N1u+8>dv
zFV?~+?7*@jDBxTjDhgkO`hMv?9+SJs1cRADesxQ>`JEy1wC^`>#>Z=qpiuMxh1s+9
z>D%Dy{gqigKylf24kAy7D4Jv`1f8mW)qru8gR8HR!@4
zBDK2JC^-`=saHO^OS;8%6%H-ZSH*KZKm7>9U%oX@HyF64J1)9GMOS+K)?gLnOGy+^
zN^7|kMa|54Vp~ht{mKGWSN*U38wNyo+OCSflXp-pD|H9-xvWbR05;wHD1&pV1njti
zez>&Df6uQT?N3@&;R}ZQ^*~DBO_?6qN-k~9yk%=)Wo==5Iwl(%Yb$fCU?jP|Jw3d*
zxFT~4)8=~y?DtH!wRW~m%Xo5a7m4JG=!W3oIpJwm<-7xxlGn|9+uK&^-tlpDGcF|~
zd&T*DmQPOwQj7=Dv8JjRTGd5>=#n|}J!HO9hW>eCPEydu{
zW7EMoV^cQ5uG5et#?VDIMP`Va1#O{4R7Nv0tSnWgAe^P|jIS&TJ0Pd~DtR^wL0y9!
zpaYWLm>~_&WAHTTV71bSCT)jF`dsPv6tvep7*TNxYQe23!9`hz{vb)dm*82TDWvIp
ze}SFrHSUiYa+b}=B76lv-v$K5X_006r91*y{dWMnj+fOvmFdRy1Y&s!=jT&cO!`LP
z)zS^|4~64lZNQzdCu=s@*S8T$vTK;mc+t-HYy$m?P1llr30DQ*9l$peHYrLn)&<#g
zO}6J$pzNBPda4^}gAJ_!N19#h6!xSKO`lJwB=yQnl?2~Z4|zB7@Jit0l?CybZIN8M
zMON18q0ZpN7wp7oUtnPp_cO!}1+cc7EHo(;k&bYt5^WKZVlbexeX~-{ANxE9(?gEP
z;;{tU+yT5V_kneruXe4|YU5awc-J~5_^w;3R=RsK88%PamV0LOw}*s>Cmw!9Gqg$}
z8HHp7v`TB
z){NVlAq-5Gdp5PoCROh9IV+rA{ZgbhX!G-2?nX@LczV5ub
z`9N-M`f4BDPf5^@r|xd<+@nzJ)BEHW;`5zu*Lb%^3ej}IV6>~eEqK4HqAl1z(iLe7
zqRoOe`~>@_+Ek?m3pa~4`SI3{b_N@}3O7e5Y0Hu4fTfKMkAW4>3_Bnls<8v+(;@{J
z9gvH6#tzwmoz6*=5Om|s+ms+*wvdwANI>#DxYVN2Psa9>i&6D2!M0O0?(oOwFN@5v
zmib8eYSmhccCAZDX;GQ%Yv?kN(i0GkZFXS?#_WzUXdCvcORMz*98CO!+$yrK(zvgF
z+b%=@gS}gl3$OTGcERSFczW7eE$^0Zwqk*YZJ~j8GGlM)iP(G)%sbz(=0>?O@vV0-
zl|3R&FpbM<^VPSzr#HcfEe-qa`g%M%+=Zp*Qagj0>J$_~1Y>#vg-dmjGS)_{*m%lW
zP4PadVH*VZL_n8vm*7cEl1Lk``Rb0X^scPWvqoQv3?=6m)+~;rmhxg4?|3ZLX%mjS
z_l|B|w3bZ1!8?T^(WNjdbUwkNOisxzpqiJukRqER-vFI`c$eTLBI7$x{wUI
z%6R8T#4;xUJJ-D3yx*LfZGO|f-TXFRM&I}WR|f*5=Yf`yh47tLz7D}i;D{NB%7}hW
zB=fAcF5DBoi-idaEvZ_R%7M$ly8}Gw!w>-c{G|ZT@GTnQ>lKWT%5Dj4jqC(!V9y^Ep-SJWpqAjZ?V6$_+D0bmloO<
z-phv#1mCN6dro${T+)$hUsneO;hH?+XgnjWHiXdmWYaE|?TxS=3z5b9Qmg)r9P^rJ
zg_fs}2QUMRvVPG?m2^o%LLZRcR`H;LiH*7ncJ6H?>huLxa(WA;S8Me(%Vq%%<^m*Vw{JWK232Iw9D$ijhGamAu4@^yVYj4jJS&nWQjk;y1F`ITZp
zV#`~E_8Vy_zXsve=?-YCR55|6naO!cVf1dk2Ig+JH8BMG;R&dr!{Mb>y^rg~Am>GL
zEs2`3W2$p}=cCbcjv*e1Mz6}_Dv&$K2@pyTB3|^H3MDCSyhII_bI}FcMP1MGHkV_8
znWxqMOIm`aVZ}wc10~PokP%F;&`j!_GP^upSXx-0w{M~r{O&QhW#5|CF~;ft?d5>858hUDrsXG3mR-`$)P}
zS~4Vaa-hvFU>h0+Pmy(R6svnOWhCGSnVm@LTY6d+K-r4?FTrgkx{#CRBO_4ji$>M#
zXdba!bnX+BL}h#lP(y1GGwg;Q+T{-O@Ne>_hrCrBtF%FU`Isb08V+&4&y_QBzwA|;DT>8}qc|p8rR!Gq7o0eT3?&-ki#KQj5wYpX*JL
zzt%6^D*qqQ?$fnll~4*qun%WhcNUh$LonLa;oHN#{)qxrDZEtUuZlsAn^qA*xEnfo
zskGwvhNUb_wVIIhR~hS>vhU!kYZ!MV2Ny?>fRu2%5p@L;cDIzY)VJJddDLPt&%*$v
zJ;CL}_{&phl$P}r5;0{-YEUIqsxF0BUGj-0ct=?~Y{VnJzDS08>xX(jJe5`(o|KW%xmy
zJOc^*HzfG74}0_R()d$;t$BGJ=g=SMCNLSx7nZn{3?;|H^Wi-PWj@w&4rNi9l<>g1
zODsM;v?(+7jj{3j8`l3g;7TdulNSmJcDZBAS7%PPb2=8DXG6bVSCQQJ-xU
zzavI);03JETP56P+A-eiKn#NT)OE=ZzJpUeRKvxSOU5^;W4n
z9n>Z5Y_#%;B<73B7GSWptF1xB?VMWNyEKl`qBSu#nCpbJwzEpiR<#d@EYwDGYTdCyDfue&5@A|T3?lP7viS$K7`?#SJwc6lN($C
zwp@4PmUBfAdrr7+03I2iQEnZk*u=RKEFm5~Fy)<6Ezo!cc#A?g;Dunlh_A&>ic5~a
z+;3g=-}b{M*jlXkl~2-=PCM`e3=Xx2L#eO6bEMnQ8uoO{yjps})n)ePuRt<@Uk|A6
zUaDi%JIyW8mO7bl*=ylLQHQ+FF9mR-gj5Fabu-~Akf%tNe5fl;QEosBW%NLDgl+?^
z(&2{To5PQX>&9eZb=dkeOr;q|1StQblnUaP;w|x5d>rlZE^a+gZ#GHiFE?qOPhLyX
zT;@xmlEH|2jQtNS9C@mJZ{H
zF?h=fZv%Q}Ivt?1q9WY*`FekWfv6+yg>KRC=G3A&;vtvRyj4Hg;}515@{bYK7!|r$
zA_Xx_iPFJJ&+darLUugH;#Ch11GyqWj0~vP^U!K{=fIOPF>vXkR7~{h+oq3UY3PMl
z!FXjgS1wJp;R=8NRq;WElNM{@JZP?*h^<$JXZi{t=YY@^YOXW{pd`gjy`#?a_-?4w
zvNJg>_dJXWm+cPZ!IC7_1#woX&KP_mGi?hs<3ROhL{`?97q(V*X2R=p3w%pN;ZEq`
zUjr1@-pz)N)jkOqb;F}?MtG(q1-JJ+XzB(hoyp3M5yaSZ8(5fH4CdT64e0QBpT=&f
ztd_Sgd3RrO$E%o-_#adrw6HeGmnS!v0~GQo#Wjy*7_g19xKj5Vuf*<1
zw@A}%fqM4BH_Z~Ef{!{jh%vcuePC>u+^@Hnt8II#Qn#$2P!q7XeesHTbNt?r#is^e
zsK5&ud)qT?Pezp@0M9ex!(F%%jH1-t@+w{ZK|7Eqtu6x@1)n(UIO1$s!!Ov1nc4>w
z`AG#xy?(6mg}!?jM!n{?oNu|-a;IguWu|4jrN;0#tz1^|d1JRinY(C;MTkDY2>6_W
zeci3Jj*Je2);_VEukh(QNJHkGA+3=lMh%G%=j%hpJjw;o9frrRF1~stb9|^~Yi4dI
z71@}XTb)@#D5&|aw5vmA@hnjl3Vs<*&Lp>&iasYZ7NsK_&ZQ)BAg#>1+;dY;*Q7>M
zb1Boy6<$ndxH(7x^LJf%xv_(FbEXR&p`Wr$)cC2OhyC!ZI%>jXg*`1FwZzR9Hj!Ge
z`YPz&kaN|hFbtJ>_Il;rfwZRQ6?yY7P?m0tN+ONuG1^=>sLa?P;w
zW1%+AwHI7{ECU~F`t^AUA5)o?Pnf6$h~7hui`FXCW%mfH5q%*&KiUx0w}&{j_^~D}
zg^{$#;A9Ij7_YBiVyNhAka#a##8B{WqEzrl-B;f=D@rIkVVomupD69g;*pn`DDfao
zVRgCO(3J@>PQO&6qj+E89v+N0w2Xh`i6m}F5q48-S_%;eNHwOM_Iu#iaLJ~^jYCBm!YXL`5e*hax8njsE-Dk
zviV>s5`0W=kk9cL*7odkY5RO-!{qb~tBL`3Hy1I6)QW90`MPHCy^_lxtB`}ty_ff_
zd_Brsyi1fW@#RN9*#Il*dB008qX;0GwSn0v7_rudKO0;86C1CRzX4h6fQNJ9Fca$54}Yo92|mq|-kchE-iqT<1io|U&{=RWOjFKoA@<`*{b
zc5HX1I2_X~Z&C*i&-rtpW0Q2Wp!!N7o1HJC*3^xGNWi#%p`_2wqx@*JSY^=olyX#!
z!iR%+YAG2L>Omodr_wtUbaC{~Z_J|^eV4Y*c|wVb`}NW?92@pA;AWgP!<@`Op72~D
zvM%jy!F|X7D31S;Gj+)gT_cZ#Fu0b&@54}?`5V%YPvA%kOS~|AIo!%&W{9uyRwv~z!Cp#T^j2`;KhWV
zy$NhWgKewQ{E&4*(k$F{Sh}N<(0?A+?Ag?oUZA=V}oMkGaAP
zB|x>KrlQSFNlr@z5@jBV>Dwx$Jbh0lQd-wGC9Iha)P+~3d>9yRkrXp&iF!LJGiFXs
z)j!w5`c2`WwI}DTy0*aPowQc3;eoUEbm@^5e5oAOC0?4_y>9Pb$J!fBpBvJGgijdF
zVNE2&&5Q5^J~YVH#~MUKF|Qd0Ov?D>NNsL$=|^#dHTyi-DmxQUg0t!errlVD
zQn>njm8#EDPspQBm|?kGIwD;ht|aUyi;*n)(Vzq
z1uan%p{cNN_&lQiZp92**XOVBb27H4U`%$`BP;8X*oZyxm`BPDPB0ZUsVg+^?j;Tr
zTDn%`SS-fz=A>9lhE3ANouA2Q0A;yzGsT{3i2-N4lpmR&;VZj^S0XrLxs3x;xP^n+
zD?wiHHequ3ypzyt9+7X=yV!|h`o?4C@Wf#eGq@mkPl(Tn3`Xh@$}_j%UxSRjBR|eXeUM*2CPZH_wgaF~K=z#`;T_qHl%|hMjC^O>t*D3dW)E#Gmkw
zwSaE-#r9e08)WUMj{Q1$Q4o!;Va7J|f@CzBkElVR*jE>zo=yf}7Duw07-dZ+i&w+9
z!%r@pmyWF>@$YSxK)B(_)(@C}=6^XT;=Pv!bzz4erM~mUWu1PPSkEOfxuo)k6S0kp
zc>=#RQh!6b(sKe5ScQkH}3oo{4WO
z8J9Lnd=fTVeK9Qi
z7^*?Rom_EIIpIP|Ha{vGdvTkr3%ChR{dd(v-VI)$}-0zYa`Q
zsa37t%SJjz_sxk!vmB}`lHqfs(W!@hdNu~xr@V1!%0I=?_(@eQ0s`sj=hp}SI%eoI
z?o#eMysaAz(>(Se{5FjOQos;C+)8kL1JTU1@~*5zBLOQK-AIwCM^eg)Nkq7eO1}Ti
zkh)3u(68IoDD|AM%H^ScFss&CnyOv{^ipg%^`2^~83=FJ*x2|S$%s?I9t6rG_CUjG
zIXyI*!#*K+fRNI`OC{eN)8A?HPg5oYqrKG6<)}bI7%}Q;!R|5va8f=|HqU=VVj%_V
z3vt<~yqH#(%Aj->>kLNLq{HQ9KnyBQx04OYHa!4=*)c}uj*MkjRY@J1o|{wmF;i0%Rb;mlSKD1H0s*(il
zWlbELEb>;&L5WrV+W}r1F<<W>`LAhcSm_CxF^-yJA4|%7KuS`R
zz8qeu9m9&^3rwDu{7*wizQClP_$k$49tk=F4N;;zANRecx_*LZ%=+phLO-jj#pT7g
zk59v-zYe6Or-_F_J2?aqU&`X+43v%mx;oPQIbF*V03;p#l0%Ce&9pec$#o~)hm%8w
zH3_l_0K5UP0zjaxBu3zR!is^^Bk!J6l)B(b3AC>Fdl-K5l!`$hU
zT>8lQpQ>)Oa)eZ;M>s62T>`epe8OIoKeSRVA2{$*aBpS%(Zc(8$*uYA!~3V~{_=rt
zr$22c2?Df-zL~W(-fb~yr?*zNuAIiToGBS;Xm85xzhWsz&}n;9KifStADNw53$G<<
zS9xn(Uw|?xeId%ZQ#LXf)t1s@_cyn-TP$Am!B^ww^BLyR_v`SAz>n(i==*ipDg03#
z9(}(KFBJZ$4v)TDryUabK^=Yc{W?D$Tl+U-OGC~tuOsFY)WB^V+C=_=#SJ`z;hml2
zTZ6(0UgzSYC5QC#;1K3!e4wuX{rZf&U70f^BhHaQLxV;i9ujiDE^zhDWqolucirIv
z#ULT7oU5`QZMDk)-m>hS<4rDkYu2~Bz+
zlT$;EFO%b$ANMtXRi>Dn8{}}VI$f)gocmvuxlPVEIeOgto@sf4oK3RNit>ss~
zQgV)rkdO3LlXJAMSH4^1T%eXSQ{hznyy&3%
zS&f7;qK-tdrL>^1tsrX8mx*Cwgjh*b9;hbP5NnC3b*rA(K;%;u*5p;g*p7j!|DD%4
zv%bs_IpE==4ENz*T=xr
z;`!c3C4cV-{;KsT1y~ar&~=mk#!NhBGyd~19AH#y%h;D&4z2(DV5lSXEROrU+lM1m
zd-+F!|I-1ARH!?_=G_loMbWh_jHIs#RgrYws?ib_@9y&sioJ}j+kl^u^&;A}fpz7c
zv9eb2g}9UfAM1Ao*|P&wYJg#Aa4Kiqchhmj^;%^`cEkApjVlx=ssQX&atrwg3WVB=
ziUI3r;NE^95evki-(19Z$
ztibjopF)dAQI$cYW+0%mmqds`uP&<%Vw$@Rfp3BZyPwAU&GxU~VC
xv4CU6z!n40JD|$}?L{(!xrBfxu>pHopoK#02@JKix{AQmZBt?oDh5dcTmT3<$%_C0

diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/doc-files/readme.txt b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/doc-files/readme.txt
deleted file mode 100644
index 14720bae06e..00000000000
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/doc-files/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-The sxd/vsd files are the master, and the gif file should be created from it.
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AbstractInlineAnnotationReaderImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AbstractInlineAnnotationReaderImpl.java
index ec6b246ac4f..1a4d8b6a8dc 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AbstractInlineAnnotationReaderImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AbstractInlineAnnotationReaderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.annotation;
 
 import java.lang.annotation.Annotation;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationReader.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationReader.java
index 8626e502a9e..da93afeb549 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationReader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,15 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.annotation;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
+import javax.xml.bind.annotation.XmlTransient;
+
+import com.sun.istack.internal.Nullable;
 import com.sun.xml.internal.bind.v2.model.core.ErrorHandler;
 
 /**
@@ -82,6 +84,11 @@ public interface AnnotationReader {
      */
     boolean hasFieldAnnotation(Class annotationType, F field);
 
+    /**
+     * Checks if a class has the annotation.
+     */
+    boolean hasClassAnnotation(C clazz, Class annotationType);
+
     /**
      * Gets all the annotations on a field.
      */
@@ -119,17 +126,20 @@ public interface AnnotationReader {
      * @return null
      *      if the annotation was not found.
      */
+    @Nullable
      A getMethodParameterAnnotation(
             Class annotation, M method, int paramIndex, Locatable srcPos );
 
     /**
      * Reads an annotation on a class.
      */
+    @Nullable
      A getClassAnnotation(Class annotation, C clazz, Locatable srcpos) ;
 
     /**
      * Reads an annotation on the package that the given class belongs to.
      */
+    @Nullable
      A getPackageAnnotation(Class annotation, C clazz, Locatable srcpos);
 
     /**
@@ -144,4 +154,10 @@ public interface AnnotationReader {
      *      The name of the annotation parameter to be read.
      */
     T getClassValue( Annotation a, String name );
+
+    /**
+     * Similar to {@link #getClassValue(Annotation, String)} method but
+     * obtains an array parameter.
+     */
+    T[] getClassArrayValue( Annotation a, String name );
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationSource.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationSource.java
index c4c5e59e356..ffc75d21062 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationSource.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.annotation;
 
 import java.lang.annotation.Annotation;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/ClassLocatable.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/ClassLocatable.java
index 24087f61ef2..0b3d42069d9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/ClassLocatable.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/ClassLocatable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.annotation;
 
 import com.sun.xml.internal.bind.v2.model.nav.Navigator;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/FieldLocatable.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/FieldLocatable.java
index ca30ab24cd3..87697d02ab5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/FieldLocatable.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/FieldLocatable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.annotation;
 
 import com.sun.xml.internal.bind.v2.model.nav.Navigator;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Init.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Init.java
index 48a1a78608c..fa000cc4249 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Init.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Init.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.model.annotation;
 
 
@@ -31,7 +29,7 @@ class Init {
 
 
     static Quick[] getAll() {
-        return new Quick[] {new XmlAttributeQuick(null, null), new XmlElementRefQuick(null, null), new XmlElementQuick(null, null), new XmlElementRefsQuick(null, null), new XmlElementDeclQuick(null, null), new XmlRootElementQuick(null, null), new XmlTransientQuick(null, null), new XmlEnumQuick(null, null), new XmlSchemaQuick(null, null), new XmlValueQuick(null, null), new XmlTypeQuick(null, null)};
+        return new Quick[] {new XmlTypeQuick(null, null), new XmlSchemaQuick(null, null), new XmlElementRefsQuick(null, null), new XmlValueQuick(null, null), new XmlElementDeclQuick(null, null), new XmlElementRefQuick(null, null), new XmlTransientQuick(null, null), new XmlElementQuick(null, null), new XmlAttributeQuick(null, null), new XmlRootElementQuick(null, null), new XmlEnumQuick(null, null)};
     }
 
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Locatable.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Locatable.java
index d895bf4fa94..7c0c6601023 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Locatable.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Locatable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.annotation;
 
 import com.sun.xml.internal.bind.v2.runtime.Location;
@@ -33,7 +32,7 @@ import com.sun.xml.internal.bind.v2.runtime.Location;
  * 
    
  * {@link Locatable} forms a tree structure, where each {@link Locatable}
  * points back to the upstream {@link Locatable}.
- * For example, image {@link Locatable} X that points to a particular annotation,
+ * For example, imagine {@link Locatable} X that points to a particular annotation,
  * whose upstream is {@link Locatable} Y, which points to a particular method
  * (on which the annotation is put), whose upstream is {@link Locatable} Z,
  * which points to a particular class (in which the method is defined),
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/LocatableAnnotation.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/LocatableAnnotation.java
index 405e0988837..ad1a98e45c4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/LocatableAnnotation.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/LocatableAnnotation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.annotation;
 
 import java.lang.annotation.Annotation;
@@ -72,6 +71,10 @@ public class LocatableAnnotation implements InvocationHandler, Locatable, Locati
         } catch (ClassNotFoundException e) {
             // annotation not loadable
             return annotation;
+        } catch (IllegalArgumentException e) {
+            // Proxy.newProxyInstance throws this if it cannot resolve this annotation
+            // in this classloader
+            return annotation;
         }
 
     }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.java
index 05f1a2d00ff..c663d3a4fce 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.annotation;
 
 import java.text.MessageFormat;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.properties b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.properties
index 319a34fb1d2..77a9996763f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.properties
@@ -1,3 +1,28 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
 DUPLICATE_ANNOTATIONS = \
     Annotation "{0}" is present on both "{1}" and "{2}"
  
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/MethodLocatable.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/MethodLocatable.java
index 2c44c46b094..ef6a2e6f119 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/MethodLocatable.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/MethodLocatable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.annotation;
 
 import com.sun.xml.internal.bind.v2.model.nav.Navigator;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Quick.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Quick.java
index 2fd0ea4b636..13a4b41c6d8 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Quick.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Quick.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.annotation;
 
 import java.lang.annotation.Annotation;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeAnnotationReader.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeAnnotationReader.java
index 961ff0b71f3..4a7e9833cfd 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeAnnotationReader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeAnnotationReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.annotation;
 
 import java.lang.reflect.Field;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeInlineAnnotationReader.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeInlineAnnotationReader.java
index 12b356c2c95..2fdf0bdc1f3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeInlineAnnotationReader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeInlineAnnotationReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.annotation;
 
 import java.lang.annotation.Annotation;
@@ -50,6 +49,10 @@ public final class RuntimeInlineAnnotationReader extends AbstractInlineAnnotatio
         return field.isAnnotationPresent(annotationType);
     }
 
+    public boolean hasClassAnnotation(Class clazz, Class annotationType) {
+        return clazz.isAnnotationPresent(annotationType);
+    }
+
     public Annotation[] getAllFieldAnnotations(Field field, Locatable srcPos) {
         Annotation[] r = field.getAnnotations();
         for( int i=0; i
 
   Abstraction around reading annotations, to support internal/external annotations.
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/Adapter.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/Adapter.java
index 3512c8131c3..a908f60f47f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/Adapter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/Adapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.core;
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ArrayInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ArrayInfo.java
index 4cb64eda698..278e1ffbbe3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ArrayInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ArrayInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.core;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/AttributePropertyInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/AttributePropertyInfo.java
index 5d6e44b218b..819005ef948 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/AttributePropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/AttributePropertyInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.core;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/BuiltinLeafInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/BuiltinLeafInfo.java
index d0344fbc703..81de52a27c5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/BuiltinLeafInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/BuiltinLeafInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.core;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ClassInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ClassInfo.java
index 41506a80649..c97a2f8fab4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ClassInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ClassInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,12 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.core;
 
 import java.util.List;
 
 import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlValue;
 
 /**
  * Information about JAXB-bound class.
@@ -99,6 +99,12 @@ public interface ClassInfo extends MaybeElement {
      */
     List> getProperties();
 
+    /**
+     * Returns true if this class or its ancestor has {@link XmlValue}
+     * property.
+     */
+    boolean hasValueProperty();
+
     /**
      * Gets the property that has the specified name.
      *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/Element.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/Element.java
index a51429f64a4..62d4984ee84 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/Element.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/Element.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.core;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementInfo.java
index 6d2c029b65a..6a89040b5a0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.core;
 
 import java.util.Collection;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java
index 500457f675b..d866d506a6d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.core;
 
 import java.util.List;
@@ -82,6 +81,14 @@ public interface ElementPropertyInfo extends PropertyInfo {
      */
     QName getXmlName();
 
+    /**
+     * Checks if the wrapper element is required.
+     *
+     * @return
+     *      Always false if {@link #getXmlName()}==null.
+     */
+    boolean isCollectionRequired();
+
     /**
      * Returns true if this property is nillable
      * (meaning the absence of the value is treated as nil='true')
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumConstant.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumConstant.java
index a25baea8080..d2f7d136e62 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumConstant.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumConstant.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.core;
 
 import javax.xml.bind.annotation.XmlEnumValue;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumLeafInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumLeafInfo.java
index 6a074cbb44b..60dfa680279 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumLeafInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumLeafInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.core;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ErrorHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ErrorHandler.java
index b87a2aa65f9..47198f10244 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ErrorHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ErrorHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.core;
 
 import com.sun.xml.internal.bind.v2.model.impl.ModelBuilder;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ID.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ID.java
index 2f448b1f5b3..6a243716c3c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ID.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ID.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.core;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/LeafInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/LeafInfo.java
index 4c16d93ed69..33cf00a8cac 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/LeafInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/LeafInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.core;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/MapPropertyInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/MapPropertyInfo.java
index 03dbc069370..30d2cd24ca4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/MapPropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/MapPropertyInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.core;
 
 import java.util.Map;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/MaybeElement.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/MaybeElement.java
index 81cb3c192ad..56fff25cdd5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/MaybeElement.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/MaybeElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.core;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElement.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElement.java
index 25ade4d9974..bf34310e655 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElement.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.core;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElementRef.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElementRef.java
index 9c623e983b0..ed635205be2 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElementRef.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElementRef.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.core;
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyInfo.java
index 3cbca34c4c7..9367e0b82b3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.core;
 
 import java.util.Collection;
@@ -35,6 +34,7 @@ import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.namespace.QName;
 
 import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.bind.v2.model.annotation.AnnotationSource;
 
 /**
  * Information about a JAXB-bound property.
@@ -48,7 +48,7 @@ import com.sun.istack.internal.Nullable;
  *
  * @author Kohsuke Kawaguchi
  */
-public interface PropertyInfo {
+public interface PropertyInfo extends AnnotationSource {
 
     /**
      * Gets the {@link ClassInfo} or {@link ElementInfo} to which this property belongs.
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyKind.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyKind.java
index b9b88d53a22..fefbbf5b53e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyKind.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyKind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.core;
 
 import javax.xml.bind.annotation.XmlMimeType;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/Ref.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/Ref.java
index a61584dc16d..528c80eb168 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/Ref.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/Ref.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.core;
 
 import javax.xml.bind.annotation.XmlList;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ReferencePropertyInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ReferencePropertyInfo.java
index 4ae9fe78f3d..25afe96fa3f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ReferencePropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ReferencePropertyInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.core;
 
 import java.util.Collection;
@@ -85,6 +84,14 @@ public interface ReferencePropertyInfo extends PropertyInfo {
      */
     boolean isCollectionNillable();
 
+    /**
+     * Checks if the wrapper element is required.
+     *
+     * @return
+     *      Always false if {@link #getXmlName()}==null.
+     */
+    boolean isCollectionRequired();
+
     /**
      * Returns true if this property can hold {@link String}s to represent
      * mixed content model.
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/RegistryInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/RegistryInfo.java
index 03638d679f8..091bdae9beb 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/RegistryInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/RegistryInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.core;
 
 import java.util.Set;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfo.java
index aaaffc700fd..ff917d9f2d0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.core;
 
 import javax.xml.bind.annotation.XmlIDREF;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfoSet.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfoSet.java
index e440614a94a..270c37164a0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfoSet.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfoSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.core;
 
 import java.util.Map;
@@ -143,6 +142,20 @@ public interface TypeInfoSet {
      */
     Map getXmlNs(String namespaceUri);
 
+    /**
+     * Gets {@link XmlSchema#location()} found in this context.
+     *
+     * 
    
+     * This operation is expected to be only used in schema generator, so it can be slow.
+     *
+     * @return
+     *      A map from namespace URI to the value of the location.
+     *      If the entry is missing, that means a schema should be generated for that namespace.
+     *      If the value is "", that means the schema location is implied
+     *      (<xs:schema namespace="..."/> w/o schemaLocation.)
+     */
+    Map getSchemaLocations();
+
     /**
      * Gets the reasonable {@link XmlNsForm} for the given namespace URI.
      *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeRef.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeRef.java
index 158801fcb9e..ec1f5aae5a7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeRef.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeRef.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.core;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ValuePropertyInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ValuePropertyInfo.java
index 6e7a88f3501..a1640f1cc79 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ValuePropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ValuePropertyInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.core;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardMode.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardMode.java
index 3320c1db8ff..996652a473b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardMode.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardMode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.core;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardTypeInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardTypeInfo.java
index 45d088c3aca..8c3ff288d61 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardTypeInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardTypeInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.core;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/package-info.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/package-info.java
index 459113a4966..c64208bffad 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/package-info.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 /**
  * The in-memory model of the JAXB-bound beans.
  *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/AnyTypeImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/AnyTypeImpl.java
index e1fe7dc134e..dc9250d9fc1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/AnyTypeImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/AnyTypeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ArrayInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ArrayInfoImpl.java
index 29e11febfd5..68f8d082035 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ArrayInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ArrayInfoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/AttributePropertyInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/AttributePropertyInfoImpl.java
index 39ea191a7c8..ae466dda99f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/AttributePropertyInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/AttributePropertyInfoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/BuiltinLeafInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/BuiltinLeafInfoImpl.java
index 16b7ecd5efc..a3e4c6904a2 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/BuiltinLeafInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/BuiltinLeafInfoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.util.HashMap;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ClassInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ClassInfoImpl.java
index 3ef9e114b97..9a136e00590 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ClassInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ClassInfoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,11 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
@@ -67,15 +67,16 @@ import javax.xml.namespace.QName;
 
 import com.sun.istack.internal.FinalArrayList;
 import com.sun.xml.internal.bind.annotation.XmlLocation;
-import com.sun.xml.internal.bind.v2.TODO;
 import com.sun.xml.internal.bind.v2.model.annotation.Locatable;
 import com.sun.xml.internal.bind.v2.model.annotation.MethodLocatable;
 import com.sun.xml.internal.bind.v2.model.core.ClassInfo;
 import com.sun.xml.internal.bind.v2.model.core.Element;
 import com.sun.xml.internal.bind.v2.model.core.ID;
+import com.sun.xml.internal.bind.v2.model.core.NonElement;
 import com.sun.xml.internal.bind.v2.model.core.PropertyInfo;
 import com.sun.xml.internal.bind.v2.model.core.PropertyKind;
 import com.sun.xml.internal.bind.v2.model.core.TypeInfo;
+import com.sun.xml.internal.bind.v2.model.core.ValuePropertyInfo;
 import com.sun.xml.internal.bind.v2.runtime.IllegalAnnotationException;
 import com.sun.xml.internal.bind.v2.runtime.Location;
 
@@ -86,8 +87,7 @@ import com.sun.xml.internal.bind.v2.runtime.Location;
  *
  * @author Kohsuke Kawaguchi (kk@kohsuke.org)
  */
-class ClassInfoImpl
-    extends TypeInfoImpl
+class ClassInfoImpl extends TypeInfoImpl
     implements ClassInfo, Element {
 
     protected final C clazz;
@@ -169,12 +169,17 @@ class ClassInfoImpl
             propOrder = DEFAULT_ORDER;
         }
 
+        if(nav().isInterface(clazz)) {
+            builder.reportError(new IllegalAnnotationException(
+                Messages.CANT_HANDLE_INTERFACE.format(nav().getClassName(clazz)), this ));
+        }
+
         // the class must have the default constructor
         if (!hasFactoryConstructor(t)){
             if(!nav().hasDefaultConstructor(clazz)){
                 Messages msg;
-                if(nav().isInterface(clazz))
-                    msg = Messages.CANT_HANDLE_INTERFACE;
+                if(nav().isInnerClass(clazz))
+                    msg = Messages.CANT_HANDLE_INNER_CLASS;
                 else
                     msg = Messages.NO_DEFAULT_CONSTRUCTOR;
 
@@ -192,8 +197,13 @@ class ClassInfoImpl
             if(s==null || s==nav().asDecl(Object.class))
                 baseClass = null;
             else {
-                baseClass = (ClassInfoImpl) builder.getClassInfo(s,this);
-                baseClass.hasSubClasses = true;
+                NonElement b = builder.getClassInfo(s, true, this);
+                if(b instanceof ClassInfoImpl) {
+                    baseClass = (ClassInfoImpl) b;
+                    baseClass.hasSubClasses = true;
+                } else {
+                    baseClass = null;
+                }
             }
         }
         return baseClass;
@@ -239,7 +249,7 @@ class ClassInfoImpl
             if(p.id()== ID.ID)
                 return true;
         }
-        ClassInfoImpl base = getBaseClass();
+        ClassInfoImpl base = getBaseClass();
         if(base!=null)
             return base.canBeReferencedByIDREF();
         else
@@ -269,28 +279,7 @@ class ClassInfoImpl
 
         properties = new FinalArrayList>();
 
-        // find properties from fields
-        for( F f : nav().getDeclaredFields(clazz) ) {
-            Annotation[] annotations = reader().getAllFieldAnnotations(f,this);
-            if( nav().isTransient(f) ) {
-                // it's an error for transient field to have any binding annotation
-                if(hasJAXBAnnotation(annotations))
-                    builder.reportError(new IllegalAnnotationException(
-                        Messages.TRANSIENT_FIELD_NOT_BINDABLE.format(nav().getFieldName(f)),
-                            getSomeJAXBAnnotation(annotations)));
-            } else
-            if( nav().isStaticField(f) ) {
-                // static fields are bound only when there's explicit annotation.
-                if(hasJAXBAnnotation(annotations))
-                    addProperty(createFieldSeed(f),annotations);
-            } else {
-                if(at==XmlAccessType.FIELD
-                ||(at==XmlAccessType.PUBLIC_MEMBER && nav().isPublicField(f))
-                || hasJAXBAnnotation(annotations))
-                    addProperty(createFieldSeed(f),annotations);
-                checkFieldXmlLocation(f);
-            }
-        }
+        findFieldProperties(clazz,at);
 
         findGetterSetterProperties(at);
 
@@ -350,6 +339,47 @@ class ClassInfoImpl
         return properties;
     }
 
+    private void findFieldProperties(C c, XmlAccessType at) {
+        // always find properties from the super class first
+        C sc = nav().getSuperClass(c);
+        if(shouldRecurseSuperClass(sc))
+            findFieldProperties(sc,at);
+
+        for( F f : nav().getDeclaredFields(c) ) {
+            Annotation[] annotations = reader().getAllFieldAnnotations(f,this);
+            if( nav().isTransient(f) ) {
+                // it's an error for transient field to have any binding annotation
+                if(hasJAXBAnnotation(annotations))
+                    builder.reportError(new IllegalAnnotationException(
+                        Messages.TRANSIENT_FIELD_NOT_BINDABLE.format(nav().getFieldName(f)),
+                            getSomeJAXBAnnotation(annotations)));
+            } else
+            if( nav().isStaticField(f) ) {
+                // static fields are bound only when there's explicit annotation.
+                if(hasJAXBAnnotation(annotations))
+                    addProperty(createFieldSeed(f),annotations);
+            } else {
+                if(at==XmlAccessType.FIELD
+                ||(at==XmlAccessType.PUBLIC_MEMBER && nav().isPublicField(f))
+                || hasJAXBAnnotation(annotations))
+                    addProperty(createFieldSeed(f),annotations);
+                checkFieldXmlLocation(f);
+            }
+        }
+    }
+
+    public final boolean hasValueProperty() {
+        ClassInfoImpl bc = getBaseClass();
+        if(bc!=null && bc.hasValueProperty())
+            return true;
+
+        for (PropertyInfo p : getProperties()) {
+            if (p instanceof ValuePropertyInfo) return true;
+        }
+
+        return false;
+    }
+
     public PropertyInfo getProperty(String name) {
         for( PropertyInfo p: getProperties() ) {
             if(p.getName().equals(name))
@@ -817,23 +847,23 @@ class ClassInfoImpl
         }
     }
 
-    protected ReferencePropertyInfoImpl createReferenceProperty(PropertySeed seed) {
+    protected ReferencePropertyInfoImpl createReferenceProperty(PropertySeed seed) {
         return new ReferencePropertyInfoImpl(this,seed);
     }
 
-    protected AttributePropertyInfoImpl createAttributeProperty(PropertySeed seed) {
+    protected AttributePropertyInfoImpl createAttributeProperty(PropertySeed seed) {
         return new AttributePropertyInfoImpl(this,seed);
     }
 
-    protected ValuePropertyInfoImpl createValueProperty(PropertySeed seed) {
+    protected ValuePropertyInfoImpl createValueProperty(PropertySeed seed) {
         return new ValuePropertyInfoImpl(this,seed);
     }
 
-    protected ElementPropertyInfoImpl createElementProperty(PropertySeed seed) {
+    protected ElementPropertyInfoImpl createElementProperty(PropertySeed seed) {
         return new ElementPropertyInfoImpl(this,seed);
     }
 
-    protected MapPropertyInfoImpl createMapProperty(PropertySeed seed) {
+    protected MapPropertyInfoImpl createMapProperty(PropertySeed seed) {
         return new MapPropertyInfoImpl(this,seed);
     }
 
@@ -842,54 +872,19 @@ class ClassInfoImpl
      * Adds properties that consists of accessors.
      */
     private void findGetterSetterProperties(XmlAccessType at) {
-        TODO.checkSpec();   // TODO: I don't think the spec describes how properties are found
-
         // in the first step we accumulate getters and setters
         // into this map keyed by the property name.
         Map getters = new LinkedHashMap();
         Map setters = new LinkedHashMap();
 
-        Collection methods = nav().getDeclaredMethods(clazz);
-        for( M method : methods ) {
-            boolean used = false;   // if this method is added to getters or setters
+        C c = clazz;
+        do {
+            collectGetterSetters(clazz, getters, setters);
 
-            if(nav().isBridgeMethod(method))
-                continue;   // ignore
+            // take super classes into account if they have @XmlTransient
+            c = nav().getSuperClass(c);
+        } while(shouldRecurseSuperClass(c));
 
-            String name = nav().getMethodName(method);
-            int arity = nav().getMethodParameters(method).length;
-
-            if(nav().isStaticMethod(method)) {
-                ensureNoAnnotation(method);
-                continue;
-            }
-
-            // don't look at XmlTransient. We'll deal with that later.
-
-            // is this a get method?
-            String propName = getPropertyNameFromGetMethod(name);
-            if(propName!=null) {
-                if(arity==0) {
-                    getters.put(propName,method);
-                    used = true;
-                }
-                // TODO: do we support indexed property?
-            }
-
-            // is this a set method?
-            propName = getPropertyNameFromSetMethod(name);
-            if(propName!=null) {
-                if(arity==1) {
-                    // TODO: we should check collisions like setFoo(int) and setFoo(String)
-                    setters.put(propName,method);
-                    used = true;
-                }
-                // TODO: do we support indexed property?
-            }
-
-            if(!used)
-                ensureNoAnnotation(method);
-        }
 
         // compute the intersection
         Set complete = new TreeSet(getters.keySet());
@@ -911,8 +906,8 @@ class ClassInfoImpl
             if(!hasAnnotation) {
                 // checking if the method is overriding others isn't free,
                 // so we don't compute it if it's not necessary.
-                isOverriding = (getter!=null && nav().isOverriding(getter))
-                            || (setter!=null && nav().isOverriding(setter));
+                isOverriding = (getter!=null && nav().isOverriding(getter,c))
+                            || (setter!=null && nav().isOverriding(setter,c));
             }
 
             if((at==XmlAccessType.PROPERTY && !isOverriding)
@@ -962,6 +957,90 @@ class ClassInfoImpl
         // and how it will be XML-ized.
     }
 
+    private void collectGetterSetters(C c, Map getters, Map setters) {
+        // take super classes into account if they have @XmlTransient.
+        // always visit them first so that
+        //   1) order is right
+        //   2) overriden properties are handled accordingly
+        C sc = nav().getSuperClass(c);
+        if(shouldRecurseSuperClass(sc))
+            collectGetterSetters(sc,getters,setters);
+
+
+        Collection methods = nav().getDeclaredMethods(c);
+        Map> allSetters = new LinkedHashMap>();
+        for( M method : methods ) {
+            boolean used = false;   // if this method is added to getters or setters
+
+            if(nav().isBridgeMethod(method))
+                continue;   // ignore
+
+            String name = nav().getMethodName(method);
+            int arity = nav().getMethodParameters(method).length;
+
+            if(nav().isStaticMethod(method)) {
+                ensureNoAnnotation(method);
+                continue;
+            }
+
+            // don't look at XmlTransient on properties. We'll deal with that later.
+
+            // is this a get method?
+            String propName = getPropertyNameFromGetMethod(name);
+            if(propName!=null && arity==0) {
+                getters.put(propName,method);
+                used = true;
+            }
+
+            // is this a set method?
+            propName = getPropertyNameFromSetMethod(name);
+            if(propName!=null && arity==1) {
+                List propSetters = allSetters.get(propName);
+                if(null == propSetters){
+                    propSetters = new ArrayList();
+                    allSetters.put(propName, propSetters);
+                }
+                propSetters.add(method);
+                used = true; // used check performed later
+            }
+
+            if(!used)
+                ensureNoAnnotation(method);
+        }
+
+        // Match getter with setters by comparing getter return type to setter param
+        for (Map.Entry entry : getters.entrySet()) {
+            String propName = entry.getKey();
+            M getter = entry.getValue();
+            List propSetters = allSetters.remove(propName);
+            if (null == propSetters) {
+                //no matching setter
+                continue;
+            }
+            T getterType = nav().getReturnType(getter);
+            for (M setter : propSetters) {
+                T setterType = nav().getMethodParameters(setter)[0];
+                if (setterType.equals(getterType)) {
+                    setters.put(propName, setter);
+                    break;
+                }
+            }
+        }
+
+        // also allow set-only properties
+        for (Map.Entry> e : allSetters.entrySet()) {
+            setters.put(e.getKey(),e.getValue().get(0));
+        }
+    }
+
+    /**
+     * Checks if the properties in this given super class should be aggregated into this class.
+     */
+    private boolean shouldRecurseSuperClass(C sc) {
+        return sc!=null
+            && (builder.isReplaced(sc) || reader().hasClassAnnotation(sc, XmlTransient.class));
+    }
+
     /**
      * Returns true if the method is considered 'public'.
      */
@@ -1182,9 +1261,13 @@ class ClassInfoImpl
         return factoryMethod != null;
     }
 
-
     public Method getFactoryMethod(){
         return (Method) factoryMethod;
     }
+
+    public String toString() {
+        return "ClassInfo("+clazz+')';
+    }
+
     private static final String[] DEFAULT_ORDER = new String[0];
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ERPropertyInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ERPropertyInfoImpl.java
index e79d57a1793..1faed72178b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ERPropertyInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ERPropertyInfoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import javax.xml.bind.annotation.XmlElementWrapper;
@@ -44,6 +43,7 @@ abstract class ERPropertyInfoImpl
         XmlElementWrapper e = seed.readAnnotation(XmlElementWrapper.class);
 
         boolean nil = false;
+        boolean required = false;
         if(!isCollection()) {
             xmlName = null;
             if(e!=null)
@@ -56,11 +56,13 @@ abstract class ERPropertyInfoImpl
             if(e!=null) {
                 xmlName = calcXmlName(e);
                 nil = e.nillable();
+                required = e.required();
             } else
                 xmlName = null;
         }
 
         wrapperNillable = nil;
+        wrapperRequired = required;
     }
 
     private final QName xmlName;
@@ -70,6 +72,11 @@ abstract class ERPropertyInfoImpl
      */
     private final boolean wrapperNillable;
 
+    /**
+     * True if the wrapper tag is required.
+     */
+    private final boolean wrapperRequired;
+
     /**
      * Gets the wrapper element name.
      */
@@ -80,4 +87,8 @@ abstract class ERPropertyInfoImpl
     public final boolean isCollectionNillable() {
         return wrapperNillable;
     }
+
+    public final boolean isCollectionRequired() {
+        return wrapperRequired;
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementInfoImpl.java
index 1c7f6f35262..ddcae966794 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementInfoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.lang.annotation.Annotation;
@@ -41,6 +40,7 @@ import javax.xml.bind.annotation.XmlSchema;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import javax.xml.namespace.QName;
 
+import com.sun.istack.internal.FinalArrayList;
 import com.sun.xml.internal.bind.v2.TODO;
 import com.sun.xml.internal.bind.v2.model.annotation.AnnotationSource;
 import com.sun.xml.internal.bind.v2.model.annotation.Locatable;
@@ -57,7 +57,6 @@ import com.sun.xml.internal.bind.v2.model.core.TypeRef;
 import com.sun.xml.internal.bind.v2.runtime.IllegalAnnotationException;
 import com.sun.xml.internal.bind.v2.runtime.Location;
 import com.sun.xml.internal.bind.v2.runtime.SwaRefAdapter;
-import com.sun.istack.internal.FinalArrayList;
 
 /**
  * {@link ElementInfo} implementation.
@@ -70,6 +69,8 @@ class ElementInfoImpl extends TypeInfoImpl implements ElementI
 
     private final NonElement contentType;
 
+    private final T tOfJAXBElementT;
+
     private final T elementType;
 
     private final ClassInfo scope;
@@ -140,6 +141,10 @@ class ElementInfoImpl extends TypeInfoImpl implements ElementI
             return tagName;
         }
 
+        public boolean isCollectionRequired() {
+            return false;
+        }
+
         public boolean isCollectionNillable() {
             return true;
         }
@@ -264,15 +269,16 @@ class ElementInfoImpl extends TypeInfoImpl implements ElementI
         }
         this.adapter = a;
 
+        // T of JAXBElement
+        tOfJAXBElementT =
+            methodParams.length>0 ? methodParams[0] // this is more reliable, as it works even for ObjectFactory that sometimes have to return public types
+            : nav().getTypeArgument(baseClass,0); // fall back to infer from the return type if no parameter.
+
         if(adapter==null) {
-            // T of JAXBElement
-            T typeType =
-                methodParams.length>0 ? methodParams[0] // this is more reliable, as it works even for ObjectFactory that sometimes have to return public types
-                : nav().getTypeArgument(baseClass,0); // fall back to infer from the return type if no parameter.
-            T list = nav().getBaseClass(typeType,nav().asDecl(List.class));
+            T list = nav().getBaseClass(tOfJAXBElementT,nav().asDecl(List.class));
             if(list==null) {
                 isCollection = false;
-                contentType = builder.getTypeInfo(typeType,this);  // suck this type into the current set.
+                contentType = builder.getTypeInfo(tOfJAXBElementT,this);  // suck this type into the current set.
             } else {
                 isCollection = true;
                 contentType = builder.getTypeInfo(nav().getTypeArgument(list,0),this);
@@ -339,7 +345,7 @@ class ElementInfoImpl extends TypeInfoImpl implements ElementI
 
     public T getContentInMemoryType() {
         if(adapter==null) {
-            return contentType.getType();
+            return tOfJAXBElementT;
         } else {
             return adapter.customType;
         }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementPropertyInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementPropertyInfoImpl.java
index d0e737e05ec..3ed31649067 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementPropertyInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementPropertyInfoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.util.AbstractList;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumConstantImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumConstantImpl.java
index d8521233558..b13521e1507 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumConstantImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumConstantImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import com.sun.xml.internal.bind.v2.model.core.EnumConstant;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumLeafInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumLeafInfoImpl.java
index ae2ae6a286d..3e0967e8c8a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumLeafInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumLeafInfoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.util.Iterator;
@@ -108,7 +107,9 @@ class EnumLeafInfoImpl extends TypeInfoImpl
      */
     protected void calcConstants() {
         EnumConstantImpl last = null;
-        for( F constant : nav().getEnumConstants(clazz) ) {
+        F[] constants = nav().getEnumConstants(clazz);
+        for( int i=constants.length-1; i>=0; i-- ) {
+            F constant = constants[i];
             String name = nav().getFieldName(constant);
             XmlEnumValue xev = builder.reader.getFieldAnnotation(XmlEnumValue.class, constant, this);
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/FieldPropertySeed.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/FieldPropertySeed.java
index 33f3da95b1e..6c7bdd842d4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/FieldPropertySeed.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/FieldPropertySeed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.lang.annotation.Annotation;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/GetterSetterPropertySeed.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/GetterSetterPropertySeed.java
index a08ba9a5af5..2c8fa37525b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/GetterSetterPropertySeed.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/GetterSetterPropertySeed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.lang.annotation.Annotation;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/LeafInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/LeafInfoImpl.java
index 92297043ddb..e8c9874899b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/LeafInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/LeafInfoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/MapPropertyInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/MapPropertyInfoImpl.java
index 8e8535b7b31..eaea94fa6e4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/MapPropertyInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/MapPropertyInfoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.util.Arrays;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.java
index 8f9e79a25af..7a49bf2741d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.text.MessageFormat;
@@ -39,6 +38,7 @@ enum Messages {
     DUPLICATE_ANNOTATIONS, // 1 arg
     NO_DEFAULT_CONSTRUCTOR, // 1 arg
     CANT_HANDLE_INTERFACE, // 1 arg
+    CANT_HANDLE_INNER_CLASS, // 1 arg
     ANNOTATION_ON_WRONG_METHOD, // 0 args
     GETTER_SETTER_INCOMPATIBLE_TYPE, // 2 args
     DUPLICATE_ENTRY_IN_PROP_ORDER, // 1 arg
@@ -82,9 +82,18 @@ enum Messages {
     NO_FACTORY_METHOD, // 2 args
     FACTORY_CLASS_NEEDS_FACTORY_METHOD, // 1 arg
 
+    INCOMPATIBLE_API_VERSION, // 2 args
+    INCOMPATIBLE_API_VERSION_MUSTANG, // 2 args
+
     MISSING_JAXB_PROPERTIES, // 1arg
     TRANSIENT_FIELD_NOT_BINDABLE, // 1 arg
-    THERE_MUST_BE_VALUE_IN_XMLVALUE // 1 arg
+    THERE_MUST_BE_VALUE_IN_XMLVALUE, // 1 arg
+    UNMATCHABLE_ADAPTER, // 2 args
+
+    ACCESSORFACTORY_INSTANTIATION_EXCEPTION, // 2 arg
+    ACCESSORFACTORY_ACCESS_EXCEPTION, // 2 arg
+    CUSTOM_ACCESSORFACTORY_PROPERTY_ERROR, // 2 arg
+    CUSTOM_ACCESSORFACTORY_FIELD_ERROR, // 2 arg
     ;
 
     private static final ResourceBundle rb = ResourceBundle.getBundle(Messages.class.getName());
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.properties b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.properties
index a32e0b0b877..929ba29db8f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.properties
@@ -1,3 +1,28 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
 ID_MUST_BE_STRING = \
     Property "{0}" has an XmlID annotation but its type is not String.
 
@@ -13,6 +38,9 @@ NO_DEFAULT_CONSTRUCTOR = \
 CANT_HANDLE_INTERFACE = \
     {0} is an interface, and JAXB can''t handle interfaces.
 
+CANT_HANDLE_INNER_CLASS = \
+    {0} is a non-static inner class, and JAXB can''t handle those.
+
 ANNOTATION_ON_WRONG_METHOD = \
     JAXB annotation is placed on a method that is not a JAXB property
 
@@ -124,4 +152,27 @@ TRANSIENT_FIELD_NOT_BINDABLE = \
 
 THERE_MUST_BE_VALUE_IN_XMLVALUE = \
     Object must have some value in its @XmlValue field: {0}
+
+INCOMPATIBLE_API_VERSION = \
+    JAXB 2.0 API jar is being loaded (from {0}), but this RI (from {1}) requires JAXB 2.1 API jar.
+
+INCOMPATIBLE_API_VERSION_MUSTANG = \
+    JAXB 2.0 API is being loaded from the bootstrap classloader, but this RI (from {1}) needs 2.1 API. \
+    Use the endorsed directory mechanism to place jaxb-api.jar in the bootstrap classloader. \
+    (See http://java.sun.com/j2se/1.5.0/docs/guide/standards/)
+
+UNMATCHABLE_ADAPTER = \
+    Adapter {0} is not applicable to the field type {1}. 
+
+ACCESSORFACTORY_INSTANTIATION_EXCEPTION = \
+    Unable to create instance of AccessorFactory, {0} for class {1}.
+
+ACCESSORFACTORY_ACCESS_EXCEPTION = \
+    Unable to access instance of AccessorFactory, {0} for class {1}.
+
+CUSTOM_ACCESSORFACTORY_PROPERTY_ERROR = \
+    Custom AccessorFactory, {0}, is reporting an error accessing a property. {1}
+
+CUSTOM_ACCESSORFACTORY_FIELD_ERROR = \
+    Custom AccessorFactory, {0}, is reporting an error accessing a field. {1}
  
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java
index e7fc190a15a..1baa96d3702 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,16 +22,21 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.xml.bind.annotation.XmlAttachmentRef;
 import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.bind.annotation.XmlSchema;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.namespace.QName;
 
+import com.sun.xml.internal.bind.util.Which;
 import com.sun.xml.internal.bind.v2.model.annotation.AnnotationReader;
+import com.sun.xml.internal.bind.v2.model.annotation.ClassLocatable;
 import com.sun.xml.internal.bind.v2.model.annotation.Locatable;
 import com.sun.xml.internal.bind.v2.model.core.ClassInfo;
 import com.sun.xml.internal.bind.v2.model.core.ErrorHandler;
@@ -90,10 +95,14 @@ public class ModelBuilder {
      */
     public final String defaultNsUri;
 
+
     /**
      * Packages whose registries are already added.
      */
-    /*package*/ final Map registries = new HashMap();
+    /*package*/ final Map> registries
+            = new HashMap>();
+
+    private final Map subclassReplacements;
 
     /**
      * @see #setErrorHandler
@@ -101,20 +110,28 @@ public class ModelBuilder {
     private ErrorHandler errorHandler;
     private boolean hadError;
 
+    /**
+     * Set to true if the model includes {@link XmlAttachmentRef}. JAX-WS
+     * needs to know this information.
+     */
+    public boolean hasSwaRef;
+
     private final ErrorHandler proxyErrorHandler = new ErrorHandler() {
         public void error(IllegalAnnotationException e) {
             reportError(e);
         }
     };
 
-
     public ModelBuilder(
-        AnnotationReader reader,
-        Navigator navigator,
-        String defaultNamespaceRemap ) {
+            AnnotationReader reader,
+            Navigator navigator,
+            Map subclassReplacements,
+            String defaultNamespaceRemap
+    ) {
 
         this.reader = reader;
         this.nav = navigator;
+        this.subclassReplacements = subclassReplacements;
         if(defaultNamespaceRemap==null)
             defaultNamespaceRemap = "";
         this.defaultNsUri = defaultNamespaceRemap;
@@ -122,8 +139,33 @@ public class ModelBuilder {
         typeInfoSet = createTypeInfoSet();
     }
 
+    /**
+     * Makes sure that we are running with 2.1 JAXB API,
+     * and report an error if not.
+     */
+    static {
+        try {
+            XmlSchema s = null;
+            s.location();
+        } catch (NullPointerException e) {
+            // as epxected
+        } catch (NoSuchMethodError e) {
+            // this is not a 2.1 API. Where is it being loaded from?
+            Messages res;
+            if(XmlSchema.class.getClassLoader()==null)
+                res = Messages.INCOMPATIBLE_API_VERSION_MUSTANG;
+            else
+                res = Messages.INCOMPATIBLE_API_VERSION;
+
+            throw new LinkageError( res.format(
+                Which.which(XmlSchema.class),
+                Which.which(ModelBuilder.class)
+            ));
+        }
+    }
+
     protected TypeInfoSetImpl createTypeInfoSet() {
-        return new TypeInfoSetImpl(nav,reader,BuiltinLeafInfoImpl.createLeaves(nav));
+        return new TypeInfoSetImpl(nav,reader,BuiltinLeafInfoImpl.createLeaves(nav));
     }
 
     /**
@@ -135,6 +177,15 @@ public class ModelBuilder {
      * {@link String} or {@link Enum}-derived ones)
      */
     public NonElement getClassInfo( C clazz, Locatable upstream ) {
+        return getClassInfo(clazz,false,upstream);
+    }
+
+    /**
+     * For limited cases where the caller needs to search for a super class.
+     * This is necessary because we don't want {@link #subclassReplacements}
+     * to kick in for the super class search, which will cause infinite recursion.
+     */
+    public NonElement getClassInfo( C clazz, boolean searchForSuperClass, Locatable upstream ) {
         assert clazz!=null;
         NonElement r = typeInfoSet.getClassInfo(clazz);
         if(r!=null)
@@ -144,32 +195,53 @@ public class ModelBuilder {
             EnumLeafInfoImpl li = createEnumLeafInfo(clazz,upstream);
             typeInfoSet.add(li);
             r = li;
+            addTypeName(r);
         } else {
-            ClassInfoImpl ci = createClassInfo(clazz,upstream);
-            typeInfoSet.add(ci);
+            boolean isReplaced = subclassReplacements.containsKey(clazz);
+            if(isReplaced && !searchForSuperClass) {
+                // handle it as if the replacement was specified
+                r = getClassInfo(subclassReplacements.get(clazz),upstream);
+            } else
+            if(reader.hasClassAnnotation(clazz,XmlTransient.class) || isReplaced) {
+                // handle it as if the base class was specified
+                r = getClassInfo( nav.getSuperClass(clazz), searchForSuperClass,
+                        new ClassLocatable(upstream,clazz,nav) );
+            } else {
+                ClassInfoImpl ci = createClassInfo(clazz,upstream);
+                typeInfoSet.add(ci);
 
-            // compute the closure by eagerly expanding references
-            for( PropertyInfo p : ci.getProperties() ) {
-                if(p.kind()== PropertyKind.REFERENCE) {
-                    // make sure that we have a registry for this package
-                    String pkg = nav.getPackageName(ci.getClazz());
-                    if(!registries.containsKey(pkg)) {
-                        // insert the package's object factory
-                        C c = nav.findClass(pkg + ".ObjectFactory",ci.getClazz());
-                        if(c!=null)
-                            addRegistry(c,(Locatable)p);
+                // compute the closure by eagerly expanding references
+                for( PropertyInfo p : ci.getProperties() ) {
+                    if(p.kind()== PropertyKind.REFERENCE) {
+                        // make sure that we have a registry for this package
+                        String pkg = nav.getPackageName(ci.getClazz());
+                        if(!registries.containsKey(pkg)) {
+                            // insert the package's object factory
+                            C c = nav.findClass(pkg + ".ObjectFactory",ci.getClazz());
+                            if(c!=null)
+                                addRegistry(c,(Locatable)p);
+                        }
                     }
+
+                    for( TypeInfo t : p.ref() )
+                        ; // just compute a reference should be suffice
                 }
+                ci.getBaseClass(); // same as above.
 
-                for( TypeInfo t : p.ref() )
-                    ; // just compute a reference should be suffice
+                r = ci;
+                addTypeName(r);
+            }
+        }
+
+
+        // more reference closure expansion. @XmlSeeAlso
+        XmlSeeAlso sa = reader.getClassAnnotation(XmlSeeAlso.class, clazz, upstream);
+        if(sa!=null) {
+            for( T t : reader.getClassArrayValue(sa,"value") ) {
+                getTypeInfo(t,(Locatable)sa);
             }
-            ci.getBaseClass();
-
-            r = ci;
         }
 
-        addTypeName(r);
 
         return r;
     }
@@ -234,8 +306,7 @@ public class ModelBuilder {
         return new EnumLeafInfoImpl(this,upstream,clazz,nav.use(clazz));
     }
 
-    protected ClassInfoImpl createClassInfo(
-            C clazz, Locatable upstream ) {
+    protected ClassInfoImpl createClassInfo(C clazz, Locatable upstream ) {
         return new ClassInfoImpl(this,upstream,clazz);
     }
 
@@ -254,8 +325,7 @@ public class ModelBuilder {
      * in it.
      */
     public RegistryInfo addRegistry(C registryClass, Locatable upstream ) {
-        RegistryInfoImpl r = new RegistryInfoImpl(this,upstream,registryClass);
-        return r;
+        return new RegistryInfoImpl(this,upstream,registryClass);
     }
 
     /**
@@ -324,4 +394,8 @@ public class ModelBuilder {
         if(errorHandler!=null)
             errorHandler.error(e);
     }
+
+    public boolean isReplaced(C sc) {
+        return subclassReplacements.containsKey(sc);
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertyInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertyInfoImpl.java
index 8675bebc8b4..93c2c252908 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertyInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertyInfoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,10 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.util.Collection;
+import java.lang.annotation.Annotation;
 
 import javax.activation.MimeType;
 import javax.xml.bind.annotation.XmlAttachmentRef;
@@ -38,6 +38,7 @@ import javax.xml.bind.annotation.XmlMimeType;
 import javax.xml.bind.annotation.XmlSchema;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
+import javax.xml.bind.annotation.adapters.XmlAdapter;
 import javax.xml.namespace.QName;
 
 import com.sun.xml.internal.bind.v2.TODO;
@@ -81,7 +82,16 @@ abstract class PropertyInfoImpl
     protected PropertyInfoImpl(ClassInfoImpl parent, PropertySeed spi) {
         this.seed = spi;
         this.parent = parent;
-        this.id = calcId();
+
+        if(parent==null)
+            /*
+                Various people reported a bug where this parameter is somehow null.
+                In an attempt to catch the error better, let's do an explicit check here.
+
+                http://forums.java.net/jive/thread.jspa?threadID=18479
+                http://forums.java.net/jive/thread.jspa?messageID=165946
+             */
+            throw new AssertionError();
 
         MimeType mt = Util.calcExpectedMediaType(seed,parent.builder);
         if(mt!=null && !kind().canHaveXmlMimeType) {
@@ -97,21 +107,46 @@ abstract class PropertyInfoImpl
                 getIndividualType(),this);
 
         T t = seed.getRawType();
-        this.isCollection = nav().isSubClassOf(t, nav().ref(Collection.class))
-                         || nav().isArrayButNotByteArray(t);
 
-        XmlJavaTypeAdapter xjta = getApplicableAdapter(getIndividualType());
-        if(xjta==null) {
-            // ugly ugly hack, but we implement swaRef as adapter
-            XmlAttachmentRef xsa = seed.readAnnotation(XmlAttachmentRef.class);
-            if(xsa!=null) {
-                adapter = new Adapter(nav().asDecl(SwaRefAdapter.class),nav());
-            } else {
-                adapter = null;
-            }
-        } else {
+        // check if there's an adapter applicable to the whole property
+        XmlJavaTypeAdapter xjta = getApplicableAdapter(t);
+        if(xjta!=null) {
+            isCollection = false;
             adapter = new Adapter(xjta,reader(),nav());
+        } else {
+            // check if the adapter is applicable to the individual item in the property
+
+            this.isCollection = nav().isSubClassOf(t, nav().ref(Collection.class))
+                             || nav().isArrayButNotByteArray(t);
+
+            xjta = getApplicableAdapter(getIndividualType());
+            if(xjta==null) {
+                // ugly ugly hack, but we implement swaRef as adapter
+                XmlAttachmentRef xsa = seed.readAnnotation(XmlAttachmentRef.class);
+                if(xsa!=null) {
+                    parent.builder.hasSwaRef = true;
+                    adapter = new Adapter(nav().asDecl(SwaRefAdapter.class),nav());
+                } else {
+                    adapter = null;
+
+                    // if this field has adapter annotation but not applicable,
+                    // that must be an error of the user
+                    xjta = seed.readAnnotation(XmlJavaTypeAdapter.class);
+                    if(xjta!=null) {
+                        T adapter = reader().getClassValue(xjta,"value");
+                        parent.builder.reportError(new IllegalAnnotationException(
+                            Messages.UNMATCHABLE_ADAPTER.format(
+                                    nav().getTypeName(adapter), nav().getTypeName(t)),
+                            xjta
+                        ));
+                    }
+                }
+            } else {
+                adapter = new Adapter(xjta,reader(),nav());
+            }
         }
+
+        this.id = calcId();
     }
 
 
@@ -159,13 +194,21 @@ abstract class PropertyInfoImpl
         if(jta==null)   return false;
 
         T type = reader().getClassValue(jta,"type");
-        return declaredType.equals(type);
+        if(declaredType.equals(type))
+            return true;    // for types explicitly marked in XmlJavaTypeAdapter.type()
 
+        T adapter = reader().getClassValue(jta,"value");
+        T ba = nav().getBaseClass(adapter, nav().asDecl(XmlAdapter.class));
+        if(!nav().isParameterizedType(ba))
+            return true;   // can't check type applicability. assume Object, which means applicable to any.
+        T inMemType = nav().getTypeArgument(ba, 1);
+
+        return nav().isSubClassOf(declaredType,inMemType);
     }
 
     private XmlJavaTypeAdapter getApplicableAdapter(T type) {
         XmlJavaTypeAdapter jta = seed.readAnnotation(XmlJavaTypeAdapter.class);
-        if(jta!=null)
+        if(jta!=null && isApplicable(jta,type))
             return jta;
 
         // check the applicable adapters on the package
@@ -181,10 +224,10 @@ abstract class PropertyInfoImpl
             return jta;
 
         // then on the target class
-        C refType = nav().asDecl(seed.getRawType());
+        C refType = nav().asDecl(type);
         if(refType!=null) {
             jta = reader().getClassAnnotation(XmlJavaTypeAdapter.class, refType, seed );
-            if(jta!=null) // the one on the type always apply.
+            if(jta!=null && isApplicable(jta,type)) // the one on the type always apply.
                 return jta;
         }
 
@@ -211,7 +254,7 @@ abstract class PropertyInfoImpl
     private ID calcId() {
         if(seed.hasAnnotation(XmlID.class)) {
             // check the type
-            if(!seed.getRawType().equals(nav().ref(String.class)))
+            if(!getIndividualType().equals(nav().ref(String.class)))
                 parent.builder.reportError(new IllegalAnnotationException(
                     Messages.ID_MUST_BE_STRING.format(getName()), seed )
                 );
@@ -331,4 +374,12 @@ abstract class PropertyInfoImpl
     public int compareTo(PropertyInfoImpl that) {
         return this.getName().compareTo(that.getName());
     }
+
+    public final  A readAnnotation(Class annotationType) {
+        return seed.readAnnotation(annotationType);
+    }
+
+    public final boolean hasAnnotation(Class annotationType) {
+        return seed.hasAnnotation(annotationType);
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertySeed.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertySeed.java
index 9c190a38bb4..422e7e6ecd1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertySeed.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertySeed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import com.sun.xml.internal.bind.v2.model.annotation.Locatable;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ReferencePropertyInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ReferencePropertyInfoImpl.java
index 7e95ce14bc3..d45cc5a531c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ReferencePropertyInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ReferencePropertyInfoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.util.Collections;
@@ -34,6 +33,8 @@ import javax.xml.bind.annotation.XmlAnyElement;
 import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlElementRefs;
 import javax.xml.bind.annotation.XmlMixed;
+import javax.xml.bind.annotation.XmlSchema;
+import javax.xml.bind.annotation.XmlNsForm;
 import javax.xml.namespace.QName;
 
 import com.sun.xml.internal.bind.v2.model.annotation.AnnotationReader;
@@ -185,8 +186,15 @@ class ReferencePropertyInfoImpl
 
     private String getEffectiveNamespaceFor(XmlElementRef r) {
         String nsUri = r.namespace();
-        if(nsUri.length()==0)
-            nsUri = parent.builder.defaultNsUri;
+
+        XmlSchema xs = reader().getPackageAnnotation( XmlSchema.class, parent.getClazz(), this );
+        if(xs!=null && xs.attributeFormDefault()== XmlNsForm.QUALIFIED) {
+            // JAX-RPC doesn't want the default namespace URI swapping to take effect to
+            // local "unqualified" elements. UGLY.
+            if(nsUri.length()==0)
+                nsUri = parent.builder.defaultNsUri;
+        }
+
         return nsUri;
     }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RegistryInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RegistryInfoImpl.java
index eebc654fdbe..1528d202a2b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RegistryInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RegistryInfoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.util.LinkedHashSet;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java
index 06e521454aa..c84fc8d6f41 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeArrayInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeArrayInfoImpl.java
index 2731afa58c5..13232ebad18 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeArrayInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeArrayInfoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.lang.reflect.Field;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAttributePropertyInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAttributePropertyInfoImpl.java
index a4e3bd162d6..272759a89cb 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAttributePropertyInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAttributePropertyInfoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.lang.reflect.Field;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java
index 719ae135610..3b8e1db63fb 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.awt.*;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeClassInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeClassInfoImpl.java
index 93dac634af6..fce327ac853 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeClassInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeClassInfoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.io.IOException;
@@ -34,8 +33,10 @@ import java.lang.reflect.Type;
 import java.util.List;
 import java.util.Map;
 
+import javax.xml.bind.annotation.XmlType;
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
+import javax.xml.bind.JAXBException;
 
 import com.sun.istack.internal.NotNull;
 import com.sun.xml.internal.bind.annotation.XmlLocation;
@@ -51,9 +52,14 @@ import com.sun.xml.internal.bind.v2.runtime.Location;
 import com.sun.xml.internal.bind.v2.runtime.Name;
 import com.sun.xml.internal.bind.v2.runtime.Transducer;
 import com.sun.xml.internal.bind.v2.runtime.XMLSerializer;
+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.AccessorFactory;
+import com.sun.xml.internal.bind.AccessorFactoryImpl;
 import com.sun.xml.internal.bind.v2.runtime.reflect.TransducedAccessor;
 import com.sun.xml.internal.bind.v2.runtime.unmarshaller.UnmarshallingContext;
+import com.sun.xml.internal.bind.XmlAccessorFactory;
+import com.sun.xml.internal.bind.v2.runtime.IllegalAnnotationException;
 
 import org.xml.sax.Locator;
 import org.xml.sax.SAXException;
@@ -72,10 +78,53 @@ class RuntimeClassInfoImpl extends ClassInfoImpl
      */
     private Accessor xmlLocationAccessor;
 
+    private AccessorFactory accessorFactory;
+
     public RuntimeClassInfoImpl(RuntimeModelBuilder modelBuilder, Locatable upstream, Class clazz) {
         super(modelBuilder, upstream, clazz);
+        accessorFactory = createAccessorFactory(clazz);
     }
 
+    protected AccessorFactory createAccessorFactory(Class clazz) {
+        XmlAccessorFactory factoryAnn;
+        AccessorFactory accFactory = null;
+
+        // user providing class to be used.
+        if (((RuntimeModelBuilder)builder).context.xmlAccessorFactorySupport){
+            factoryAnn = findXmlAccessorFactoryAnnotation(clazz);
+
+            if (factoryAnn != null) {
+                try {
+                    accFactory = factoryAnn.value().newInstance();
+                } catch (InstantiationException e) {
+                    builder.reportError(new IllegalAnnotationException(
+                            Messages.ACCESSORFACTORY_INSTANTIATION_EXCEPTION.format(
+                            factoryAnn.getClass().getName(), nav().getClassName(clazz)), this));
+                } catch (IllegalAccessException e) {
+                    builder.reportError(new IllegalAnnotationException(
+                            Messages.ACCESSORFACTORY_ACCESS_EXCEPTION.format(
+                            factoryAnn.getClass().getName(), nav().getClassName(clazz)),this));
+                }
+            }
+        }
+
+        // Fall back to local AccessorFactory when no
+        // user not providing one or as error recovery.
+        if (accFactory == null){
+            accFactory = AccessorFactoryImpl.getInstance();
+        }
+        return accFactory;
+    }
+
+    protected XmlAccessorFactory findXmlAccessorFactoryAnnotation(Class clazz) {
+        XmlAccessorFactory factoryAnn = reader().getClassAnnotation(XmlAccessorFactory.class,clazz,this);
+        if (factoryAnn == null) {
+            factoryAnn = reader().getPackageAnnotation(XmlAccessorFactory.class,clazz,this);
+        }
+        return factoryAnn;
+    }
+
+
     public Method getFactoryMethod(){
         return super.getFactoryMethod();
     }
@@ -122,8 +171,8 @@ class RuntimeClassInfoImpl extends ClassInfoImpl
 
 
     public void link() {
-        super.link();
         getTransducer();    // populate the transducer
+        super.link();
     }
 
     private Accessor> attributeWildcardAccessor;
@@ -171,7 +220,8 @@ class RuntimeClassInfoImpl extends ClassInfoImpl
         if( !valuep.getTarget().isSimpleType() )
             return null;    // if there's an error, recover from it by returning null.
 
-        return new TransducerImpl(getClazz(),TransducedAccessor.get(valuep));
+        return new TransducerImpl(getClazz(),TransducedAccessor.get(
+                ((RuntimeModelBuilder)builder).context,valuep));
     }
 
     /**
@@ -184,29 +234,32 @@ class RuntimeClassInfoImpl extends ClassInfoImpl
 
     @Override
     protected RuntimePropertySeed createFieldSeed(Field field) {
-        Accessor.FieldReflection acc;
-        if(Modifier.isStatic(field.getModifiers()))
-            acc = new Accessor.ReadOnlyFieldReflection(field);
-        else
-            acc = new Accessor.FieldReflection(field);
-
-        return new RuntimePropertySeed(
-            super.createFieldSeed(field),
-                acc );
+       final boolean readOnly = Modifier.isStatic(field.getModifiers());
+        Accessor acc;
+        try {
+            acc = accessorFactory.createFieldAccessor(clazz, field, readOnly);
+        } catch(JAXBException e) {
+            builder.reportError(new IllegalAnnotationException(
+                    Messages.CUSTOM_ACCESSORFACTORY_FIELD_ERROR.format(
+                    nav().getClassName(clazz), e.toString()), this ));
+            acc = Accessor.getErrorInstance(); // error recovery
+        }
+        return new RuntimePropertySeed(super.createFieldSeed(field), acc );
     }
 
     @Override
     public RuntimePropertySeed createAccessorSeed(Method getter, Method setter) {
         Accessor acc;
-        if(getter==null)
-            acc = new Accessor.SetterOnlyReflection(setter);
-        else
-        if(setter==null)
-            acc = new Accessor.GetterOnlyReflection(getter);
-        else
-            acc = new Accessor.GetterSetterReflection(getter, setter);
-
-        return new RuntimePropertySeed( super.createAccessorSeed(getter,setter), acc );
+        try {
+            acc = accessorFactory.createPropertyAccessor(clazz, getter, setter);
+        } catch(JAXBException e) {
+            builder.reportError(new IllegalAnnotationException(
+                Messages.CUSTOM_ACCESSORFACTORY_PROPERTY_ERROR.format(
+                nav().getClassName(clazz), e.toString()), this ));
+            acc = Accessor.getErrorInstance(); // error recovery
+        }
+        return new RuntimePropertySeed( super.createAccessorSeed(getter,setter),
+          acc );
     }
 
     @Override
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java
index 7bf53978c17..f8840bec2cb 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.lang.reflect.Field;
@@ -42,6 +41,7 @@ import com.sun.xml.internal.bind.v2.model.runtime.RuntimeElementPropertyInfo;
 import com.sun.xml.internal.bind.v2.model.runtime.RuntimeNonElement;
 import com.sun.xml.internal.bind.v2.model.runtime.RuntimePropertyInfo;
 import com.sun.xml.internal.bind.v2.model.runtime.RuntimeTypeRef;
+import com.sun.xml.internal.bind.v2.model.nav.Navigator;
 import com.sun.xml.internal.bind.v2.runtime.IllegalAnnotationException;
 import com.sun.xml.internal.bind.v2.runtime.Transducer;
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
@@ -121,7 +121,7 @@ final class RuntimeElementInfoImpl extends ElementInfoImpl getType() {
-        return JAXBElement.class;
+        return Navigator.REFLECTION.erasure(super.getType());
     }
 
     public RuntimeClassInfo getScope() {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementPropertyInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementPropertyInfoImpl.java
index 24edc32e346..99b07e6b261 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementPropertyInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementPropertyInfoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.lang.reflect.Field;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumConstantImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumConstantImpl.java
index a4eb831ddbb..9e7dd64a0c5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumConstantImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumConstantImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.lang.reflect.Field;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumLeafInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumLeafInfoImpl.java
index 92fad55f606..edf1dfb4e0e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumLeafInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumLeafInfoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeMapPropertyInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeMapPropertyInfoImpl.java
index 245e73d4c40..f272a293b8a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeMapPropertyInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeMapPropertyInfoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.lang.reflect.Field;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java
index 84557489f84..06b25a2f5d3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,12 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
+import java.util.Map;
 
 import javax.activation.MimeType;
 
@@ -48,6 +48,7 @@ import com.sun.xml.internal.bind.v2.runtime.InlineBinaryTransducer;
 import com.sun.xml.internal.bind.v2.runtime.MimeTypedTransducer;
 import com.sun.xml.internal.bind.v2.runtime.SchemaTypeTransducer;
 import com.sun.xml.internal.bind.v2.runtime.Transducer;
+import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
 import com.sun.xml.internal.bind.v2.runtime.unmarshaller.UnmarshallingContext;
 
 import org.xml.sax.SAXException;
@@ -63,9 +64,14 @@ import org.xml.sax.SAXException;
  * @author Kohsuke Kawaguchi (kk@kohsuke.org)
  */
 public class RuntimeModelBuilder extends ModelBuilder {
+    /**
+     * The {@link JAXBContextImpl} for which the model is built.
+     */
+    public final JAXBContextImpl context;
 
-    public RuntimeModelBuilder(RuntimeAnnotationReader annotationReader, String defaultNamespaceRemap) {
-        super(annotationReader, Navigator.REFLECTION, defaultNamespaceRemap);
+    public RuntimeModelBuilder(JAXBContextImpl context, RuntimeAnnotationReader annotationReader, Map subclassReplacements, String defaultNamespaceRemap) {
+        super(annotationReader, Navigator.REFLECTION, subclassReplacements, defaultNamespaceRemap);
+        this.context = context;
     }
 
     @Override
@@ -73,6 +79,11 @@ public class RuntimeModelBuilder extends ModelBuilder {
         return (RuntimeNonElement)super.getClassInfo(clazz,upstream);
     }
 
+    @Override
+    public RuntimeNonElement getClassInfo( Class clazz, boolean searchForSuperClass, Locatable upstream ) {
+        return (RuntimeNonElement)super.getClassInfo(clazz,searchForSuperClass,upstream);
+    }
+
     @Override
     protected RuntimeEnumLeafInfoImpl createEnumLeafInfo(Class clazz, Locatable upstream) {
         return new RuntimeEnumLeafInfoImpl(this,upstream,clazz);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeReferencePropertyInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeReferencePropertyInfoImpl.java
index fdd90f2457f..b96c46fe3af 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeReferencePropertyInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeReferencePropertyInfoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.lang.reflect.Field;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java
index 23e29ca1277..709d047b993 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.lang.reflect.Field;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeRefImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeRefImpl.java
index 43316b2ca04..2dd76c6f364 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeRefImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeRefImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeValuePropertyInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeValuePropertyInfoImpl.java
index 88d8ad03454..f428ebde42e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeValuePropertyInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeValuePropertyInfoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.lang.reflect.Field;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/SingleTypePropertyInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/SingleTypePropertyInfoImpl.java
index 18f5fd90d88..2676694c762 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/SingleTypePropertyInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/SingleTypePropertyInfoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.util.Collections;
@@ -63,7 +62,7 @@ abstract class SingleTypePropertyInfoImpl
             if(getAdapter()!=null && !isCollection())
                 // adapter for a single-value property is handled by accessor.
                 // adapter for a collection property is handled by lister.
-                rawAcc = rawAcc.adapt(getAdapter());
+                rawAcc = rawAcc.adapt(((RuntimePropertyInfo)this).getAdapter());
             this.acc = rawAcc;
         } else
             this.acc = null;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoImpl.java
index d9e8d4177f7..1766502b99b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoSetImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoSetImpl.java
index ef5fa018839..9c966a5e150 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoSetImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoSetImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.util.Collections;
@@ -67,28 +66,27 @@ import com.sun.xml.internal.bind.v2.util.FlattenIterator;
  *
  * @author Kohsuke Kawaguchi
  */
-class TypeInfoSetImpl implements
-        TypeInfoSet {
+class TypeInfoSetImpl implements TypeInfoSet {
 
     @XmlTransient
-    public final Navigator nav;
+    public final Navigator nav;
 
     @XmlTransient
-    public final AnnotationReader reader;
+    public final AnnotationReader reader;
 
     /**
      * All the leaves.
      */
-    private final Map> builtins =
-            new LinkedHashMap>();
+    private final Map> builtins =
+            new LinkedHashMap>();
 
     /** All {@link EnumLeafInfoImpl}s. */
-    private final Map> enums =
-            new LinkedHashMap>();
+    private final Map> enums =
+            new LinkedHashMap>();
 
     /** All {@link ArrayInfoImpl}s. */
-    private final Map> arrays =
-            new LinkedHashMap>();
+    private final Map> arrays =
+            new LinkedHashMap>();
 
     /**
      * All the user-defined classes.
@@ -99,23 +97,23 @@ class TypeInfoSetImpl implements
      * an error to be reported on a class closer to the user's code.
      */
     @XmlJavaTypeAdapter(RuntimeUtil.ToStringAdapter.class)
-    private final Map> beans
-            = new LinkedHashMap>();
+    private final Map> beans
+            = new LinkedHashMap>();
 
     @XmlTransient
-    private final Map> beansView =
+    private final Map> beansView =
         Collections.unmodifiableMap(beans);
 
     /**
      * The element mapping.
      */
-    private final Map>> elementMappings =
-        new LinkedHashMap>>();
+    private final Map>> elementMappings =
+        new LinkedHashMap>>();
 
-    private final Iterable> allElements =
-        new Iterable>() {
-            public Iterator> iterator() {
-                return new FlattenIterator>(elementMappings.values());
+    private final Iterable> allElements =
+        new Iterable>() {
+            public Iterator> iterator() {
+                return new FlattenIterator>(elementMappings.values());
             }
         };
 
@@ -125,7 +123,7 @@ class TypeInfoSetImpl implements
      * anyType is the only {@link TypeInfo} that works with an interface,
      * and accordingly it requires a lot of special casing.
      */
-    private final NonElement anyType;
+    private final NonElement anyType;
 
     /**
      * Lazily parsed set of {@link XmlNs}s.
@@ -134,9 +132,9 @@ class TypeInfoSetImpl implements
      */
     private Map> xmlNsCache;
 
-    public TypeInfoSetImpl(Navigator nav,
-                           AnnotationReader reader,
-                           Map> leaves) {
+    public TypeInfoSetImpl(Navigator nav,
+                           AnnotationReader reader,
+                           Map> leaves) {
         this.nav = nav;
         this.reader = reader;
         this.builtins.putAll(leaves);
@@ -149,32 +147,32 @@ class TypeInfoSetImpl implements
         }
 
         // make sure at lease we got a map for global ones.
-        elementMappings.put(null,new LinkedHashMap>());
+        elementMappings.put(null,new LinkedHashMap>());
     }
 
-    protected NonElement createAnyType() {
-        return new AnyTypeImpl(nav);
+    protected NonElement createAnyType() {
+        return new AnyTypeImpl(nav);
     }
 
-    public Navigator getNavigator() {
+    public Navigator getNavigator() {
         return nav;
     }
 
     /**
      * Adds a new {@link ClassInfo} to the set.
      */
-    public void add( ClassInfoImpl ci ) {
+    public void add( ClassInfoImpl ci ) {
         beans.put( ci.getClazz(), ci );
     }
 
     /**
      * Adds a new {@link LeafInfo} to the set.
      */
-    public void add( EnumLeafInfoImpl li ) {
+    public void add( EnumLeafInfoImpl li ) {
         enums.put( li.clazz,  li );
     }
 
-    public void add(ArrayInfoImpl ai) {
+    public void add(ArrayInfoImpl ai) {
         arrays.put( ai.getType(), ai );
     }
 
@@ -185,32 +183,32 @@ class TypeInfoSetImpl implements
      *      null if the specified type cannot be bound by JAXB, or
      *      not known to this set.
      */
-    public NonElement getTypeInfo( TypeT type ) {
+    public NonElement getTypeInfo( T type ) {
         type = nav.erasure(type);   // replace type variables by their bounds
 
-        LeafInfo l = builtins.get(type);
+        LeafInfo l = builtins.get(type);
         if(l!=null)     return l;
 
         if( nav.isArray(type) ) {
             return arrays.get(type);
         }
 
-        ClassDeclT d = nav.asDecl(type);
+        C d = nav.asDecl(type);
         if(d==null)     return null;
         return getClassInfo(d);
     }
 
-    public NonElement getAnyTypeInfo() {
+    public NonElement getAnyTypeInfo() {
         return anyType;
     }
 
     /**
      * This method is used to add a root reference to a model.
      */
-    public NonElement getTypeInfo(Ref ref) {
+    public NonElement getTypeInfo(Ref ref) {
         // TODO: handle XmlValueList
         assert !ref.valueList;
-        ClassDeclT c = nav.asDecl(ref.type);
+        C c = nav.asDecl(ref.type);
         if(c!=null && reader.getClassAnnotation(XmlRegistry.class,c,null/*TODO: is this right?*/)!=null) {
             return null;    // TODO: is this correct?
         } else
@@ -220,19 +218,19 @@ class TypeInfoSetImpl implements
     /**
      * Returns all the {@link ClassInfo}s known to this set.
      */
-    public Map> beans() {
+    public Map> beans() {
         return beansView;
     }
 
-    public Map> builtins() {
+    public Map> builtins() {
         return builtins;
     }
 
-    public Map> enums() {
+    public Map> enums() {
         return enums;
     }
 
-    public Map> arrays() {
+    public Map> arrays() {
         return arrays;
     }
 
@@ -247,8 +245,8 @@ class TypeInfoSetImpl implements
      *      null if the specified type is not bound by JAXB or otherwise
      *      unknown to this set.
      */
-    public NonElement getClassInfo( ClassDeclT type ) {
-        LeafInfo l = builtins.get(nav.use(type));
+    public NonElement getClassInfo( C type ) {
+        LeafInfo l = builtins.get(nav.use(type));
         if(l!=null)     return l;
 
         l = enums.get(type);
@@ -260,11 +258,11 @@ class TypeInfoSetImpl implements
         return beans.get(type);
     }
 
-    public ElementInfoImpl getElementInfo( ClassDeclT scope, QName name ) {
+    public ElementInfoImpl getElementInfo( C scope, QName name ) {
         while(scope!=null) {
-            Map> m = elementMappings.get(scope);
+            Map> m = elementMappings.get(scope);
             if(m!=null) {
-                ElementInfoImpl r = m.get(name);
+                ElementInfoImpl r = m.get(name);
                 if(r!=null)     return r;
             }
             scope = nav.getSuperClass(scope);
@@ -276,16 +274,16 @@ class TypeInfoSetImpl implements
      * @param builder
      *      used for reporting errors.
      */
-    public final void add( ElementInfoImpl ei, ModelBuilder builder ) {
-        ClassDeclT scope = null;
+    public final void add( ElementInfoImpl ei, ModelBuilder builder ) {
+        C scope = null;
         if(ei.getScope()!=null)
             scope = ei.getScope().getClazz();
 
-        Map> m = elementMappings.get(scope);
+        Map> m = elementMappings.get(scope);
         if(m==null)
-            elementMappings.put(scope,m=new LinkedHashMap>());
+            elementMappings.put(scope,m=new LinkedHashMap>());
 
-        ElementInfoImpl existing = m.put(ei.getElementName(),ei);
+        ElementInfoImpl existing = m.put(ei.getElementName(),ei);
 
         if(existing!=null) {
             QName en = ei.getElementName();
@@ -296,11 +294,11 @@ class TypeInfoSetImpl implements
         }
     }
 
-    public Map> getElementMappings( ClassDeclT scope ) {
+    public Map> getElementMappings( C scope ) {
         return elementMappings.get(scope);
     }
 
-    public Iterable> getAllElements() {
+    public Iterable> getAllElements() {
         return allElements;
     }
 
@@ -308,7 +306,7 @@ class TypeInfoSetImpl implements
         if(xmlNsCache==null) {
             xmlNsCache = new HashMap>();
 
-            for (ClassInfoImpl ci : beans().values()) {
+            for (ClassInfoImpl ci : beans().values()) {
                 XmlSchema xs = reader.getPackageAnnotation( XmlSchema.class, ci.getClazz(), null );
                 if(xs==null)
                     continue;
@@ -329,8 +327,24 @@ class TypeInfoSetImpl implements
         else            return Collections.emptyMap();
     }
 
+    public Map getSchemaLocations() {
+        Map r = new HashMap();
+        for (ClassInfoImpl ci : beans().values()) {
+            XmlSchema xs = reader.getPackageAnnotation( XmlSchema.class, ci.getClazz(), null );
+            if(xs==null)
+                continue;
+
+            String loc = xs.location();
+            if(loc.equals(XmlSchema.NO_LOCATION))
+                continue;   // unspecified
+
+            r.put(xs.namespace(),loc);
+        }
+        return r;
+    }
+
     public final XmlNsForm getElementFormDefault(String nsUri) {
-        for (ClassInfoImpl ci : beans().values()) {
+        for (ClassInfoImpl ci : beans().values()) {
             XmlSchema xs = reader.getPackageAnnotation( XmlSchema.class, ci.getClazz(), null );
             if(xs==null)
                 continue;
@@ -346,7 +360,7 @@ class TypeInfoSetImpl implements
     }
 
     public final XmlNsForm getAttributeFormDefault(String nsUri) {
-        for (ClassInfoImpl ci : beans().values()) {
+        for (ClassInfoImpl ci : beans().values()) {
             XmlSchema xs = reader.getPackageAnnotation( XmlSchema.class, ci.getClazz(), null );
             if(xs==null)
                 continue;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeRefImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeRefImpl.java
index 7c63cfc677f..4f4d46434ee 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeRefImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeRefImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Util.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Util.java
index 03f7f34a31e..d205e72b721 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Util.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Util.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import javax.activation.MimeType;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ValuePropertyInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ValuePropertyInfoImpl.java
index aac00b1dc01..38478671734 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ValuePropertyInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ValuePropertyInfoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import com.sun.xml.internal.bind.v2.model.core.PropertyKind;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/package.html b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/package.html
index 1644fb0c99d..8d3b0671dfa 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/package.html
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/package.html
@@ -1,3 +1,27 @@
+
 
 
 Implementation of the com.sun.xml.internal.bind.j2s.model package.
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/GenericArrayTypeImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/GenericArrayTypeImpl.java
index 2cc55cb9138..47efff30125 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/GenericArrayTypeImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/GenericArrayTypeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.nav;
 
 import java.lang.reflect.GenericArrayType;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java
index 38c89be4a80..596a0310e02 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.nav;
 
 import java.util.Collection;
@@ -368,9 +367,9 @@ public interface Navigator {
 
     /**
      * Returns true if the given method is overriding another one
-     * defined in the base class.
+     * defined in the base class 'base' or its ancestors.
      */
-    boolean isOverriding(M method);
+    boolean isOverriding(M method, C base);
 
     /**
      * Returns true if 'clazz' is an interface.
@@ -381,4 +380,12 @@ public interface Navigator {
      * Returns true if the field is transient.
      */
     boolean isTransient(F f);
+
+    /**
+     * Returns true if the given class is an inner class.
+     *
+     * This is only used to improve the error diagnostics, so
+     * it's OK to fail to detect some inner classes as such.
+     */
+    boolean isInnerClass(C clazz);
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/ParameterizedTypeImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/ParameterizedTypeImpl.java
index 9af56d9cbd8..8b71c4a65ea 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/ParameterizedTypeImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/ParameterizedTypeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.nav;
 
 import java.lang.reflect.MalformedParameterizedTypeException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java
index e826a09bac2..6f59f82874b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.nav;
 
 import java.lang.reflect.Array;
@@ -53,7 +52,10 @@ public final class ReflectionNavigator implements Navigator baseClassFinder = new TypeVisitor() {
@@ -509,7 +511,7 @@ public final class ReflectionNavigator implements Navigator {
@@ -520,19 +522,18 @@ public final class ReflectionNavigator implements Navigator s = method.getDeclaringClass().getSuperclass();
         String name = method.getName();
         Class[] params = method.getParameterTypes();
 
-        while(s!=null) {
+        while(base!=null) {
             try {
-                if(s.getDeclaredMethod(name,params)!=null)
+                if(base.getDeclaredMethod(name,params)!=null)
                     return true;
             } catch (NoSuchMethodException e) {
-                ; // recursively go into the base class
+                // recursively go into the base class
             }
 
-            s = s.getSuperclass();
+            base = base.getSuperclass();
         }
 
         return false;
@@ -546,6 +547,10 @@ public final class ReflectionNavigator implements Navigator
 
   Abstraction around the reflection library, to support various reflection models (such as java.lang.reflect and APT).
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeArrayInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeArrayInfo.java
index f1a564854f5..62994a1fc0a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeArrayInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeArrayInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeAttributePropertyInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeAttributePropertyInfo.java
index 8b8de96da09..641b27c531c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeAttributePropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeAttributePropertyInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeBuiltinLeafInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeBuiltinLeafInfo.java
index 204d76334bc..8438e9c0dc7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeBuiltinLeafInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeBuiltinLeafInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeClassInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeClassInfo.java
index 44d7b2ad814..73093432217 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeClassInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeClassInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Type;
@@ -33,7 +32,6 @@ import java.util.Map;
 import javax.xml.namespace.QName;
 
 import com.sun.xml.internal.bind.v2.model.core.ClassInfo;
-import com.sun.xml.internal.bind.v2.model.core.PropertyInfo;
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
 import com.sun.xml.internal.bind.annotation.XmlLocation;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElement.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElement.java
index ecb204c5715..183fd78d69f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElement.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementInfo.java
index 0ae24cf8bf5..cf114d1d8e1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementPropertyInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementPropertyInfo.java
index c018c35f683..33eb07a52b4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementPropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementPropertyInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeEnumLeafInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeEnumLeafInfo.java
index fc1cfd1b8e1..7e78aa015fc 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeEnumLeafInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeEnumLeafInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeLeafInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeLeafInfo.java
index 91cbcce4b7d..ad351f9f045 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeLeafInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeLeafInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeMapPropertyInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeMapPropertyInfo.java
index eeb1666d626..7a94c5cb747 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeMapPropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeMapPropertyInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElement.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElement.java
index bffafd1a4e3..ec5d58ce717 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElement.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Type;
 
 import com.sun.xml.internal.bind.v2.model.core.NonElement;
 import com.sun.xml.internal.bind.v2.runtime.Transducer;
+import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
 
 /**
  * @author Kohsuke Kawaguchi
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElementRef.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElementRef.java
index 94ce8edbf2f..6f20325e385 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElementRef.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElementRef.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimePropertyInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimePropertyInfo.java
index cac777a1b43..87610b707c0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimePropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimePropertyInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeReferencePropertyInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeReferencePropertyInfo.java
index f2dcbce3f8a..db24c7f78ec 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeReferencePropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeReferencePropertyInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfo.java
index ab88d9fbc92..15fc6514d87 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java
index dc59cd3fa70..0724b71c0ba 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Field;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeRef.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeRef.java
index 2f1aecb83ae..3f7e5792a2a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeRef.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeRef.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeValuePropertyInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeValuePropertyInfo.java
index bc6e310071f..974854c048a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeValuePropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeValuePropertyInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/package-info.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/package-info.java
index fe560caec32..45cfb381d88 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/package-info.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 /**
  * The specialization of {@link com.sun.xml.internal.bind.v2.model.core} for the runtime.
  *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/package-info.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/package-info.java
index 69139027c75..e62f76e7630 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/package-info.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 /**
  * 
    The JAXB 2.0 runtime
    .
  *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/AnyTypeBeanInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/AnyTypeBeanInfo.java
index 6cc85b76cd3..3777a56c560 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/AnyTypeBeanInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/AnyTypeBeanInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.io.IOException;
@@ -137,11 +136,11 @@ final class AnyTypeBeanInfo extends JaxBeanInfo {
         for( int i=0; i {
         }
     }
 
-    private final Map> byElement = new HashMap>();
-    private final Map> byPeer = new HashMap>();
+    private final Map> byElement = new IdentityHashMap>();
+    private final Map> byPeer = new IdentityHashMap>();
     private final Set usedNodes = new HashSet();
 
     /** Records the new element<->inner peer association. */
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BinderImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BinderImpl.java
index f1eb4502295..bc103aaec53 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BinderImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BinderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime;
 
 import javax.xml.bind.Binder;
@@ -123,6 +122,7 @@ public class BinderImpl extends Binder {
     }
 
     public void setSchema(Schema schema) {
+        getMarshaller().setSchema(schema);
         getUnmarshaller().setSchema(schema);
     }
 
@@ -157,6 +157,8 @@ public class BinderImpl extends Binder {
     }
 
     public Object getJAXBNode(XmlNode xmlNode) {
+        if(xmlNode==null)
+            throw new IllegalArgumentException();
         AssociationMap.Entry e = assoc.byElement(xmlNode);
         if(e==null)     return null;
         if(e.outer()!=null)     return e.outer();
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java
index 4c338d49401..380d2ba2b9b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeContextImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeContextImpl.java
index d1b10d08d06..c95ca8c7855 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeContextImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeContextImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime;
 
 import javax.xml.bind.JAXBException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java
index 5cb5d767007..3688773b12e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.io.IOException;
@@ -76,7 +75,7 @@ final class BridgeImpl extends InternalBridge {
 
     public void marshal(Marshaller _m, T t, XMLStreamWriter output) throws JAXBException {
         MarshallerImpl m = (MarshallerImpl)_m;
-        m.write(tagName,bi,t,XMLStreamWriterOutput.create(output),new StAXPostInitAction(output,m.serializer));
+        m.write(tagName,bi,t,XMLStreamWriterOutput.create(output,context),new StAXPostInitAction(output,m.serializer));
     }
 
     public void marshal(Marshaller _m, T t, OutputStream output, NamespaceContext nsContext) throws JAXBException {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ClassBeanInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ClassBeanInfoImpl.java
index c64bf8367c2..d9ae488c030 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ClassBeanInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ClassBeanInfoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/CompositeStructureBeanInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/CompositeStructureBeanInfo.java
index 283fb2ec2bb..3fc280695e9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/CompositeStructureBeanInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/CompositeStructureBeanInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ContentHandlerAdaptor.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ContentHandlerAdaptor.java
index e640f63e8d4..bd71257a2ab 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ContentHandlerAdaptor.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ContentHandlerAdaptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.io.IOException;
@@ -46,7 +45,7 @@ import org.xml.sax.helpers.DefaultHandler;
 final class ContentHandlerAdaptor extends DefaultHandler {
 
     /** Stores newly declared prefix-URI mapping. */
-    private final FinalArrayList prefixMap = new FinalArrayList();
+    private final FinalArrayList prefixMap = new FinalArrayList();
 
     /** Events will be sent to this object. */
     private final XMLSerializer serializer;
@@ -67,6 +66,15 @@ final class ContentHandlerAdaptor extends DefaultHandler {
         prefixMap.add(uri);
     }
 
+    private boolean containsPrefixMapping(String prefix, String uri) {
+        for( int i=0; i {
     public final Class expectedType;
     private final Class scope;
 
+    /**
+     * If non-null, use this to create an instance.
+     * It takes one value.
+     */
+    private final Constructor constructor;
+
     ElementBeanInfoImpl(JAXBContextImpl grammar, RuntimeElementInfo rei) {
         super(grammar,rei,(Class)rei.getType(),true,false,true);
 
@@ -74,6 +81,19 @@ public final class ElementBeanInfoImpl extends JaxBeanInfo {
         tagName = rei.getElementName();
         expectedType = Navigator.REFLECTION.erasure(rei.getContentInMemoryType());
         scope = rei.getScope()==null ? JAXBElement.GlobalScope.class : rei.getScope().getClazz();
+
+        Class type = Navigator.REFLECTION.erasure(rei.getType());
+        if(type==JAXBElement.class)
+            constructor = null;
+        else {
+            try {
+                constructor = type.getConstructor(expectedType);
+            } catch (NoSuchMethodException e) {
+                NoSuchMethodError x = new NoSuchMethodError("Failed to find the constructor for " + type + " with " + expectedType);
+                x.initCause(e);
+                throw x;
+            }
+        }
     }
 
     /**
@@ -89,6 +109,7 @@ public final class ElementBeanInfoImpl extends JaxBeanInfo {
         tagName = null;
         expectedType = null;
         scope = null;
+        constructor = null;
 
         this.property = new Property() {
             public void reset(JAXBElement o) {
@@ -238,12 +259,15 @@ public final class ElementBeanInfoImpl extends JaxBeanInfo {
         return loader;
     }
 
-    public final JAXBElement createInstance(UnmarshallingContext context) {
+    public final JAXBElement createInstance(UnmarshallingContext context) throws IllegalAccessException, InvocationTargetException, InstantiationException {
         return createInstanceFromValue(null);
     }
 
-    public final JAXBElement createInstanceFromValue(Object o) {
-        return new JAXBElement(tagName,expectedType,scope,o);
+    public final JAXBElement createInstanceFromValue(Object o) throws IllegalAccessException, InvocationTargetException, InstantiationException {
+        if(constructor==null)
+            return new JAXBElement(tagName,expectedType,scope,o);
+        else
+            return constructor.newInstance(o);
     }
 
     public boolean reset(JAXBElement e, UnmarshallingContext context) {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/FilterTransducer.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/FilterTransducer.java
index a85fbaff81c..fec5064813f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/FilterTransducer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/FilterTransducer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationException.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationException.java
index 34030d35121..ef787816bca 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.lang.annotation.Annotation;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationsException.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationsException.java
index 0f636711b32..e1a07feab78 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationsException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationsException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/InlineBinaryTransducer.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/InlineBinaryTransducer.java
index 36e7a0ec831..aab952d3be1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/InlineBinaryTransducer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/InlineBinaryTransducer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/InternalBridge.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/InternalBridge.java
index 415ea5e0767..930b502b42a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/InternalBridge.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/InternalBridge.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java
index 35b340bfde2..0fd9cb0904b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.io.IOException;
@@ -32,6 +31,7 @@ import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -43,6 +43,7 @@ import java.util.TreeSet;
 
 import javax.xml.bind.Binder;
 import javax.xml.bind.DatatypeConverter;
+import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.JAXBIntrospector;
@@ -67,18 +68,21 @@ import javax.xml.transform.sax.SAXTransformerFactory;
 import javax.xml.transform.sax.TransformerHandler;
 
 import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
 import com.sun.istack.internal.Pool;
 import com.sun.xml.internal.bind.DatatypeConverterImpl;
 import com.sun.xml.internal.bind.api.AccessorException;
 import com.sun.xml.internal.bind.api.Bridge;
 import com.sun.xml.internal.bind.api.BridgeContext;
 import com.sun.xml.internal.bind.api.CompositeStructure;
+import com.sun.xml.internal.bind.api.ErrorListener;
 import com.sun.xml.internal.bind.api.JAXBRIContext;
 import com.sun.xml.internal.bind.api.RawAccessor;
 import com.sun.xml.internal.bind.api.TypeReference;
 import com.sun.xml.internal.bind.unmarshaller.DOMScanner;
 import com.sun.xml.internal.bind.util.Which;
 import com.sun.xml.internal.bind.v2.WellKnownNamespace;
+import com.sun.xml.internal.bind.v2.model.annotation.RuntimeAnnotationReader;
 import com.sun.xml.internal.bind.v2.model.annotation.RuntimeInlineAnnotationReader;
 import com.sun.xml.internal.bind.v2.model.core.Adapter;
 import com.sun.xml.internal.bind.v2.model.core.NonElement;
@@ -106,16 +110,19 @@ import com.sun.xml.internal.bind.v2.runtime.unmarshaller.UnmarshallingContext;
 import com.sun.xml.internal.bind.v2.schemagen.XmlSchemaGenerator;
 import com.sun.xml.internal.bind.v2.util.EditDistance;
 import com.sun.xml.internal.bind.v2.util.QNameMap;
+import com.sun.xml.internal.txw2.output.ResultFactory;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
 import org.xml.sax.helpers.DefaultHandler;
 
 /**
  * This class provides the implementation of JAXBContext.
  *
+ * @version $Revision$
  */
 public final class JAXBContextImpl extends JAXBRIContext {
 
@@ -198,24 +205,70 @@ public final class JAXBContextImpl extends JAXBRIContext {
      */
     protected final boolean c14nSupport;
 
+    /**
+     * Flag that user has provided a custom AccessorFactory for JAXB to use
+     */
+    public final boolean xmlAccessorFactorySupport;
+
+    /**
+     * @see JAXBRIContext#TREAT_EVERYTHING_NILLABLE
+     */
+    public final boolean allNillable;
+
+
     private WeakReference typeInfoSetCache;
 
+    private @NotNull RuntimeAnnotationReader annotaitonReader;
+
+    private /*almost final*/ boolean hasSwaRef;
+    private final @NotNull Map subclassReplacements;
+
+    /**
+     * If true, we aim for faster {@link JAXBContext} instanciation performance,
+     * instead of going after efficient sustained unmarshalling/marshalling performance.
+     *
+     * @since 2.0.4
+     */
+    public final boolean fastBoot;
+
     /**
      *
      * @param typeRefs
      *      used to build {@link Bridge}s. Can be empty.
      * @param c14nSupport
      *      {@link #c14nSupport}.
+     * @param xmlAccessorFactorySupport
+     *      Use custom com.sun.xml.internal.bind.v2.runtime.reflect.Accessor implementation.
      */
-    public JAXBContextImpl(Class[] classes, Collection typeRefs, String defaultNsUri, boolean c14nSupport) throws JAXBException {
-
+    public JAXBContextImpl(Class[] classes, Collection typeRefs,
+        Map subclassReplacements, String defaultNsUri, boolean c14nSupport,
+        @Nullable RuntimeAnnotationReader ar, boolean xmlAccessorFactorySupport, boolean allNillable) throws JAXBException {
         // initialize datatype converter with ours
         DatatypeConverter.setDatatypeConverter(DatatypeConverterImpl.theInstance);
 
         if(defaultNsUri==null)      defaultNsUri="";    // fool-proof
 
+        if(ar==null)
+            ar = new RuntimeInlineAnnotationReader();
+
+        if(subclassReplacements==null)  subclassReplacements=Collections.emptyMap();
+        if(typeRefs==null)              typeRefs=Collections.emptyList();
+
+        this.annotaitonReader = ar;
+        this.subclassReplacements = subclassReplacements;
+
+        boolean fastBoot;
+        try {
+            fastBoot = Boolean.getBoolean(JAXBContextImpl.class.getName()+".fastBoot");
+        } catch (SecurityException e) {
+            fastBoot = false;
+        }
+        this.fastBoot = fastBoot;
+
         this.defaultNsUri = defaultNsUri;
         this.c14nSupport = c14nSupport;
+        this.xmlAccessorFactorySupport = xmlAccessorFactorySupport;
+        this.allNillable = allNillable;
         this.classes = new Class[classes.length];
         System.arraycopy(classes,0,this.classes,0,classes.length);
 
@@ -304,6 +357,7 @@ public final class JAXBContextImpl extends JAXBRIContext {
             }
             if(tr.get(XmlAttachmentRef.class)!=null) {
                 a = new Adapter(SwaRefAdapter.class,nav);
+                hasSwaRef = true;
             }
 
             if(a!=null) {
@@ -335,6 +389,13 @@ public final class JAXBContextImpl extends JAXBRIContext {
         beanInfos = null;
     }
 
+    /**
+     * True if this JAXBContext has {@link XmlAttachmentRef}.
+     */
+    public boolean hasSwaRef() {
+        return hasSwaRef;
+    }
+
     /**
      * Creates a {@link RuntimeTypeInfoSet}.
      */
@@ -347,9 +408,8 @@ public final class JAXBContextImpl extends JAXBRIContext {
                 return r;
         }
 
-        final RuntimeModelBuilder builder = new RuntimeModelBuilder(
-                new RuntimeInlineAnnotationReader(),
-                defaultNsUri);
+        final RuntimeModelBuilder builder = new RuntimeModelBuilder(this,annotaitonReader,subclassReplacements,defaultNsUri);
+
         IllegalAnnotationsException.Builder errorHandler = new IllegalAnnotationsException.Builder();
         builder.setErrorHandler(errorHandler);
 
@@ -361,6 +421,7 @@ public final class JAXBContextImpl extends JAXBRIContext {
             builder.getTypeInfo(new Ref(c));
         }
 
+        this.hasSwaRef |= builder.hasSwaRef;
         RuntimeTypeInfoSet r = builder.link();
 
         errorHandler.check();
@@ -478,8 +539,11 @@ public final class JAXBContextImpl extends JAXBRIContext {
     public final JaxBeanInfo getBeanInfo(Object o,boolean fatal) throws JAXBException {
         JaxBeanInfo bi = getBeanInfo(o);
         if(bi!=null)    return bi;
-        if(fatal)
-            throw new JAXBException(o.getClass().getName()+" nor any of its super class is known to this context");
+        if(fatal) {
+            if(o instanceof Document)
+                throw new JAXBException(Messages.ELEMENT_NEEDED_BUT_FOUND_DOCUMENT.format(o.getClass()));
+            throw new JAXBException(Messages.UNKNOWN_CLASS.format(o.getClass()));
+        }
         return null;
     }
 
@@ -520,10 +584,9 @@ public final class JAXBContextImpl extends JAXBRIContext {
      * @return
      *      null if the given name pair is not recognized.
      */
-    public final Loader selectRootLoader( UnmarshallingContext.State state, TagName ea ) {
-        JaxBeanInfo beanInfo = rootMap.get(ea.uri,ea.local);
+    public final Loader selectRootLoader( UnmarshallingContext.State state, TagName tag ) {
+        JaxBeanInfo beanInfo = rootMap.get(tag.uri,tag.local);
         if(beanInfo==null)
-            // TODO: this is probably the right place to handle @xsi:type
             return null;
 
         return beanInfo.getLoader(this,true);
@@ -692,17 +755,46 @@ public final class JAXBContextImpl extends JAXBRIContext {
         XmlJavaTypeAdapter xjta = tr.get(XmlJavaTypeAdapter.class);
         XmlList xl = tr.get(XmlList.class);
 
-        Ref ref = new Ref(
-            new RuntimeInlineAnnotationReader(), tis.getNavigator(), tr.type, xjta, xl );
+        Ref ref = new Ref(annotaitonReader, tis.getNavigator(), tr.type, xjta, xl );
 
         return tis.getTypeInfo(ref);
     }
 
-    public void generateSchema(SchemaOutputResolver outputResolver) throws IOException {
-        if(outputResolver==null) {
-            throw new IOException(Messages.NULL_OUTPUT_RESOLVER.format());
-        }
+    @Override
+    public void generateEpisode(Result output) {
+        if(output==null)
+            throw new IllegalArgumentException();
+        createSchemaGenerator().writeEpisodeFile(ResultFactory.createSerializer(output));
+    }
 
+    @Override
+    public void generateSchema(SchemaOutputResolver outputResolver) throws IOException {
+        if(outputResolver==null)
+            throw new IOException(Messages.NULL_OUTPUT_RESOLVER.format());
+
+        final SAXParseException[] e = new SAXParseException[1];
+
+        createSchemaGenerator().write(outputResolver, new ErrorListener() {
+            public void error(SAXParseException exception) {
+                e[0] = exception;
+            }
+
+            public void fatalError(SAXParseException exception) {
+                e[0] = exception;
+            }
+
+            public void warning(SAXParseException exception) {}
+            public void info(SAXParseException exception) {}
+        });
+
+        if(e[0]!=null) {
+            IOException x = new IOException(Messages.FAILED_TO_GENERATE_SCHEMA.format());
+            x.initCause(e[0]);
+            throw x;
+        }
+    }
+
+    private XmlSchemaGenerator createSchemaGenerator() {
         RuntimeTypeInfoSet tis;
         try {
             tis = getTypeInfoSet();
@@ -711,8 +803,8 @@ public final class JAXBContextImpl extends JAXBRIContext {
             throw new AssertionError(e);
         }
 
-        XmlSchemaGenerator xsdgen =
-                new XmlSchemaGenerator(tis.getNavigator(),tis);
+        XmlSchemaGenerator xsdgen =
+                new XmlSchemaGenerator(tis.getNavigator(),tis);
 
         // JAX-RPC uses Bridge objects that collide with
         // @XmlRootElement.
@@ -732,13 +824,15 @@ public final class JAXBContextImpl extends JAXBRIContext {
 
             if(tr.type==void.class || tr.type==Void.class) {
                 xsdgen.add(tr.tagName,false,null);
+            } else
+            if(tr.type==CompositeStructure.class) {
+                // this is a special class we introduced for JAX-WS that we *don't* want in the schema
             } else {
                 NonElement typeInfo = getXmlType(tis,tr);
                 xsdgen.add(tr.tagName, !Navigator.REFLECTION.isPrimitive(tr.type),typeInfo);
             }
         }
-
-        xsdgen.write(outputResolver);
+        return xsdgen;
     }
 
     public QName getTypeName(TypeReference tr) {
@@ -874,6 +968,18 @@ public final class JAXBContextImpl extends JAXBRIContext {
         return null;
     }
 
+    /**
+     * Creates a {@link JAXBContextImpl} that includes the specified additional classes.
+     */
+    public JAXBContextImpl createAugmented(Class clazz) throws JAXBException {
+        Class[] newList = new Class[classes.length+1];
+        System.arraycopy(classes,0,newList,0,classes.length);
+        newList[classes.length] = clazz;
+
+        return new JAXBContextImpl(newList,bridges.keySet(),subclassReplacements,
+        defaultNsUri,c14nSupport,annotaitonReader, xmlAccessorFactorySupport, allNillable);
+    }
+
     private static final Comparator QNAME_COMPARATOR = new Comparator() {
         public int compare(QName lhs, QName rhs) {
             int r = lhs.getLocalPart().compareTo(rhs.getLocalPart());
@@ -881,5 +987,5 @@ public final class JAXBContextImpl extends JAXBRIContext {
 
             return lhs.getNamespaceURI().compareTo(rhs.getNamespaceURI());
         }
-    }; ;
+    };
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/JaxBeanInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/JaxBeanInfo.java
index 02fdd8c69bb..5b89cba63cd 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/JaxBeanInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/JaxBeanInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.io.IOException;
@@ -415,47 +414,40 @@ public abstract class JaxBeanInfo {
      */
     protected final void setLifecycleFlags() {
         try {
-            Method m;
-
-            // beforeUnmarshal
-            try {
-                m = jaxbType.getDeclaredMethod("beforeUnmarshal", unmarshalEventParams);
-                cacheLifecycleMethod(m, FLAG_HAS_BEFORE_UNMARSHAL_METHOD);
-            } catch (NoSuchMethodException e) {
-                // no-op, look for the next method
-            }
-
-            // afterUnmarshal
-            try {
-                m = jaxbType.getDeclaredMethod("afterUnmarshal", unmarshalEventParams);
-                cacheLifecycleMethod(m, FLAG_HAS_AFTER_UNMARSHAL_METHOD);
-            } catch (NoSuchMethodException e) {
-                // no-op, look for the next method
-            }
-
-            // beforeMarshal
-            try {
-                m = jaxbType.getDeclaredMethod("beforeMarshal", marshalEventParams);
-                cacheLifecycleMethod(m, FLAG_HAS_BEFORE_MARSHAL_METHOD);
-            } catch (NoSuchMethodException e) {
-                // no-op, look for the next method
-            }
-
-            // afterMarshal
-            try {
-                m = jaxbType.getDeclaredMethod("afterMarshal", marshalEventParams);
-                cacheLifecycleMethod(m, FLAG_HAS_AFTER_MARSHAL_METHOD);
-            } catch (NoSuchMethodException e) {
-                // no-op
+            for( Method m : jaxbType.getDeclaredMethods() ) {
+                String name = m.getName();
+                if(name.equals("beforeUnmarshal")) {
+                    if(match(m,unmarshalEventParams)) {
+                        cacheLifecycleMethod(m, FLAG_HAS_BEFORE_UNMARSHAL_METHOD);
+                    }
+                } else
+                if(name.equals("afterUnmarshal")) {
+                    if(match(m,unmarshalEventParams)) {
+                        cacheLifecycleMethod(m, FLAG_HAS_AFTER_UNMARSHAL_METHOD);
+                    }
+                } else
+                if(name.equals("beforeMarshal")) {
+                    if(match(m,marshalEventParams)) {
+                        cacheLifecycleMethod(m, FLAG_HAS_BEFORE_MARSHAL_METHOD);
+                    }
+                } else
+                if(name.equals("afterMarshal")) {
+                    if(match(m,marshalEventParams)) {
+                        cacheLifecycleMethod(m, FLAG_HAS_AFTER_MARSHAL_METHOD);
+                    }
+                }
             }
         } catch(SecurityException e) {
             // this happens when we don't have enough permission.
             logger.log( Level.WARNING, Messages.UNABLE_TO_DISCOVER_EVENTHANDLER.format(
-                jaxbType.getName(),
-                e ));
+                jaxbType.getName(), e ));
         }
     }
 
+    private boolean match(Method m, Class[] params) {
+        return Arrays.equals(m.getParameterTypes(),params);
+    }
+
     /**
      * Cache a reference to the specified lifecycle method for the jaxbType
      * associated with this beanInfo.
@@ -477,16 +469,16 @@ public abstract class JaxBeanInfo {
 
         switch (lifecycleFlag) {
         case FLAG_HAS_BEFORE_UNMARSHAL_METHOD:
-            lcm.setBeforeUnmarshal(m);
+            lcm.beforeUnmarshal = m;
             break;
         case FLAG_HAS_AFTER_UNMARSHAL_METHOD:
-            lcm.setAfterUnmarshal(m);
+            lcm.afterUnmarshal = m;
             break;
         case FLAG_HAS_BEFORE_MARSHAL_METHOD:
-            lcm.setBeforeMarshal(m);
+            lcm.beforeMarshal = m;
             break;
         case FLAG_HAS_AFTER_MARSHAL_METHOD:
-            lcm.setAfterMarshal(m);
+            lcm.afterMarshal = m;
             break;
         }
     }
@@ -504,7 +496,7 @@ public abstract class JaxBeanInfo {
      * Invokes the beforeUnmarshal method if applicable.
      */
     public final void invokeBeforeUnmarshalMethod(UnmarshallerImpl unm, Object child, Object parent) throws SAXException {
-        Method m = getLifecycleMethods().getBeforeUnmarshal();
+        Method m = getLifecycleMethods().beforeUnmarshal;
         invokeUnmarshallCallback(m, child, unm, parent);
     }
 
@@ -512,7 +504,7 @@ public abstract class JaxBeanInfo {
      * Invokes the afterUnmarshal method if applicable.
      */
     public final void invokeAfterUnmarshalMethod(UnmarshallerImpl unm, Object child, Object parent) throws SAXException {
-        Method m = getLifecycleMethods().getAfterUnmarshal();
+        Method m = getLifecycleMethods().afterUnmarshal;
         invokeUnmarshallCallback(m, child, unm, parent);
     }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/LeafBeanInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/LeafBeanInfoImpl.java
index 32f19298c5f..2f434a456fe 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/LeafBeanInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/LeafBeanInfoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/LifecycleMethods.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/LifecycleMethods.java
index 4c60cd99c3e..23008cc17f1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/LifecycleMethods.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/LifecycleMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,12 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.lang.reflect.Method;
 
-import com.sun.xml.internal.bind.v2.runtime.unmarshaller.UnmarshallingContext;
 import com.sun.xml.internal.bind.v2.runtime.unmarshaller.Loader;
+import com.sun.xml.internal.bind.v2.runtime.unmarshaller.UnmarshallingContext;
 
 /**
  * This class is a simple container for caching lifecycle methods that are
@@ -39,41 +38,9 @@ import com.sun.xml.internal.bind.v2.runtime.unmarshaller.Loader;
  * @see Loader#fireAfterUnmarshal(JaxBeanInfo, Object, UnmarshallingContext.State)
  * @see XMLSerializer#fireMarshalEvent(Object, Method)
  */
-public final class LifecycleMethods {
-    private Method beforeUnmarshal;
-    private Method afterUnmarshal;
-    private Method beforeMarshal;
-    private Method afterMarshal;
-
-    public Method getAfterMarshal() {
-        return afterMarshal;
-    }
-
-    public void setAfterMarshal(Method afterMarshal) {
-        this.afterMarshal = afterMarshal;
-    }
-
-    public Method getAfterUnmarshal() {
-        return afterUnmarshal;
-    }
-
-    public void setAfterUnmarshal(Method afterUnmarshal) {
-        this.afterUnmarshal = afterUnmarshal;
-    }
-
-    public Method getBeforeMarshal() {
-        return beforeMarshal;
-    }
-
-    public void setBeforeMarshal(Method beforeMarshal) {
-        this.beforeMarshal = beforeMarshal;
-    }
-
-    public Method getBeforeUnmarshal() {
-        return beforeUnmarshal;
-    }
-
-    public void setBeforeUnmarshal(Method beforeUnmarshal) {
-        this.beforeUnmarshal = beforeUnmarshal;
-    }
+final class LifecycleMethods {
+    Method beforeUnmarshal;
+    Method afterUnmarshal;
+    Method beforeMarshal;
+    Method afterMarshal;
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Location.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Location.java
index b0acf597203..4670926bdc7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Location.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Location.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime;
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java
index 1f5c5fdbf55..820c7f67b46 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.io.BufferedWriter;
@@ -151,7 +150,7 @@ public /*to make unit tests happy*/ final class MarshallerImpl extends AbstractM
     }
 
     public void marshal(Object obj, XMLStreamWriter writer) throws JAXBException {
-        write(obj, XMLStreamWriterOutput.create(writer), new StAXPostInitAction(writer,serializer));
+        write(obj, XMLStreamWriterOutput.create(writer,context), new StAXPostInitAction(writer,serializer));
     }
 
     public void marshal(Object obj, XMLEventWriter writer) throws JAXBException {
@@ -195,7 +194,16 @@ public /*to make unit tests happy*/ final class MarshallerImpl extends AbstractM
                         fileURL = fileURL.substring(8);
                     else
                         fileURL = fileURL.substring(7);
-                } // otherwise assume that it's a file name
+                }
+                if (fileURL.startsWith("file:/")) {
+                    // some people use broken URLs like "file:/c:/abc/def/ghi.txt"
+                    // so let's make it work with that
+                    if (fileURL.substring(6).indexOf(":") > 0)
+                        fileURL = fileURL.substring(6);
+                    else
+                        fileURL = fileURL.substring(5);
+                }
+                // otherwise assume that it's a file name
 
                 try {
                     FileOutputStream fos = new FileOutputStream(fileURL);
@@ -247,7 +255,7 @@ public /*to make unit tests happy*/ final class MarshallerImpl extends AbstractM
                         serializer.childAsXsiType(obj,"root",bi);
                 }
                 serializer.endElement();
-                postwrite(out);
+                postwrite();
             } catch( SAXException e ) {
                 throw new MarshalException(e);
             } catch (IOException e) {
@@ -296,7 +304,7 @@ public /*to make unit tests happy*/ final class MarshallerImpl extends AbstractM
             try {
                 prewrite(out,isFragment(),postInitAction);
                 serializer.childAsRoot(obj);
-                postwrite(out);
+                postwrite();
             } catch( SAXException e ) {
                 throw new MarshalException(e);
             } catch (IOException e) {
@@ -348,10 +356,9 @@ public /*to make unit tests happy*/ final class MarshallerImpl extends AbstractM
         serializer.setPrefixMapper(prefixMapper);
     }
 
-    private void postwrite(XmlOutput out) throws IOException, SAXException, XMLStreamException {
+    private void postwrite() throws IOException, SAXException, XMLStreamException {
         serializer.endDocument();
         serializer.reconcileID();   // extra check
-        out.flush();
     }
 
 
@@ -444,7 +451,7 @@ public /*to make unit tests happy*/ final class MarshallerImpl extends AbstractM
     public Object getProperty(String name) throws PropertyException {
         if( INDENT_STRING.equals(name) )
             return indent;
-        if( ENCODING_HANDLER.equals(name) )
+        if( ENCODING_HANDLER.equals(name) || ENCODING_HANDLER2.equals(name) )
             return escapeHandler;
         if( PREFIX_MAPPER.equals(name) )
             return prefixMapper;
@@ -454,6 +461,9 @@ public /*to make unit tests happy*/ final class MarshallerImpl extends AbstractM
             return header;
         if( C14N.equals(name) )
             return c14nSupport;
+        if ( OBJECT_IDENTITY_CYCLE_DETECTION.equals(name))
+                return serializer.getObjectIdentityCycleDetection();
+;
 
         return super.getProperty(name);
     }
@@ -464,7 +474,7 @@ public /*to make unit tests happy*/ final class MarshallerImpl extends AbstractM
             indent = (String)value;
             return;
         }
-        if( ENCODING_HANDLER.equals(name) ) {
+        if( ENCODING_HANDLER.equals(name) || ENCODING_HANDLER2.equals(name)) {
             if(!(value instanceof CharacterEscapeHandler))
                 throw new PropertyException(
                     Messages.MUST_BE_X.format(
@@ -501,6 +511,11 @@ public /*to make unit tests happy*/ final class MarshallerImpl extends AbstractM
             c14nSupport = (Boolean)value;
             return;
         }
+        if (OBJECT_IDENTITY_CYCLE_DETECTION.equals(name)) {
+                checkBoolean(name,value);
+            serializer.setObjectIdentityCycleDetection((Boolean)value);
+            return;
+        }
 
         super.setProperty(name, value);
     }
@@ -585,7 +600,9 @@ public /*to make unit tests happy*/ final class MarshallerImpl extends AbstractM
     protected static final String INDENT_STRING = "com.sun.xml.internal.bind.indentString";
     protected static final String PREFIX_MAPPER = "com.sun.xml.internal.bind.namespacePrefixMapper";
     protected static final String ENCODING_HANDLER = "com.sun.xml.internal.bind.characterEscapeHandler";
+    protected static final String ENCODING_HANDLER2 = "com.sun.xml.internal.bind.marshaller.CharacterEscapeHandler";
     protected static final String XMLDECLARATION = "com.sun.xml.internal.bind.xmlDeclaration";
     protected static final String XML_HEADERS = "com.sun.xml.internal.bind.xmlHeaders";
     protected static final String C14N = JAXBRIContext.CANONICALIZATION_SUPPORT;
+    protected static final String OBJECT_IDENTITY_CYCLE_DETECTION = "com.sun.xml.internal.bind.objectIdentitityCycleDetection";
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.java
index 0d742108605..1f4be623ea3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.text.MessageFormat;
@@ -52,6 +51,9 @@ enum Messages {
     SUBSTITUTED_BY_ANONYMOUS_TYPE, // 3 arg
     CYCLE_IN_MARSHALLER, // 1 arg
     UNABLE_TO_DISCOVER_EVENTHANDLER, // 1 arg
+    ELEMENT_NEEDED_BUT_FOUND_DOCUMENT, // 1 arg
+    UNKNOWN_CLASS, // 1 arg
+    FAILED_TO_GENERATE_SCHEMA, // 0 args
     ;
 
     private static final ResourceBundle rb = ResourceBundle.getBundle(Messages.class.getName());
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.properties b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.properties
index d3c25d906a2..79d34b7e597 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.properties
@@ -1,3 +1,28 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
 NOT_MARSHALLABLE = \
 	the object parameter to marshal() is not marshallable
 
@@ -58,4 +83,13 @@ CYCLE_IN_MARSHALLER = \
 
 UNABLE_TO_DISCOVER_EVENTHANDLER = \
     Unable to list methods of "{0}". If there is any event callback handler on this class, it will be ignored.
+
+ELEMENT_NEEDED_BUT_FOUND_DOCUMENT = \
+    A DOM document "{0}" is found but an element is needed. Use Document.getDocumentElement() and set that object instead.
+
+UNKNOWN_CLASS = \
+    {0} nor any of its super class is known to this context.
+
+FAILED_TO_GENERATE_SCHEMA = \
+    Failed to generate schema.
  
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/MimeTypedTransducer.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/MimeTypedTransducer.java
index 20b088ebd6c..8eee884c91a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/MimeTypedTransducer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/MimeTypedTransducer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.awt.*;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Name.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Name.java
index 4db08105e92..c1650c3c53f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Name.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Name.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/NameBuilder.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/NameBuilder.java
index 82a4994dbd5..8682f7d017c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/NameBuilder.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/NameBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.util.HashMap;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/NameList.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/NameList.java
index e0fc006c492..a076711c96f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/NameList.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/NameList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/NamespaceContext2.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/NamespaceContext2.java
index 2e637305a3f..7c14fb1e3f7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/NamespaceContext2.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/NamespaceContext2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,8 @@ package com.sun.xml.internal.bind.v2.runtime;
 
 import javax.xml.namespace.NamespaceContext;
 
+import com.sun.istack.internal.NotNull;
+
 /**
  * Maintains namespace<->prefix bindings.
  *
@@ -74,4 +76,13 @@ public interface NamespaceContext2 extends NamespaceContext
      *      the default namespace, null is returned.
      */
     String declareNamespace( String namespaceUri, String preferedPrefix, boolean requirePrefix );
+
+    /**
+     * Forcibly make a namespace declaration in effect.
+     *
+     * If the (prefix,uri) binding is already in-scope, this method
+     * simply returns the assigned prefix index. Otherwise a new
+     * declaration will be put.
+     */
+    int force(@NotNull String uri, @NotNull String prefix);
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/RuntimeUtil.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/RuntimeUtil.java
index 6921a9c8acd..d6d77f64483 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/RuntimeUtil.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/RuntimeUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.util.Collections;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/SchemaTypeTransducer.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/SchemaTypeTransducer.java
index 1b1db3bdbf0..2582b3a835a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/SchemaTypeTransducer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/SchemaTypeTransducer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/StAXPostInitAction.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/StAXPostInitAction.java
index 023e0f93dde..58d2dd4fee2 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/StAXPostInitAction.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/StAXPostInitAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime;
 
 import javax.xml.namespace.NamespaceContext;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapter.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapter.java
index 2e2d2add54a..c87e4e22b73 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime;
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Transducer.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Transducer.java
index c47a7bb82f5..1173ecd1f3c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Transducer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Transducer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ValueListBeanInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ValueListBeanInfoImpl.java
index 8ed95749307..83d16fd9424 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ValueListBeanInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ValueListBeanInfoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java
index fb85c09e91b..bfc6d5c3899 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,6 +64,7 @@ import com.sun.xml.internal.bind.v2.runtime.output.XmlOutput;
 import com.sun.xml.internal.bind.v2.runtime.unmarshaller.Base64Data;
 import com.sun.xml.internal.bind.v2.runtime.unmarshaller.IntData;
 import com.sun.xml.internal.bind.v2.util.CollisionCheckStack;
+import com.sun.xml.internal.bind.CycleRecoverable;
 
 import org.xml.sax.SAXException;
 
@@ -254,6 +255,16 @@ public final class XMLSerializer extends Coordinator {
         nse.setTagName(idx,localName,outerPeer);
     }
 
+    /**
+     * Variation of {@link #startElement(String, String, String, Object)} that forces
+     * a specific prefix. Needed to preserve the prefix when marshalling DOM.
+     */
+    public void startElementForce(String nsUri, String localName, String forcedPrefix, Object outerPeer) {
+        startElement();
+        int idx = nsContext.force(nsUri, forcedPrefix);
+        nse.setTagName(idx,localName,outerPeer);
+    }
+
     public void endNamespaceDecls(Object innerPeer) throws IOException, XMLStreamException {
         nsContext.collectionMode = false;
         nse.startElement(out,innerPeer);
@@ -472,25 +483,46 @@ public final class XMLSerializer extends Coordinator {
         cycleDetectionStack.pop();
     }
 
-    private void pushObject(Object obj, String fieldName) throws SAXException {
-        if(cycleDetectionStack.push(obj)) {
-            // cycle detected
-            StringBuilder sb = new StringBuilder();
-            sb.append(obj);
-            int i=cycleDetectionStack.size()-1;
-            Object x;
-            do {
-                sb.append(" -> ");
-                x = cycleDetectionStack.get(--i);
-                sb.append(x);
-            } while(obj!=x);
+    /**
+     * Pushes the object to {@link #cycleDetectionStack} and also
+     * detect any cycles.
+     *
+     * When a cycle is found, this method tries to recover from it.
+     *
+     * @return
+     *      the object that should be marshalled instead of the given obj,
+     *      or null if the error is found and we need to avoid marshalling this object
+     *      to prevent infinite recursion. When this method returns null, the error
+     *      has already been reported.
+     */
+    private Object pushObject(Object obj, String fieldName) throws SAXException {
+        if(!cycleDetectionStack.push(obj))
+            return obj;
 
-            reportError(new ValidationEventImpl(
-                ValidationEvent.ERROR,
-                Messages.CYCLE_IN_MARSHALLER.format(sb),
-                getCurrentLocation(fieldName),
-                null));
+        // allow the object to nominate its replacement
+        if(obj instanceof CycleRecoverable) {
+            obj = ((CycleRecoverable)obj).onCycleDetected(new CycleRecoverable.Context(){
+                public Marshaller getMarshaller() {
+                    return marshaller;
+                }
+            });
+            if(obj!=null) {
+                // object nominated its replacement.
+                // we still need to make sure that the nominated.
+                // this may cause inifinite recursion on its own.
+                cycleDetectionStack.pop();
+                return pushObject(obj,fieldName);
+            } else
+                return null;
         }
+
+        // cycle detected and no one is catching the error.
+        reportError(new ValidationEventImpl(
+            ValidationEvent.ERROR,
+            Messages.CYCLE_IN_MARSHALLER.format(cycleDetectionStack.getCycleString()),
+            getCurrentLocation(fieldName),
+            null));
+        return null;
     }
 
     /**
@@ -512,6 +544,14 @@ public final class XMLSerializer extends Coordinator {
         if(child==null) {
             handleMissingObjectError(fieldName);
         } else {
+            child = pushObject(child,fieldName);
+            if(child==null) {
+                // error recovery
+                endNamespaceDecls(null);
+                endAttributes();
+                cycleDetectionStack.pop();
+            }
+
             JaxBeanInfo beanInfo;
             try {
                 beanInfo = grammar.getBeanInfo(child,true);
@@ -520,11 +560,10 @@ public final class XMLSerializer extends Coordinator {
                 // recover by ignore
                 endNamespaceDecls(null);
                 endAttributes();
+                cycleDetectionStack.pop();
                 return;
             }
 
-            pushObject(child,fieldName);
-
             final boolean lookForLifecycleMethods = beanInfo.lookForLifecycleMethods();
             if (lookForLifecycleMethods) {
                 fireBeforeMarshalEvents(beanInfo, child);
@@ -572,12 +611,17 @@ public final class XMLSerializer extends Coordinator {
         if(child==null) {
             handleMissingObjectError(fieldName);
         } else {
+            child = pushObject(child,fieldName);
+            if(child==null) { // error recovery
+                endNamespaceDecls(null);
+                endAttributes();
+                return;
+            }
+
             boolean asExpected = child.getClass()==expected.jaxbType;
             JaxBeanInfo actual = expected;
             QName actualTypeName = null;
 
-            pushObject(child,fieldName);
-
             if((asExpected) && (actual.lookForLifecycleMethods())) {
                 fireBeforeMarshalEvents(actual, child);
             }
@@ -643,7 +687,7 @@ public final class XMLSerializer extends Coordinator {
     private void fireAfterMarshalEvents(final JaxBeanInfo beanInfo, Object currentTarget) {
         // first invoke bean embedded listener
         if (beanInfo.hasAfterMarshalMethod()) {
-            Method m = beanInfo.getLifecycleMethods().getAfterMarshal();
+            Method m = beanInfo.getLifecycleMethods().afterMarshal;
             fireMarshalEvent(currentTarget, m);
         }
 
@@ -667,7 +711,7 @@ public final class XMLSerializer extends Coordinator {
     private void fireBeforeMarshalEvents(final JaxBeanInfo beanInfo, Object currentTarget) {
         // first invoke bean embedded listener
         if (beanInfo.hasBeforeMarshalMethod()) {
-            Method m = beanInfo.getLifecycleMethods().getBeforeMarshal();
+            Method m = beanInfo.getLifecycleMethods().beforeMarshal;
             fireMarshalEvent(currentTarget, m);
         }
 
@@ -908,6 +952,13 @@ public final class XMLSerializer extends Coordinator {
         return schemaType;
     }
 
+    public void setObjectIdentityCycleDetection(boolean val) {
+        cycleDetectionStack.setUseIdentity(val);
+    }
+    public boolean getObjectIdentityCycleDetection() {
+        return cycleDetectionStack.getUseIdentity();
+    }
+
     void reconcileID() throws SAXException {
         // find objects that were not a part of the object graph
         idReferencedObjects.removeAll(objectsWithId);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/C14nXmlOutput.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/C14nXmlOutput.java
index d093aada43e..dc67cda23a9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/C14nXmlOutput.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/C14nXmlOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.output;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/DOMOutput.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/DOMOutput.java
index 13243a16f3b..391b1cb07a5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/DOMOutput.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/DOMOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.output;
 
 import com.sun.xml.internal.bind.v2.runtime.AssociationMap;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Encoded.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Encoded.java
index ae9752838ca..03274cbaea1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Encoded.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Encoded.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.output;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java
index 0424016a2c1..6350afbc4be 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,46 +22,423 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.output;
 
-import java.io.IOException;
-
+import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
+import com.sun.xml.internal.bind.v2.runtime.Name;
+import com.sun.xml.internal.bind.v2.runtime.XMLSerializer;
 import javax.xml.stream.XMLStreamException;
 
 import com.sun.xml.internal.bind.v2.runtime.unmarshaller.Base64Data;
+import com.sun.xml.internal.fastinfoset.EncodingConstants;
 import com.sun.xml.internal.fastinfoset.stax.StAXDocumentSerializer;
-
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Map;
+import java.util.WeakHashMap;
+import javax.xml.bind.JAXBContext;
+import com.sun.xml.internal.org.jvnet.fastinfoset.VocabularyApplicationData;
 import org.xml.sax.SAXException;
 
 /**
- * {@link XmlOutput} for {@link StAXDocumentSerializer}.
+ * {@link XmlOutput} for {@link LowLevelStAXDocumentSerializer}.
+ * 
    
+ * 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
+ * from JAXB beans or schema). The pre-encoded UTF-8 representations of known
+ * local names are also utilized.
+ * 
    
+ * The lookup of  elements, attributes and local names with respect to a context
+ * is very efficient. It relies on an incrementing base line so that look up is
+ * performed in O(1) time and only uses static memory. When the base line reaches
+ * a point where integer overflow will occur the arrays and base line are reset
+ * (such an event is rare and will have little impact on performance).
+ * 
    
+ * A weak map of JAXB contexts to optimized tables for attributes, elements and
+ * local names is utilized and stored on the LowLevel StAX serializer. Thus,
+ * optimized serializing can work other multiple serializing of JAXB beans using
+ * the same LowLevel StAX serializer instance. This approach works best when JAXB
+ * contexts are only created once per schema or JAXB beans (which is the recommended
+ * practice as the creation JAXB contexts are expensive, they are thread safe and
+ * can be reused).
  *
- * @author Paul Sandoz.
+ * @author Paul.Sandoz@Sun.Com
  */
 public final class FastInfosetStreamWriterOutput extends XMLStreamWriterOutput {
     private final StAXDocumentSerializer fiout;
+    private final Encoded[] localNames;
+    private final TablesPerJAXBContext tables;
+
+    /**
+     * Holder for the optimzed element, attribute and
+     * local name tables.
+     */
+    final static class TablesPerJAXBContext {
+        final int[] elementIndexes;
+        final int[] attributeIndexes;
+        final int[] localNameIndexes;
+
+        /**
+         * The offset of the index
+         */
+        int indexOffset;
+
+        /**
+         * The the maximum known value of an index
+         */
+        int maxIndex;
+
+        /**
+         * True if the tables require clearing
+         */
+        boolean requiresClear;
+
+        /**
+         * Create a new set of tables for a JAXB context.
+         * 
    
+         * @param content the JAXB context.
+         * @param initialIndexOffset the initial index offset to calculate
+         *                           the maximum possible index
+         *
+         */
+        TablesPerJAXBContext(JAXBContextImpl context, int initialIndexOffset) {
+            elementIndexes = new int[context.getNumberOfElementNames()];
+            attributeIndexes = new int[context.getNumberOfAttributeNames()];
+            localNameIndexes = new int[context.getNumberOfLocalNames()];
+
+            indexOffset = 1;
+            maxIndex = initialIndexOffset + elementIndexes.length + attributeIndexes.length;
+        }
+
+        /**
+         * Require that tables are cleared.
+         */
+        public void requireClearTables() {
+            requiresClear = true;
+        }
+
+        /**
+         * Clear or reset the tables.
+         * 
    
+         * @param initialIndexOffset the initial index offset to calculate
+         *                           the maximum possible index
+         */
+        public void clearOrResetTables(int intialIndexOffset) {
+            if (requiresClear) {
+                requiresClear = false;
+
+                // Increment offset to new position
+                indexOffset += maxIndex;
+                // Reset the maximum known value of an index
+                maxIndex = intialIndexOffset + elementIndexes.length + attributeIndexes.length;
+                // Check if there is enough free space
+                // If overflow
+                if ((indexOffset + maxIndex) < 0) {
+                    clearAll();
+                }
+            } else {
+                // Reset the maximum known value of an index
+                maxIndex = intialIndexOffset + elementIndexes.length + attributeIndexes.length;
+                // Check if there is enough free space
+                // If overflow
+                if ((indexOffset + maxIndex) < 0) {
+                    resetAll();
+                }
+            }
+        }
+
+        private void clearAll() {
+            clear(elementIndexes);
+            clear(attributeIndexes);
+            clear(localNameIndexes);
+            indexOffset = 1;
+        }
+
+        private void clear(int[] array) {
+            for (int i = 0; i < array.length; i++) {
+                array[i] = 0;
+            }
+        }
+
+        /**
+         * Increment the maximum know index value
+         * 
    
+         * The indexes are preserved.
+         */
+        public void incrementMaxIndexValue() {
+            // Increment the maximum value of an index
+            maxIndex++;
+            // Check if there is enough free space
+            // If overflow
+            if ((indexOffset + maxIndex) < 0) {
+                resetAll();
+            }
+        }
+
+        private void resetAll() {
+            clear(elementIndexes);
+            clear(attributeIndexes);
+            clear(localNameIndexes);
+            indexOffset = 1;
+        }
+
+        private void reset(int[] array) {
+            for (int i = 0; i < array.length; i++) {
+                if (array[i] > indexOffset) {
+                    array[i] = array[i] - indexOffset + 1;
+                } else {
+                    array[i] = 0;
+                }
+            }
+        }
 
-    public FastInfosetStreamWriterOutput(StAXDocumentSerializer out) {
-        super(out);
-        this.fiout = out;
     }
 
-    public void text(Pcdata value, boolean needsSeparatingWhitespace) throws XMLStreamException {
-        if(needsSeparatingWhitespace) {
-            fiout.writeCharacters(" ");
+    /**
+     * Holder of JAXB contexts -> tables.
+     * 
    
+     * An instance will be registered with the
+     * {@link LowLevelStAXDocumentSerializer}.
+     */
+    final static class AppData implements VocabularyApplicationData {
+        final Map contexts =
+                new WeakHashMap();
+        final Collection collectionOfContexts = contexts.values();
+
+        /**
+         * Clear all the tables.
+         */
+        public void clear() {
+            for(TablesPerJAXBContext c : collectionOfContexts)
+                c.requireClearTables();
         }
+    }
+
+    public FastInfosetStreamWriterOutput(StAXDocumentSerializer out,
+            JAXBContextImpl context) {
+        super(out);
+
+        this.fiout = out;
+        this.localNames = context.getUTF8NameTable();
+
+        final VocabularyApplicationData vocabAppData = fiout.getVocabularyApplicationData();
+        AppData appData = null;
+        if (vocabAppData == null || !(vocabAppData instanceof AppData)) {
+            appData = new AppData();
+            fiout.setVocabularyApplicationData(appData);
+        } else {
+            appData = (AppData)vocabAppData;
+        }
+
+        final TablesPerJAXBContext tablesPerContext = appData.contexts.get(context);
+        if (tablesPerContext != null) {
+            tables = tablesPerContext;
+            /**
+             * Obtain the current local name index. Thus will be used to
+             * calculate the maximum index value when serializing for this context
+             */
+            tables.clearOrResetTables(out.getLocalNameIndex());
+        } else {
+            tables = new TablesPerJAXBContext(context, out.getLocalNameIndex());
+            appData.contexts.put(context, tables);
+        }
+    }
+
+    public void startDocument(XMLSerializer serializer, boolean fragment,
+            int[] nsUriIndex2prefixIndex, NamespaceContextImpl nsContext)
+            throws IOException, SAXException, XMLStreamException {
+        super.startDocument(serializer, fragment, nsUriIndex2prefixIndex, nsContext);
+
+        if (fragment)
+            fiout.initiateLowLevelWriting();
+    }
+
+    public void endDocument(boolean fragment) throws IOException, SAXException, XMLStreamException {
+        super.endDocument(fragment);
+    }
+
+    public void beginStartTag(Name name) throws IOException {
+        fiout.writeLowLevelTerminationAndMark();
+
+        if (nsContext.getCurrent().count() == 0) {
+            final int qNameIndex = tables.elementIndexes[name.qNameIndex] - tables.indexOffset;
+            if (qNameIndex >= 0) {
+                fiout.writeLowLevelStartElementIndexed(EncodingConstants.ELEMENT, qNameIndex);
+            } else {
+                tables.elementIndexes[name.qNameIndex] = fiout.getNextElementIndex() + tables.indexOffset;
+
+                final int prefix = nsUriIndex2prefixIndex[name.nsUriIndex];
+                writeLiteral(EncodingConstants.ELEMENT | EncodingConstants.ELEMENT_LITERAL_QNAME_FLAG,
+                        name,
+                        nsContext.getPrefix(prefix),
+                        nsContext.getNamespaceURI(prefix));
+            }
+        } else {
+            beginStartTagWithNamespaces(name);
+        }
+    }
+
+    public void beginStartTagWithNamespaces(Name name) throws IOException {
+        final NamespaceContextImpl.Element nse = nsContext.getCurrent();
+
+        fiout.writeLowLevelStartNamespaces();
+        for (int i = nse.count() - 1; i >= 0; i--) {
+            final String uri = nse.getNsUri(i);
+            if (uri.length() == 0 && nse.getBase() == 1)
+                continue;   // no point in definint xmlns='' on the root
+            fiout.writeLowLevelNamespace(nse.getPrefix(i), uri);
+        }
+        fiout.writeLowLevelEndNamespaces();
+
+        final int qNameIndex = tables.elementIndexes[name.qNameIndex] - tables.indexOffset;
+        if (qNameIndex >= 0) {
+            fiout.writeLowLevelStartElementIndexed(0, qNameIndex);
+        } else {
+            tables.elementIndexes[name.qNameIndex] = fiout.getNextElementIndex() + tables.indexOffset;
+
+            final int prefix = nsUriIndex2prefixIndex[name.nsUriIndex];
+            writeLiteral(EncodingConstants.ELEMENT_LITERAL_QNAME_FLAG,
+                    name,
+                    nsContext.getPrefix(prefix),
+                    nsContext.getNamespaceURI(prefix));
+        }
+    }
+
+    public void attribute(Name name, String value) throws IOException {
+        fiout.writeLowLevelStartAttributes();
+
+        final int qNameIndex = tables.attributeIndexes[name.qNameIndex] - tables.indexOffset;
+        if (qNameIndex >= 0) {
+            fiout.writeLowLevelAttributeIndexed(qNameIndex);
+        } else {
+            tables.attributeIndexes[name.qNameIndex] = fiout.getNextAttributeIndex() + tables.indexOffset;
+
+            final int namespaceURIId = name.nsUriIndex;
+            if (namespaceURIId == -1) {
+                writeLiteral(EncodingConstants.ATTRIBUTE_LITERAL_QNAME_FLAG,
+                        name,
+                        "",
+                        "");
+            } else {
+                final int prefix = nsUriIndex2prefixIndex[namespaceURIId];
+                writeLiteral(EncodingConstants.ATTRIBUTE_LITERAL_QNAME_FLAG,
+                        name,
+                        nsContext.getPrefix(prefix),
+                        nsContext.getNamespaceURI(prefix));
+            }
+        }
+
+        fiout.writeLowLevelAttributeValue(value);
+    }
+
+    private void writeLiteral(int type, Name name, String prefix, String namespaceURI) throws IOException {
+        final int localNameIndex = tables.localNameIndexes[name.localNameIndex] - tables.indexOffset;
+
+        if (localNameIndex < 0) {
+            tables.localNameIndexes[name.localNameIndex] = fiout.getNextLocalNameIndex() + tables.indexOffset;
+
+            fiout.writeLowLevelStartNameLiteral(
+                    type,
+                    prefix,
+                    localNames[name.localNameIndex].buf,
+                    namespaceURI);
+        } else {
+            fiout.writeLowLevelStartNameLiteral(
+                    type,
+                    prefix,
+                    localNameIndex,
+                    namespaceURI);
+        }
+    }
+
+    public void endStartTag() throws IOException {
+        fiout.writeLowLevelEndStartElement();
+    }
+
+    public void endTag(Name name) throws IOException {
+        fiout.writeLowLevelEndElement();
+    }
+
+    public void endTag(int prefix, String localName) throws IOException {
+        fiout.writeLowLevelEndElement();
+    }
+
+
+    public void text(Pcdata value, boolean needsSeparatingWhitespace) throws IOException {
+        if (needsSeparatingWhitespace)
+            fiout.writeLowLevelText(" ");
 
         /*
          * Check if the CharSequence is from a base64Binary data type
          */
         if (!(value instanceof Base64Data)) {
-            // Write out characters
-            fiout.writeCharacters(value.toString());
+            final int len = value.length();
+            if(len  0) {
+            final NamespaceContextImpl.Element nse = nsContext.getCurrent();
+
+            fiout.writeLowLevelStartNamespaces();
+            for (int i = nse.count() - 1; i >= 0; i--) {
+                final String uri = nse.getNsUri(i);
+                if (uri.length() == 0 && nse.getBase() == 1)
+                    continue;   // no point in definint xmlns='' on the root
+                fiout.writeLowLevelNamespace(nse.getPrefix(i), uri);
+            }
+            fiout.writeLowLevelEndNamespaces();
+
+            type= 0;
+        }
+
+        final boolean isIndexed = fiout.writeLowLevelStartElement(
+                type,
+                nsContext.getPrefix(prefix),
+                localName,
+                nsContext.getNamespaceURI(prefix));
+
+        if (!isIndexed)
+            tables.incrementMaxIndexValue();
+    }
+
+    public void attribute(int prefix, String localName, String value) throws IOException {
+        fiout.writeLowLevelStartAttributes();
+
+        boolean isIndexed;
+        if (prefix == -1)
+            isIndexed = fiout.writeLowLevelAttribute("", "", localName);
+        else
+            isIndexed = fiout.writeLowLevelAttribute(
+                    nsContext.getPrefix(prefix),
+                    nsContext.getNamespaceURI(prefix),
+                    localName);
+
+        if (!isIndexed)
+            tables.incrementMaxIndexValue();
+
+        fiout.writeLowLevelAttributeValue(value);
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/ForkXmlOutput.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/ForkXmlOutput.java
index f5e2df0169c..42c229b7443 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/ForkXmlOutput.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/ForkXmlOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.output;
 
 import java.io.IOException;
@@ -77,12 +76,6 @@ public final class ForkXmlOutput extends XmlOutputAbstractImpl {
         rhs.endTag(name);
     }
 
-    @Override
-    public void flush() throws IOException, XMLStreamException {
-        lhs.flush();
-        rhs.flush();
-    }
-
     public void beginStartTag(int prefix, String localName) throws IOException, XMLStreamException {
         lhs.beginStartTag(prefix,localName);
         rhs.beginStartTag(prefix,localName);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/InPlaceDOMOutput.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/InPlaceDOMOutput.java
index 6130d56bebf..17835a026ee 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/InPlaceDOMOutput.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/InPlaceDOMOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.output;
 
 import com.sun.xml.internal.bind.v2.runtime.AssociationMap;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/IndentingUTF8XmlOutput.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/IndentingUTF8XmlOutput.java
index 50707fc85de..d189430e41a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/IndentingUTF8XmlOutput.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/IndentingUTF8XmlOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.output;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/MTOMXmlOutput.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/MTOMXmlOutput.java
index 6f913d2a516..7e12ce802f2 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/MTOMXmlOutput.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/MTOMXmlOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.output;
 
 import java.io.IOException;
@@ -126,8 +125,4 @@ public final class MTOMXmlOutput extends XmlOutputAbstractImpl {
         }
         next.text(value, needsSeparatingWhitespace);
     }
-
-    public void flush() throws IOException, XMLStreamException {
-        next.flush();
-    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/NamespaceContextImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/NamespaceContextImpl.java
index a4076d9e04e..2bc80c294ec 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/NamespaceContextImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/NamespaceContextImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.output;
 
 import java.io.IOException;
@@ -216,11 +215,32 @@ public final class NamespaceContextImpl implements NamespaceContext2 {
         }
     }
 
+    public int force(@NotNull String uri, @NotNull String prefix) {
+        // check for the existing binding
+        for( int i=size-1; i>=0; i-- ) {
+            if(prefixes[i].equals(prefix)) {
+                if(nsUris[i].equals(uri))
+                    return i;   // found duplicate
+                else
+                    // the prefix is used for another namespace. we need to declare it
+                    break;
+            }
+        }
+
+        return put(uri, prefix);
+    }
+
     /**
-     * {@inheritDoc}.
+     * Puts this new binding into the declared prefixes list
+     * without doing any duplicate check.
      *
-     * @param prefix
-     *      if null, an unique prefix (including "") is allocated.
+     * This can be used to forcibly set namespace declarations.
+     *
+     * 
    
+     * Most of the time {@link #declareNamespace(String, String, boolean)} shall be used.
+     *
+     * @return
+     *      the index of this new binding.
      */
     public int put(@NotNull String uri, @Nullable String prefix) {
         if(size==nsUris.length) {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Pcdata.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Pcdata.java
index 725863419fc..22454b9601d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Pcdata.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Pcdata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.output;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/SAXOutput.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/SAXOutput.java
index 111518a0fa4..060d4d1730c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/SAXOutput.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/SAXOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.output;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java
index 0bace854bdd..f8347818f39 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.output;
 
 import java.io.IOException;
@@ -377,13 +376,6 @@ public class UTF8XmlOutput extends XmlOutputAbstractImpl {
         octetBufferIndex = 0;
     }
 
-    public void flush() throws IOException {
-        flushBuffer();
-        out.flush();
-    }
-
-
-
     static byte[] toBytes(String s) {
         byte[] buf = new byte[s.length()];
         for( int i=s.length()-1; i>=0; i-- )
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLEventWriterOutput.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLEventWriterOutput.java
index c95f9c5e232..68b18d5ee13 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLEventWriterOutput.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLEventWriterOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.output;
 
 import java.io.IOException;
@@ -123,8 +122,4 @@ public class XMLEventWriterOutput extends XmlOutputAbstractImpl {
     public void text(Pcdata value, boolean needsSeparatingWhitespace) throws IOException, SAXException, XMLStreamException {
         text(value.toString(),needsSeparatingWhitespace);
     }
-
-    public void flush() throws IOException, XMLStreamException {
-        out.flush();
-    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java
index 7004946fef2..fad08392d46 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.output;
 
 import java.io.IOException;
@@ -31,6 +30,7 @@ import java.lang.reflect.Constructor;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
 
+import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
 import com.sun.xml.internal.bind.v2.runtime.MarshallerImpl;
 import com.sun.xml.internal.bind.v2.runtime.XMLSerializer;
 import com.sun.xml.internal.bind.v2.runtime.unmarshaller.UnmarshallerImpl;
@@ -39,6 +39,11 @@ import org.xml.sax.SAXException;
 
 /**
  * {@link XmlOutput} that writes to StAX {@link XMLStreamWriter}.
+ * 
    
+ * TODO:
+ * Finding the optimized FI implementations is a bit hacky and not very
+ * extensible. Can we use the service provider mechnism in general for
+ * concrete implementations of XmlOutputAbstractImpl.
  *
  * @author Kohsuke Kawaguchi
  */
@@ -48,15 +53,16 @@ public class XMLStreamWriterOutput extends XmlOutputAbstractImpl {
      * Creates a new {@link XmlOutput} from a {@link XMLStreamWriter}.
      * This method recognizes an FI StAX writer.
      */
-    public static XmlOutput create(XMLStreamWriter out) {
+    public static XmlOutput create(XMLStreamWriter out, JAXBContextImpl context) {
         // try optimized path
-        if(out.getClass()==FI_STAX_WRITER_CLASS) {
+        final Class writerClass = out.getClass();
+        if (writerClass==FI_STAX_WRITER_CLASS) {
             try {
-                return FI_OUTPUT_CTOR.newInstance(out);
+                return FI_OUTPUT_CTOR.newInstance(out, context);
             } catch (Exception e) {
             }
         }
-        if(STAXEX_WRITER_CLASS!=null && STAXEX_WRITER_CLASS.isAssignableFrom(out.getClass())) {
+        if (STAXEX_WRITER_CLASS!=null && STAXEX_WRITER_CLASS.isAssignableFrom(writerClass)) {
             try {
                 return STAXEX_OUTPUT_CTOR.newInstance(out);
             } catch (Exception e) {
@@ -70,7 +76,7 @@ public class XMLStreamWriterOutput extends XmlOutputAbstractImpl {
 
     private final XMLStreamWriter out;
 
-    private final char[] buf = new char[256];
+    protected final char[] buf = new char[256];
 
     protected XMLStreamWriterOutput(XMLStreamWriter out) {
         this.out = out;
@@ -154,7 +160,15 @@ public class XMLStreamWriterOutput extends XmlOutputAbstractImpl {
 
     private static Class initFIStAXWriterClass() {
         try {
-            return MarshallerImpl.class.getClassLoader().loadClass("com.sun.xml.internal.fastinfoset.stax.StAXDocumentSerializer");
+            Class llfisw = MarshallerImpl.class.getClassLoader().
+                    loadClass("com.sun.xml.internal.org.jvnet.fastinfoset.stax.LowLevelFastInfosetStreamWriter");
+            Class sds = MarshallerImpl.class.getClassLoader().
+                    loadClass("com.sun.xml.internal.fastinfoset.stax.StAXDocumentSerializer");
+            // Check if StAXDocumentSerializer implements LowLevelFastInfosetStreamWriter
+            if (llfisw.isAssignableFrom(sds))
+                return sds;
+            else
+                return null;
         } catch (Throwable e) {
             return null;
         }
@@ -162,8 +176,11 @@ public class XMLStreamWriterOutput extends XmlOutputAbstractImpl {
 
     private static Constructor initFastInfosetOutputClass() {
         try {
+            if (FI_STAX_WRITER_CLASS == null)
+                return null;
+
             Class c = UnmarshallerImpl.class.getClassLoader().loadClass("com.sun.xml.internal.bind.v2.runtime.output.FastInfosetStreamWriterOutput");
-            return c.getConstructor(FI_STAX_WRITER_CLASS);
+            return c.getConstructor(FI_STAX_WRITER_CLASS, JAXBContextImpl.class);
         } catch (Throwable e) {
             return null;
         }
@@ -177,7 +194,7 @@ public class XMLStreamWriterOutput extends XmlOutputAbstractImpl {
 
     private static Class initStAXExWriterClass() {
         try {
-            return MarshallerImpl.class.getClassLoader().loadClass("org.jvnet.staxex.XMLStreamWriterEx");
+            return MarshallerImpl.class.getClassLoader().loadClass("com.sun.xml.internal.org.jvnet.staxex.XMLStreamWriterEx");
         } catch (Throwable e) {
             return null;
         }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutput.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutput.java
index 9132eb3f8d6..37ba1ed92c5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutput.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,11 +22,9 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.output;
 
 import java.io.IOException;
-import java.io.OutputStream;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.stream.XMLStreamException;
@@ -116,8 +114,9 @@ public interface XmlOutput {
      *      true if we are marshalling a fragment.
      */
     public void startDocument(XMLSerializer serializer, boolean fragment, int[] nsUriIndex2prefixIndex, NamespaceContextImpl nsContext) throws IOException, SAXException, XMLStreamException;
+
     /**
-     * Called at the very end.
+     * Called at the very end. This is the last method to be invoked.
      *
      * @param fragment
      *      false if we are writing the whole document.
@@ -172,11 +171,4 @@ public interface XmlOutput {
      * @param needsSeparatingWhitespace
      */
     public void text( Pcdata value, boolean needsSeparatingWhitespace ) throws IOException, SAXException, XMLStreamException;
-
-    /**
-     * Flush the output.
-     *
-     * @see OutputStream#flush()
-     */
-    public void flush() throws IOException, XMLStreamException;
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutputAbstractImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutputAbstractImpl.java
index 918e4a5e175..af3607e774e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutputAbstractImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutputAbstractImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.output;
 
 import java.io.IOException;
@@ -110,14 +109,6 @@ public abstract class XmlOutputAbstractImpl implements XmlOutput {
     }
     public abstract void endTag(int prefix, String localName) throws IOException, SAXException, XMLStreamException;
 
-    /**
-     * Flush the output.
-     *
-     * @see OutputStream#flush()
-     */
-    public void flush() throws IOException, XMLStreamException {
-    }
-
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/package-info.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/package-info.java
index 2626f44cc69..b715ea0491d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/package-info.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 /**
  * Code that writes well-formed XML ({@link XmlOutput} and its implementations}.
  */
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/package.html b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/package.html
index d599e94156f..98bc4868080 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/package.html
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/package.html
@@ -1,3 +1,27 @@
+
 
 
 Code that implements JAXBContext, Unmarshaller, and Marshaller.
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayERProperty.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayERProperty.java
index 366f70b3b99..476bc0755e2 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayERProperty.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayERProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.property;
 
 import java.io.IOException;
@@ -37,12 +36,15 @@ import com.sun.xml.internal.bind.v2.model.runtime.RuntimePropertyInfo;
 import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
 import com.sun.xml.internal.bind.v2.runtime.Name;
 import com.sun.xml.internal.bind.v2.runtime.XMLSerializer;
+import com.sun.xml.internal.bind.v2.runtime.reflect.Lister;
+import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
 import com.sun.xml.internal.bind.v2.runtime.unmarshaller.ChildLoader;
 import com.sun.xml.internal.bind.v2.runtime.unmarshaller.TagName;
 import com.sun.xml.internal.bind.v2.runtime.unmarshaller.Loader;
 import com.sun.xml.internal.bind.v2.runtime.unmarshaller.Receiver;
 import com.sun.xml.internal.bind.v2.runtime.unmarshaller.Scope;
 import com.sun.xml.internal.bind.v2.runtime.unmarshaller.UnmarshallingContext;
+import com.sun.xml.internal.bind.v2.runtime.unmarshaller.XsiNilLoader;
 
 import org.xml.sax.SAXException;
 
@@ -75,18 +77,30 @@ abstract class ArrayERProperty extends ArrayProperty children) {
+
+        private final Accessor acc;
+        private final Lister lister;
+
+        public ItemsLoader(Accessor acc, Lister lister, QNameMap children) {
             super(false);
+            this.acc = acc;
+            this.lister = lister;
             this.children = children;
         }
 
         @Override
-        public void startElement(UnmarshallingContext.State state, TagName ea) {
-            state.getContext().startScope(1);
+        public void startElement(UnmarshallingContext.State state, TagName ea) throws SAXException {
+            UnmarshallingContext context = state.getContext();
+            context.startScope(1);
             // inherit the target so that our children can access its target
             state.target = state.prev.target;
+
+            // start it now, so that even if there's no children we can still return empty collection
+            context.getScope(0).start(acc,lister);
         }
 
         private final QNameMap children;
@@ -157,7 +171,10 @@ abstract class ArrayERProperty extends ArrayProperty m = new QNameMap();
             createBodyUnmarshaller(c,m);
-            loaders.put(wrapperTagName,new ChildLoader(new ItemsLoader(m),null));
+            Loader loader = new ItemsLoader(acc, lister, m);
+            if(isWrapperNillable || chain.context.allNillable)
+                loader = new XsiNilLoader(loader);
+            loaders.put(wrapperTagName,new ChildLoader(loader,null));
         } else {
             createBodyUnmarshaller(chain,loaders);
         }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementLeafProperty.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementLeafProperty.java
index 271e9d2fb1b..af694560524 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementLeafProperty.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementLeafProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.property;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementNodeProperty.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementNodeProperty.java
index 858033f6e7d..8d2d9906727 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementNodeProperty.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementNodeProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.property;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementProperty.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementProperty.java
index 83bbb206f82..f5c27aedccb 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementProperty.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.property;
 
 import java.io.IOException;
@@ -190,7 +189,7 @@ abstract class ArrayElementProperty extends ArrayERProperty extends PropertyImpl {
         lister = Lister.create(
             Navigator.REFLECTION.erasure(prop.getRawType()),prop.id(),prop.getAdapter());
         assert lister!=null;
-        acc = prop.getAccessor().optimize();
+        acc = prop.getAccessor().optimize(context);
         assert acc!=null;
     }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayReferenceNodeProperty.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayReferenceNodeProperty.java
index 8d5dea48c87..270dc10cda1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayReferenceNodeProperty.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayReferenceNodeProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.property;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/AttributeProperty.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/AttributeProperty.java
index 4e9e5ace339..5c899917009 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/AttributeProperty.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/AttributeProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.property;
 
 import java.io.IOException;
@@ -31,7 +30,6 @@ import javax.xml.stream.XMLStreamException;
 
 import com.sun.xml.internal.bind.api.AccessorException;
 import com.sun.xml.internal.bind.v2.util.QNameMap;
-import com.sun.xml.internal.bind.v2.util.QNameMap;
 import com.sun.xml.internal.bind.v2.model.core.AttributePropertyInfo;
 import com.sun.xml.internal.bind.v2.model.core.PropertyKind;
 import com.sun.xml.internal.bind.v2.model.runtime.RuntimeAttributePropertyInfo;
@@ -39,7 +37,6 @@ import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
 import com.sun.xml.internal.bind.v2.runtime.Name;
 import com.sun.xml.internal.bind.v2.runtime.XMLSerializer;
 import com.sun.xml.internal.bind.v2.runtime.JaxBeanInfo;
-import com.sun.xml.internal.bind.v2.runtime.unmarshaller.Loader;
 import com.sun.xml.internal.bind.v2.runtime.unmarshaller.ChildLoader;
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
 import com.sun.xml.internal.bind.v2.runtime.reflect.TransducedAccessor;
@@ -72,10 +69,10 @@ public final class AttributeProperty extends PropertyImpl
 
     private final Accessor acc;
 
-    public AttributeProperty(JAXBContextImpl p, RuntimeAttributePropertyInfo prop) {
-        super(p,prop);
-        this.attName = p.nameBuilder.createAttributeName(prop.getXmlName());
-        this.xacc = TransducedAccessor.get(prop);
+    public AttributeProperty(JAXBContextImpl context, RuntimeAttributePropertyInfo prop) {
+        super(context,prop);
+        this.attName = context.nameBuilder.createAttributeName(prop.getXmlName());
+        this.xacc = TransducedAccessor.get(context,prop);
         this.acc = prop.getAccessor();   // we only use this for binder, so don't waste memory by optimizing
     }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ListElementProperty.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ListElementProperty.java
index df50fe14bc0..6146d26398d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ListElementProperty.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ListElementProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.property;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.java
index de200594e1a..5458d005020 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.property;
 
 import java.text.MessageFormat;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.properties b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.properties
index 5d044d38d88..fc31ce45297 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.properties
@@ -1,3 +1,28 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
 UNSUBSTITUTABLE_TYPE = \
     type {0} is mapped to {1} but it cannot substitute {2} here
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Property.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Property.java
index 51e27b9ff80..6e20e6da580 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Property.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Property.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.property;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyFactory.java
index cdce8eb9a49..db35b10c799 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyFactory.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.property;
 
 import java.lang.reflect.Constructor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyImpl.java
index e1fe1a431b9..6bbdb447f70 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.property;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementLeafProperty.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementLeafProperty.java
index 5afe69840f7..d17d29af2be 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementLeafProperty.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementLeafProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.property;
 
 import java.io.IOException;
@@ -67,9 +66,9 @@ final class SingleElementLeafProperty extends PropertyImpl {
         assert tagName!=null;
         nillable = ref.isNillable();
         defaultValue = ref.getDefaultValue();
-        this.acc = prop.getAccessor().optimize();
+        this.acc = prop.getAccessor().optimize(context);
 
-        xacc = TransducedAccessor.get(ref);
+        xacc = TransducedAccessor.get(context,ref);
         assert xacc!=null;
     }
 
@@ -97,7 +96,7 @@ final class SingleElementLeafProperty extends PropertyImpl {
         Loader l = new LeafPropertyLoader(xacc);
         if(defaultValue!=null)
             l = new DefaultValueLoaderDecorator(l,defaultValue);
-        if(nillable)
+        if(nillable || chain.context.allNillable)
             l = new XsiNilLoader.Single(l,acc);
         handlers.put(tagName,new ChildLoader(l,null));
     }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementNodeProperty.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementNodeProperty.java
index 5a58f5d789d..cd6826cf385 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementNodeProperty.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementNodeProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.property;
 
 import java.io.IOException;
@@ -48,7 +47,6 @@ import com.sun.xml.internal.bind.v2.runtime.unmarshaller.Loader;
 import com.sun.xml.internal.bind.v2.runtime.unmarshaller.ChildLoader;
 import com.sun.xml.internal.bind.v2.runtime.unmarshaller.XsiNilLoader;
 import com.sun.xml.internal.bind.v2.runtime.unmarshaller.DefaultValueLoaderDecorator;
-import com.sun.xml.internal.bind.v2.runtime.unmarshaller.XsiTypeLoader;
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
 
 import org.xml.sax.SAXException;
@@ -75,7 +73,7 @@ final class SingleElementNodeProperty extends PropertyImpl
 
     public SingleElementNodeProperty(JAXBContextImpl context, RuntimeElementPropertyInfo prop) {
         super(context,prop);
-        acc = prop.getAccessor().optimize();
+        acc = prop.getAccessor().optimize(context);
         this.prop = prop;
 
         QName nt = null;
@@ -155,7 +153,7 @@ final class SingleElementNodeProperty extends PropertyImpl
             Loader l = bi.getLoader(context,true);
             if(e.getDefaultValue()!=null)
                 l = new DefaultValueLoaderDecorator(l,e.getDefaultValue());
-            if(nillable)
+            if(nillable || chain.context.allNillable)
                 l = new XsiNilLoader.Single(l,acc);
             handlers.put( e.getTagName(), new ChildLoader(l,acc));
         }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java
index d9b84d7ba2c..d044e002db4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.property;
 
 import java.io.IOException;
@@ -54,7 +53,6 @@ import com.sun.xml.internal.bind.v2.runtime.unmarshaller.TagName;
 import com.sun.xml.internal.bind.v2.runtime.unmarshaller.Loader;
 import com.sun.xml.internal.bind.v2.runtime.unmarshaller.Receiver;
 import com.sun.xml.internal.bind.v2.runtime.unmarshaller.UnmarshallingContext;
-import com.sun.xml.internal.bind.v2.runtime.unmarshaller.XsiTypeLoader;
 
 import org.xml.sax.SAXException;
 
@@ -88,7 +86,7 @@ final class SingleMapNodeProperty extends PropertyImpl
 
     public SingleMapNodeProperty(JAXBContextImpl context, RuntimeMapPropertyInfo prop) {
         super(context, prop);
-        acc = prop.getAccessor().optimize();
+        acc = prop.getAccessor().optimize(context);
         this.tagName = context.nameBuilder.createElementName(prop.getXmlName());
         this.entryTag = context.nameBuilder.createElementName("","entry");
         this.keyTag = context.nameBuilder.createElementName("","key");
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleReferenceNodeProperty.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleReferenceNodeProperty.java
index 2585e8029b0..89d4a39fc6b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleReferenceNodeProperty.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleReferenceNodeProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,10 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.property;
 
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.JAXBException;
@@ -61,12 +61,12 @@ final class SingleReferenceNodeProperty extends PropertyImpl extends PropertyImpl extends PropertyImpl {
     private final Accessor acc;
 
 
-    public ValueProperty(JAXBContextImpl grammar, RuntimeValuePropertyInfo prop) {
-        super(grammar,prop);
-        xacc = TransducedAccessor.get(prop);
+    public ValueProperty(JAXBContextImpl context, RuntimeValuePropertyInfo prop) {
+        super(context,prop);
+        xacc = TransducedAccessor.get(context,prop);
         acc = prop.getAccessor();   // we only use this for binder, so don't waste memory by optimizing
     }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java
index a5c9e4c1284..e06ac090d24 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect;
 
 import java.lang.reflect.Field;
@@ -47,6 +46,7 @@ import com.sun.xml.internal.bind.v2.runtime.reflect.opt.OptimizedAccessorFactory
 import com.sun.xml.internal.bind.v2.runtime.unmarshaller.Loader;
 import com.sun.xml.internal.bind.v2.runtime.unmarshaller.Receiver;
 import com.sun.xml.internal.bind.v2.runtime.unmarshaller.UnmarshallingContext;
+import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
 
 import org.xml.sax.SAXException;
 
@@ -82,10 +82,12 @@ public abstract class Accessor implements Receiver {
     /**
      * Returns the optimized version of the same accessor.
      *
+     * @param context
+     *      The {@link JAXBContextImpl} that owns the whole thing.
      * @return
      *      At least the implementation can return this.
      */
-    public Accessor optimize() {
+    public Accessor optimize(JAXBContextImpl context) {
         return this;
     }
 
@@ -130,6 +132,15 @@ public abstract class Accessor implements Receiver {
         return get(bean);
     }
 
+    /**
+     * Returns true if this accessor wraps an adapter.
+     *
+     * This method needs to be used with care, but it helps some optimization.
+     */
+    public boolean isAdapted() {
+        return false;
+    }
+
     /**
      * Sets the value without adapting the value.
      *
@@ -219,7 +230,10 @@ public abstract class Accessor implements Receiver {
         }
 
         @Override
-        public Accessor optimize() {
+        public Accessor optimize(JAXBContextImpl context) {
+            if(context.fastBoot)
+                // let's not waste time on doing this for the sake of faster boot.
+                return this;
             Accessor acc = OptimizedAccessorFactory.get(f);
             if(acc!=null)
                 return acc;
@@ -241,7 +255,7 @@ public abstract class Accessor implements Receiver {
         }
 
         @Override
-        public Accessor optimize() {
+        public Accessor optimize(JAXBContextImpl context) {
             return this;
         }
     }
@@ -325,10 +339,13 @@ public abstract class Accessor implements Receiver {
         }
 
         @Override
-        public Accessor optimize() {
+        public Accessor optimize(JAXBContextImpl context) {
             if(getter==null || setter==null)
                 // if we aren't complete, OptimizedAccessor won't always work
                 return this;
+            if(context.fastBoot)
+                // let's not waste time on doing this for the sake of faster boot.
+                return this;
 
             Accessor acc = OptimizedAccessorFactory.get(getter,setter);
             if(acc!=null)
@@ -373,9 +390,14 @@ public abstract class Accessor implements Receiver {
     }
 
     /**
-     * Special {@link Accessor} used to recover from errors.
+     * Gets the special {@link Accessor} used to recover from errors.
      */
-    public static final Accessor ERROR = new Accessor(Object.class) {
+    @SuppressWarnings("unchecked")
+    public static  Accessor getErrorInstance() {
+        return ERROR;
+    }
+
+    private static final Accessor ERROR = new Accessor(Object.class) {
         public Object get(Object o) {
             return null;
         }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedAccessor.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedAccessor.java
index 80df7c31d82..913cbf05330 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedAccessor.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect;
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;
@@ -48,6 +47,11 @@ final class AdaptedAccessor extends Accessor {
         return l;
     }
 
-    private static Class getImplClass(Class fieldType) {
+    private static Class getImplClass(Class fieldType) {
         return ClassFactory.inferImplClass(fieldType,ClassFactory.COLLECTION_IMPL_CLASSES);
     }
 
@@ -274,6 +274,8 @@ public abstract class Lister {
             T collection = acc.get(bean);
             if(collection==null) {
                 collection = ClassFactory.create(implClass);
+                if(!acc.isAdapted())
+                    acc.set(bean,collection);
             }
             collection.clear();
             return collection;
@@ -286,12 +288,21 @@ public abstract class Lister {
         public void endPacking( T collection, BeanT bean, Accessor acc ) throws AccessorException {
             // this needs to be done in the endPacking, because
             // sometimes the accessor uses an adapter, and the adapter needs to see
-            // the whole thing
-            acc.set(bean,collection);
+            // the whole thing.
+
+            // but always doing so causes a problem when this collection property
+            // is getter-only
+
+            if(acc.isAdapted())
+                acc.set(bean,collection);
         }
 
         public void reset(BeanT bean, Accessor acc) throws AccessorException {
-            acc.get(bean).clear();
+            T collection = acc.get(bean);
+            if(collection == null) {
+                return;
+            }
+            collection.clear();
         }
     }
 
@@ -339,11 +350,13 @@ public abstract class Lister {
             private final List idrefs = new ArrayList();
             private final UnmarshallingContext context;
             private final Accessor acc;
+            private final LocatorEx location;
 
             public Pack(BeanT bean, Accessor acc) {
                 this.bean = bean;
                 this.acc = acc;
                 this.context = UnmarshallingContext.getInstance();
+                this.location = new LocatorEx.Snapshot(context.getLocator());
                 context.addPatcher(this);
             }
 
@@ -371,7 +384,7 @@ public abstract class Lister {
                         }
 
                         if(t==null) {
-                            context.errorUnresolvedIDREF(bean,id);
+                            context.errorUnresolvedIDREF(bean,id,location);
                         } else {
                             TODO.prototype(); // TODO: check if the type of t is proper.
                             core.addToPack(pack,t);
@@ -425,8 +438,13 @@ public abstract class Lister {
     }
 
     /**
-     * Special {@link Lister} used to recover from an error.
+     * Gets the special {@link Lister} used to recover from an error.
      */
+    @SuppressWarnings("unchecked")
+    public static  Lister getErrorInstance() {
+        return ERROR;
+    }
+
     public static final Lister ERROR = new Lister() {
         public ListIterator iterator(Object o, XMLSerializer context) {
             return EMPTY_ITERATOR;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.java
index da1c89b3587..b74f0f99aaa 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect;
 
 import java.text.MessageFormat;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.properties b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.properties
index a43f6038048..58daf1a6e8e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.properties
@@ -1,3 +1,28 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
 UNABLE_TO_ACCESS_NON_PUBLIC_FIELD = \
     Unable to make {0}.{1} accessible.
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/NullSafeAccessor.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/NullSafeAccessor.java
index 25abec33814..86085836161 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/NullSafeAccessor.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/NullSafeAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect;
 
 import com.sun.xml.internal.bind.api.AccessorException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java
index 12b046c6136..552d7cccf1c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect;
 
 import com.sun.xml.internal.bind.api.AccessorException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerByte.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerByte.java
index dea07a0e4fb..5b2e9683637 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerByte.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerByte.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect;
 
 import com.sun.xml.internal.bind.api.AccessorException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java
index e2d2153d277..21af48680ef 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect;
 
 import com.sun.xml.internal.bind.api.AccessorException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java
index 3f4257d459f..00580f319fc 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect;
 
 import com.sun.xml.internal.bind.api.AccessorException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java
index 636c2536658..0a72a794fc6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect;
 
 import com.sun.xml.internal.bind.api.AccessorException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java
index 99c38015338..53b9a8a177b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect;
 
 import com.sun.xml.internal.bind.api.AccessorException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java
index c6abaf96fb4..02c6a7a7679 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect;
 
 import com.sun.xml.internal.bind.api.AccessorException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java
index cc0ca430f68..673b0eb53b7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect;
 
 import com.sun.xml.internal.bind.api.AccessorException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java
index bdaf7840e44..26f4d82e203 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect;
 
 import java.io.IOException;
@@ -45,9 +44,11 @@ import com.sun.xml.internal.bind.v2.model.runtime.RuntimePropertyInfo;
 import com.sun.xml.internal.bind.v2.runtime.Name;
 import com.sun.xml.internal.bind.v2.runtime.Transducer;
 import com.sun.xml.internal.bind.v2.runtime.XMLSerializer;
+import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
 import com.sun.xml.internal.bind.v2.runtime.reflect.opt.OptimizedTransducedAccessorFactory;
 import com.sun.xml.internal.bind.v2.runtime.unmarshaller.Patcher;
 import com.sun.xml.internal.bind.v2.runtime.unmarshaller.UnmarshallingContext;
+import com.sun.xml.internal.bind.v2.runtime.unmarshaller.LocatorEx;
 
 import org.xml.sax.SAXException;
 
@@ -136,7 +137,7 @@ public abstract class TransducedAccessor {
      * 
    
      * This allows the implementation to use an optimized code.
      */
-    public static  TransducedAccessor get(RuntimeNonElementRef ref) {
+    public static  TransducedAccessor get(JAXBContextImpl context, RuntimeNonElementRef ref) {
         Transducer xducer = RuntimeModelBuilder.createTransducer(ref);
         RuntimePropertyInfo prop = ref.getSource();
 
@@ -149,15 +150,15 @@ public abstract class TransducedAccessor {
         if(prop.id()==ID.IDREF)
             return new IDREFTransducedAccessorImpl(prop.getAccessor());
 
-        if(xducer.isDefault()) {
+        if(xducer.isDefault() && !context.fastBoot) {
             TransducedAccessor xa = OptimizedTransducedAccessorFactory.get(prop);
             if(xa!=null)    return xa;
         }
 
         if(xducer.useNamespace())
-            return new CompositeContextDependentTransducedAccessorImpl( xducer, prop.getAccessor() );
+            return new CompositeContextDependentTransducedAccessorImpl( context, xducer, prop.getAccessor() );
         else
-            return new CompositeTransducedAccessorImpl( xducer, prop.getAccessor() );
+            return new CompositeTransducedAccessorImpl( context, xducer, prop.getAccessor() );
     }
 
     /**
@@ -178,8 +179,8 @@ public abstract class TransducedAccessor {
     public abstract void writeText(XMLSerializer w, BeanT o, String fieldName) throws AccessorException, SAXException, IOException, XMLStreamException;
 
     static class CompositeContextDependentTransducedAccessorImpl extends CompositeTransducedAccessorImpl {
-        public CompositeContextDependentTransducedAccessorImpl(Transducer xducer, Accessor acc) {
-            super(xducer, acc);
+        public CompositeContextDependentTransducedAccessorImpl(JAXBContextImpl context,Transducer xducer, Accessor acc) {
+            super(context,xducer,acc);
             assert xducer.useNamespace();
         }
 
@@ -213,9 +214,9 @@ public abstract class TransducedAccessor {
         protected final Transducer xducer;
         protected final Accessor acc;
 
-        public CompositeTransducedAccessorImpl(Transducer xducer, Accessor acc) {
+        public CompositeTransducedAccessorImpl(JAXBContextImpl context, Transducer xducer, Accessor acc) {
             this.xducer = xducer;
-            this.acc = acc.optimize();
+            this.acc = acc.optimize(context);
         }
 
         public CharSequence print(BeanT bean) throws AccessorException {
@@ -291,7 +292,8 @@ public abstract class TransducedAccessor {
 
             final Callable callable = context.getObjectFromId(idref,acc.valueType);
             if(callable==null) {
-                context.errorUnresolvedIDREF(bean,idref);
+                // the IDResolver decided to abort it now
+                context.errorUnresolvedIDREF(bean,idref,context.getLocator());
                 return;
             }
 
@@ -309,12 +311,13 @@ public abstract class TransducedAccessor {
                 assign(bean,t,context);
             } else {
                 // try again later
+                final LocatorEx loc = new LocatorEx.Snapshot(context.getLocator());
                 context.addPatcher(new Patcher() {
                     public void run() throws SAXException {
                         try {
                             TargetT t = (TargetT)callable.call();
                             if(t==null) {
-                                context.errorUnresolvedIDREF(bean,idref);
+                                context.errorUnresolvedIDREF(bean,idref,loc);
                             } else {
                                 assign(bean,t,context);
                             }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/AccessorInjector.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/AccessorInjector.java
index 0690dfdc7b1..b2a61d640e9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/AccessorInjector.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/AccessorInjector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import java.io.InputStream;
@@ -53,7 +52,7 @@ class AccessorInjector {
      * @return null
      *      if it fails for some reason.
      */
-    public static final Class prepare(
+    public static Class prepare(
         Class beanClass, String templateClassName, String newClassName, String... replacements ) {
 
         if(noOptimize)
@@ -96,7 +95,7 @@ class AccessorInjector {
      *      The search strings found in the constant pool will be replaced by the corresponding
      *      replacement string.
      */
-    private static final byte[] tailor( String templateClassName, String newClassName, String... replacements ) {
+    private static byte[] tailor( String templateClassName, String newClassName, String... replacements ) {
         InputStream resource;
         if(CLASS_LOADER!=null)
             resource = CLASS_LOADER.getResourceAsStream(templateClassName+".class");
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Bean.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Bean.java
index 4aec7542bd5..9d31df9d3c1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Bean.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Bean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.TransducedAccessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Const.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Const.java
index feab106fbb9..205570f7de4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Const.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Const.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java
index 09c0f070f86..d37fb41457a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Byte.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Byte.java
index fa2a415a6c4..e5638176fa5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Byte.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Byte.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java
index d3c03a8ea2a..f4038948e4a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java
index 15417f672fd..992021caa70 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java
index 885dbcc4c7a..1be74c250bf 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java
index 7676ea4dae6..1e6baf9981e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java
index 7cf0a7ab2ac..e929827eeb2 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Ref.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Ref.java
index d1beb118fb4..f0e4ee5d66f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Ref.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Ref.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java
index 54a9e3012f9..8f5f1b287c3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Injector.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Injector.java
index 91cc7e96dde..fc97c48a7f3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Injector.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Injector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import java.lang.reflect.InvocationTargetException;
@@ -158,6 +157,9 @@ final class Injector {
             } catch (SecurityException e) {
                 logger.log(Level.FINE,"Unable to inject "+className,e);
                 return null;
+            } catch (LinkageError e) {
+                logger.log(Level.FINE,"Unable to inject "+className,e);
+                return null;
             }
             classes.put(className,c);
         }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java
index 3de8d7ab1bd..a0549b7eb3d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Byte.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Byte.java
index 4ad0028f9d9..0d214308f5c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Byte.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Byte.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java
index fe1acf5fa6c..bdc0de7f827 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java
index 3783ab9fd39..c3b9a9e98e5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java
index 105093323ab..1cb1358d3cf 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java
index f2178db0419..95d60203178 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java
index 63422188492..c38737b4df1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Ref.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Ref.java
index 8135d7c5ab8..4500602ee6d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Ref.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Ref.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java
index 4e7d7201801..00be3e99cc7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedAccessorFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedAccessorFactory.java
index 2dd74383f25..cfe365965f9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedAccessorFactory.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedAccessorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import java.lang.reflect.Field;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java
index cfe28e5b595..4e9f320dc32 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import java.lang.reflect.Field;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Ref.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Ref.java
index 07977852c05..78750da3e04 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Ref.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Ref.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.TransducedAccessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Boolean.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Boolean.java
index c328dc91019..9ac66b6c29a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Boolean.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Boolean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.DatatypeConverterImpl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Byte.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Byte.java
index f5b8ad0221c..c28384210e0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Byte.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Byte.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.DatatypeConverterImpl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java
index ed4eabf5a7f..f248583bf71 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.DatatypeConverterImpl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java
index 5a71a371464..b2eedfdf58a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.DatatypeConverterImpl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Integer.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Integer.java
index a9c30365fd9..f2000d84026 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Integer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Integer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java
index f12e9b3ef53..3c72844f24a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.DatatypeConverterImpl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java
index 0ec9cd035a8..30179aae843 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.DatatypeConverterImpl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java
index 202c70e5ca6..a33499f246a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.DatatypeConverterImpl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Byte.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Byte.java
index 73b6ac13094..6a422b52955 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Byte.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Byte.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.DatatypeConverterImpl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java
index 24334dfb478..6647ba301d8 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.DatatypeConverterImpl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java
index 7aa7e0b0e13..5c9bb786a2a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.DatatypeConverterImpl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Integer.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Integer.java
index 4f32c079496..2a1f2916aa8 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Integer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Integer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java
index 8bd50bb7524..a0b424776fc 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.DatatypeConverterImpl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java
index f6c60a2274e..3e0883f51bf 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.DatatypeConverterImpl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/package.html b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/package.html
index f57175592db..3027e47aa41 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/package.html
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/package.html
@@ -1,3 +1,27 @@
+
 
 Hosts optimized
 {@link com.sun.xml.internal.bind.v2.runtime.reflect.Accessor},
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/package.html b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/package.html
index 988a3f2215a..5be12b33db0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/package.html
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/package.html
@@ -1,3 +1,27 @@
+
 
   Abstraction around accessing data of actual objects.
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesEx.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesEx.java
index 048a93493a4..57149a8ae00 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesEx.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesEx.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import org.xml.sax.Attributes;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesExImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesExImpl.java
index 335a0cb2bbe..1d2337c8938 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesExImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesExImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import com.sun.xml.internal.bind.util.AttributesImpl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Base64Data.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Base64Data.java
index 08445bc0116..02148532133 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Base64Data.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Base64Data.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import java.io.ByteArrayInputStream;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ChildLoader.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ChildLoader.java
index 36223dfebee..5b0349c34e6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ChildLoader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ChildLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultIDResolver.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultIDResolver.java
index 1d52edd37cb..5bc387decfd 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultIDResolver.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultIDResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import java.util.HashMap;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java
index 0febfe90934..6ff02a682b2 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import org.xml.sax.SAXException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Discarder.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Discarder.java
index d2356990cb7..40ed98ac441 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Discarder.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Discarder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,6 +23,9 @@
  * have any questions.
  */
 
+/*
+ * @(#)$Id: Discarder.java,v 1.4 2005/09/10 19:07:43 kohsuke Exp $
+ */
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DomLoader.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DomLoader.java
index 841c7bf15e6..52f846c35c1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DomLoader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DomLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import javax.xml.bind.annotation.DomHandler;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/FastInfosetConnector.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/FastInfosetConnector.java
index f2cc63a945a..97f7739a0b4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/FastInfosetConnector.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/FastInfosetConnector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import javax.xml.stream.Location;
@@ -31,12 +30,13 @@ import javax.xml.stream.XMLStreamException;
 
 import com.sun.xml.internal.bind.WhiteSpaceProcessor;
 import com.sun.xml.internal.fastinfoset.stax.StAXDocumentParser;
-
-import com.sun.xml.internal.org.jvnet.fastinfoset.EncodingAlgorithmIndexes;
 import org.xml.sax.SAXException;
 
 /**
  * Reads from FastInfoset StAX parser and feeds into JAXB Unmarshaller.
+ * 
    
+ * This class will peek at future events to ascertain if characters need to be
+ * buffered or not.
  *
  * @author Paul Sandoz.
  */
@@ -45,16 +45,14 @@ final class FastInfosetConnector extends StAXConnector {
     // event source
     private final StAXDocumentParser fastInfosetStreamReader;
 
-    // Flag set to true if there is octets instead of characters
-    boolean hasBase64Data = false;
-    // Flag set to true if the first chunk of CIIs
-    boolean firstCIIChunk = true;
+    // Flag set to true if text has been reported
+    private boolean textReported;
 
     // Buffer for octets
-    private Base64Data base64Data = new Base64Data();
+    private final Base64Data base64Data = new Base64Data();
 
     // Buffer for characters
-    private StringBuilder buffer = new StringBuilder();
+    private final StringBuilder buffer = new StringBuilder();
 
     public FastInfosetConnector(StAXDocumentParser fastInfosetStreamReader,
             XmlVisitor visitor) {
@@ -102,7 +100,17 @@ final class FastInfosetConnector extends StAXConnector {
                     case XMLStreamConstants.CHARACTERS :
                     case XMLStreamConstants.CDATA :
                     case XMLStreamConstants.SPACE :
-                        handleCharacters();
+                        if (predictor.expectText()) {
+                            // Peek at the next event to see if there are
+                            // fragmented characters
+                            event = fastInfosetStreamReader.peekNext();
+                            if (event == XMLStreamConstants.END_ELEMENT)
+                                processNonIgnorableText();
+                            else if (event == XMLStreamConstants.START_ELEMENT)
+                                processIgnorableText();
+                            else
+                                handleFragmentedCharacters();
+                        }
                         break;
                     // otherwise simply ignore
                 }
@@ -127,78 +135,142 @@ final class FastInfosetConnector extends StAXConnector {
     }
 
     private void handleStartElement() throws SAXException {
-        processText(true);
+        processUnreportedText();
 
-        for (int i = 0; i < fastInfosetStreamReader.getNamespaceCount(); i++) {
+        for (int i = 0; i < fastInfosetStreamReader.accessNamespaceCount(); i++) {
             visitor.startPrefixMapping(fastInfosetStreamReader.getNamespacePrefix(i),
                     fastInfosetStreamReader.getNamespaceURI(i));
         }
 
-        tagName.uri = fastInfosetStreamReader.getNamespaceURI();
-        tagName.local = fastInfosetStreamReader.getLocalName();
+        tagName.uri = fastInfosetStreamReader.accessNamespaceURI();
+        tagName.local = fastInfosetStreamReader.accessLocalName();
         tagName.atts = fastInfosetStreamReader.getAttributesHolder();
 
         visitor.startElement(tagName);
     }
 
-    private void handleCharacters() {
-        if (predictor.expectText()) {
-            // If the first chunk of CIIs and character data is present
-            if (firstCIIChunk &&
-                    fastInfosetStreamReader.getTextAlgorithmBytes() == null) {
-                buffer.append(fastInfosetStreamReader.getTextCharacters(),
-                        fastInfosetStreamReader.getTextStart(),
-                        fastInfosetStreamReader.getTextLength());
-                firstCIIChunk = false;
-            // If the first chunk of CIIs and octet data is present
-            } else if (firstCIIChunk &&
-                    fastInfosetStreamReader.getTextAlgorithmIndex() == EncodingAlgorithmIndexes.BASE64) {
-                firstCIIChunk = false;
-                hasBase64Data = true;
-                // Clone the octets
-                base64Data.set(fastInfosetStreamReader.getTextAlgorithmBytesClone(),null);
-                return;
-            // If a subsequent sequential chunk of CIIs
-            } else {
-                // If the first chunk is octet data
-                if (hasBase64Data) {
-                    // Append base64 encoded octets to the character buffer
-                    buffer.append(base64Data);
-                    hasBase64Data = false;
-                }
+    private void handleFragmentedCharacters() throws XMLStreamException, SAXException {
+        buffer.setLength(0);
 
-                // Append the second or subsequence chunk of CIIs to the buffer
-                buffer.append(fastInfosetStreamReader.getTextCharacters(),
-                        fastInfosetStreamReader.getTextStart(),
-                        fastInfosetStreamReader.getTextLength());
+        // Append characters of first character event
+        buffer.append(fastInfosetStreamReader.accessTextCharacters(),
+                fastInfosetStreamReader.accessTextStart(),
+                fastInfosetStreamReader.accessTextLength());
+
+        // Consume all character
+        while(true) {
+            switch(fastInfosetStreamReader.peekNext()) {
+                case XMLStreamConstants.START_ELEMENT :
+                    processBufferedText(true);
+                    return;
+                case XMLStreamConstants.END_ELEMENT :
+                    processBufferedText(false);
+                    return;
+                case XMLStreamConstants.CHARACTERS :
+                case XMLStreamConstants.CDATA :
+                case XMLStreamConstants.SPACE :
+                    // Append characters of second and subsequent character events
+                    fastInfosetStreamReader.next();
+                    buffer.append(fastInfosetStreamReader.accessTextCharacters(),
+                            fastInfosetStreamReader.accessTextStart(),
+                            fastInfosetStreamReader.accessTextLength());
+                    break;
+                default:
+                    fastInfosetStreamReader.next();
             }
-
         }
     }
 
     private void handleEndElement() throws SAXException {
-        processText(false);
+        processUnreportedText();
 
-        tagName.uri = fastInfosetStreamReader.getNamespaceURI();
-        tagName.local = fastInfosetStreamReader.getLocalName();
+        tagName.uri = fastInfosetStreamReader.accessNamespaceURI();
+        tagName.local = fastInfosetStreamReader.accessLocalName();
 
         visitor.endElement(tagName);
 
-        for (int i = fastInfosetStreamReader.getNamespaceCount() - 1; i >= 0; i--) {
+        for (int i = fastInfosetStreamReader.accessNamespaceCount() - 1; i >= 0; i--) {
             visitor.endPrefixMapping(fastInfosetStreamReader.getNamespacePrefix(i));
         }
     }
 
-    private void processText(boolean ignorable) throws SAXException {
-        firstCIIChunk = true;
-        if(predictor.expectText() && (!ignorable || !WhiteSpaceProcessor.isWhiteSpace(buffer))) {
-            if (!hasBase64Data) {
-                visitor.text(buffer);
-            } else {
-                visitor.text(base64Data);
-                hasBase64Data = false;
-            }
+    final private class CharSequenceImpl implements CharSequence {
+        char[] ch;
+        int start;
+        int length;
+
+        CharSequenceImpl() {
         }
-        buffer.setLength(0);
+
+        CharSequenceImpl(final char[] ch, final int start, final int length) {
+            this.ch = ch;
+            this.start = start;
+            this.length = length;
+        }
+
+        public void set() {
+            ch = fastInfosetStreamReader.accessTextCharacters();
+            start = fastInfosetStreamReader.accessTextStart();
+            length = fastInfosetStreamReader.accessTextLength();
+        }
+
+        // CharSequence interface
+
+        public final int length() {
+            return length;
+        }
+
+        public final char charAt(final int index) {
+            return ch[start + index];
+        }
+
+        public final CharSequence subSequence(final int start, final int end) {
+            return new CharSequenceImpl(ch, this.start + start, end - start);
+        }
+
+        public String toString() {
+            return new String(ch, start, length);
+        }
+    }
+
+    final private CharSequenceImpl charArray = new CharSequenceImpl();
+
+    private void processNonIgnorableText() throws SAXException {
+        textReported = true;
+        if (fastInfosetStreamReader.getTextAlgorithmBytes() == null) {
+            charArray.set();
+            visitor.text(charArray);
+        } else {
+            base64Data.set(fastInfosetStreamReader.getTextAlgorithmBytesClone(),null);
+            visitor.text(base64Data);
+        }
+    }
+
+    private void processIgnorableText() throws SAXException {
+        if (fastInfosetStreamReader.getTextAlgorithmBytes() == null) {
+            charArray.set();
+            if (!WhiteSpaceProcessor.isWhiteSpace(charArray)) {
+                visitor.text(charArray);
+                textReported = true;
+            }
+        } else {
+            base64Data.set(fastInfosetStreamReader.getTextAlgorithmBytesClone(),null);
+            visitor.text(base64Data);
+            textReported = true;
+        }
+    }
+
+    private void processBufferedText(boolean ignorable) throws SAXException {
+        if (!ignorable || !WhiteSpaceProcessor.isWhiteSpace(buffer)) {
+            visitor.text(buffer);
+            textReported = true;
+        }
+    }
+
+    private void processUnreportedText() throws SAXException {
+        if(!textReported && predictor.expectText()) {
+            visitor.text("");
+        }
+        textReported = false;
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntArrayData.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntArrayData.java
index 091855de62e..994dd02fc0d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntArrayData.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntArrayData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntData.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntData.java
index 59c67f99d28..3d9ae5a32f8 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntData.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Intercepter.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Intercepter.java
index 9f449e40504..e83d9c8eb28 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Intercepter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Intercepter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import org.xml.sax.SAXException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/InterningXmlVisitor.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/InterningXmlVisitor.java
index 5b661c7d538..3a3b44a11a3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/InterningXmlVisitor.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/InterningXmlVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import javax.xml.namespace.NamespaceContext;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyLoader.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyLoader.java
index 01ac54b565e..3c4cc3b56a0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyLoader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import com.sun.xml.internal.bind.api.AccessorException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java
index 26e5e0a635f..599efd130ef 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import java.util.Collection;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorEx.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorEx.java
index 1995e697bcc..be4750742d5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorEx.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorEx.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,14 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
+import java.net.URL;
+
 import javax.xml.bind.ValidationEventLocator;
 
 import org.xml.sax.Locator;
+import org.w3c.dom.Node;
 
 /**
  * Object that returns the current location that the {@link XmlVisitor} is parsing.
@@ -40,4 +42,63 @@ public interface LocatorEx extends Locator {
      */
     ValidationEventLocator getLocation();
 
+    /**
+     * Immutable snapshot of a {@link LocatorEx}
+     */
+    public static final class Snapshot implements LocatorEx, ValidationEventLocator {
+        private final int columnNumber,lineNumber,offset;
+        private final String systemId,publicId;
+        private final URL url;
+        private final Object object;
+        private final Node node;
+
+        public Snapshot(LocatorEx loc) {
+            columnNumber = loc.getColumnNumber();
+            lineNumber = loc.getLineNumber();
+            systemId = loc.getSystemId();
+            publicId = loc.getPublicId();
+
+            ValidationEventLocator vel = loc.getLocation();
+            offset = vel.getOffset();
+            url = vel.getURL();
+            object = vel.getObject();
+            node = vel.getNode();
+        }
+
+        public Object getObject() {
+            return object;
+        }
+
+        public Node getNode() {
+            return node;
+        }
+
+        public int getOffset() {
+            return offset;
+        }
+
+        public URL getURL() {
+            return url;
+        }
+
+        public int getColumnNumber() {
+            return columnNumber;
+        }
+
+        public int getLineNumber() {
+            return lineNumber;
+        }
+
+        public String getSystemId() {
+            return systemId;
+        }
+
+        public String getPublicId() {
+            return publicId;
+        }
+
+        public ValidationEventLocator getLocation() {
+            return this;
+        }
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorExWrapper.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorExWrapper.java
index d3a1c61b1a0..7eba826c26d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorExWrapper.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorExWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import javax.xml.bind.ValidationEventLocator;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/MTOMDecorator.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/MTOMDecorator.java
index ae38421f961..ff9b0cd4aa3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/MTOMDecorator.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/MTOMDecorator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import javax.activation.DataHandler;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java
index f76b164de7d..62672145963 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import java.text.MessageFormat;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties
index 0a4db7e27e5..2f61f7a43fb 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties
@@ -1,3 +1,28 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
 NOT_A_QNAME = \
     {0} is not a valid QName
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Patcher.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Patcher.java
index 5167db95eea..11feacb12b6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Patcher.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Patcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import org.xml.sax.SAXException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ProxyLoader.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ProxyLoader.java
index 1fb0126d205..73741a3a0fa 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ProxyLoader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ProxyLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import org.xml.sax.SAXException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Receiver.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Receiver.java
index 99c2e703e4d..d1f58842e38 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Receiver.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Receiver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import org.xml.sax.SAXException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java
index d7247921686..4a7ad294b80 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import javax.xml.bind.JAXBException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Scope.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Scope.java
index b5591369685..6ae01839861 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Scope.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Scope.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import com.sun.xml.internal.bind.api.AccessorException;
@@ -107,8 +106,30 @@ public final class Scope {
         } catch (AccessorException e) {
             Loader.handleGenericException(e,true);
             // recover from this error by ignoring future items.
-            this.lister = Lister.ERROR;
-            this.acc = Accessor.ERROR;
+            this.lister = Lister.getErrorInstance();
+            this.acc = Accessor.getErrorInstance();
+        }
+    }
+
+    /**
+     * Starts the packing scope, without adding any item.
+     *
+     * This allows us to return an empty pack, thereby allowing the user
+     * to distinguish empty array vs null array.
+     */
+    public void start( Accessor acc, Lister lister) throws SAXException{
+        try {
+            if(!hasStarted()) {
+                this.bean = (BeanT)context.getCurrentState().target;
+                this.acc = acc;
+                this.lister = lister;
+                this.pack = lister.startPacking(bean,acc);
+            }
+        } catch (AccessorException e) {
+            Loader.handleGenericException(e,true);
+            // recover from this error by ignoring future items.
+            this.lister = Lister.getErrorInstance();
+            this.acc = Accessor.getErrorInstance();
         }
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXConnector.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXConnector.java
index 9378cbdb88c..72dd4232f45 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXConnector.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXConnector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import javax.xml.bind.ValidationEventLocator;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java
index e77f0533eaf..848e57b46de 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import java.util.Iterator;
@@ -50,6 +49,7 @@ import org.xml.sax.helpers.AttributesImpl;
  * parser technologies.
  *
  * @author Ryan.Shoemaker@Sun.COM
+ * @version 1.0
  */
 final class StAXEventConnector extends StAXConnector {
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java
index 959ad2df91f..81870b56a5d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import java.lang.reflect.Constructor;
@@ -40,9 +39,15 @@ import org.xml.sax.SAXException;
 /**
  * Reads XML from StAX {@link XMLStreamReader} and
  * feeds events to {@link XmlVisitor}.
+ * 
    
+ * TODO:
+ * Finding the optimized FI implementations is a bit hacky and not very
+ * extensible. Can we use the service provider mechnism in general for
+ * concrete implementations of StAXConnector.
  *
  * @author Ryan.Shoemaker@Sun.COM
  * @author Kohsuke Kawaguchi
+ * @version JAXB 2.0
  */
 class StAXStreamConnector extends StAXConnector {
 
@@ -53,26 +58,59 @@ class StAXStreamConnector extends StAXConnector {
      */
     public static StAXConnector create(XMLStreamReader reader, XmlVisitor visitor) {
         // try optimized codepath
-        if (reader.getClass()==FI_STAX_READER_CLASS && FI_CONNECTOR_CTOR!=null) {
+        final Class readerClass = reader.getClass();
+        if (FI_STAX_READER_CLASS != null && FI_STAX_READER_CLASS.isAssignableFrom(readerClass) && FI_CONNECTOR_CTOR!=null) {
             try {
                 return FI_CONNECTOR_CTOR.newInstance(reader,visitor);
             } catch (Exception t) {
             }
         }
-        if (STAX_EX_READER!=null && STAX_EX_READER.isAssignableFrom(reader.getClass())) {
+
+        // Quick hack until SJSXP fixes 6270116
+        boolean isZephyr = readerClass.getName().equals("com.sun.xml.internal.stream.XMLReaderImpl");
+        if(isZephyr)
+            ; // no need for interning
+        else
+        if(checkImplementaionNameOfSjsxp(reader))
+            ; // no need for interning
+        if(getBoolProp(reader,"org.codehaus.stax2.internNames")
+        && getBoolProp(reader,"org.codehaus.stax2.internNsUris"))
+            ; // no need for interning.
+        else
+            visitor = new InterningXmlVisitor(visitor);
+
+        if (STAX_EX_READER_CLASS!=null && STAX_EX_READER_CLASS.isAssignableFrom(readerClass)) {
             try {
                 return STAX_EX_CONNECTOR_CTOR.newInstance(reader,visitor);
             } catch (Exception t) {
             }
         }
 
-        // Quick hack until SJSXP fixes 6270116
-        boolean isZephyr = reader.getClass().getName().equals("com.sun.xml.internal.stream.XMLReaderImpl");
-        if(!isZephyr)
-            visitor = new InterningXmlVisitor(visitor);
         return new StAXStreamConnector(reader,visitor);
     }
 
+    private static boolean checkImplementaionNameOfSjsxp(XMLStreamReader reader) {
+        try {
+            Object name = reader.getProperty("http://java.sun.com/xml/stream/properties/implementation-name");
+            return name!=null && name.equals("sjsxp");
+        } catch (Exception e) {
+            // be defensive against broken StAX parsers since javadoc is not clear
+            // about when an error happens
+            return false;
+        }
+    }
+
+    private static boolean getBoolProp(XMLStreamReader r, String n) {
+        try {
+            Object o = r.getProperty(n);
+            if(o instanceof Boolean)    return (Boolean)o;
+            return false;
+        } catch (Exception e) {
+            // be defensive against broken StAX parsers since javadoc is not clear
+            // about when an error happens
+            return false;
+        }
+    }
 
 
     // StAX event source
@@ -296,7 +334,15 @@ class StAXStreamConnector extends StAXConnector {
 
     private static Class initFIStAXReaderClass() {
         try {
-            return UnmarshallerImpl.class.getClassLoader().loadClass("com.sun.xml.internal.fastinfoset.stax.StAXDocumentParser");
+            Class fisr = UnmarshallerImpl.class.getClassLoader().
+                    loadClass("com.sun.xml.internal.org.jvnet.fastinfoset.stax.FastInfosetStreamReader");
+            Class sdp = UnmarshallerImpl.class.getClassLoader().
+                    loadClass("com.sun.xml.internal.fastinfoset.stax.StAXDocumentParser");
+            // Check if StAXDocumentParser implements FastInfosetStreamReader
+            if (fisr.isAssignableFrom(sdp))
+                return sdp;
+            else
+                return null;
         } catch (Throwable e) {
             return null;
         }
@@ -304,23 +350,26 @@ class StAXStreamConnector extends StAXConnector {
 
     private static Constructor initFastInfosetConnectorClass() {
         try {
-            Class c = UnmarshallerImpl.class.getClassLoader().loadClass("com.sun.xml.internal.bind.v2.runtime.unmarshaller.FastInfosetConnector");
+            if (FI_STAX_READER_CLASS == null)
+                return null;
+
+            Class c = UnmarshallerImpl.class.getClassLoader().loadClass(
+                    "com.sun.xml.internal.bind.v2.runtime.unmarshaller.FastInfosetConnector");
             return c.getConstructor(FI_STAX_READER_CLASS,XmlVisitor.class);
         } catch (Throwable e) {
             return null;
         }
     }
 
-
     //
     // reference to StAXEx classes
     //
-    private static final Class STAX_EX_READER = initStAXExReader();
+    private static final Class STAX_EX_READER_CLASS = initStAXExReader();
     private static final Constructor STAX_EX_CONNECTOR_CTOR = initStAXExConnector();
 
     private static Class initStAXExReader() {
         try {
-            return UnmarshallerImpl.class.getClassLoader().loadClass("org.jvnet.staxex.XMLStreamReaderEx");
+            return UnmarshallerImpl.class.getClassLoader().loadClass("com.sun.xml.internal.org.jvnet.staxex.XMLStreamReaderEx");
         } catch (Throwable e) {
             return null;
         }
@@ -329,7 +378,7 @@ class StAXStreamConnector extends StAXConnector {
     private static Constructor initStAXExConnector() {
         try {
             Class c = UnmarshallerImpl.class.getClassLoader().loadClass("com.sun.xml.internal.bind.v2.runtime.unmarshaller.StAXExConnector");
-            return c.getConstructor(STAX_EX_READER,XmlVisitor.class);
+            return c.getConstructor(STAX_EX_READER_CLASS,XmlVisitor.class);
         } catch (Throwable e) {
             return null;
         }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java
index 1aea12ff348..bd24507ecf0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import java.util.Collection;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TagName.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TagName.java
index c465be1703e..5f6576a769d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TagName.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TagName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TextLoader.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TextLoader.java
index f499ec79399..3bf69b483be 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TextLoader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TextLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import com.sun.xml.internal.bind.api.AccessorException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallerImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallerImpl.java
index 92acbea6643..18e21d53bfd 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallerImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import java.io.IOException;
@@ -52,6 +51,7 @@ import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
 
 import com.sun.xml.internal.bind.IDResolver;
+import com.sun.xml.internal.bind.api.ClassResolver;
 import com.sun.xml.internal.bind.unmarshaller.DOMScanner;
 import com.sun.xml.internal.bind.unmarshaller.InfosetScanner;
 import com.sun.xml.internal.bind.unmarshaller.Messages;
@@ -418,6 +418,10 @@ public final class UnmarshallerImpl extends AbstractUnmarshallerImpl implements
             idResolver = (IDResolver)value;
             return;
         }
+        if(name.equals(ClassResolver.class.getName())) {
+            coordinator.classResolver = (ClassResolver)value;
+            return;
+        }
         super.setProperty(name, value);
     }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java
index cef12839d7e..bc0c0b30686 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import java.lang.reflect.InvocationTargetException;
@@ -44,14 +43,15 @@ import javax.xml.bind.ValidationEvent;
 import javax.xml.bind.ValidationEventHandler;
 import javax.xml.bind.ValidationEventLocator;
 import javax.xml.bind.helpers.ValidationEventImpl;
-import javax.xml.bind.helpers.ValidationEventLocatorImpl;
 import javax.xml.namespace.NamespaceContext;
 import javax.xml.namespace.QName;
 
 import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
 import com.sun.istack.internal.SAXParseException2;
 import com.sun.xml.internal.bind.IDResolver;
 import com.sun.xml.internal.bind.api.AccessorException;
+import com.sun.xml.internal.bind.api.ClassResolver;
 import com.sun.xml.internal.bind.unmarshaller.InfosetScanner;
 import com.sun.xml.internal.bind.v2.ClassFactory;
 import com.sun.xml.internal.bind.v2.runtime.AssociationMap;
@@ -154,6 +154,10 @@ public final class UnmarshallingContext extends Coordinator
      */
     private NamespaceContext environmentNamespaceContext;
 
+    /**
+     * Used to discover additional classes when we hit unknown elements/types.
+     */
+    public @Nullable ClassResolver classResolver;
 
     /**
      * State information for each element.
@@ -292,6 +296,35 @@ public final class UnmarshallingContext extends Coordinator
         return current;
     }
 
+    /**
+     * On top of {@link JAXBContextImpl#selectRootLoader(State, TagName)},
+     * this method also consults {@link ClassResolver}.
+     *
+     * @throws SAXException
+     *      if {@link ValidationEventHandler} reported a failure.
+     */
+    public Loader selectRootLoader(State state, TagName tag) throws SAXException {
+        try {
+            Loader l = getJAXBContext().selectRootLoader(state, tag);
+            if(l!=null)     return l;
+
+            if(classResolver!=null) {
+                Class clazz = classResolver.resolveElementName(tag.uri, tag.local);
+                if(clazz!=null) {
+                    JAXBContextImpl enhanced = getJAXBContext().createAugmented(clazz);
+                    JaxBeanInfo bi = enhanced.getBeanInfo(clazz);
+                    return bi.getLoader(enhanced,true);
+                }
+            }
+        } catch (RuntimeException e) {
+            throw e;
+        } catch (Exception e) {
+            handleError(e);
+        }
+
+        return null;
+    }
+
     /**
      * Allocates a few more {@link State}s.
      *
@@ -343,7 +376,8 @@ public final class UnmarshallingContext extends Coordinator
     }
 
     public void startDocument(LocatorEx locator, NamespaceContext nsContext) throws SAXException {
-        this.locator = locator;
+        if(locator!=null)
+            this.locator = locator;
         this.environmentNamespaceContext = nsContext;
         // reset the object
         result = null;
@@ -354,8 +388,6 @@ public final class UnmarshallingContext extends Coordinator
         isUnmarshalInProgress = true;
         nsLen=0;
 
-        startPrefixMapping("",""); // by default, the default ns is bound to "".
-
         setThreadAffinity();
 
         if(expectedType!=null)
@@ -596,11 +628,11 @@ public final class UnmarshallingContext extends Coordinator
     /**
      * Called when there's no corresponding ID value.
      */
-    public void errorUnresolvedIDREF(Object bean, String idref) throws SAXException {
+    public void errorUnresolvedIDREF(Object bean, String idref, LocatorEx loc) throws SAXException {
         handleEvent( new ValidationEventImpl(
             ValidationEvent.ERROR,
             Messages.UNRESOLVED_IDREF.format(idref),
-            new ValidationEventLocatorImpl(bean)), true );
+            loc.getLocation()), true );
     }
 
 
@@ -728,6 +760,12 @@ public final class UnmarshallingContext extends Coordinator
             // temporary workaround until Zephyr fixes 6337180
             return environmentNamespaceContext.getNamespaceURI(prefix.intern());
 
+        // by default, the default ns is bound to "".
+        // but allow environmentNamespaceContext to take precedence
+        if(prefix.equals(""))
+            return "";
+
+        // unresolved. error.
         return null;
     }
 
@@ -750,7 +788,7 @@ public final class UnmarshallingContext extends Coordinator
      *      is represented by the empty string.
      */
     public String[] getAllDeclaredPrefixes() {
-        return getPrefixList( 2 );  // skip the default ""->"" mapping
+        return getPrefixList(0);
     }
 
     private String[] getPrefixList( int startIndex ) {
@@ -885,10 +923,15 @@ public final class UnmarshallingContext extends Coordinator
      */
     public void endScope(int frameSize) throws SAXException {
         try {
-            for( ; frameSize>0; frameSize-- )
-                scopes[scopeTop--].finish();
+            for( ; frameSize>0; frameSize--, scopeTop-- )
+                scopes[scopeTop].finish();
         } catch (AccessorException e) {
             handleError(e);
+
+            // the error might have left scopes in inconsistent state,
+            // so replace them by fresh ones
+            for( ; frameSize>0; frameSize-- )
+                scopes[scopeTop--] = new Scope(this);
         }
     }
 
@@ -928,9 +971,7 @@ public final class UnmarshallingContext extends Coordinator
          * unmarshalling.
          */
         public void childElement(UnmarshallingContext.State state, TagName ea) throws SAXException {
-            JAXBContextImpl jaxbContext = state.getContext().getJAXBContext();
-
-            Loader loader = jaxbContext.selectRootLoader(state,ea);
+            Loader loader = state.getContext().selectRootLoader(state,ea);
             if(loader!=null) {
                 state.loader = loader;
                 state.receiver = this;
@@ -939,7 +980,7 @@ public final class UnmarshallingContext extends Coordinator
 
             // the registry doesn't know about this element.
             // try its xsi:type
-            JaxBeanInfo beanInfo = XsiTypeLoader.parseXsiType(state, ea);
+            JaxBeanInfo beanInfo = XsiTypeLoader.parseXsiType(state, ea, null);
             if(beanInfo==null) {
                 // we don't even know its xsi:type
                 reportUnexpectedChildElement(ea,false);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValidatingUnmarshaller.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValidatingUnmarshaller.java
index dac6bd43835..5109afa714c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValidatingUnmarshaller.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValidatingUnmarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import javax.xml.namespace.NamespaceContext;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValuePropertyLoader.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValuePropertyLoader.java
index ba8ad3ffa3b..fdc871a2957 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValuePropertyLoader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValuePropertyLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.TransducedAccessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/WildcardLoader.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/WildcardLoader.java
index 53340fc77d5..2b49b885ccc 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/WildcardLoader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/WildcardLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,6 +23,9 @@
  * have any questions.
  */
 
+/*
+ * @(#)$Id: WildcardLoader.java,v 1.3.6.1 2006/08/23 17:24:39 kohsuke Exp $
+ */
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import javax.xml.bind.annotation.DomHandler;
@@ -53,11 +56,11 @@ public final class WildcardLoader extends ProxyLoader {
         this.mode = mode;
     }
 
-    protected Loader selectLoader(UnmarshallingContext.State state, TagName ea) {
+    protected Loader selectLoader(UnmarshallingContext.State state, TagName tag) throws SAXException {
         UnmarshallingContext context = state.getContext();
 
         if(mode.allowTypedObject) {
-            Loader l = context.getJAXBContext().selectRootLoader(state,ea);
+            Loader l = context.selectRootLoader(state,tag);
             if(l!=null)
                 return l;
         }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XmlVisitor.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XmlVisitor.java
index 73b8a6d762c..7e4078ce939 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XmlVisitor.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XmlVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import javax.xml.namespace.NamespaceContext;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiNilLoader.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiNilLoader.java
index 9285e5614ea..740eaa6eaad 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiNilLoader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiNilLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import com.sun.xml.internal.bind.DatatypeConverterImpl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java
index 0a3dd394d08..f3d8cdb12df 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import javax.xml.namespace.QName;
@@ -30,6 +29,7 @@ import javax.xml.namespace.QName;
 import com.sun.xml.internal.bind.DatatypeConverterImpl;
 import com.sun.xml.internal.bind.v2.WellKnownNamespace;
 import com.sun.xml.internal.bind.v2.runtime.JaxBeanInfo;
+import com.sun.istack.internal.Nullable;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
@@ -52,7 +52,7 @@ public class XsiTypeLoader extends Loader {
     }
 
     public void startElement(UnmarshallingContext.State state, TagName ea) throws SAXException {
-        JaxBeanInfo beanInfo = parseXsiType(state, ea);
+        JaxBeanInfo beanInfo = parseXsiType(state,ea,defaultBeanInfo);
         if(beanInfo==null)
             beanInfo = defaultBeanInfo;
 
@@ -61,7 +61,7 @@ public class XsiTypeLoader extends Loader {
         loader.startElement(state,ea);
     }
 
-    /*pacakge*/ static JaxBeanInfo parseXsiType(UnmarshallingContext.State state, TagName ea) throws SAXException {
+    /*pacakge*/ static JaxBeanInfo parseXsiType(UnmarshallingContext.State state, TagName ea, @Nullable JaxBeanInfo defaultBeanInfo) throws SAXException {
         UnmarshallingContext context = state.getContext();
         JaxBeanInfo beanInfo = null;
 
@@ -78,6 +78,15 @@ public class XsiTypeLoader extends Loader {
             if(type==null) {
                 reportError(Messages.NOT_A_QNAME.format(value),true);
             } else {
+                if(defaultBeanInfo!=null && defaultBeanInfo.getTypeNames().contains(type))
+                    // if this xsi:type is something that the default type can already handle,
+                    // let it do so. This is added as a work around to bug https://jax-ws.dev.java.net/issues/show_bug.cgi?id=195
+                    // where a redundant xsi:type="xs:dateTime" causes JAXB to unmarshal XMLGregorianCalendar,
+                    // where Date is expected.
+                    // this is not a complete fix, as we still won't be able to handle simple type substitution in general,
+                    // but none-the-less
+                    return defaultBeanInfo;
+
                 beanInfo = context.getJAXBContext().getGlobalType(type);
                 if(beanInfo==null) {
                     String nearest = context.getJAXBContext().getNearestTypeName(type);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/FoolProofResolver.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/FoolProofResolver.java
index 75c9b2d3eef..8d6ba01718d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/FoolProofResolver.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/FoolProofResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.schemagen;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Form.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Form.java
index dfb45b49023..14772100d15 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Form.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Form.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.schemagen;
 
 import javax.xml.bind.annotation.XmlNsForm;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/GroupKind.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/GroupKind.java
new file mode 100644
index 00000000000..6b2dee052d2
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/GroupKind.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.bind.v2.schemagen;
+
+import com.sun.xml.internal.bind.v2.schemagen.xmlschema.Particle;
+import com.sun.xml.internal.bind.v2.schemagen.xmlschema.ContentModelContainer;
+
+/**
+ * Enum for model group type.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+enum GroupKind {
+    ALL("all"), SEQUENCE("sequence"), CHOICE("choice");
+
+    private final String name;
+
+    GroupKind(String name) {
+        this.name = name;
+    }
+
+    /**
+     * Writes the model group.
+     */
+    Particle write(ContentModelContainer parent) {
+        return parent._element(name,Particle.class);
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/message/SOAPMsgCreateException.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.java
similarity index 69%
rename from jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/message/SOAPMsgCreateException.java
rename to jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.java
index 72f4cd1455c..2743e2cabdc 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/message/SOAPMsgCreateException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,21 +22,25 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+package com.sun.xml.internal.bind.v2.schemagen;
 
-package com.sun.xml.internal.ws.encoding.soap.message;
-
-import com.sun.xml.internal.ws.util.exception.JAXWSExceptionBase;
+import java.util.ResourceBundle;
+import java.text.MessageFormat;
 
 /**
- * @author WS Development Team
+ * Message resources
  */
-public class SOAPMsgCreateException extends JAXWSExceptionBase {
+enum Messages {
+    ANONYMOUS_TYPE_CYCLE // 1 arg
+    ;
 
-    public SOAPMsgCreateException(String key, Object... args) {
-        super(key, args);
+    private static final ResourceBundle rb = ResourceBundle.getBundle(Messages.class.getName());
+
+    public String toString() {
+        return format();
     }
 
-    public String getResourceBundleName() {
-        return "com.sun.xml.internal.ws.resources.soap";
+    public String format( Object... args ) {
+        return MessageFormat.format( rb.getString(name()), args );
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.properties b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.properties
new file mode 100644
index 00000000000..28d7d716366
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.properties
@@ -0,0 +1,27 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
+ANONYMOUS_TYPE_CYCLE=Anonymous types form an infinite cycle: {0}
+ 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/MultiMap.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/MultiMap.java
index 9e4173799c3..6c8c84237c6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/MultiMap.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/MultiMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.schemagen;
 
 import java.util.TreeMap;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Tree.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Tree.java
new file mode 100644
index 00000000000..c3b041989a4
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Tree.java
@@ -0,0 +1,243 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.bind.v2.schemagen;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import com.sun.xml.internal.bind.v2.schemagen.xmlschema.ContentModelContainer;
+import com.sun.xml.internal.bind.v2.schemagen.xmlschema.Particle;
+import com.sun.xml.internal.bind.v2.schemagen.xmlschema.TypeDefParticle;
+import com.sun.xml.internal.bind.v2.schemagen.xmlschema.Occurs;
+
+/**
+ * Normalized representation of the content model.
+ *
+ * 
    
+ * This is built from bottom up so that we can eliminate redundant constructs,
+ * and produce the most concise content model definition in XML.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+abstract class Tree {
+
+    /**
+     * Returns "T?" from "T".
+     *
+     * @param really
+     *      if false this method becomes no-op. This is so that we can write
+     *      the caller fluently.
+     */
+    Tree makeOptional(boolean really) {
+        return really?new Optional(this) :this;
+    }
+
+    /**
+     * Returns "T+" from "T".
+     *
+     * @param really
+     *      if false this method becomes no-op. This is so that we can write
+     *      the caller fluently.
+     */
+    Tree makeRepeated(boolean really) {
+        return really?new Repeated(this) :this;
+    }
+
+    /**
+     * Returns a group tree.
+     */
+    static Tree makeGroup(GroupKind kind, List children ) {
+        // pointless binary operator.
+        if(children.size()==1)
+            return children.get(0);
+
+        // we neither have epsilon or emptySet, so can't handle children.length==0 nicely
+
+        // eliminated nesting groups of the same kind.
+        // this is where binary tree would have shined.
+        List normalizedChildren = new ArrayList(children.size());
+        for (Tree t : children) {
+            if (t instanceof Group) {
+                Group g = (Group) t;
+                if(g.kind==kind) {
+                    normalizedChildren.addAll(Arrays.asList(g.children));
+                    continue;
+                }
+            }
+            normalizedChildren.add(t);
+        }
+
+        return new Group(kind,normalizedChildren.toArray(new Tree[normalizedChildren.size()]));
+    }
+
+    /**
+     * Returns true if this tree accepts empty sequence.
+     */
+    abstract boolean isNullable();
+
+    /**
+     * Returns true if the top node of this tree can
+     * appear as a valid top-level content model in XML Schema.
+     *
+     * 
    
+     * Model groups and occurrences that have model group in it can.
+     */
+    boolean canBeTopLevel() { return false; }
+
+    /**
+     * Writes out the content model.
+     *
+     * Normall this runs recursively until we write out the whole content model.
+     */
+    protected abstract void write(ContentModelContainer parent, boolean isOptional, boolean repeated);
+
+    /**
+     * Writes inside the given complex type.
+     */
+    protected void write(TypeDefParticle ct) {
+        if(canBeTopLevel())
+            write(ct._cast(ContentModelContainer.class), false, false);
+        else
+            // need a dummy wrapper
+            new Group(GroupKind.SEQUENCE,this).write(ct);
+    }
+
+    /**
+     * Convenience method to write occurrence constraints.
+     */
+    protected final void writeOccurs(Occurs o, boolean isOptional, boolean repeated) {
+        if(isOptional)
+            o.minOccurs(0);
+        if(repeated)
+            o.maxOccurs("unbounded");
+    }
+
+    /**
+     * Represents a terminal tree node, such as element, wildcard, etc.
+     */
+    abstract static class Term extends Tree {
+        boolean isNullable() {
+            return false;
+        }
+    }
+
+    /**
+     * "T?"
+     */
+    private static final class Optional extends Tree {
+        private final Tree body;
+
+        private Optional(Tree body) {
+            this.body = body;
+        }
+
+        @Override
+        boolean isNullable() {
+            return true;
+        }
+
+        @Override
+        Tree makeOptional(boolean really) {
+            return this;
+        }
+
+        @Override
+        protected void write(ContentModelContainer parent, boolean isOptional, boolean repeated) {
+            body.write(parent,true,repeated);
+        }
+    }
+
+    /**
+     * "T+"
+     */
+    private static final class Repeated extends Tree {
+        private final Tree body;
+
+        private Repeated(Tree body) {
+            this.body = body;
+        }
+
+        @Override
+        boolean isNullable() {
+            return body.isNullable();
+        }
+
+        @Override
+        Tree makeRepeated(boolean really) {
+            return this;
+        }
+
+        @Override
+        protected void write(ContentModelContainer parent, boolean isOptional, boolean repeated) {
+            body.write(parent,isOptional,true);
+        }
+    }
+
+    /**
+     * "S|T", "S,T", and "S&T".
+     */
+    private static final class Group extends Tree {
+        private final GroupKind kind;
+        private final Tree[] children;
+
+        private Group(GroupKind kind, Tree... children) {
+            this.kind = kind;
+            this.children = children;
+        }
+
+        @Override
+        boolean canBeTopLevel() {
+            return true;
+        }
+
+        @Override
+        boolean isNullable() {
+            if(kind== GroupKind.CHOICE) {
+                for (Tree t : children) {
+                    if(t.isNullable())
+                        return true;
+                }
+                return false;
+            } else {
+                for (Tree t : children) {
+                    if(!t.isNullable())
+                        return false;
+                }
+                return true;
+            }
+        }
+
+        @Override
+        protected void write(ContentModelContainer parent, boolean isOptional, boolean repeated) {
+            Particle c = kind.write(parent);
+            writeOccurs(c,isOptional,repeated);
+
+            for (Tree child : children) {
+                child.write(c,false,false);
+            }
+        }
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Util.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Util.java
index 9a13e35327c..dd4c683bed0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Util.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Util.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.schemagen;
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java
index 1baa833026b..2676fc62caf 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,12 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.schemagen;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.Writer;
+import java.io.File;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Comparator;
@@ -36,6 +36,7 @@ import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
+import java.util.ArrayList;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -46,10 +47,13 @@ import javax.xml.transform.Result;
 import javax.xml.transform.stream.StreamResult;
 
 import com.sun.istack.internal.Nullable;
+import com.sun.istack.internal.NotNull;
 import com.sun.xml.internal.bind.Util;
 import com.sun.xml.internal.bind.api.CompositeStructure;
+import com.sun.xml.internal.bind.api.ErrorListener;
 import com.sun.xml.internal.bind.v2.TODO;
 import com.sun.xml.internal.bind.v2.WellKnownNamespace;
+import com.sun.xml.internal.bind.v2.util.CollisionCheckStack;
 import static com.sun.xml.internal.bind.v2.WellKnownNamespace.XML_SCHEMA;
 import com.sun.xml.internal.bind.v2.model.core.Adapter;
 import com.sun.xml.internal.bind.v2.model.core.ArrayInfo;
@@ -83,7 +87,6 @@ import com.sun.xml.internal.bind.v2.schemagen.xmlschema.Import;
 import com.sun.xml.internal.bind.v2.schemagen.xmlschema.List;
 import com.sun.xml.internal.bind.v2.schemagen.xmlschema.LocalAttribute;
 import com.sun.xml.internal.bind.v2.schemagen.xmlschema.LocalElement;
-import com.sun.xml.internal.bind.v2.schemagen.xmlschema.Occurs;
 import com.sun.xml.internal.bind.v2.schemagen.xmlschema.Schema;
 import com.sun.xml.internal.bind.v2.schemagen.xmlschema.SimpleExtension;
 import com.sun.xml.internal.bind.v2.schemagen.xmlschema.SimpleRestrictionModel;
@@ -92,10 +95,17 @@ import com.sun.xml.internal.bind.v2.schemagen.xmlschema.SimpleTypeHost;
 import com.sun.xml.internal.bind.v2.schemagen.xmlschema.TopLevelAttribute;
 import com.sun.xml.internal.bind.v2.schemagen.xmlschema.TopLevelElement;
 import com.sun.xml.internal.bind.v2.schemagen.xmlschema.TypeHost;
+import com.sun.xml.internal.bind.v2.schemagen.xmlschema.ContentModelContainer;
+import com.sun.xml.internal.bind.v2.schemagen.xmlschema.TypeDefParticle;
+import com.sun.xml.internal.bind.v2.schemagen.xmlschema.AttributeType;
+import com.sun.xml.internal.bind.v2.schemagen.episode.Bindings;
 import com.sun.xml.internal.txw2.TXW;
 import com.sun.xml.internal.txw2.TxwException;
 import com.sun.xml.internal.txw2.TypedXmlWriter;
 import com.sun.xml.internal.txw2.output.ResultFactory;
+import com.sun.xml.internal.txw2.output.XmlSerializer;
+
+import org.xml.sax.SAXParseException;
 
 /**
  * Generates a set of W3C XML Schema documents from a set of Java classes.
@@ -127,6 +137,11 @@ public final class XmlSchemaGenerator {
      */
     private final Map namespaces = new TreeMap(NAMESPACE_COMPARATOR);
 
+    /**
+     * {@link ErrorListener} to send errors to.
+     */
+    private ErrorListener errorListener;
+
     /** model navigator **/
     private Navigator navigator;
 
@@ -142,6 +157,11 @@ public final class XmlSchemaGenerator {
      */
     private final NonElement anyType;
 
+    /**
+     * Used to detect cycles in anonymous types.
+     */
+    private final CollisionCheckStack> collisionChecker = new CollisionCheckStack>();
+
     public XmlSchemaGenerator( Navigator navigator, TypeInfoSet types ) {
         this.navigator = navigator;
         this.types = types;
@@ -228,12 +248,17 @@ public final class XmlSchemaGenerator {
                     }
                 }
             }
+
+            if(generateSwaRefAdapter(p))
+                n.useSwaRef = true;
         }
 
         // recurse on baseTypes to make sure that we can refer to them in the schema
         ClassInfo bc = clazz.getBaseClass();
-        if (bc != null)
+        if (bc != null) {
             add(bc);
+            n.addDependencyTo(bc.getTypeName());
+        }
     }
 
     /**
@@ -315,17 +340,78 @@ public final class XmlSchemaGenerator {
             n.addDependencyTo(type.getTypeName());
     }
 
+    /**
+     * Writes out the episode file.
+     */
+    public void writeEpisodeFile(XmlSerializer out) {
+        Bindings root = TXW.create(Bindings.class, out);
+
+        if(namespaces.containsKey("")) // otherwise jaxb binding NS should be the default namespace
+            root._namespace(WellKnownNamespace.JAXB,"jaxb");
+        root.version("2.1");
+        // TODO: don't we want to bake in versions?
+
+        // generate listing per schema
+        for (Map.Entry e : namespaces.entrySet()) {
+            Bindings group = root.bindings();
+
+            String prefix;
+            String tns = e.getKey();
+            if(!tns.equals("")) {
+                group._namespace(tns,"tns");
+                prefix = "tns:";
+            } else {
+                prefix = "";
+            }
+
+            group.scd("x-schema::"+(tns.equals("")?"":"tns"));
+            group.schemaBindings().map(false);
+
+            for (ClassInfo ci : e.getValue().classes) {
+                if(ci.getTypeName()==null)  continue;   // local type
+
+                if(ci.getTypeName().getNamespaceURI().equals(tns)) {
+                    Bindings child = group.bindings();
+                    child.scd('~'+prefix+ci.getTypeName().getLocalPart());
+                    child.klass().ref(ci.getName());
+                }
+
+                if(ci.isElement() && ci.getElementName().getNamespaceURI().equals(tns)) {
+                    Bindings child = group.bindings();
+                    child.scd(prefix+ci.getElementName().getLocalPart());
+                    child.klass().ref(ci.getName());
+                }
+            }
+
+            for (EnumLeafInfo en : e.getValue().enums) {
+                if(en.getTypeName()==null)  continue;   // local type
+
+                Bindings child = group.bindings();
+                child.scd('~'+prefix+en.getTypeName().getLocalPart());
+                child.klass().ref(navigator.getClassName(en.getClazz()));
+            }
+
+            group.commit(true);
+        }
+
+        root.commit();
+    }
+
     /**
      * Write out the schema documents.
      */
-    public void write(SchemaOutputResolver resolver) throws IOException {
+    public void write(SchemaOutputResolver resolver, ErrorListener errorListener) throws IOException {
         if(resolver==null)
             throw new IllegalArgumentException();
 
         // make it fool-proof
         resolver = new FoolProofResolver(resolver);
+        this.errorListener = errorListener;
+
+        Map schemaLocations = types.getSchemaLocations();
 
         Map out = new HashMap();
+        Map systemIds = new HashMap();
 
         // we create a Namespace object for the XML Schema namespace
         // as a side-effect, but we don't want to generate it.
@@ -334,25 +420,29 @@ public final class XmlSchemaGenerator {
         // first create the outputs for all so that we can resolve references among
         // schema files when we write
         for( Namespace n : namespaces.values() ) {
-            final Result output = resolver.createOutput(n.uri,"schema"+(out.size()+1)+".xsd");
-            if(output!=null) {  // null result means no schema for that namespace
-                out.put(n,output);
+            String schemaLocation = schemaLocations.get(n.uri);
+            if(schemaLocation!=null) {
+                systemIds.put(n,schemaLocation);
+            } else {
+                Result output = resolver.createOutput(n.uri,"schema"+(out.size()+1)+".xsd");
+                if(output!=null) {  // null result means no schema for that namespace
+                    out.put(n,output);
+                    systemIds.put(n,output.getSystemId());
+                }
             }
         }
 
         // then write'em all
-        for( Namespace n : namespaces.values() ) {
-            Result result = out.get(n);
-            if(result!=null) {
-                n.writeTo( result, out );
-                if(result instanceof StreamResult) {
-                    OutputStream outputStream = ((StreamResult)result).getOutputStream();
-                    if(outputStream != null) {
-                        outputStream.close(); // fix for bugid: 6291301
-                    } else {
-                        final Writer writer = ((StreamResult)result).getWriter();
-                        if(writer != null) writer.close();
-                    }
+        for( Map.Entry e : out.entrySet() ) {
+            Result result = e.getValue();
+            e.getKey().writeTo( result, systemIds );
+            if(result instanceof StreamResult) {
+                OutputStream outputStream = ((StreamResult)result).getOutputStream();
+                if(outputStream != null) {
+                    outputStream.close(); // fix for bugid: 6291301
+                } else {
+                    final Writer writer = ((StreamResult)result).getWriter();
+                    if(writer != null) writer.close();
                 }
             }
         }
@@ -364,7 +454,7 @@ public final class XmlSchemaGenerator {
      * Schema components are organized per namespace.
      */
     private class Namespace {
-        final String uri;
+        final @NotNull String uri;
 
         /**
          * Other {@link Namespace}s that this namespace depends on.
@@ -394,7 +484,7 @@ public final class XmlSchemaGenerator {
         /**
          * Global attribute declarations keyed by their local names.
          */
-        private final MultiMap> attributeDecls = new MultiMap>(stringType);
+        private final MultiMap> attributeDecls = new MultiMap>(null);
 
         /**
          * Global element declarations to be written, keyed by their local names.
@@ -405,6 +495,12 @@ public final class XmlSchemaGenerator {
         private Form attributeFormDefault;
         private Form elementFormDefault;
 
+        /**
+         * Does schema in this namespace uses swaRef? If so, we need to generate import
+         * statement.
+         */
+        private boolean useSwaRef;
+
         public Namespace(String uri) {
             this.uri = uri;
             assert !XmlSchemaGenerator.this.namespaces.containsKey(uri);
@@ -455,8 +551,11 @@ public final class XmlSchemaGenerator {
 
         /**
          * Writes the schema document to the specified result.
+         *
+         * @param systemIds
+         *      System IDs of the other schema documents. "" indicates 'implied'.
          */
-        private void writeTo(Result result, Map out) throws IOException {
+        private void writeTo(Result result, Map systemIds) throws IOException {
             try {
                 Schema schema = TXW.create(Schema.class,ResultFactory.createSerializer(result));
 
@@ -467,6 +566,9 @@ public final class XmlSchemaGenerator {
                     schema._namespace(e.getValue(),e.getKey());
                 }
 
+                if(useSwaRef)
+                    schema._namespace(WellKnownNamespace.SWA_URI,"swaRef");
+
                 attributeFormDefault = Form.get(types.getAttributeFormDefault(uri));
                 attributeFormDefault.declare("attributeFormDefault",schema);
 
@@ -504,9 +606,16 @@ public final class XmlSchemaGenerator {
                     Import imp = schema._import();
                     if(n.uri.length()!=0)
                         imp.namespace(n.uri);
-                    imp.schemaLocation(relativize(out.get(n).getSystemId(),result.getSystemId()));
+                    String refSystemId = systemIds.get(n);
+                    if(refSystemId!=null && !refSystemId.equals("")) {
+                        // "" means implied. null if the SchemaOutputResolver said "don't generate!"
+                        imp.schemaLocation(relativize(refSystemId,result.getSystemId()));
+                    }
                     schema._pcdata(newline);
                 }
+                if(useSwaRef) {
+                    schema._import().namespace(WellKnownNamespace.SWA_URI).schemaLocation("http://ws-i.org/profiles/basic/1.1/swaref.xsd");
+                }
 
                 // then write each component
                 for (Map.Entry e : elementDecls.entrySet()) {
@@ -535,10 +644,13 @@ public final class XmlSchemaGenerator {
                     writeArray(a,schema);
                     schema._pcdata(newline);
                 }
-                for (Map.Entry> e : attributeDecls.entrySet()) {
+                for (Map.Entry> e : attributeDecls.entrySet()) {
                     TopLevelAttribute a = schema.attribute();
                     a.name(e.getKey());
-                    writeTypeRef(a,e.getValue(),"type");
+                    if(e.getValue()==null)
+                        writeTypeRef(a,stringType,"type");
+                    else
+                        writeAttributeTypeRef(e.getValue(),a);
                     schema._pcdata(newline);
                 }
 
@@ -600,18 +712,6 @@ public final class XmlSchemaGenerator {
             writeTypeRef(th, typeRef.getTarget(), refAttName);
         }
 
-        /**
-         * Examine the specified element ref and determine if a swaRef attribute needs to be generated
-         * @param typeRef
-         */
-        private boolean generateSwaRefAdapter(NonElementRef typeRef) {
-            final Adapter adapter = typeRef.getSource().getAdapter();
-            if (adapter == null) return false;
-            final Object o = navigator.asDecl(SwaRefAdapter.class);
-            if (o == null) return false;
-            return (o.equals(adapter.adapterType));
-        }
-
         /**
          * Writes a type attribute (if the referenced type is a global type)
          * or writes out the definition of the anonymous type in place (if the referenced
@@ -626,8 +726,18 @@ public final class XmlSchemaGenerator {
          */
         private void writeTypeRef(TypeHost th, NonElement type, String refAttName) {
             if(type.getTypeName()==null) {
+                // anonymous
+                th.block(); // so that the caller may write other attribuets
                 if(type instanceof ClassInfo) {
-                    writeClass( (ClassInfo)type, th );
+                    if(collisionChecker.push((ClassInfo)type)) {
+                        errorListener.error(new SAXParseException(
+                            Messages.ANONYMOUS_TYPE_CYCLE.format(collisionChecker.getCycleString()),
+                            null
+                        ));
+                    } else {
+                        writeClass( (ClassInfo)type, th );
+                    }
+                    collisionChecker.pop();
                 } else {
                     writeEnum( (EnumLeafInfo)type, (SimpleTypeHost)th);
                 }
@@ -746,64 +856,57 @@ public final class XmlSchemaGenerator {
             if(c.isAbstract())
                 ct._abstract(true);
 
-            // hold the ct open in case we need to generate @mixed below...
-            ct.block();
-
-            // either  or 
-            ExplicitGroup compositor = null;
-
-            // only necessary if this type has a base class we need to extend from
+            // these are where we write content model and attributes
             AttrDecls contentModel = ct;
+            TypeDefParticle contentModelOwner = ct;
 
             // if there is a base class, we need to generate an extension in the schema
             final ClassInfo bc = c.getBaseClass();
             if (bc != null) {
-                ComplexExtension ce = ct.complexContent().extension();
-                contentModel = ce;
-
-                ce.base(bc.getTypeName());
-                // TODO: what if the base type is anonymous?
-                // ordered props go in a sequence, unordered go in an all
-                if( c.isOrdered() ) {
-                    compositor = ce.sequence();
+                if(bc.hasValueProperty()) {
+                    // extending complex type with simple content
+                    SimpleExtension se = ct.simpleContent().extension();
+                    contentModel = se;
+                    contentModelOwner = null;
+                    se.base(bc.getTypeName());
                 } else {
-                    compositor = ce.all();
+                    ComplexExtension ce = ct.complexContent().extension();
+                    contentModel = ce;
+                    contentModelOwner = ce;
+
+                    ce.base(bc.getTypeName());
+                    // TODO: what if the base type is anonymous?
                 }
             }
 
-            // iterate over the properties
-            if (c.hasProperties()) {
-                if( compositor == null ) { // if there is no extension base, create a top level seq
-                    // ordered props go in a sequence, unordered go in an all
-                    if( c.isOrdered() ) {
-                        compositor = ct.sequence();
-                    } else {
-                        compositor = ct.all();
-                    }
-                }
-
-                // block writing the compositor because we might need to
-                // write some out of order attributes to handle min/maxOccurs
-                compositor.block();
-
+            if(contentModelOwner!=null) {
+                // build the tree that represents the explicit content model from iterate over the properties
+                ArrayList children = new ArrayList();
                 for (PropertyInfo p : c.getProperties()) {
                     // handling for 
                     if(p instanceof ReferencePropertyInfo && ((ReferencePropertyInfo)p).isMixed()) {
                         ct.mixed(true);
                     }
-                    writeProperty(p, contentModel, compositor);
+                    Tree t = buildPropertyContentModel(p);
+                    if(t!=null)
+                        children.add(t);
                 }
 
-                compositor.commit();
+                Tree top = Tree.makeGroup( c.isOrdered() ? GroupKind.SEQUENCE : GroupKind.ALL, children);
+
+                // write the content model
+                top.write(contentModelOwner);
             }
 
-            // look for wildcard attributes
+            // then attributes
+            for (PropertyInfo p : c.getProperties()) {
+                if (p instanceof AttributePropertyInfo) {
+                    handleAttributeProp((AttributePropertyInfo)p, contentModel);
+                }
+            }
             if( c.hasAttributeWildcard()) {
-                // TODO: not type safe
                 contentModel.anyAttribute().namespace("##other").processContents("skip");
             }
-
-            // finally commit the ct
             ct.commit();
         }
 
@@ -824,27 +927,23 @@ public final class XmlSchemaGenerator {
         }
 
         /**
-         * write the schema definition(s) for the specified property
+         * Builds content model writer for the specified property.
          */
-        private void writeProperty(PropertyInfo p, AttrDecls attr, ExplicitGroup compositor) {
+        private Tree buildPropertyContentModel(PropertyInfo p) {
             switch(p.kind()) {
             case ELEMENT:
-                handleElementProp((ElementPropertyInfo)p, compositor);
-                break;
+                return handleElementProp((ElementPropertyInfo)p);
             case ATTRIBUTE:
-                handleAttributeProp((AttributePropertyInfo)p, attr);
-                break;
+                // attribuets are handled later
+                return null;
             case REFERENCE:
-                handleReferenceProp((ReferencePropertyInfo)p, compositor);
-                break;
+                return handleReferenceProp((ReferencePropertyInfo)p);
             case MAP:
-                handleMapProp((MapPropertyInfo)p, compositor);
-                break;
+                return handleMapProp((MapPropertyInfo)p);
             case VALUE:
                 // value props handled above in writeClass()
                 assert false;
                 throw new IllegalStateException();
-                // break();
             default:
                 assert false;
                 throw new IllegalStateException();
@@ -859,91 +958,83 @@ public final class XmlSchemaGenerator {
          * not be wrapped.
          *
          * @param ep the element property
-         * @param compositor the schema compositor (sequence or all)
          */
-        private void handleElementProp(ElementPropertyInfo ep, ExplicitGroup compositor) {
-            QName ename = ep.getXmlName();
-            Occurs occurs = null;
-
+        private Tree handleElementProp(final ElementPropertyInfo ep) {
             if (ep.isValueList()) {
-                TypeRef t = ep.getTypes().get(0);
-                LocalElement e = compositor.element();
-
-                QName tn = t.getTagName();
-                e.name(tn.getLocalPart());
-                List lst = e.simpleType().list();
-                writeTypeRef(lst,t, "itemType");
-                elementFormDefault.writeForm(e,tn);
-                return;
+                return new Tree.Term() {
+                    protected void write(ContentModelContainer parent, boolean isOptional, boolean repeated) {
+                        TypeRef t = ep.getTypes().get(0);
+                        LocalElement e = parent.element();
+                        e.block(); // we will write occurs later
+                        QName tn = t.getTagName();
+                        e.name(tn.getLocalPart());
+                        List lst = e.simpleType().list();
+                        writeTypeRef(lst,t, "itemType");
+                        elementFormDefault.writeForm(e,tn);
+                        writeOccurs(e,isOptional||!ep.isRequired(),repeated);
+                    }
+                };
             }
 
-            if (ep.isCollection()) {
-                if (ename != null) { // wrapped collection
-                    LocalElement e = compositor.element();
-                    if(ename.getNamespaceURI().length()>0) {
-                        if (!ename.getNamespaceURI().equals(this.uri)) {
-                            // TODO: we need to generate the corresponding element declaration for this
-                            // table 8-25: Property/field element wrapper with ref attribute
-                            e.ref(new QName(ename.getNamespaceURI(), ename.getLocalPart()));
-                            return;
+            ArrayList children = new ArrayList();
+            for (final TypeRef t : ep.getTypes()) {
+                children.add(new Tree.Term() {
+                    protected void write(ContentModelContainer parent, boolean isOptional, boolean repeated) {
+                        LocalElement e = parent.element();
+
+                        QName tn = t.getTagName();
+
+                        if(canBeDirectElementRef(t,tn) || (!tn.getNamespaceURI().equals(uri) && tn.getNamespaceURI().length()>0)) {
+                            e.ref(tn);
+                        } else {
+                            e.name(tn.getLocalPart());
+                            writeTypeRef(e,t, "type");
+                            elementFormDefault.writeForm(e,tn);
                         }
-                    }
-                    elementFormDefault.writeForm(e,ename);
 
-                    ComplexType p = e.name(ename.getLocalPart()).complexType();
-                    if(ep.isCollectionNillable()) {
-                        e.nillable(true);
-                    } else {
-                        e.minOccurs(0);
+                        if (t.isNillable()) {
+                            e.nillable(true);
+                        }
+                        if(t.getDefaultValue()!=null)
+                            e._default(t.getDefaultValue());
+                        writeOccurs(e,isOptional,repeated);
                     }
-                    if (ep.getTypes().size() == 1) {
-                        compositor = p.sequence();
-                    } else {
-                        compositor = p.choice();
-                        occurs = compositor;
-                    }
-                } else { // unwrapped collection
-                    if (ep.getTypes().size() > 1) {
-                        compositor = compositor.choice();
-                        occurs = compositor;
-                    }
-                }
-            } else {
-                if (ep.getTypes().size() > 1) {
-                    compositor = compositor.choice();
-                    occurs = compositor;
-                }
+                });
             }
 
+            final Tree choice = Tree.makeGroup(GroupKind.CHOICE, children)
+                    .makeOptional(!ep.isRequired())
+                    .makeRepeated(ep.isCollection()); // see Spec table 8-13
 
-            // fill in the content model
-            for (TypeRef t : ep.getTypes()) {
-                LocalElement e = compositor.element();
-                if (occurs == null) occurs = e;
-                QName tn = t.getTagName();
 
-                if(canBeDirectElementRef(t,tn) || (!tn.getNamespaceURI().equals(uri) && tn.getNamespaceURI().length()>0)) {
-                    e.ref(tn);
-                } else {
-                    e.name(tn.getLocalPart());
-                    writeTypeRef(e,t, "type");
-                    elementFormDefault.writeForm(e,tn);
-                }
+            final QName ename = ep.getXmlName();
+            if (ename != null) { // wrapped collection
+                return new Tree.Term() {
+                    protected void write(ContentModelContainer parent, boolean isOptional, boolean repeated) {
+                        LocalElement e = parent.element();
+                        if(ename.getNamespaceURI().length()>0) {
+                            if (!ename.getNamespaceURI().equals(uri)) {
+                                // TODO: we need to generate the corresponding element declaration for this
+                                // table 8-25: Property/field element wrapper with ref attribute
+                                e.ref(new QName(ename.getNamespaceURI(), ename.getLocalPart()));
+                                return;
+                            }
+                        }
+                        e.name(ename.getLocalPart());
+                        elementFormDefault.writeForm(e,ename);
 
-                if (t.isNillable()) {
-                    e.nillable(true);
-                }
-                if(t.getDefaultValue()!=null)
-                    e._default(t.getDefaultValue());
+                        if(ep.isCollectionNillable()) {
+                            e.nillable(true);
+                        }
+                        writeOccurs(e,true,repeated);
+
+                        ComplexType p = e.complexType();
+                        choice.write(p);
+                    }
+                };
+            } else {// non-wrapped
+                return choice;
             }
-
-            if (ep.isCollection())
-                occurs.maxOccurs("unbounded");
-
-            if (!ep.isRequired())
-                // see Spec table 8-13
-                occurs.minOccurs(0);
-            // else minOccurs defaults to 1
         }
 
         /**
@@ -999,18 +1090,10 @@ public final class XmlSchemaGenerator {
             LocalAttribute localAttribute = attr.attribute();
 
             final String attrURI = ap.getXmlName().getNamespaceURI();
-            if (attrURI.equals("") || attrURI.equals(uri)) {
+            if (attrURI.equals("") /*|| attrURI.equals(uri) --- those are generated as global attributes anyway, so use them.*/) {
                 localAttribute.name(ap.getXmlName().getLocalPart());
 
-                TypeHost th; String refAtt;
-                if( ap.isCollection() ) {
-                    th = localAttribute.simpleType().list();
-                    refAtt = "itemType";
-                } else {
-                    th = localAttribute;
-                    refAtt = "type";
-                }
-                writeTypeRef(th, ap, refAtt);
+                writeAttributeTypeRef(ap, localAttribute);
 
                 attributeFormDefault.writeForm(localAttribute,ap.getXmlName());
             } else { // generate an attr ref
@@ -1023,90 +1106,103 @@ public final class XmlSchemaGenerator {
             }
         }
 
+        private void writeAttributeTypeRef(AttributePropertyInfo ap, AttributeType a) {
+            if( ap.isCollection() )
+                writeTypeRef(a.simpleType().list(), ap, "itemType");
+            else
+                writeTypeRef(a, ap, "type");
+        }
+
         /**
          * Generate the proper schema fragment for the given reference property into the
          * specified schema compositor.
          *
          * The reference property may or may not refer to a collection and it may or may
          * not be wrapped.
-         *
-         * @param rp
-         * @param compositor
          */
-        private void handleReferenceProp(ReferencePropertyInfo rp, ExplicitGroup compositor) {
-            QName ename = rp.getXmlName();
-            Occurs occurs = null;
-
-            if (rp.isCollection()) {
-                if (ename != null) { // wrapped collection
-                    LocalElement e = compositor.element();
-                    ComplexType p = e.name(ename.getLocalPart()).complexType();
-                    elementFormDefault.writeForm(e,ename);
-                    if(rp.isCollectionNillable())
-                        e.nillable(true);
-                    if (rp.getElements().size() == 1) {
-                        compositor = p.sequence();
-                    } else {
-                        compositor = p.choice();
-                        occurs = compositor;
-                    }
-                } else { // unwrapped collection
-                    if (rp.getElements().size() > 1) {
-                        compositor = compositor.choice();
-                        occurs = compositor;
-                    }
-                }
-            }
-
+        private Tree handleReferenceProp(final ReferencePropertyInfo rp) {
             // fill in content model
-            TODO.checkSpec("should we loop in the case of a non-collection ep?");
-            for (Element e : rp.getElements()) {
-                LocalElement eref = compositor.element();
-                if (occurs == null) occurs = eref;
+            ArrayList children = new ArrayList();
 
-                QName en = e.getElementName();
-                if(e.getScope()!=null) {
-                    // scoped. needs to be inlined
-                    boolean qualified = en.getNamespaceURI().equals(uri);
-                    boolean unqualified = en.getNamespaceURI().equals("");
-                    if(qualified || unqualified) {
-                        // can be inlined indeed
+            for (final Element e : rp.getElements()) {
+                children.add(new Tree.Term() {
+                    protected void write(ContentModelContainer parent, boolean isOptional, boolean repeated) {
+                        LocalElement eref = parent.element();
 
-                        // write form="..." if necessary
-                        if(unqualified) {
-                            if(elementFormDefault.isEffectivelyQualified)
-                                eref.form("unqualified");
-                        } else {
-                            if(!elementFormDefault.isEffectivelyQualified)
-                                eref.form("qualified");
+                        boolean local=false;
+
+                        QName en = e.getElementName();
+                        if(e.getScope()!=null) {
+                            // scoped. needs to be inlined
+                            boolean qualified = en.getNamespaceURI().equals(uri);
+                            boolean unqualified = en.getNamespaceURI().equals("");
+                            if(qualified || unqualified) {
+                                // can be inlined indeed
+
+                                // write form="..." if necessary
+                                if(unqualified) {
+                                    if(elementFormDefault.isEffectivelyQualified)
+                                        eref.form("unqualified");
+                                } else {
+                                    if(!elementFormDefault.isEffectivelyQualified)
+                                        eref.form("qualified");
+                                }
+
+                                local = true;
+                                eref.name(en.getLocalPart());
+
+                                // write out type reference
+                                if(e instanceof ClassInfo) {
+                                    writeTypeRef(eref,(ClassInfo)e,"type");
+                                } else {
+                                    writeTypeRef(eref,((ElementInfo)e).getContentType(),"type");
+                                }
+                            }
                         }
-
-                        eref.name(en.getLocalPart());
-
-                        // write out type reference
-                        if(e instanceof ClassInfo) {
-                            writeTypeRef(eref,(ClassInfo)e,"type");
-                        } else {
-                            writeTypeRef(eref,((ElementInfo)e).getContentType(),"type");
-                        }
-                        continue;
+                        if(!local)
+                            eref.ref(en);
+                        writeOccurs(eref,isOptional,repeated);
                     }
-                }
-                eref.ref(en);
+                });
             }
 
-            WildcardMode wc = rp.getWildcard();
+            final WildcardMode wc = rp.getWildcard();
             if( wc != null ) {
-                Any any = compositor.any();
-                final String pcmode = getProcessContentsModeName(wc);
-                if( pcmode != null ) any.processContents(pcmode);
-                TODO.schemaGenerator("generate @namespace ???");
-                if( occurs == null ) occurs = any;
+                children.add(new Tree.Term() {
+                    protected void write(ContentModelContainer parent, boolean isOptional, boolean repeated) {
+                        Any any = parent.any();
+                        final String pcmode = getProcessContentsModeName(wc);
+                        if( pcmode != null ) any.processContents(pcmode);
+                        any.namespace("##other");
+                        writeOccurs(any,isOptional,repeated);
+                    }
+                });
             }
 
-            if(rp.isCollection())
-                occurs.maxOccurs("unbounded");
 
+            final Tree choice = Tree.makeGroup(GroupKind.CHOICE, children).makeRepeated(rp.isCollection()).makeOptional(rp.isCollection());
+            // it's a curious omission that XmlElementRef doesn't have required().
+            // instead right now a collection will make it [0,unbounded]
+
+
+            final QName ename = rp.getXmlName();
+
+            if (ename != null) { // wrapped
+                return new Tree.Term() {
+                    protected void write(ContentModelContainer parent, boolean isOptional, boolean repeated) {
+                        LocalElement e = parent.element().name(ename.getLocalPart());
+                        elementFormDefault.writeForm(e,ename);
+                        if(rp.isCollectionNillable())
+                            e.nillable(true);
+                        writeOccurs(e,true,repeated);
+
+                        ComplexType p = e.complexType();
+                        choice.write(p);
+                    }
+                };
+            } else { // unwrapped
+                return choice;
+            }
         }
 
         /**
@@ -1114,25 +1210,31 @@ public final class XmlSchemaGenerator {
          * specified schema compositor.
          *
          * @param mp the map property
-         * @param compositor the schema compositor (sequence or all)
          */
-        private void handleMapProp(MapPropertyInfo mp, ExplicitGroup compositor) {
-            QName ename = mp.getXmlName();
+        private Tree handleMapProp(final MapPropertyInfo mp) {
+            return new Tree.Term() {
+                protected void write(ContentModelContainer parent, boolean isOptional, boolean repeated) {
+                    QName ename = mp.getXmlName();
 
-            LocalElement e = compositor.element();
-            elementFormDefault.writeForm(e,ename);
-            if(mp.isCollectionNillable())
-                e.nillable(true);
-            ComplexType p = e.name(ename.getLocalPart()).complexType();
+                    LocalElement e = parent.element();
+                    elementFormDefault.writeForm(e,ename);
+                    if(mp.isCollectionNillable())
+                        e.nillable(true);
 
-            // TODO: entry, key, and value are always unqualified. that needs to be fixed, too.
-            // TODO: we need to generate the corresponding element declaration, if they are qualified
-            e = p.sequence().element();
-            e.name("entry").minOccurs(0).maxOccurs("unbounded");
+                    e = e.name(ename.getLocalPart());
+                    writeOccurs(e,isOptional,repeated);
+                    ComplexType p = e.complexType();
 
-            ExplicitGroup seq = e.complexType().sequence();
-            writeKeyOrValue(seq, "key", mp.getKeyType());
-            writeKeyOrValue(seq, "value", mp.getValueType());
+                    // TODO: entry, key, and value are always unqualified. that needs to be fixed, too.
+                    // TODO: we need to generate the corresponding element declaration, if they are qualified
+                    e = p.sequence().element();
+                    e.name("entry").minOccurs(0).maxOccurs("unbounded");
+
+                    ExplicitGroup seq = e.complexType().sequence();
+                    writeKeyOrValue(seq, "key", mp.getKeyType());
+                    writeKeyOrValue(seq, "value", mp.getValueType());
+                }
+            };
         }
 
         private void writeKeyOrValue(ExplicitGroup seq, String tagName, NonElement typeRef) {
@@ -1142,7 +1244,7 @@ public final class XmlSchemaGenerator {
         }
 
         public void addGlobalAttribute(AttributePropertyInfo ap) {
-            attributeDecls.put( ap.getXmlName().getLocalPart(), ap.getTarget() );
+            attributeDecls.put( ap.getXmlName().getLocalPart(), ap );
             addDependencyTo(ap.getTarget().getTypeName());
         }
 
@@ -1217,6 +1319,24 @@ public final class XmlSchemaGenerator {
         }
     }
 
+    /**
+     * Examine the specified element ref and determine if a swaRef attribute needs to be generated
+     * @param typeRef
+     */
+    private boolean generateSwaRefAdapter(NonElementRef typeRef) {
+        return generateSwaRefAdapter(typeRef.getSource());
+    }
+
+    /**
+     * Examine the specified element ref and determine if a swaRef attribute needs to be generated
+     */
+    private boolean generateSwaRefAdapter(PropertyInfo prop) {
+        final Adapter adapter = prop.getAdapter();
+        if (adapter == null) return false;
+        final Object o = navigator.asDecl(SwaRefAdapter.class);
+        if (o == null) return false;
+        return (o.equals(adapter.adapterType));
+    }
 
     /**
      * return the string representation of the processContents mode of the
@@ -1281,7 +1401,7 @@ public final class XmlSchemaGenerator {
             if( uriPath.equals(basePath))
                 return ".";
 
-            String relPath = calculateRelativePath(uriPath, basePath);
+            String relPath = calculateRelativePath(uriPath, basePath, fixNull(theUri.getScheme()).equals("file"));
 
             if (relPath == null)
                 return uri; // recursion found no commonality in the two uris at all
@@ -1298,17 +1418,30 @@ public final class XmlSchemaGenerator {
         }
     }
 
-    private static String calculateRelativePath(String uri, String base) {
+    private static String fixNull(String s) {
+        if(s==null)     return "";
+        else            return s;
+    }
+
+    private static String calculateRelativePath(String uri, String base, boolean fileUrl) {
+        // if this is a file URL (very likely), and if this is on a case-insensitive file system,
+        // then treat it accordingly.
+        boolean onWindows = File.pathSeparatorChar==';';
+
         if (base == null) {
             return null;
         }
-        if (uri.startsWith(base)) {
+        if ((fileUrl && onWindows && startsWithIgnoreCase(uri,base)) || uri.startsWith(base)) {
             return uri.substring(base.length());
         } else {
-            return "../" + calculateRelativePath(uri, getParentUriPath(base));
+            return "../" + calculateRelativePath(uri, getParentUriPath(base), fileUrl);
         }
     }
 
+    private static boolean startsWithIgnoreCase(String s, String t) {
+        return s.toUpperCase().startsWith(t.toUpperCase());
+    }
+
     /**
      * JAX-RPC wants the namespaces to be sorted in the reverse order
      * so that the empty namespace "" comes to the very end. Don't ask me why.
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/XmlSchemaLoader.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Bindings.java
similarity index 63%
rename from jaxws/src/share/classes/com/sun/tools/internal/txw2/XmlSchemaLoader.java
rename to jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Bindings.java
index 545e4faab10..bf833917799 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/XmlSchemaLoader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Bindings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,28 +22,35 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+package com.sun.xml.internal.bind.v2.schemagen.episode;
 
-package com.sun.tools.internal.txw2;
-
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import com.sun.tools.internal.txw2.model.NodeSet;
-import com.sun.tools.internal.txw2.builder.xsd.XmlSchemaBuilder;
-import com.sun.xml.xsom.parser.XSOMParser;
+import com.sun.xml.internal.txw2.TypedXmlWriter;
+import com.sun.xml.internal.txw2.annotation.XmlElement;
+import com.sun.xml.internal.txw2.annotation.XmlAttribute;
 
 /**
  * @author Kohsuke Kawaguchi
  */
-class XmlSchemaLoader implements SchemaBuilder {
-    private final InputSource in;
+@XmlElement("bindings")
+public interface Bindings extends TypedXmlWriter {
+    /**
+     * Nested bindings.
+     */
+    @XmlElement
+    Bindings bindings();
 
-    public XmlSchemaLoader(InputSource in) {
-        this.in = in;
-    }
+    /**
+     * Nested class customization.
+     */
+    @XmlElement("class")
+    Klass klass();
 
-    public NodeSet build(TxwOptions options) throws SAXException {
-        XSOMParser xsom = new XSOMParser();
-        xsom.parse(in);
-        return XmlSchemaBuilder.build(xsom.getResult(),options);
-    }
+    @XmlElement
+    SchemaBindings schemaBindings();
+
+    @XmlAttribute
+    void scd(String scd);
+
+    @XmlAttribute
+    void version(String v);
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Klass.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Klass.java
new file mode 100644
index 00000000000..fbdf2f92cdb
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Klass.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.bind.v2.schemagen.episode;
+
+import com.sun.xml.internal.txw2.TypedXmlWriter;
+import com.sun.xml.internal.txw2.annotation.XmlAttribute;
+
+/**
+ * @author Kohsuke Kawaguchi
+ */
+public interface Klass extends TypedXmlWriter {
+    /**
+     * FQCN.
+     */
+    @XmlAttribute
+    void ref(String className);
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/prop/LeafElementProp.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/SchemaBindings.java
similarity index 77%
rename from jaxws/src/share/classes/com/sun/tools/internal/txw2/model/prop/LeafElementProp.java
rename to jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/SchemaBindings.java
index c3d2b886180..534ff758a77 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/prop/LeafElementProp.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/SchemaBindings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,18 +22,15 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+package com.sun.xml.internal.bind.v2.schemagen.episode;
 
-package com.sun.tools.internal.txw2.model.prop;
-
-import com.sun.codemodel.JType;
-
-import javax.xml.namespace.QName;
+import com.sun.xml.internal.txw2.TypedXmlWriter;
+import com.sun.xml.internal.txw2.annotation.XmlAttribute;
 
 /**
  * @author Kohsuke Kawaguchi
  */
-public final class LeafElementProp extends XmlItemProp {
-    public LeafElementProp(QName name, JType valueType) {
-        super(name, valueType);
-    }
+public interface SchemaBindings extends TypedXmlWriter {
+    @XmlAttribute
+    void map(boolean value);
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/package-info.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/package-info.java
new file mode 100644
index 00000000000..4af20cdc167
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/package-info.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+/**
+ * TXW interfaces for writing episode file, which is what XJC needs to
+ * handle separate compilation.
+ */
+@XmlNamespace(WellKnownNamespace.JAXB)
+package com.sun.xml.internal.bind.v2.schemagen.episode;
+
+import com.sun.xml.internal.txw2.annotation.XmlNamespace;
+import com.sun.xml.internal.bind.v2.WellKnownNamespace;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/package-info.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/package-info.java
index fd1ef805e98..336802edd2f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/package-info.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 /**
  * Schema generator.
  *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotated.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotated.java
index 531fd891a10..36ce652a2af 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotated.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotated.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotation.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotation.java
index 8a2513493a4..341f2adf763 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotation.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Any.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Any.java
index dc7e4a013c9..7bddd979e8c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Any.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Any.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Appinfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Appinfo.java
index f2256498675..19912f1d481 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Appinfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Appinfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttrDecls.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttrDecls.java
index 555e0e12a34..28bf25686a3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttrDecls.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttrDecls.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttributeType.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttributeType.java
index 3c0f3bfa077..ac4bb69ac96 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttributeType.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttributeType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexContent.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexContent.java
index a6a1f2c494f..ffbd2f261a0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexContent.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexContent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexExtension.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexExtension.java
index 827b9c86c30..ad9e510c2ac 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexExtension.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexRestriction.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexRestriction.java
index fd936342282..697ab2fdd64 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexRestriction.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexRestriction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexType.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexType.java
index 1045eb8add8..f641776e2e4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexType.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
@@ -36,18 +34,18 @@ public interface ComplexType
 {
 
 
-    @XmlAttribute("final")
-    public ComplexType _final(String[] value);
-
     @XmlAttribute("final")
     public ComplexType _final(String value);
 
-    @XmlAttribute
-    public ComplexType block(String[] value);
+    @XmlAttribute("final")
+    public ComplexType _final(String[] value);
 
     @XmlAttribute
     public ComplexType block(String value);
 
+    @XmlAttribute
+    public ComplexType block(String[] value);
+
     @XmlAttribute("abstract")
     public ComplexType _abstract(boolean value);
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeHost.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeHost.java
index 86c3656f5d6..a3bc52def42 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeHost.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeHost.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeModel.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeModel.java
index 7398a207f79..6f82d39eea9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeModel.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ContentModelContainer.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ContentModelContainer.java
new file mode 100644
index 00000000000..013f0aa20a9
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ContentModelContainer.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
+
+import com.sun.xml.internal.txw2.TypedXmlWriter;
+import com.sun.xml.internal.txw2.annotation.XmlElement;
+
+/**
+ * Used to write a content model.
+ *
+ * This mixes the particle and model group as the child of complex type.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public interface ContentModelContainer extends TypedXmlWriter {
+    @XmlElement
+    LocalElement element();
+
+    @XmlElement
+    Any any();
+
+    @XmlElement
+    ExplicitGroup all();
+
+    @XmlElement
+    ExplicitGroup sequence();
+
+    @XmlElement
+    ExplicitGroup choice();
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Documentation.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Documentation.java
index c150fa153c7..85e9976d00a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Documentation.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Documentation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java
index 6503af77ea7..d3a0c64ff86 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import javax.xml.namespace.QName;
@@ -39,10 +37,10 @@ public interface Element
     public Element type(QName value);
 
     @XmlAttribute
-    public Element block(String[] value);
+    public Element block(String value);
 
     @XmlAttribute
-    public Element block(String value);
+    public Element block(String[] value);
 
     @XmlAttribute
     public Element nillable(boolean value);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExplicitGroup.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExplicitGroup.java
index 0c8de4422a4..d915548ca3e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExplicitGroup.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExplicitGroup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExtensionType.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExtensionType.java
index 290171f589f..930a0511957 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExtensionType.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExtensionType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/FixedOrDefault.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/FixedOrDefault.java
index e9199d3a3e3..7bf1d17c72e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/FixedOrDefault.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/FixedOrDefault.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Import.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Import.java
index 533a9c3ff3b..a4f82b4d033 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Import.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Import.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/List.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/List.java
index 6dd3dca3915..e3454b4912a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/List.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/List.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalAttribute.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalAttribute.java
index 9ee57e85527..11e90168ac7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalAttribute.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalElement.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalElement.java
index 5c9140443b6..5bac06f118a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalElement.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NestedParticle.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NestedParticle.java
index ee88be0f661..15f8fff0600 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NestedParticle.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NestedParticle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NoFixedFacet.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NoFixedFacet.java
index c72efb796f8..101bcad75bd 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NoFixedFacet.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NoFixedFacet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java
index d81692c452b..2fbb76652d5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
@@ -37,10 +35,10 @@ public interface Occurs
     @XmlAttribute
     public Occurs minOccurs(int value);
 
-    @XmlAttribute
-    public Occurs maxOccurs(String value);
-
     @XmlAttribute
     public Occurs maxOccurs(int value);
 
+    @XmlAttribute
+    public Occurs maxOccurs(String value);
+
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/CommentListImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Particle.java
similarity index 80%
rename from jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/CommentListImpl.java
rename to jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Particle.java
index 43f8e344db8..3b5f9b625c0 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/CommentListImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Particle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,14 +22,10 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-package com.sun.tools.internal.txw2.builder.relaxng;
-
-import org.kohsuke.rngom.ast.builder.CommentList;
-import org.kohsuke.rngom.ast.util.LocatorImpl;
+package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 /**
  * @author Kohsuke Kawaguchi
  */
-public interface CommentListImpl extends CommentList {
+public interface Particle extends ContentModelContainer, Occurs {
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Redefinable.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Redefinable.java
index a947074da81..698c4fd3d83 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Redefinable.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Redefinable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java
index a3e4685da24..6f7700794b8 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
@@ -57,18 +55,18 @@ public interface Schema
     @XmlAttribute
     public Schema attributeFormDefault(String value);
 
-    @XmlAttribute
-    public Schema blockDefault(String[] value);
-
     @XmlAttribute
     public Schema blockDefault(String value);
 
     @XmlAttribute
-    public Schema finalDefault(String[] value);
+    public Schema blockDefault(String[] value);
 
     @XmlAttribute
     public Schema finalDefault(String value);
 
+    @XmlAttribute
+    public Schema finalDefault(String[] value);
+
     @XmlAttribute
     public Schema version(String value);
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SchemaTop.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SchemaTop.java
index 42c2b53f96b..a291b427574 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SchemaTop.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SchemaTop.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleContent.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleContent.java
index 2eea5b40dab..260fa0b80c0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleContent.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleContent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleDerivation.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleDerivation.java
index f57e62abeb7..607a93249e8 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleDerivation.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleDerivation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleExtension.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleExtension.java
index 3ef40cadee5..42c906bde08 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleExtension.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestriction.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestriction.java
index d74c58bcf07..547e34e2cd4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestriction.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestriction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestrictionModel.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestrictionModel.java
index 46291f470b0..ab70d17dea2 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestrictionModel.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestrictionModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java
index 14ffb04f61d..a417fdeb7df 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleTypeHost.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleTypeHost.java
index ed8d783daf7..9c1921acec9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleTypeHost.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleTypeHost.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelAttribute.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelAttribute.java
index 8bbaba8235d..c992fad2901 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelAttribute.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelElement.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelElement.java
index 3f48b1e0827..3761d6de2a6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelElement.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import javax.xml.namespace.QName;
@@ -38,10 +36,10 @@ public interface TopLevelElement
 
 
     @XmlAttribute("final")
-    public TopLevelElement _final(String[] value);
+    public TopLevelElement _final(String value);
 
     @XmlAttribute("final")
-    public TopLevelElement _final(String value);
+    public TopLevelElement _final(String[] value);
 
     @XmlAttribute("abstract")
     public TopLevelElement _abstract(boolean value);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeDefParticle.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeDefParticle.java
index e0073d3fe20..9e73265bb7e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeDefParticle.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeDefParticle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeHost.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeHost.java
index 3d86b37836c..8c46f3712a7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeHost.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeHost.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Union.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Union.java
index 492d322ce95..b3bbd0b9cf6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Union.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Union.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java
index 16f85fa2cd9..07d0233be81 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
-
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
@@ -37,10 +35,10 @@ public interface Wildcard
     @XmlAttribute
     public Wildcard processContents(String value);
 
-    @XmlAttribute
-    public Wildcard namespace(String value);
-
     @XmlAttribute
     public Wildcard namespace(String[] value);
 
+    @XmlAttribute
+    public Wildcard namespace(String value);
+
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package-info.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package-info.java
index 7dbae0842f7..e1ff9e170b5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package-info.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,5 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 @com.sun.xml.internal.txw2.annotation.XmlNamespace("http://www.w3.org/2001/XMLSchema")
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package.html b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package.html
index d5ec73fd963..61c4d07bd0e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package.html
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package.html
@@ -1,3 +1,27 @@
+
 
 
 XML Schema writer generated by TXW.
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/xmlschema-for-jaxb.rng b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/xmlschema-for-jaxb.rng
index e6ad1dff1f2..0938747836e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/xmlschema-for-jaxb.rng
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/xmlschema-for-jaxb.rng
@@ -1,4 +1,28 @@
 
+
  extends AbstractList {
     private int[] next;
     private int size = 0;
 
+    /**
+     * True if the check shall be done by using the object identity.
+     * False if the check shall be done with the equals method.
+     */
+    private boolean useIdentity = true;
+
     // for our purpose, there isn't much point in resizing this as we don't expect
     // the stack to grow that much.
     private final int[] initialHash;
@@ -63,6 +68,18 @@ public final class CollisionCheckStack extends AbstractList {
         next = new int[16];
     }
 
+    /**
+     * Set to false to use {@link Object#equals(Object)} to detect cycles.
+     * This method can be only used when the stack is empty.
+     */
+    public void setUseIdentity(boolean useIdentity) {
+        this.useIdentity = useIdentity;
+    }
+
+    public boolean getUseIdentity() {
+        return useIdentity;
+    }
+
     /**
      * Pushes a new object to the stack.
      *
@@ -105,7 +122,7 @@ public final class CollisionCheckStack extends AbstractList {
     }
 
     private int hash(Object o) {
-        return System.identityHashCode(o) % initialHash.length;
+        return ((useIdentity?System.identityHashCode(o):o.hashCode())&0x7FFFFFFF) % initialHash.length;
     }
 
     /**
@@ -138,7 +155,11 @@ public final class CollisionCheckStack extends AbstractList {
         while(p!=0) {
             p--;
             Object existing = data[p];
-            if(existing==o)     return true;
+            if (useIdentity) {
+                if(existing==o)     return true;
+            } else {
+                if (o.equals(existing)) return true;
+            }
             p = next[p];
         }
         return false;
@@ -166,4 +187,22 @@ public final class CollisionCheckStack extends AbstractList {
             Arrays.fill(initialHash,0);
         }
     }
+
+    /**
+     * String that represents the cycle.
+     */
+    public String getCycleString() {
+        StringBuilder sb = new StringBuilder();
+        int i=size()-1;
+        E obj = get(i);
+        sb.append(obj);
+        Object x;
+        do {
+            sb.append(" -> ");
+            x = get(--i);
+            sb.append(x);
+        } while(obj!=x);
+
+        return sb.toString();
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/DataSourceSource.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/DataSourceSource.java
index 5c981a5c8a0..6b017eb985b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/DataSourceSource.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/DataSourceSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.util;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/EditDistance.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/EditDistance.java
index 6da0668cc17..6c35c5998d7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/EditDistance.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/EditDistance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,9 +22,16 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * @(#)$Id$
+ */
+
 
 package com.sun.xml.internal.bind.v2.util;
 
+import java.util.Collection;
+import java.util.Arrays;
+
 /**
  * Computes the string edit distance.
  *
@@ -54,14 +61,24 @@ public class EditDistance {
      * @return null if group.length==0.
      */
     public static String findNearest( String key, String[] group ) {
+        return findNearest(key, Arrays.asList(group));
+    }
+
+    /**
+     * Finds the string in the group closest to
+     * key and returns it.
+     *
+     * @return null if group.length==0.
+     */
+    public static String findNearest( String key, Collection group ) {
         int c = Integer.MAX_VALUE;
         String r = null;
 
-        for( int i=0; ied ) {
                 c = ed;
-                r = group[i];
+                r = s;
             }
         }
         return r;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/FatalAdapter.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/FatalAdapter.java
index 5e7d5c23cd2..52ddc36fc7f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/FatalAdapter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/FatalAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.util;
 
 import org.xml.sax.ErrorHandler;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/FlattenIterator.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/FlattenIterator.java
index 02a3db9f8ad..b93b6ec8524 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/FlattenIterator.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/FlattenIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.util;
 
 import java.util.Iterator;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/QNameMap.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/QNameMap.java
index 92855b2dbd5..00fbb5dadd0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/QNameMap.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/QNameMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind.v2.util;
 import java.util.AbstractSet;
 import java.util.Iterator;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/CycleIterator.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/TypeCast.java
similarity index 61%
rename from jaxws/src/share/classes/com/sun/tools/internal/txw2/model/CycleIterator.java
rename to jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/TypeCast.java
index fe9edf77294..0b0d7e4be85 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/CycleIterator.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/TypeCast.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,39 +22,26 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+package com.sun.xml.internal.bind.v2.util;
 
-package com.sun.tools.internal.txw2.model;
-
-import java.util.Iterator;
+import java.util.Map;
 
 /**
  * @author Kohsuke Kawaguchi
  */
-final class CycleIterator implements Iterator {
-    private Leaf start;
-    private Leaf current;
-    private boolean hasNext = true;
-
-    public CycleIterator(Leaf start) {
-        assert start!=null;
-        this.start = start;
-        this.current = start;
-    }
-
-    public boolean hasNext() {
-        return hasNext;
-    }
-
-    public Leaf next() {
-        Leaf last = current;
-        current = current.getNext();
-        if(current==start)
-            hasNext = false;
-
-        return last;
-    }
-
-    public void remove() {
-        throw new UnsupportedOperationException();
+public class TypeCast {
+    /**
+     * Makes sure that a map contains the right type, and returns it to the desirable type.
+     */
+    public static  Map checkedCast( Map m, Class keyType, Class valueType ) {
+        if(m==null)
+            return null;
+        for (Map.Entry e : m.entrySet()) {
+            if(!keyType.isInstance(e.getKey()))
+                throw new ClassCastException(e.getKey().getClass().toString());
+            if(!valueType.isInstance(e.getValue()))
+                throw new ClassCastException(e.getValue().getClass().toString());
+        }
+        return (Map)m;
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/DTDEventListener.java b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/DTDEventListener.java
index 8ce5b541fa1..ef9780d87dd 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/DTDEventListener.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/DTDEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/DTDHandlerBase.java b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/DTDHandlerBase.java
index d169040beca..dbcf55820bd 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/DTDHandlerBase.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/DTDHandlerBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/DTDParser.java b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/DTDParser.java
index 505ccb486ca..7ffc6efdb29 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/DTDParser.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/DTDParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,6 +58,7 @@ import java.util.Vector;
  * @author David Brownell
  * @author Janet Koenig
  * @author Kohsuke KAWAGUCHI
+ * @version $Id: DTDParser.java,v 1.1 2005/05/15 04:24:19 kohsuke Exp $
  */
 public class DTDParser {
     public final static String TYPE_CDATA = "CDATA";
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/EndOfInputException.java b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/EndOfInputException.java
index b88256b833a..9d650798e01 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/EndOfInputException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/EndOfInputException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/EntityDecl.java b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/EntityDecl.java
index cb1944ede1e..f51037c653b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/EntityDecl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/EntityDecl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 @@ package com.sun.xml.internal.dtdparser;
  *
  * @author David Brownell
  * @author Janet Koenig
+ * @version 1.3 00/02/24
  */
 class EntityDecl {
     String name;        // 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/ExternalEntity.java b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/ExternalEntity.java
index 64a9cc1019a..e7c89ae3a7b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/ExternalEntity.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/ExternalEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/InputEntity.java b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/InputEntity.java
index f0098d12597..7db3603cf99 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/InputEntity.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/InputEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,6 +52,7 @@ import java.util.Locale;
  *
  * @author David Brownell
  * @author Janet Koenig
+ * @version 1.4 00/08/05
  */
 public class InputEntity {
     private int start, finish;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/InternalEntity.java b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/InternalEntity.java
index 0116b967eb1..95e96d744a3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/InternalEntity.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/InternalEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/MessageCatalog.java b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/MessageCatalog.java
index f29d0c6a70c..2229961c2d6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/MessageCatalog.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/MessageCatalog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -130,6 +130,7 @@ import java.util.ResourceBundle;
  * as distributed in its JAR file.
  *
  * @author David Brownell
+ * @version 1.1, 00/08/05
  * @see java.util.Locale
  * @see java.util.ListResourceBundle
  * @see java.text.MessageFormat
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/Resolver.java b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/Resolver.java
index 848d5d7e680..bb73c7e517d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/Resolver.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/Resolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,6 +91,7 @@ import java.util.Hashtable;
  *
  * @author David Brownell
  * @author Janet Koenig
+ * @version 1.3 00/02/24
  */
 public class Resolver implements EntityResolver {
     private boolean ignoringMIME;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/SimpleHashtable.java b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/SimpleHashtable.java
index fa5e1e86b78..0f548b6aa98 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/SimpleHashtable.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/SimpleHashtable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,6 +58,7 @@ import java.util.Enumeration;
  * it makes a significant difference when normalizing attributes,
  * which is done for each start-element construct.
  *
+ * @version $Revision: 1.1 $
  */
 final class SimpleHashtable implements Enumeration {
     // entries ...
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/XmlChars.java b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/XmlChars.java
index 227cecde0ff..021daca5d45 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/XmlChars.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/XmlChars.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,6 +32,7 @@ package com.sun.xml.internal.dtdparser;
  * both to parse and to create such documents.
  *
  * @author David Brownell
+ * @version 1.1, 00/08/05
  */
 public class XmlChars {
     // can't construct instances
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/XmlNames.java b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/XmlNames.java
index 823d5324540..13aea64077e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/XmlNames.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/XmlNames.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,6 +32,7 @@ package com.sun.xml.internal.dtdparser;
  * both to parse and to create such documents.
  *
  * @author David Brownell
+ * @version 1.1, 00/08/05
  */
 public class XmlNames {
     private XmlNames() {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/XmlReader.java b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/XmlReader.java
index 8d116931db0..0732a80c8ba 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/XmlReader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/XmlReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,6 +59,7 @@ import java.util.Hashtable;
  *
  * @author David Brownell
  * @author Janet Koenig
+ * @version 1.3 00/02/24
  */
 // package private
 final class XmlReader extends Reader {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/package.html b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/package.html
index a1f0908fc54..a10f44db39b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/package.html
+++ b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/package.html
@@ -1,3 +1,27 @@
+
 
 
       scan DTD stream and generates appropriate events.
    
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/resources/Messages.properties b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/resources/Messages.properties
index f419068d6e8..57f36287012 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/resources/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/resources/Messages.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
 # CA 95054 USA or visit www.sun.com if you need additional information or
 # have any questions.
-# 
+#
 
 #
 # English diagnostic messages (and fragments) for Sun's XML parser.
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/AbstractResourceBundle.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/AbstractResourceBundle.java
index 17fa432cbcd..27e8640b690 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/AbstractResourceBundle.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/AbstractResourceBundle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,44 +24,6 @@
  *
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-/*
- * ====================================================================
- *
- * This code is subject to the freebxml License, Version 1.1
- *
- * Copyright (c) 2001 - 2005 freebxml.org.  All rights reserved.
- *
- * $Header: /cvs/fi/FastInfoset/src/com/sun/xml/internal/fastinfoset/AbstractResourceBundle.java,v 1.2 2005/05/17 20:53:19 joehw Exp $
- * ====================================================================
- */
 package com.sun.xml.internal.fastinfoset;
 
 import java.text.MessageFormat;
@@ -83,7 +45,7 @@ public abstract class AbstractResourceBundle extends ResourceBundle {
     public static String getBundleName() {
         return _bundleName;
     }
-    public void setBundleName(String name) {
+    public static void setBundleName(String name) {
         _bundleName = name;
     }
     /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/CommonResourceBundle.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/CommonResourceBundle.java
index d9fe20d68ef..e9d992c2fb0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/CommonResourceBundle.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/CommonResourceBundle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,34 +24,6 @@
  *
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 package com.sun.xml.internal.fastinfoset;
 
 import java.util.Locale;
@@ -79,14 +51,12 @@ public class CommonResourceBundle extends AbstractResourceBundle {
     public static CommonResourceBundle getInstance() {
         if (instance == null) {
             synchronized (CommonResourceBundle.class) {
-                if (instance == null) {
-                    instance = new CommonResourceBundle();
-                    //**need to know where to get the locale
-                    //String localeString = CommonProperties.getInstance()
-                    //                  .getProperty("omar.common.locale");
-                    String localeString = null;
-                    locale = parseLocale(localeString);
-                }
+                instance = new CommonResourceBundle();
+                //**need to know where to get the locale
+                //String localeString = CommonProperties.getInstance()
+                //                  .getProperty("omar.common.locale");
+                String localeString = null;
+                locale = parseLocale(localeString);
             }
         }
 
@@ -96,9 +66,7 @@ public class CommonResourceBundle extends AbstractResourceBundle {
     public static CommonResourceBundle getInstance(Locale locale) {
         if (instance == null) {
             synchronized (CommonResourceBundle.class) {
-                if (instance == null) {
-                    instance = new CommonResourceBundle(locale);
-                }
+                instance = new CommonResourceBundle(locale);
             }
         } else {
             synchronized (CommonResourceBundle.class) {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/Decoder.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/Decoder.java
index c4722ce90c2..68619d68bef 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/Decoder.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/Decoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,34 +24,6 @@
  *
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 package com.sun.xml.internal.fastinfoset;
 
 import com.sun.xml.internal.fastinfoset.alphabet.BuiltInRestrictedAlphabets;
@@ -100,17 +72,23 @@ import com.sun.xml.internal.org.jvnet.fastinfoset.FastInfosetParser;
  */
 public abstract class Decoder implements FastInfosetParser {
 
+    protected static final char[] XML_NAMESPACE_NAME_CHARS = EncodingConstants.XML_NAMESPACE_NAME.toCharArray();
+
+    protected static final char[] XMLNS_NAMESPACE_PREFIX_CHARS = EncodingConstants.XMLNS_NAMESPACE_PREFIX.toCharArray();
+
+    protected static final char[] XMLNS_NAMESPACE_NAME_CHARS = EncodingConstants.XMLNS_NAMESPACE_NAME.toCharArray();
+
     /**
      * String interning system property.
      */
     public static final String STRING_INTERNING_SYSTEM_PROPERTY =
-        "com.sun.xml.internal.fastinfoset.parser.string-interning";
+            "com.sun.xml.internal.fastinfoset.parser.string-interning";
 
     /**
      * Internal buffer size interning system property.
      */
     public static final String BUFFER_SIZE_SYSTEM_PROPERTY =
-        "com.sun.xml.internal.fastinfoset.parser.buffer-size";
+            "com.sun.xml.internal.fastinfoset.parser.buffer-size";
 
     private static boolean _stringInterningSystemDefault = false;
 
@@ -118,11 +96,11 @@ public abstract class Decoder implements FastInfosetParser {
 
     static {
         String p = System.getProperty(STRING_INTERNING_SYSTEM_PROPERTY,
-            Boolean.toString(_stringInterningSystemDefault));
+                Boolean.toString(_stringInterningSystemDefault));
         _stringInterningSystemDefault = Boolean.valueOf(p).booleanValue();
 
         p = System.getProperty(BUFFER_SIZE_SYSTEM_PROPERTY,
-            Integer.toString(_bufferSizeSystemDefault));
+                Integer.toString(_bufferSizeSystemDefault));
         try {
             int i = Integer.valueOf(p).intValue();
             if (i > 0) {
@@ -147,6 +125,16 @@ public abstract class Decoder implements FastInfosetParser {
      */
     private Map _externalVocabularies;
 
+    /**
+     * True if can parse fragments.
+     */
+    protected boolean _parseFragments;
+
+    /**
+     * True if needs to close underlying input stream.
+     */
+    protected boolean _needForceStreamClose;
+
     /**
      * True if the vocabulary is internally created by decoder.
      */
@@ -359,8 +347,35 @@ public abstract class Decoder implements FastInfosetParser {
         return _externalVocabularies;
     }
 
-    // End FastInfosetParser interface
+    /**
+     * {@inheritDoc}
+     */
+    public void setParseFragments(boolean parseFragments) {
+        _parseFragments = parseFragments;
+    }
 
+    /**
+     * {@inheritDoc}
+     */
+    public boolean getParseFragments() {
+        return _parseFragments;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void setForceStreamClose(boolean needForceStreamClose) {
+        _needForceStreamClose = needForceStreamClose;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean getForceStreamClose() {
+        return _needForceStreamClose;
+    }
+
+// End FastInfosetParser interface
 
     /**
      * Reset the decoder for reuse decoding another XML infoset.
@@ -404,7 +419,7 @@ public abstract class Decoder implements FastInfosetParser {
             decodeInitialVocabulary();
         } else if (b != 0) {
             throw new IOException(CommonResourceBundle.getInstance().
-                getString("message.optinalValues"));
+                    getString("message.optinalValues"));
         }
     }
 
@@ -604,9 +619,9 @@ public abstract class Decoder implements FastInfosetParser {
             String name = decodeIdentifyingNonEmptyStringOnFirstBit(_v.otherNCName);
 
             String system_identifier = ((_b & EncodingConstants.NOTATIONS_SYSTEM_IDENTIFIER_FLAG) > 0)
-                ? decodeIdentifyingNonEmptyStringOnFirstBit(_v.otherURI) : "";
+            ? decodeIdentifyingNonEmptyStringOnFirstBit(_v.otherURI) : "";
             String public_identifier = ((_b & EncodingConstants.NOTATIONS_PUBLIC_IDENTIFIER_FLAG) > 0)
-                ? decodeIdentifyingNonEmptyStringOnFirstBit(_v.otherURI) : "";
+            ? decodeIdentifyingNonEmptyStringOnFirstBit(_v.otherURI) : "";
 
             Notation notation = new Notation(name, system_identifier, public_identifier);
             _notations.add(notation);
@@ -631,7 +646,7 @@ public abstract class Decoder implements FastInfosetParser {
             String system_identifier = decodeIdentifyingNonEmptyStringOnFirstBit(_v.otherURI);
 
             String public_identifier = ((_b & EncodingConstants.UNPARSED_ENTITIES_PUBLIC_IDENTIFIER_FLAG) > 0)
-                ? decodeIdentifyingNonEmptyStringOnFirstBit(_v.otherURI) : "";
+            ? decodeIdentifyingNonEmptyStringOnFirstBit(_v.otherURI) : "";
 
             String notation_name = decodeIdentifyingNonEmptyStringOnFirstBit(_v.otherNCName);
 
@@ -669,7 +684,7 @@ public abstract class Decoder implements FastInfosetParser {
 
     protected final QualifiedName decodeEIIIndexMedium() throws FastInfosetException, IOException {
         final int i = (((_b & EncodingConstants.INTEGER_3RD_BIT_MEDIUM_MASK) << 8) | read())
-            + EncodingConstants.INTEGER_3RD_BIT_SMALL_LIMIT;
+        + EncodingConstants.INTEGER_3RD_BIT_SMALL_LIMIT;
         return _v.elementName._array[i];
     }
 
@@ -678,20 +693,22 @@ public abstract class Decoder implements FastInfosetParser {
         if ((_b & EncodingConstants.INTEGER_3RD_BIT_LARGE_LARGE_FLAG) == 0x20) {
             // EII large index
             i = (((_b & EncodingConstants.INTEGER_3RD_BIT_LARGE_MASK) << 16) | (read() << 8) | read())
-                + EncodingConstants.INTEGER_3RD_BIT_MEDIUM_LIMIT;
+            + EncodingConstants.INTEGER_3RD_BIT_MEDIUM_LIMIT;
         } else {
             // EII large large index
             i = (((read() & EncodingConstants.INTEGER_3RD_BIT_LARGE_LARGE_MASK) << 16) | (read() << 8) | read())
-                + EncodingConstants.INTEGER_3RD_BIT_LARGE_LIMIT;
+            + EncodingConstants.INTEGER_3RD_BIT_LARGE_LIMIT;
         }
         return _v.elementName._array[i];
     }
 
-    protected final QualifiedName decodeLiteralQualifiedName(int state) throws FastInfosetException, IOException {
+    protected final QualifiedName decodeLiteralQualifiedName(int state, QualifiedName q)
+    throws FastInfosetException, IOException {
+        if (q == null) q = new QualifiedName();
         switch (state) {
             // no prefix, no namespace
             case 0:
-                return new QualifiedName(
+                return q.set(
                         "",
                         "",
                         decodeIdentifyingNonEmptyStringOnFirstBit(_v.localName),
@@ -699,9 +716,9 @@ public abstract class Decoder implements FastInfosetParser {
                         -1,
                         _identifier,
                         null);
-            // no prefix, namespace
+                // no prefix, namespace
             case 1:
-                return new QualifiedName(
+                return q.set(
                         "",
                         decodeIdentifyingNonEmptyStringIndexOnFirstBitAsNamespaceName(false),
                         decodeIdentifyingNonEmptyStringOnFirstBit(_v.localName),
@@ -709,12 +726,12 @@ public abstract class Decoder implements FastInfosetParser {
                         _namespaceNameIndex,
                         _identifier,
                         null);
-            // prefix, no namespace
+                // prefix, no namespace
             case 2:
                 throw new FastInfosetException(CommonResourceBundle.getInstance().getString("message.qNameMissingNamespaceName"));
-            // prefix, namespace
+                // prefix, namespace
             case 3:
-                return new QualifiedName(
+                return q.set(
                         decodeIdentifyingNonEmptyStringIndexOnFirstBitAsPrefix(true),
                         decodeIdentifyingNonEmptyStringIndexOnFirstBitAsNamespaceName(true),
                         decodeIdentifyingNonEmptyStringOnFirstBit(_v.localName),
@@ -753,9 +770,9 @@ public abstract class Decoder implements FastInfosetParser {
             {
                 _addToTable = (b & EncodingConstants.NISTRING_ADD_TO_TABLE_FLAG) > 0;
                 final int length = (read() << 24) |
-                    (read() << 16) |
-                    (read() << 8) |
-                    read();
+                        (read() << 16) |
+                        (read() << 8) |
+                        read();
                 _octetBufferLength = length + EncodingConstants.OCTET_STRING_LENGTH_5TH_BIT_MEDIUM_LIMIT;
                 decodeUtf8StringAsCharBuffer();
                 return NISTRING_STRING;
@@ -774,9 +791,9 @@ public abstract class Decoder implements FastInfosetParser {
             {
                 _addToTable = (b & EncodingConstants.NISTRING_ADD_TO_TABLE_FLAG) > 0;
                 final int length = (read() << 24) |
-                    (read() << 16) |
-                    (read() << 8) |
-                    read();
+                        (read() << 16) |
+                        (read() << 8) |
+                        read();
                 _octetBufferLength = length + EncodingConstants.OCTET_STRING_LENGTH_5TH_BIT_MEDIUM_LIMIT;
                 decodeUtf16StringAsCharBuffer();
                 return NISTRING_STRING;
@@ -810,11 +827,11 @@ public abstract class Decoder implements FastInfosetParser {
                 return NISTRING_INDEX;
             case DecoderStateTables.NISTRING_INDEX_MEDIUM:
                 _integer = (((b & EncodingConstants.INTEGER_2ND_BIT_MEDIUM_MASK) << 8) | read())
-                    + EncodingConstants.INTEGER_2ND_BIT_SMALL_LIMIT;
+                + EncodingConstants.INTEGER_2ND_BIT_SMALL_LIMIT;
                 return NISTRING_INDEX;
             case DecoderStateTables.NISTRING_INDEX_LARGE:
                 _integer = (((b & EncodingConstants.INTEGER_2ND_BIT_LARGE_MASK) << 16) | (read() << 8) | read())
-                    + EncodingConstants.INTEGER_2ND_BIT_MEDIUM_LIMIT;
+                + EncodingConstants.INTEGER_2ND_BIT_MEDIUM_LIMIT;
                 return NISTRING_INDEX;
             case DecoderStateTables.NISTRING_EMPTY:
                 return NISTRING_EMPTY_STRING;
@@ -836,9 +853,9 @@ public abstract class Decoder implements FastInfosetParser {
                 break;
             case DecoderStateTables.NISTRING_UTF8_LARGE_LENGTH:
                 final int length = (read() << 24) |
-                    (read() << 16) |
-                    (read() << 8) |
-                    read();
+                        (read() << 16) |
+                        (read() << 8) |
+                        read();
                 _octetBufferLength = length + EncodingConstants.OCTET_STRING_LENGTH_5TH_BIT_MEDIUM_LIMIT;
                 break;
             default:
@@ -856,20 +873,20 @@ public abstract class Decoder implements FastInfosetParser {
             case 0:
                 _octetBufferLength = 1;
                 break;
-            // Small length
+                // Small length
             case 1:
                 _octetBufferLength = 2;
                 break;
-            // Medium length
+                // Medium length
             case 2:
                 _octetBufferLength = read() + EncodingConstants.OCTET_STRING_LENGTH_7TH_BIT_SMALL_LIMIT;
                 break;
-            // Large length
+                // Large length
             case 3:
                 _octetBufferLength = (read() << 24) |
-                    (read() << 16) |
-                    (read() << 8) |
-                    read();
+                        (read() << 16) |
+                        (read() << 8) |
+                        read();
                 _octetBufferLength += EncodingConstants.OCTET_STRING_LENGTH_7TH_BIT_MEDIUM_LIMIT;
                 break;
         }
@@ -902,9 +919,9 @@ public abstract class Decoder implements FastInfosetParser {
             case DecoderStateTables.ISTRING_LARGE_LENGTH:
             {
                 final int length = (read() << 24) |
-                    (read() << 16) |
-                    (read() << 8) |
-                    read();
+                        (read() << 16) |
+                        (read() << 8) |
+                        read();
                 _octetBufferLength = length + EncodingConstants.OCTET_STRING_LENGTH_2ND_BIT_MEDIUM_LIMIT;
                 final String s = (_stringInterning) ? decodeUtf8StringAsString().intern() : decodeUtf8StringAsString();
                 _identifier = table.add(s) - 1;
@@ -915,11 +932,11 @@ public abstract class Decoder implements FastInfosetParser {
                 return table._array[_identifier];
             case DecoderStateTables.ISTRING_INDEX_MEDIUM:
                 _identifier = (((b & EncodingConstants.INTEGER_2ND_BIT_MEDIUM_MASK) << 8) | read())
-                    + EncodingConstants.INTEGER_2ND_BIT_SMALL_LIMIT;
+                + EncodingConstants.INTEGER_2ND_BIT_SMALL_LIMIT;
                 return table._array[_identifier];
             case DecoderStateTables.ISTRING_INDEX_LARGE:
                 _identifier = (((b & EncodingConstants.INTEGER_2ND_BIT_LARGE_MASK) << 16) | (read() << 8) | read())
-                    + EncodingConstants.INTEGER_2ND_BIT_MEDIUM_LIMIT;
+                + EncodingConstants.INTEGER_2ND_BIT_MEDIUM_LIMIT;
                 return table._array[_identifier];
             default:
                 throw new FastInfosetException(CommonResourceBundle.getInstance().getString("message.decodingIdentifyingString"));
@@ -987,9 +1004,9 @@ public abstract class Decoder implements FastInfosetParser {
             case DecoderStateTables.ISTRING_LARGE_LENGTH:
             {
                 final int length = (read() << 24) |
-                    (read() << 16) |
-                    (read() << 8) |
-                    read();
+                        (read() << 16) |
+                        (read() << 8) |
+                        read();
                 _octetBufferLength = length + EncodingConstants.OCTET_STRING_LENGTH_2ND_BIT_MEDIUM_LIMIT;
                 final String s = (_stringInterning) ? decodeUtf8StringAsString().intern() : decodeUtf8StringAsString();
                 _prefixIndex = _v.prefix.add(s);
@@ -999,7 +1016,7 @@ public abstract class Decoder implements FastInfosetParser {
                 if (namespaceNamePresent) {
                     _prefixIndex = 0;
                     // Peak at next byte and check the index of the XML namespace name
-                    if (DecoderStateTables.ISTRING_PREFIX_NAMESPACE[peak()]
+                    if (DecoderStateTables.ISTRING_PREFIX_NAMESPACE[peek()]
                             != DecoderStateTables.ISTRING_PREFIX_NAMESPACE_INDEX_ZERO) {
                         throw new FastInfosetException(CommonResourceBundle.getInstance().getString("message.wrongNamespaceName"));
                     }
@@ -1012,11 +1029,11 @@ public abstract class Decoder implements FastInfosetParser {
                 return _v.prefix._array[_prefixIndex - 1];
             case DecoderStateTables.ISTRING_INDEX_MEDIUM:
                 _prefixIndex = (((b & EncodingConstants.INTEGER_2ND_BIT_MEDIUM_MASK) << 8) | read())
-                    + EncodingConstants.INTEGER_2ND_BIT_SMALL_LIMIT;
+                + EncodingConstants.INTEGER_2ND_BIT_SMALL_LIMIT;
                 return _v.prefix._array[_prefixIndex - 1];
             case DecoderStateTables.ISTRING_INDEX_LARGE:
                 _prefixIndex = (((b & EncodingConstants.INTEGER_2ND_BIT_LARGE_MASK) << 16) | (read() << 8) | read())
-                    + EncodingConstants.INTEGER_2ND_BIT_MEDIUM_LIMIT;
+                + EncodingConstants.INTEGER_2ND_BIT_MEDIUM_LIMIT;
                 return _v.prefix._array[_prefixIndex - 1];
             default:
                 throw new FastInfosetException(CommonResourceBundle.getInstance().getString("message.decodingIdentifyingStringForPrefix"));
@@ -1033,7 +1050,7 @@ public abstract class Decoder implements FastInfosetParser {
                 if (namespaceNamePresent) {
                     _prefixIndex = 0;
                     // Peak at next byte and check the index of the XML namespace name
-                    if (DecoderStateTables.ISTRING_PREFIX_NAMESPACE[peak()]
+                    if (DecoderStateTables.ISTRING_PREFIX_NAMESPACE[peek()]
                             != DecoderStateTables.ISTRING_PREFIX_NAMESPACE_INDEX_ZERO) {
                         throw new FastInfosetException(CommonResourceBundle.getInstance().getString("message.wrongNamespaceName"));
                     }
@@ -1046,11 +1063,11 @@ public abstract class Decoder implements FastInfosetParser {
                 return _v.prefix._array[_prefixIndex - 1];
             case DecoderStateTables.ISTRING_INDEX_MEDIUM:
                 _prefixIndex = (((b & EncodingConstants.INTEGER_2ND_BIT_MEDIUM_MASK) << 8) | read())
-                    + EncodingConstants.INTEGER_2ND_BIT_SMALL_LIMIT;
+                + EncodingConstants.INTEGER_2ND_BIT_SMALL_LIMIT;
                 return _v.prefix._array[_prefixIndex - 1];
             case DecoderStateTables.ISTRING_INDEX_LARGE:
                 _prefixIndex = (((b & EncodingConstants.INTEGER_2ND_BIT_LARGE_MASK) << 16) | (read() << 8) | read())
-                    + EncodingConstants.INTEGER_2ND_BIT_MEDIUM_LIMIT;
+                + EncodingConstants.INTEGER_2ND_BIT_MEDIUM_LIMIT;
                 return _v.prefix._array[_prefixIndex - 1];
             default:
                 throw new FastInfosetException(CommonResourceBundle.getInstance().getString("message.decodingIdentifyingStringForPrefix"));
@@ -1079,7 +1096,7 @@ public abstract class Decoder implements FastInfosetParser {
                 _octetBufferLength = EncodingConstants.XMLNS_NAMESPACE_NAME_LENGTH;
                 decodeUtf8StringAsCharBuffer();
 
-                if (compareCharsWithCharBufferFromEndToStart(EncodingConstants.XMLNS_NAMESPACE_NAME_CHARS)) {
+                if (compareCharsWithCharBufferFromEndToStart(XMLNS_NAMESPACE_NAME_CHARS)) {
                     throw new FastInfosetException(CommonResourceBundle.getInstance().getString("message.xmlnsConnotBeBoundToPrefix"));
                 }
 
@@ -1093,7 +1110,7 @@ public abstract class Decoder implements FastInfosetParser {
                 _octetBufferLength = EncodingConstants.XML_NAMESPACE_NAME_LENGTH;
                 decodeUtf8StringAsCharBuffer();
 
-                if (compareCharsWithCharBufferFromEndToStart(EncodingConstants.XML_NAMESPACE_NAME_CHARS)) {
+                if (compareCharsWithCharBufferFromEndToStart(XML_NAMESPACE_NAME_CHARS)) {
                     throw new FastInfosetException(CommonResourceBundle.getInstance().getString("message.illegalNamespaceName"));
                 }
 
@@ -1112,9 +1129,9 @@ public abstract class Decoder implements FastInfosetParser {
             case DecoderStateTables.ISTRING_LARGE_LENGTH:
             {
                 final int length = (read() << 24) |
-                    (read() << 16) |
-                    (read() << 8) |
-                    read();
+                        (read() << 16) |
+                        (read() << 8) |
+                        read();
                 _octetBufferLength = length + EncodingConstants.OCTET_STRING_LENGTH_2ND_BIT_MEDIUM_LIMIT;
                 final String s = (_stringInterning) ? decodeUtf8StringAsString().intern() : decodeUtf8StringAsString();
                 _namespaceNameIndex = _v.namespaceName.add(s);
@@ -1132,11 +1149,11 @@ public abstract class Decoder implements FastInfosetParser {
                 return _v.namespaceName._array[_namespaceNameIndex - 1];
             case DecoderStateTables.ISTRING_INDEX_MEDIUM:
                 _namespaceNameIndex = (((b & EncodingConstants.INTEGER_2ND_BIT_MEDIUM_MASK) << 8) | read())
-                    + EncodingConstants.INTEGER_2ND_BIT_SMALL_LIMIT;
+                + EncodingConstants.INTEGER_2ND_BIT_SMALL_LIMIT;
                 return _v.namespaceName._array[_namespaceNameIndex - 1];
             case DecoderStateTables.ISTRING_INDEX_LARGE:
                 _namespaceNameIndex = (((b & EncodingConstants.INTEGER_2ND_BIT_LARGE_MASK) << 16) | (read() << 8) | read())
-                    + EncodingConstants.INTEGER_2ND_BIT_MEDIUM_LIMIT;
+                + EncodingConstants.INTEGER_2ND_BIT_MEDIUM_LIMIT;
                 return _v.namespaceName._array[_namespaceNameIndex - 1];
             default:
                 throw new FastInfosetException(CommonResourceBundle.getInstance().getString("message.decodingForNamespaceName"));
@@ -1161,11 +1178,11 @@ public abstract class Decoder implements FastInfosetParser {
                 return _v.namespaceName._array[_namespaceNameIndex - 1];
             case DecoderStateTables.ISTRING_INDEX_MEDIUM:
                 _namespaceNameIndex = (((b & EncodingConstants.INTEGER_2ND_BIT_MEDIUM_MASK) << 8) | read())
-                    + EncodingConstants.INTEGER_2ND_BIT_SMALL_LIMIT;
+                + EncodingConstants.INTEGER_2ND_BIT_SMALL_LIMIT;
                 return _v.namespaceName._array[_namespaceNameIndex - 1];
             case DecoderStateTables.ISTRING_INDEX_LARGE:
                 _namespaceNameIndex = (((b & EncodingConstants.INTEGER_2ND_BIT_LARGE_MASK) << 16) | (read() << 8) | read())
-                    + EncodingConstants.INTEGER_2ND_BIT_MEDIUM_LIMIT;
+                + EncodingConstants.INTEGER_2ND_BIT_MEDIUM_LIMIT;
                 return _v.namespaceName._array[_namespaceNameIndex - 1];
             default:
                 throw new FastInfosetException(CommonResourceBundle.getInstance().getString("message.decodingForNamespaceName"));
@@ -1213,9 +1230,9 @@ public abstract class Decoder implements FastInfosetParser {
             case DecoderStateTables.ISTRING_LARGE_LENGTH:
             {
                 final int length = (read() << 24) |
-                    (read() << 16) |
-                    (read() << 8) |
-                    read();
+                        (read() << 16) |
+                        (read() << 8) |
+                        read();
                 _octetBufferLength = length + EncodingConstants.OCTET_STRING_LENGTH_2ND_BIT_MEDIUM_LIMIT;
                 break;
             }
@@ -1237,10 +1254,10 @@ public abstract class Decoder implements FastInfosetParser {
                 return b & EncodingConstants.INTEGER_2ND_BIT_SMALL_MASK;
             case DecoderStateTables.ISTRING_INDEX_MEDIUM:
                 return (((b & EncodingConstants.INTEGER_2ND_BIT_MEDIUM_MASK) << 8) | read())
-                    + EncodingConstants.INTEGER_2ND_BIT_SMALL_LIMIT;
+                + EncodingConstants.INTEGER_2ND_BIT_SMALL_LIMIT;
             case DecoderStateTables.ISTRING_INDEX_LARGE:
                 return (((b & EncodingConstants.INTEGER_2ND_BIT_LARGE_MASK) << 16) | (read() << 8) | read())
-                    + EncodingConstants.INTEGER_2ND_BIT_MEDIUM_LIMIT;
+                + EncodingConstants.INTEGER_2ND_BIT_MEDIUM_LIMIT;
             case DecoderStateTables.ISTRING_SMALL_LENGTH:
             case DecoderStateTables.ISTRING_MEDIUM_LENGTH:
             case DecoderStateTables.ISTRING_LARGE_LENGTH:
@@ -1262,7 +1279,7 @@ public abstract class Decoder implements FastInfosetParser {
         } else if (_identifier >= EncodingConstants.RESTRICTED_ALPHABET_APPLICATION_START) {
             CharArray ca = _v.restrictedAlphabet.get(_identifier - EncodingConstants.RESTRICTED_ALPHABET_APPLICATION_START);
             if (ca == null) {
-                throw new FastInfosetException(CommonResourceBundle.getInstance().getString("message.alphabetNotPresent", new Object[]{new Integer(_identifier)}));
+                throw new FastInfosetException(CommonResourceBundle.getInstance().getString("message.alphabetNotPresent", new Object[]{Integer.valueOf(_identifier)}));
             }
             decodeAlphabetOctetsAsCharBuffer(ca.ch);
         } else {
@@ -1279,13 +1296,13 @@ public abstract class Decoder implements FastInfosetParser {
     }
 
     protected final String decodeRAOctetsAsString(char[] restrictedAlphabet) throws FastInfosetException, IOException {
-        decodeAlphabetOctetsAsCharBuffer(null);
+        decodeAlphabetOctetsAsCharBuffer(restrictedAlphabet);
         return new String(_charBuffer, 0, _charBufferLength);
     }
 
     protected final void decodeFourBitAlphabetOctetsAsCharBuffer(char[] restrictedAlphabet) throws FastInfosetException, IOException {
         _charBufferLength = 0;
-        final int characters = _octetBufferLength / 2;
+        final int characters = _octetBufferLength * 2;
         if (_charBuffer.length < characters) {
             _charBuffer = new char[characters];
         }
@@ -1364,6 +1381,11 @@ public abstract class Decoder implements FastInfosetParser {
         decodeUtf8StringIntoCharBuffer();
     }
 
+    protected final void decodeUtf8StringAsCharBuffer(char[] ch, int offset) throws IOException {
+        ensureOctetBufferSize();
+        decodeUtf8StringIntoCharBuffer(ch, offset);
+    }
+
     protected final String decodeUtf8StringAsString() throws IOException {
         decodeUtf8StringAsCharBuffer();
         return new String(_charBuffer, 0, _charBufferLength);
@@ -1440,6 +1462,21 @@ public abstract class Decoder implements FastInfosetParser {
         }
     }
 
+    protected final void decodeUtf8StringIntoCharBuffer(char[] ch, int offset) throws IOException {
+        _charBufferLength = offset;
+        final int end = _octetBufferLength + _octetBufferOffset;
+        int b1;
+        while (end != _octetBufferOffset) {
+            b1 = _octetBuffer[_octetBufferOffset++] & 0xFF;
+            if (DecoderStateTables.UTF8[b1] == DecoderStateTables.UTF8_ONE_BYTE) {
+                ch[_charBufferLength++] = (char) b1;
+            } else {
+                decodeTwoToFourByteUtf8Character(ch, b1, end);
+            }
+        }
+        _charBufferLength -= offset;
+    }
+
     private void decodeTwoToFourByteUtf8Character(int b1, int end) throws IOException {
         switch(DecoderStateTables.UTF8[b1]) {
             case DecoderStateTables.UTF8_TWO_BYTES:
@@ -1457,18 +1494,18 @@ public abstract class Decoder implements FastInfosetParser {
                 // since a character encoded in two bytes will be in the
                 // range [0x80, 0x1FFF]
                 _charBuffer[_charBufferLength++] = (char) (
-                    ((b1 & 0x1F) << 6)
-                    | (b2 & 0x3F));
+                        ((b1 & 0x1F) << 6)
+                        | (b2 & 0x3F));
                 break;
             }
             case DecoderStateTables.UTF8_THREE_BYTES:
                 final char c = decodeUtf8ThreeByteChar(end, b1);
                 if (XMLChar.isContent(c)) {
                     _charBuffer[_charBufferLength++] = c;
-                    break;
                 } else {
                     decodeUtf8StringIllegalState();
                 }
+                break;
             case DecoderStateTables.UTF8_FOUR_BYTES:
             {
                 final int supplemental = decodeUtf8FourByteChar(end, b1);
@@ -1485,6 +1522,51 @@ public abstract class Decoder implements FastInfosetParser {
         }
     }
 
+    private void decodeTwoToFourByteUtf8Character(char ch[], int b1, int end) throws IOException {
+        switch(DecoderStateTables.UTF8[b1]) {
+            case DecoderStateTables.UTF8_TWO_BYTES:
+            {
+                // Decode byte 2
+                if (end == _octetBufferOffset) {
+                    decodeUtf8StringLengthTooSmall();
+                }
+                final int b2 = _octetBuffer[_octetBufferOffset++] & 0xFF;
+                if ((b2 & 0xC0) != 0x80) {
+                    decodeUtf8StringIllegalState();
+                }
+
+                // Character guaranteed to be in [0x20, 0xD7FF] range
+                // since a character encoded in two bytes will be in the
+                // range [0x80, 0x1FFF]
+                ch[_charBufferLength++] = (char) (
+                        ((b1 & 0x1F) << 6)
+                        | (b2 & 0x3F));
+                break;
+            }
+            case DecoderStateTables.UTF8_THREE_BYTES:
+                final char c = decodeUtf8ThreeByteChar(end, b1);
+                if (XMLChar.isContent(c)) {
+                    ch[_charBufferLength++] = c;
+                } else {
+                    decodeUtf8StringIllegalState();
+                }
+                break;
+            case DecoderStateTables.UTF8_FOUR_BYTES:
+            {
+                final int supplemental = decodeUtf8FourByteChar(end, b1);
+                if (XMLChar.isContent(supplemental)) {
+                    ch[_charBufferLength++] = _utf8_highSurrogate;
+                    ch[_charBufferLength++] = _utf8_lowSurrogate;
+                } else {
+                    decodeUtf8StringIllegalState();
+                }
+                break;
+            }
+            default:
+                decodeUtf8StringIllegalState();
+        }
+    }
+
     protected final void decodeUtf8NCNameIntoCharBuffer() throws IOException {
         _charBufferLength = 0;
         if (_charBuffer.length < _octetBufferLength) {
@@ -1524,20 +1606,19 @@ public abstract class Decoder implements FastInfosetParser {
                 }
 
                 final char c = (char) (
-                    ((b1 & 0x1F) << 6)
-                    | (b2 & 0x3F));
+                        ((b1 & 0x1F) << 6)
+                        | (b2 & 0x3F));
                 if (XMLChar.isNCNameStart(c)) {
                     _charBuffer[_charBufferLength++] = c;
-                    break;
                 } else {
                     decodeUtf8NCNameIllegalState();
                 }
+                break;
             }
             case DecoderStateTables.UTF8_THREE_BYTES:
                 final char c = decodeUtf8ThreeByteChar(end, b1);
                 if (XMLChar.isNCNameStart(c)) {
                     _charBuffer[_charBufferLength++] = c;
-                    break;
                 } else {
                     decodeUtf8NCNameIllegalState();
                 }
@@ -1574,20 +1655,19 @@ public abstract class Decoder implements FastInfosetParser {
                 }
 
                 final char c = (char) (
-                    ((b1 & 0x1F) << 6)
-                    | (b2 & 0x3F));
+                        ((b1 & 0x1F) << 6)
+                        | (b2 & 0x3F));
                 if (XMLChar.isNCName(c)) {
                     _charBuffer[_charBufferLength++] = c;
-                    break;
                 } else {
                     decodeUtf8NCNameIllegalState();
                 }
+                break;
             }
             case DecoderStateTables.UTF8_THREE_BYTES:
                 final char c = decodeUtf8ThreeByteChar(end, b1);
                 if (XMLChar.isNCName(c)) {
                     _charBuffer[_charBufferLength++] = c;
-                    break;
                 } else {
                     decodeUtf8NCNameIllegalState();
                 }
@@ -1615,8 +1695,8 @@ public abstract class Decoder implements FastInfosetParser {
         }
         final int b2 = _octetBuffer[_octetBufferOffset++] & 0xFF;
         if ((b2 & 0xC0) != 0x80
-            || (b1 == 0xED && b2 >= 0xA0)
-            || ((b1 & 0x0F) == 0 && (b2 & 0x20) == 0)) {
+                || (b1 == 0xED && b2 >= 0xA0)
+                || ((b1 & 0x0F) == 0 && (b2 & 0x20) == 0)) {
             decodeUtf8StringIllegalState();
         }
 
@@ -1630,9 +1710,9 @@ public abstract class Decoder implements FastInfosetParser {
         }
 
         return (char) (
-            (b1 & 0x0F) << 12
-            | (b2 & 0x3F) << 6
-            | (b3 & 0x3F));
+                (b1 & 0x0F) << 12
+                | (b2 & 0x3F) << 6
+                | (b3 & 0x3F));
     }
 
     private char _utf8_highSurrogate;
@@ -1645,7 +1725,7 @@ public abstract class Decoder implements FastInfosetParser {
         }
         final int b2 = _octetBuffer[_octetBufferOffset++] & 0xFF;
         if ((b2 & 0xC0) != 0x80
-            || ((b2 & 0x30) == 0 && (b1 & 0x07) == 0)) {
+                || ((b2 & 0x30) == 0 && (b1 & 0x07) == 0)) {
             decodeUtf8StringIllegalState();
         }
 
@@ -1674,8 +1754,8 @@ public abstract class Decoder implements FastInfosetParser {
         final int wwww = uuuuu - 1;
 
         _utf8_highSurrogate = (char) (0xD800 |
-             ((wwww << 6) & 0x03C0) | ((b2 << 2) & 0x003C) |
-             ((b3 >> 4) & 0x0003));
+                ((wwww << 6) & 0x03C0) | ((b2 << 2) & 0x003C) |
+                ((b3 >> 4) & 0x0003));
         _utf8_lowSurrogate = (char) (0xDC00 | ((b3 << 6) & 0x03C0) | (b4 & 0x003F));
 
         return XMLChar.supplemental(_utf8_highSurrogate, _utf8_lowSurrogate);
@@ -1738,10 +1818,24 @@ public abstract class Decoder implements FastInfosetParser {
         }
     }
 
-    protected final int peak() throws IOException {
+    protected final void closeIfRequired() throws IOException {
+        if (_s != null && _needForceStreamClose) {
+            _s.close();
+        }
+    }
+
+    protected final int peek() throws IOException {
+        return peek(null);
+    }
+
+    protected final int peek(OctetBufferListener octetBufferListener) throws IOException {
         if (_octetBufferOffset < _octetBufferEnd) {
             return _octetBuffer[_octetBufferOffset] & 0xFF;
         } else {
+            if (octetBufferListener != null) {
+                octetBufferListener.onBeforeOctetBufferOverwrite();
+            }
+
             _octetBufferEnd = _s.read(_octetBuffer);
             if (_octetBufferEnd < 0) {
                 throw new EOFException(CommonResourceBundle.getInstance().getString("message.EOF"));
@@ -1752,6 +1846,30 @@ public abstract class Decoder implements FastInfosetParser {
         }
     }
 
+    protected final int peek2(OctetBufferListener octetBufferListener) throws IOException {
+        if (_octetBufferOffset + 1 < _octetBufferEnd) {
+            return _octetBuffer[_octetBufferOffset + 1] & 0xFF;
+        } else {
+            if (octetBufferListener != null) {
+                octetBufferListener.onBeforeOctetBufferOverwrite();
+            }
+
+            int offset = 0;
+            if (_octetBufferOffset < _octetBufferEnd) {
+                _octetBuffer[0] = _octetBuffer[_octetBufferOffset];
+                offset = 1;
+            }
+            _octetBufferEnd = _s.read(_octetBuffer, offset, _octetBuffer.length - offset);
+
+            if (_octetBufferEnd < 0) {
+                throw new EOFException(CommonResourceBundle.getInstance().getString("message.EOF"));
+            }
+
+            _octetBufferOffset = 0;
+            return _octetBuffer[1] & 0xFF;
+        }
+    }
+
     protected class EncodingAlgorithmInputStream extends InputStream {
 
         public int read() throws IOException {
@@ -1770,7 +1888,7 @@ public abstract class Decoder implements FastInfosetParser {
             if (b == null) {
                 throw new NullPointerException();
             } else if ((off < 0) || (off > b.length) || (len < 0) ||
-                       ((off + len) > b.length) || ((off + len) < 0)) {
+                    ((off + len) > b.length) || ((off + len) < 0)) {
                 throw new IndexOutOfBoundsException();
             } else if (len == 0) {
                 return 0;
@@ -1794,7 +1912,7 @@ public abstract class Decoder implements FastInfosetParser {
 
     protected final boolean _isFastInfosetDocument() throws IOException {
         // Fill up the octet buffer
-        peak();
+        peek();
 
         _octetBufferLength = EncodingConstants.BINARY_HEADER.length;
         ensureOctetBufferSize();
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/DecoderStateTables.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/DecoderStateTables.java
index f720df657a5..36a5b7be949 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/DecoderStateTables.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/DecoderStateTables.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 
 package com.sun.xml.internal.fastinfoset;
@@ -541,14 +514,14 @@ public class DecoderStateTables {
     };
 
 
-    public final static int ISTRING_SMALL_LENGTH        = 0;
-    public final static int ISTRING_MEDIUM_LENGTH       = 1;
-    public final static int ISTRING_LARGE_LENGTH        = 2;
-    public final static int ISTRING_INDEX_SMALL         = 3;
-    public final static int ISTRING_INDEX_MEDIUM        = 4;
-    public final static int ISTRING_INDEX_LARGE         = 5;
+    /* package */ final static int ISTRING_SMALL_LENGTH        = 0;
+    /* package */ final static int ISTRING_MEDIUM_LENGTH       = 1;
+    /* package */ final static int ISTRING_LARGE_LENGTH        = 2;
+    /* package */ final static int ISTRING_INDEX_SMALL         = 3;
+    /* package */ final static int ISTRING_INDEX_MEDIUM        = 4;
+    /* package */ final static int ISTRING_INDEX_LARGE         = 5;
 
-    public static final int[] ISTRING = new int[256];
+    /* package */ static final int[] ISTRING = new int[256];
 
     private static int[][] ISTRING_RANGES = {
         // %00000000 to %00111111 small length
@@ -580,13 +553,13 @@ public class DecoderStateTables {
     };
 
 
-    public final static int ISTRING_PREFIX_NAMESPACE_LENGTH_3   = 6;
-    public final static int ISTRING_PREFIX_NAMESPACE_LENGTH_5   = 7;
-    public final static int ISTRING_PREFIX_NAMESPACE_LENGTH_29  = 8;
-    public final static int ISTRING_PREFIX_NAMESPACE_LENGTH_36  = 9;
-    public final static int ISTRING_PREFIX_NAMESPACE_INDEX_ZERO = 10;
+    /* package */ final static int ISTRING_PREFIX_NAMESPACE_LENGTH_3   = 6;
+    /* package */ final static int ISTRING_PREFIX_NAMESPACE_LENGTH_5   = 7;
+    /* package */ final static int ISTRING_PREFIX_NAMESPACE_LENGTH_29  = 8;
+    /* package */ final static int ISTRING_PREFIX_NAMESPACE_LENGTH_36  = 9;
+    /* package */ final static int ISTRING_PREFIX_NAMESPACE_INDEX_ZERO = 10;
 
-    public static final int[] ISTRING_PREFIX_NAMESPACE = new int[256];
+    /* package */ static final int[] ISTRING_PREFIX_NAMESPACE = new int[256];
 
     private static int[][] ISTRING_PREFIX_NAMESPACE_RANGES = {
         // %00000000 to %00000001 small length
@@ -648,13 +621,13 @@ public class DecoderStateTables {
     };
 
     // UTF-8 states
-    public final static int UTF8_NCNAME_NCNAME         = 0;
-    public final static int UTF8_NCNAME_NCNAME_CHAR    = 1;
-    public final static int UTF8_TWO_BYTES             = 2;
-    public final static int UTF8_THREE_BYTES           = 3;
-    public final static int UTF8_FOUR_BYTES            = 4;
+    /* package */ final static int UTF8_NCNAME_NCNAME         = 0;
+    /* package */ final static int UTF8_NCNAME_NCNAME_CHAR    = 1;
+    /* package */ final static int UTF8_TWO_BYTES             = 2;
+    /* package */ final static int UTF8_THREE_BYTES           = 3;
+    /* package */ final static int UTF8_FOUR_BYTES            = 4;
 
-    public static final int[] UTF8_NCNAME = new int[256];
+    /* package */ static final int[] UTF8_NCNAME = new int[256];
 
     private static int[][] UTF8_NCNAME_RANGES = {
 
@@ -724,9 +697,9 @@ public class DecoderStateTables {
         { 0xFF, STATE_ILLEGAL }
     };
 
-    public final static int UTF8_ONE_BYTE              = 1;
+    /* package */ final static int UTF8_ONE_BYTE = 1;
 
-    public static final int[] UTF8 = new int[256];
+    /* package */ static final int[] UTF8 = new int[256];
 
     private static int[][] UTF8_RANGES = {
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/Encoder.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/Encoder.java
index 8027ea09cc5..b9983ddfb92 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/Encoder.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/Encoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,37 +24,8 @@
  *
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 package com.sun.xml.internal.fastinfoset;
 
-import com.sun.xml.internal.fastinfoset.algorithm.BuiltInEncodingAlgorithm;
 import com.sun.xml.internal.fastinfoset.algorithm.BuiltInEncodingAlgorithmFactory;
 import com.sun.xml.internal.fastinfoset.org.apache.xerces.util.XMLChar;
 import com.sun.xml.internal.fastinfoset.util.CharArrayIntMap;
@@ -72,6 +43,8 @@ import com.sun.xml.internal.org.jvnet.fastinfoset.EncodingAlgorithmIndexes;
 import com.sun.xml.internal.org.jvnet.fastinfoset.ExternalVocabulary;
 import com.sun.xml.internal.org.jvnet.fastinfoset.FastInfosetException;
 import com.sun.xml.internal.org.jvnet.fastinfoset.FastInfosetSerializer;
+import com.sun.xml.internal.org.jvnet.fastinfoset.RestrictedAlphabet;
+import com.sun.xml.internal.org.jvnet.fastinfoset.VocabularyApplicationData;
 import org.xml.sax.helpers.DefaultHandler;
 
 /**
@@ -110,18 +83,57 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
      * Default character encoding scheme system property for the encoding
      * of content and attribute values.
      */
-    protected static String _characterEncodingSchemeSystemDefault = UTF_8;
+    protected static final String _characterEncodingSchemeSystemDefault = getDefaultEncodingScheme();
 
-    static {
-        // Initiate the default character encoding schema from the system
-        // property
+    private static String getDefaultEncodingScheme() {
         String p = System.getProperty(CHARACTER_ENCODING_SCHEME_SYSTEM_PROPERTY,
-            _characterEncodingSchemeSystemDefault);
+            UTF_8);
         if (p.equals(UTF_16BE)) {
-            _characterEncodingSchemeSystemDefault = UTF_16BE;
+            return UTF_16BE;
+        } else {
+            return UTF_8;
         }
     }
 
+    protected static int[] NUMERIC_CHARACTERS_TABLE;
+
+    protected static int[] DATE_TIME_CHARACTERS_TABLE;
+
+    static {
+        NUMERIC_CHARACTERS_TABLE = new int[maxCharacter(RestrictedAlphabet.NUMERIC_CHARACTERS) + 1];
+        DATE_TIME_CHARACTERS_TABLE = new int[maxCharacter(RestrictedAlphabet.DATE_TIME_CHARACTERS) + 1];
+
+        for (int i = 0; i < NUMERIC_CHARACTERS_TABLE.length ; i++) {
+            NUMERIC_CHARACTERS_TABLE[i] = -1;
+        }
+        for (int i = 0; i < DATE_TIME_CHARACTERS_TABLE.length ; i++) {
+            DATE_TIME_CHARACTERS_TABLE[i] = -1;
+        }
+
+        for (int i = 0; i < RestrictedAlphabet.NUMERIC_CHARACTERS.length() ; i++) {
+            NUMERIC_CHARACTERS_TABLE[RestrictedAlphabet.NUMERIC_CHARACTERS.charAt(i)] = i;
+        }
+        for (int i = 0; i < RestrictedAlphabet.DATE_TIME_CHARACTERS.length() ; i++) {
+            DATE_TIME_CHARACTERS_TABLE[RestrictedAlphabet.DATE_TIME_CHARACTERS.charAt(i)] = i;
+        }
+    }
+
+    private static int maxCharacter(String alphabet) {
+        int c = 0;
+        for (int i = 0; i < alphabet.length() ; i++) {
+            if (c < alphabet.charAt(i)) {
+                c = alphabet.charAt(i);
+            }
+        }
+
+        return c;
+    }
+
+    /**
+     * True if DTD and internal subset shall be ignored.
+     */
+    private boolean _ignoreDTD;
+
     /**
      * True if comments shall be ignored.
      */
@@ -172,6 +184,11 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
      */
     protected SerializerVocabulary _v;
 
+    /**
+     * The vocabulary application data that is used by the encoder
+     */
+    protected VocabularyApplicationData _vData;
+
     /**
      * True if the vocubulary is internal to the encoder
      */
@@ -223,6 +240,12 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
      */
     protected int attributeValueSizeConstraint = FastInfosetSerializer.ATTRIBUTE_VALUE_SIZE_CONSTRAINT;
 
+    /**
+     * The limit on the size of indexed Map for attribute values
+     * Limit is measured in characters number
+     */
+    protected int attributeValueMapTotalCharactersConstraint = FastInfosetSerializer.ATTRIBUTE_VALUE_MAP_MEMORY_CONSTRAINT / 2;
+
     /**
      * The limit on the size of character content chunks
      * of Character Information Items or Comment Information Items that
@@ -230,6 +253,11 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
      */
     protected int characterContentChunkSizeContraint = FastInfosetSerializer.CHARACTER_CONTENT_CHUNK_SIZE_CONSTRAINT;
 
+    /**
+     * The limit on the size of indexed Map for character content chunks
+     * Limit is measured in characters number
+     */
+    protected int characterContentChunkMapTotalCharactersConstraint = FastInfosetSerializer.CHARACTER_CONTENT_CHUNK_MAP_MEMORY_CONSTRAINT / 2;
 
     /**
      * Default constructor for the Encoder.
@@ -246,6 +274,20 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
 
     // FastInfosetSerializer interface
 
+    /**
+     * {@inheritDoc}
+     */
+    public final void setIgnoreDTD(boolean ignoreDTD) {
+        _ignoreDTD = ignoreDTD;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public final boolean getIgnoreDTD() {
+        return _ignoreDTD;
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -346,6 +388,38 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
         return characterContentChunkSizeContraint;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public void setCharacterContentChunkMapMemoryLimit(int size) {
+        if (size < 0 ) {
+            size = 0;
+        }
+
+        characterContentChunkMapTotalCharactersConstraint = size / 2;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public int getCharacterContentChunkMapMemoryLimit() {
+        return characterContentChunkMapTotalCharactersConstraint * 2;
+    }
+
+    /**
+     * Checks whether character content chunk (its length) matches limits:
+     * length limit itself and limit for total capacity of specified CharArrayIntMap
+     *
+     * @param length the length of character content chunk is checking to be added to Map.
+     * @param map the custom CharArrayIntMap, which memory limits will be checked.
+     * @return whether character content chunk length matches limits
+     */
+    public boolean isCharacterContentChunkLengthMatchesLimit(int length, CharArrayIntMap map) {
+        return (length < characterContentChunkSizeContraint) &&
+                (map.getTotalCharacterCount() + length <
+                        characterContentChunkMapTotalCharactersConstraint);
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -364,6 +438,37 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
         return attributeValueSizeConstraint;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public void setAttributeValueMapMemoryLimit(int size) {
+        if (size < 0 ) {
+            size = 0;
+        }
+
+        attributeValueMapTotalCharactersConstraint = size / 2;
+
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public int getAttributeValueMapMemoryLimit() {
+        return attributeValueMapTotalCharactersConstraint * 2;
+    }
+
+    /**
+     * Checks whether attribute value (its length) matches limits:
+     * length limit itself and limit for index Map total capacity
+     *
+     * @return whether attribute value matches limits
+     */
+    public boolean isAttributeValueLengthMatchesLimit(int length) {
+        return (length < attributeValueSizeConstraint) &&
+                (_v.attributeValue.getTotalCharacterCount() + length <
+                        attributeValueMapTotalCharactersConstraint);
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -379,6 +484,20 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
         _vIsInternal = true;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public void setVocabularyApplicationData(VocabularyApplicationData data) {
+        _vData = data;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public VocabularyApplicationData getVocabularyApplicationData() {
+        return _vData;
+    }
+
     // End of FastInfosetSerializer interface
 
     /**
@@ -432,9 +551,13 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
             _vIsInternal = true;
         } else if (_vIsInternal) {
             _v.clear();
+            if (_vData != null)
+                _vData.clear();
         }
 
-        if (_v.hasInitialVocabulary()) {
+        if (!_v.hasInitialVocabulary() && !_v.hasExternalVocabulary()) {
+            write(0);
+        } else if (_v.hasInitialVocabulary()) {
             _b = EncodingConstants.DOCUMENT_INITIAL_VOCABULARY_FLAG;
             write(_b);
 
@@ -448,7 +571,7 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
             }
 
             if (initialVocabulary.hasExternalVocabulary()) {
-                encodeNonEmptyOctetStringOnSecondBit(_v.getExternalVocabularyURI().toString());
+                encodeNonEmptyOctetStringOnSecondBit(_v.getExternalVocabularyURI());
             }
 
             // TODO check for contents of vocabulary to encode values
@@ -460,9 +583,7 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
             write(_b);
             write(0);
 
-            encodeNonEmptyOctetStringOnSecondBit(_v.getExternalVocabularyURI().toString());
-        } else {
-            write(0);
+            encodeNonEmptyOctetStringOnSecondBit(_v.getExternalVocabularyURI());
         }
     }
 
@@ -501,6 +622,7 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
     protected final void encodeTermination() throws IOException {
         if (_terminate) {
             write(_b);
+            _b = 0;
             _terminate = false;
         }
     }
@@ -515,10 +637,10 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
      */
     protected final void encodeNamespaceAttribute(String prefix, String uri) throws IOException {
         _b = EncodingConstants.NAMESPACE_ATTRIBUTE;
-        if (prefix != "") {
+        if (prefix.length() > 0) {
             _b |= EncodingConstants.NAMESPACE_ATTRIBUTE_PREFIX_FLAG;
         }
-        if (uri != "") {
+        if (uri.length() > 0) {
             _b |= EncodingConstants.NAMESPACE_ATTRIBUTE_NAME_FLAG;
         }
 
@@ -529,10 +651,10 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
 
         write(_b);
 
-        if (prefix != "") {
+        if (prefix.length() > 0) {
             encodeIdentifyingNonEmptyStringOnFirstBit(prefix, _v.prefix);
         }
-        if (uri != "") {
+        if (uri.length() > 0) {
             encodeIdentifyingNonEmptyStringOnFirstBit(uri, _v.namespaceName);
         }
     }
@@ -546,7 +668,7 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
      * @throws ArrayIndexOutOfBoundsException.
      */
     protected final void encodeCharacters(char[] ch, int offset, int length) throws IOException {
-        final boolean addToTable = (length < characterContentChunkSizeContraint) ? true : false;
+        final boolean addToTable = isCharacterContentChunkLengthMatchesLimit(length, _v.characterContentChunk);
         encodeNonIdentifyingStringOnThirdBit(ch, offset, length, _v.characterContentChunk, addToTable, true);
     }
 
@@ -563,7 +685,7 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
      * @throws ArrayIndexOutOfBoundsException.
      */
     protected final void encodeCharactersNoClone(char[] ch, int offset, int length) throws IOException {
-        final boolean addToTable = (length < characterContentChunkSizeContraint) ? true : false;
+        final boolean addToTable = isCharacterContentChunkLengthMatchesLimit(length, _v.characterContentChunk);
         encodeNonIdentifyingStringOnThirdBit(ch, offset, length, _v.characterContentChunk, addToTable, false);
     }
 
@@ -577,11 +699,22 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
      * @param ch the array of characters.
      * @param offset the offset into the array of characters.
      * @param length the length of characters.
+     * @param addToTable if characters should be added to table.
      * @throws ArrayIndexOutOfBoundsException.
      */
-    protected final void encodeFourBitCharacters(int id, int[] table, char[] ch, int offset, int length) throws FastInfosetException, IOException {
+    protected final void encodeFourBitCharacters(int id, int[] table, char[] ch, int offset, int length,
+            boolean addToTable) throws FastInfosetException, IOException {
+        if (addToTable) {
+            final int index = _v.characterContentChunk.obtainIndex(ch, offset, length, true);
+            if (index != KeyIntMap.NOT_PRESENT) {
+                _b = EncodingConstants.CHARACTER_CHUNK | 0x20;
+                encodeNonZeroIntegerOnFourthBit(index);
+                return;
+            }
+        }
+
         // This procedure assumes that id <= 64
-        _b = (length < characterContentChunkSizeContraint) ?
+        _b = (addToTable) ?
             EncodingConstants.CHARACTER_CHUNK | EncodingConstants.CHARACTER_CHUNK_RESTRICTED_ALPHABET_FLAG | EncodingConstants.CHARACTER_CHUNK_ADD_TO_TABLE_FLAG :
             EncodingConstants.CHARACTER_CHUNK | EncodingConstants.CHARACTER_CHUNK_RESTRICTED_ALPHABET_FLAG;
         write (_b);
@@ -601,22 +734,33 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
      * @param ch the array of characters.
      * @param offset the offset into the array of characters.
      * @param length the length of characters.
+     * @param addToTable if characters should be added to table
      * @throws ArrayIndexOutOfBoundsException.
      * @throws FastInfosetException if the alphabet is not present in the
      *         vocabulary.
      */
-    protected final void encodeAlphabetCharacters(String alphabet, char[] ch, int offset, int length) throws FastInfosetException, IOException {
+    protected final void encodeAlphabetCharacters(String alphabet, char[] ch, int offset, int length,
+            boolean addToTable) throws FastInfosetException, IOException {
+        if (addToTable) {
+            final int index = _v.characterContentChunk.obtainIndex(ch, offset, length, true);
+            if (index != KeyIntMap.NOT_PRESENT) {
+                _b = EncodingConstants.CHARACTER_CHUNK | 0x20;
+                encodeNonZeroIntegerOnFourthBit(index);
+                return;
+            }
+        }
+
         int id = _v.restrictedAlphabet.get(alphabet);
         if (id == KeyIntMap.NOT_PRESENT) {
             throw new FastInfosetException(CommonResourceBundle.getInstance().getString("message.restrictedAlphabetNotPresent"));
         }
         id += EncodingConstants.RESTRICTED_ALPHABET_APPLICATION_START;
 
-        _b = (length < characterContentChunkSizeContraint) ?
+        _b = (addToTable) ?
             EncodingConstants.CHARACTER_CHUNK | EncodingConstants.CHARACTER_CHUNK_RESTRICTED_ALPHABET_FLAG | EncodingConstants.CHARACTER_CHUNK_ADD_TO_TABLE_FLAG :
             EncodingConstants.CHARACTER_CHUNK | EncodingConstants.CHARACTER_CHUNK_RESTRICTED_ALPHABET_FLAG;
         _b |= (id & 0xC0) >> 6;
-        write (_b);
+        write(_b);
 
         // Encode bottom 6 bits of enoding algorithm id
         _b = (id & 0x3F) << 2;
@@ -637,10 +781,34 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
         encodeIdentifyingNonEmptyStringOnFirstBit(target, _v.otherNCName);
 
         // Data
-        boolean addToTable = (data.length() < characterContentChunkSizeContraint) ? true : false;
+        boolean addToTable = isCharacterContentChunkLengthMatchesLimit(data.length(), _v.characterContentChunk);
         encodeNonIdentifyingStringOnFirstBit(data, _v.otherString, addToTable);
     }
 
+    /**
+     * Encode a Document Type Declaration.
+     *
+     * @param systemId the system identifier of the external subset.
+     * @param publicId the public identifier of the external subset.
+     */
+    protected final void encodeDocumentTypeDeclaration(String systemId, String publicId) throws IOException {
+        _b = EncodingConstants.DOCUMENT_TYPE_DECLARATION;
+        if (systemId != null && systemId.length() > 0) {
+            _b |= EncodingConstants.DOCUMENT_TYPE_SYSTEM_IDENTIFIER_FLAG;
+        }
+        if (publicId != null && publicId.length() > 0) {
+            _b |= EncodingConstants.DOCUMENT_TYPE_PUBLIC_IDENTIFIER_FLAG;
+        }
+        write(_b);
+
+        if (systemId != null && systemId.length() > 0) {
+            encodeIdentifyingNonEmptyStringOnFirstBit(systemId, _v.otherURI);
+        }
+        if (publicId != null && publicId.length() > 0) {
+            encodeIdentifyingNonEmptyStringOnFirstBit(publicId, _v.otherURI);
+        }
+    }
+
     /**
      * Encode a Comment Information Item.
      *
@@ -652,7 +820,7 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
     protected final void encodeComment(char[] ch, int offset, int length) throws IOException {
         write(EncodingConstants.COMMENT);
 
-        boolean addToTable = (length < characterContentChunkSizeContraint) ? true : false;
+        boolean addToTable = isCharacterContentChunkLengthMatchesLimit(length, _v.otherString);
         encodeNonIdentifyingStringOnFirstBit(ch, offset, length, _v.otherString, addToTable, true);
     }
 
@@ -671,7 +839,7 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
     protected final void encodeCommentNoClone(char[] ch, int offset, int length) throws IOException {
         write(EncodingConstants.COMMENT);
 
-        boolean addToTable = (length < characterContentChunkSizeContraint) ? true : false;
+        boolean addToTable = isCharacterContentChunkLengthMatchesLimit(length, _v.otherString);
         encodeNonIdentifyingStringOnFirstBit(ch, offset, length, _v.otherString, addToTable, false);
     }
 
@@ -722,13 +890,13 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
 
         int namespaceURIIndex = KeyIntMap.NOT_PRESENT;
         int prefixIndex = KeyIntMap.NOT_PRESENT;
-        if (namespaceURI != "") {
+        if (namespaceURI.length() > 0) {
             namespaceURIIndex = _v.namespaceName.get(namespaceURI);
             if (namespaceURIIndex == KeyIntMap.NOT_PRESENT) {
                 throw new IOException(CommonResourceBundle.getInstance().getString("message.namespaceURINotIndexed", new Object[]{namespaceURI}));
             }
 
-            if (prefix != "") {
+            if (prefix.length() > 0) {
                 prefixIndex = _v.prefix.get(prefix);
                 if (prefixIndex == KeyIntMap.NOT_PRESENT) {
                     throw new IOException(CommonResourceBundle.getInstance().getString("message.prefixNotIndexed", new Object[]{prefix}));
@@ -805,7 +973,7 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
                 LocalNameQualifiedNamesMap.Entry entry) throws IOException {
         int namespaceURIIndex = KeyIntMap.NOT_PRESENT;
         int prefixIndex = KeyIntMap.NOT_PRESENT;
-        if (namespaceURI != "") {
+        if (namespaceURI.length() > 0) {
             namespaceURIIndex = _v.namespaceName.get(namespaceURI);
             if (namespaceURIIndex == KeyIntMap.NOT_PRESENT) {
                 if (namespaceURI == EncodingConstants.XMLNS_NAMESPACE_NAME ||
@@ -816,7 +984,7 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
                 }
             }
 
-            if (prefix != "") {
+            if (prefix.length() > 0) {
                 prefixIndex = _v.prefix.get(prefix);
                 if (prefixIndex == KeyIntMap.NOT_PRESENT) {
                     throw new IOException(CommonResourceBundle.getInstance().getString("message.prefixNotIndexed", new Object[]{prefix}));
@@ -830,9 +998,9 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
         entry.addQualifiedName(name);
 
         _b = EncodingConstants.ATTRIBUTE_LITERAL_QNAME_FLAG;
-        if (namespaceURI != "") {
+        if (namespaceURI.length() > 0) {
             _b |= EncodingConstants.LITERAL_QNAME_NAMESPACE_NAME_FLAG;
-            if (prefix != "") {
+            if (prefix.length() > 0) {
                 _b |= EncodingConstants.LITERAL_QNAME_PREFIX_FLAG;
             }
         }
@@ -953,6 +1121,35 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
         }
     }
 
+    protected final void encodeNonIdentifyingStringOnFirstBit(int id, int[] table, String s, boolean addToTable)
+            throws IOException, FastInfosetException {
+        if (s == null || s.length() == 0) {
+            // C.26 an index (first bit '1') with seven '1' bits for an empty string
+            write(0xFF);
+            return;
+        } else if (addToTable) {
+            final int index = _v.attributeValue.obtainIndex(s);
+            if (index != KeyIntMap.NOT_PRESENT) {
+                encodeNonZeroIntegerOnSecondBitFirstBitOne(index);
+                return;
+            }
+        }
+
+        _b = (addToTable)
+                ? EncodingConstants.NISTRING_RESTRICTED_ALPHABET_FLAG | EncodingConstants.NISTRING_ADD_TO_TABLE_FLAG
+                : EncodingConstants.NISTRING_RESTRICTED_ALPHABET_FLAG;
+        // Encode identification and top four bits of alphabet id
+        write (_b | ((id & 0xF0) >> 4));
+        // Encode bottom 4 bits of alphabet id
+        _b = (id & 0x0F) << 4;
+
+        final int length = s.length();
+        final int octetPairLength = length / 2;
+        final int octetSingleLength = length % 2;
+        encodeNonZeroOctetStringLengthOnFifthBit(octetPairLength + octetSingleLength);
+        encodeNonEmptyFourBitCharacterString(table, s.toCharArray(), 0, octetPairLength, octetSingleLength);
+    }
+
     /**
      * Encode a non identifying string on the first bit of an octet as binary
      * data using an encoding algorithm.
@@ -986,12 +1183,9 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
                 }
             }
         } else if (id <= EncodingConstants.ENCODING_ALGORITHM_BUILTIN_END) {
-            BuiltInEncodingAlgorithm a = BuiltInEncodingAlgorithmFactory.table[id];
             int length = 0;
             switch(id) {
                 case EncodingAlgorithmIndexes.HEXADECIMAL:
-                    length = ((byte[])data).length;
-                    break;
                 case EncodingAlgorithmIndexes.BASE64:
                     length = ((byte[])data).length;
                     break;
@@ -1002,6 +1196,7 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
                     length = ((int[])data).length;
                     break;
                 case EncodingAlgorithmIndexes.LONG:
+                case EncodingAlgorithmIndexes.UUID:
                     length = ((long[])data).length;
                     break;
                 case EncodingAlgorithmIndexes.BOOLEAN:
@@ -1013,13 +1208,10 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
                 case EncodingAlgorithmIndexes.DOUBLE:
                     length = ((double[])data).length;
                     break;
-                case EncodingAlgorithmIndexes.UUID:
-                    length = ((long[])data).length;
-                    break;
                 case EncodingAlgorithmIndexes.CDATA:
                     throw new UnsupportedOperationException(CommonResourceBundle.getInstance().getString("message.CDATA"));
                 default:
-                    throw new EncodingAlgorithmException(CommonResourceBundle.getInstance().getString("message.UnsupportedBuiltInAlgorithm", new Object[]{new Integer(id)}));
+                    throw new EncodingAlgorithmException(CommonResourceBundle.getInstance().getString("message.UnsupportedBuiltInAlgorithm", new Object[]{Integer.valueOf(id)}));
             }
             encodeAIIBuiltInAlgorithmData(id, data, 0, length);
         } else if (id >= EncodingConstants.ENCODING_ALGORITHM_APPLICATION_START) {
@@ -1182,8 +1374,6 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
             int length = 0;
             switch(id) {
                 case EncodingAlgorithmIndexes.HEXADECIMAL:
-                    length = ((byte[])data).length;
-                    break;
                 case EncodingAlgorithmIndexes.BASE64:
                     length = ((byte[])data).length;
                     break;
@@ -1194,7 +1384,8 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
                     length = ((int[])data).length;
                     break;
                 case EncodingAlgorithmIndexes.LONG:
-                    length = ((int[])data).length;
+                case EncodingAlgorithmIndexes.UUID:
+                    length = ((long[])data).length;
                     break;
                 case EncodingAlgorithmIndexes.BOOLEAN:
                     length = ((boolean[])data).length;
@@ -1205,13 +1396,10 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
                 case EncodingAlgorithmIndexes.DOUBLE:
                     length = ((double[])data).length;
                     break;
-                case EncodingAlgorithmIndexes.UUID:
-                    length = ((int[])data).length;
-                    break;
                 case EncodingAlgorithmIndexes.CDATA:
                     throw new UnsupportedOperationException(CommonResourceBundle.getInstance().getString("message.CDATA"));
                 default:
-                    throw new EncodingAlgorithmException(CommonResourceBundle.getInstance().getString("message.UnsupportedBuiltInAlgorithm", new Object[]{new Integer(id)}));
+                    throw new EncodingAlgorithmException(CommonResourceBundle.getInstance().getString("message.UnsupportedBuiltInAlgorithm", new Object[]{Integer.valueOf(id)}));
             }
             encodeCIIBuiltInAlgorithmData(id, data, 0, length);
         } else if (id >= EncodingConstants.ENCODING_ALGORITHM_APPLICATION_START) {
@@ -1496,7 +1684,11 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
 
         // Encode the length
         encodeNonZeroOctetStringLengthOnSenventhBit(octetPairLength + octetSingleLength);
+        encodeNonEmptyFourBitCharacterString(table, ch, offset, octetPairLength, octetSingleLength);
+    }
 
+    protected final void encodeNonEmptyFourBitCharacterString(int[] table, char[] ch, int offset,
+            int octetPairLength, int octetSingleLength) throws FastInfosetException, IOException {
         ensureSize(octetPairLength + octetSingleLength);
         // Encode all pairs
         int v = 0;
@@ -1533,7 +1725,6 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
         while ((1 << bitsPerCharacter) <= alphabet.length()) {
             bitsPerCharacter++;
         }
-        final int terminatingValue = (1 << bitsPerCharacter) - 1;
 
         final int bits = length * bitsPerCharacter;
         final int octets = bits / 8;
@@ -1635,7 +1826,7 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
             // _b = 0xC0 | (i >> 8); // 010 00000
             write(_b);
             write(i & 0xFF);
-        } else {
+        } else if (i < EncodingConstants.INTEGER_2ND_BIT_LARGE_LIMIT) {
             // [8257, 1048576] ( [8256, 1048575] ) 20 bits
             i -= EncodingConstants.INTEGER_2ND_BIT_MEDIUM_LIMIT;
             _b = (0x80 | EncodingConstants.INTEGER_2ND_BIT_LARGE_FLAG) | (i >> 16); // 0110 0000
@@ -1643,6 +1834,10 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
             write(_b);
             write((i >> 8) & 0xFF);
             write(i & 0xFF);
+        } else {
+            throw new IOException(
+                    CommonResourceBundle.getInstance().getString("message.integerMaxSize",
+                    new Object[]{Integer.valueOf(EncodingConstants.INTEGER_2ND_BIT_LARGE_LIMIT)}));
         }
     }
 
@@ -1833,24 +2028,32 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
             write((i >> 8) & 0xFF);
             write(i & 0xFF);
         } else {
-            throw new IOException(CommonResourceBundle.getInstance().getString("message.integerMaxSize", new Object[]{new Integer(EncodingConstants.INTEGER_MAXIMUM_SIZE)}));
+            throw new IOException(CommonResourceBundle.getInstance().getString("message.integerMaxSize", new Object[]{Integer.valueOf(EncodingConstants.INTEGER_MAXIMUM_SIZE)}));
         }
     }
 
     /**
      * Mark the current position in the buffered stream.
      */
-    protected final void mark() throws IOException {
+    protected final void mark() {
         _markIndex = _octetBufferIndex;
     }
 
     /**
      * Reset the marked position in the buffered stream.
      */
-    protected final void resetMark() throws IOException {
+    protected final void resetMark() {
         _markIndex = -1;
     }
 
+    /**
+     * @return true if the mark has been set, otherwise false if the mark
+     *         has not been set.
+     */
+    protected final boolean hasMark() {
+        return _markIndex != -1;
+    }
+
     /**
      * Write a byte to the buffered stream.
      */
@@ -2133,8 +2336,8 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
         if (!XMLChar.isSpace(ch[start])) return false;
 
         final int end = start + length;
-        start++;
-        while(start < end && XMLChar.isSpace(ch[start++]));
+        while(++start < end && XMLChar.isSpace(ch[start]));
+
         return start == end;
     }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/EncodingConstants.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/EncodingConstants.java
index db3e4266b17..e4dca13efc6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/EncodingConstants.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/EncodingConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 
 package com.sun.xml.internal.fastinfoset;
@@ -61,7 +34,6 @@ import com.sun.xml.internal.org.jvnet.fastinfoset.RestrictedAlphabet;
 
 public final class EncodingConstants {
     static {
-        initiateCharacterTables();
         initiateXMLDeclarationValues();
     }
 
@@ -69,14 +41,11 @@ public final class EncodingConstants {
     public static final int XML_NAMESPACE_PREFIX_LENGTH = XML_NAMESPACE_PREFIX.length();
     public static final String XML_NAMESPACE_NAME = "http://www.w3.org/XML/1998/namespace";
     public static final int XML_NAMESPACE_NAME_LENGTH = XML_NAMESPACE_NAME.length();
-    public static final char[] XML_NAMESPACE_NAME_CHARS = XML_NAMESPACE_NAME.toCharArray();
 
     public static final String XMLNS_NAMESPACE_PREFIX = "xmlns";
     public static final int XMLNS_NAMESPACE_PREFIX_LENGTH = XMLNS_NAMESPACE_PREFIX.length();
-    public static final char[] XMLNS_NAMESPACE_PREFIX_CHARS = XMLNS_NAMESPACE_PREFIX.toCharArray();
     public static final String XMLNS_NAMESPACE_NAME = "http://www.w3.org/2000/xmlns/";
     public static final int XMLNS_NAMESPACE_NAME_LENGTH = XMLNS_NAMESPACE_NAME.length();
-    public static final char[] XMLNS_NAMESPACE_NAME_CHARS = XMLNS_NAMESPACE_NAME.toCharArray();
 
     public static final QualifiedName DEFAULT_NAMESPACE_DECLARATION = new QualifiedName(
             "",
@@ -194,7 +163,7 @@ public final class EncodingConstants {
     public static final int OCTET_STRING_LENGTH_2ND_BIT_LARGE_FLAG = 0x60;
     public static final int OCTET_STRING_LENGTH_2ND_BIT_SMALL_MASK = 0x1F;
 
-    public static final int[] OCTET_STRING_LENGTH_2ND_BIT_VALUES = {
+    /* package */ static final int[] OCTET_STRING_LENGTH_2ND_BIT_VALUES = {
         OCTET_STRING_LENGTH_2ND_BIT_SMALL_LIMIT,
         OCTET_STRING_LENGTH_2ND_BIT_MEDIUM_LIMIT,
         OCTET_STRING_LENGTH_2ND_BIT_MEDIUM_FLAG,
@@ -210,7 +179,7 @@ public final class EncodingConstants {
     public static final int OCTET_STRING_LENGTH_5TH_BIT_LARGE_FLAG = 0x0C;
     public static final int OCTET_STRING_LENGTH_5TH_BIT_SMALL_MASK = 0x07;
 
-    public static final int[] OCTET_STRING_LENGTH_5TH_BIT_VALUES = {
+    /* package */ static final int[] OCTET_STRING_LENGTH_5TH_BIT_VALUES = {
         OCTET_STRING_LENGTH_5TH_BIT_SMALL_LIMIT,
         OCTET_STRING_LENGTH_5TH_BIT_MEDIUM_LIMIT,
         OCTET_STRING_LENGTH_5TH_BIT_MEDIUM_FLAG,
@@ -226,7 +195,7 @@ public final class EncodingConstants {
     public static final int OCTET_STRING_LENGTH_7TH_BIT_LARGE_FLAG = 0x03;
     public static final int OCTET_STRING_LENGTH_7TH_BIT_SMALL_MASK = 0x01;
 
-    public static final int[] OCTET_STRING_LENGTH_7TH_BIT_VALUES = {
+    /* package */ static final int[] OCTET_STRING_LENGTH_7TH_BIT_VALUES = {
         OCTET_STRING_LENGTH_7TH_BIT_SMALL_LIMIT,
         OCTET_STRING_LENGTH_7TH_BIT_MEDIUM_LIMIT,
         OCTET_STRING_LENGTH_7TH_BIT_MEDIUM_FLAG,
@@ -257,7 +226,7 @@ public final class EncodingConstants {
     public static final int INTEGER_2ND_BIT_MEDIUM_MASK = 0x1F;
     public static final int INTEGER_2ND_BIT_LARGE_MASK = 0x0F;
 
-    public static final int[] INTEGER_2ND_BIT_VALUES = {
+    /* package */ static final int[] INTEGER_2ND_BIT_VALUES = {
         INTEGER_2ND_BIT_SMALL_LIMIT,
         INTEGER_2ND_BIT_MEDIUM_LIMIT,
         INTEGER_2ND_BIT_LARGE_LIMIT,
@@ -280,7 +249,7 @@ public final class EncodingConstants {
     public static final int INTEGER_3RD_BIT_LARGE_MASK = 0x07;
     public static final int INTEGER_3RD_BIT_LARGE_LARGE_MASK = 0x0F;
 
-    public static final int[] INTEGER_3RD_BIT_VALUES = {
+    /* package */ static final int[] INTEGER_3RD_BIT_VALUES = {
         INTEGER_3RD_BIT_SMALL_LIMIT,
         INTEGER_3RD_BIT_MEDIUM_LIMIT,
         INTEGER_3RD_BIT_LARGE_LIMIT,
@@ -302,7 +271,7 @@ public final class EncodingConstants {
     public static final int INTEGER_4TH_BIT_MEDIUM_MASK = 0x03;
     public static final int INTEGER_4TH_BIT_LARGE_MASK = 0x03;
 
-    public static final int[] INTEGER_4TH_BIT_VALUES = {
+    /* package */ static final int[] INTEGER_4TH_BIT_VALUES = {
         INTEGER_4TH_BIT_SMALL_LIMIT,
         INTEGER_4TH_BIT_MEDIUM_LIMIT,
         INTEGER_4TH_BIT_LARGE_LIMIT,
@@ -311,44 +280,9 @@ public final class EncodingConstants {
         INTEGER_4TH_BIT_LARGE_LARGE_FLAG
     };
 
+    /* package */ static final byte[] BINARY_HEADER = {(byte)0xE0, 0, 0, 1};
 
-    public static int[] NUMERIC_CHARACTERS_TABLE;
-
-    public static int[] DATE_TIME_CHARACTERS_TABLE;
-
-    private static void initiateCharacterTables() {
-        NUMERIC_CHARACTERS_TABLE = new int[maxCharacter(RestrictedAlphabet.NUMERIC_CHARACTERS) + 1];
-        DATE_TIME_CHARACTERS_TABLE = new int[maxCharacter(RestrictedAlphabet.DATE_TIME_CHARACTERS) + 1];
-
-        for (int i = 0; i < NUMERIC_CHARACTERS_TABLE.length ; i++) {
-            NUMERIC_CHARACTERS_TABLE[i] = -1;
-        }
-        for (int i = 0; i < DATE_TIME_CHARACTERS_TABLE.length ; i++) {
-            DATE_TIME_CHARACTERS_TABLE[i] = -1;
-        }
-
-        for (int i = 0; i < RestrictedAlphabet.NUMERIC_CHARACTERS.length() ; i++) {
-            NUMERIC_CHARACTERS_TABLE[RestrictedAlphabet.NUMERIC_CHARACTERS.charAt(i)] = i;
-        }
-        for (int i = 0; i < RestrictedAlphabet.DATE_TIME_CHARACTERS.length() ; i++) {
-            DATE_TIME_CHARACTERS_TABLE[RestrictedAlphabet.DATE_TIME_CHARACTERS.charAt(i)] = i;
-        }
-    }
-
-    private static int maxCharacter(String alphabet) {
-        int c = 0;
-        for (int i = 0; i < alphabet.length() ; i++) {
-            if (c < alphabet.charAt(i)) {
-                c = alphabet.charAt(i);
-            }
-        }
-
-        return c;
-    }
-
-    public static final byte[] BINARY_HEADER = {(byte)0xE0, 0, 0, 1};
-
-    public static byte[][] XML_DECLARATION_VALUES;
+    /* package */ static byte[][] XML_DECLARATION_VALUES;
 
     private static void initiateXMLDeclarationValues() {
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/Notation.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/Notation.java
index 71de72a950f..3351c3c7ed1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/Notation.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/Notation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 package com.sun.xml.internal.fastinfoset;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/spi/runtime/WebServiceContext.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/OctetBufferListener.java
similarity index 69%
rename from jaxws/src/share/classes/com/sun/xml/internal/ws/spi/runtime/WebServiceContext.java
rename to jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/OctetBufferListener.java
index 0ddec490518..fe1199787ed 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/spi/runtime/WebServiceContext.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/OctetBufferListener.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,19 +21,22 @@
  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
+ *
+ * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
-package com.sun.xml.internal.ws.spi.runtime;
 
-import javax.xml.ws.handler.MessageContext;
+package com.sun.xml.internal.fastinfoset;
 
 /**
- * Enhanced API WebServiceContext that contains a method to set MessageContext
+ * @author Paul Sandoz
+ * @author Alexey Stashok
  */
-public interface WebServiceContext extends javax.xml.ws.WebServiceContext {
-
+public interface OctetBufferListener {
     /**
-     * Sets SPI's MessageContext
+     * Callback method that will be called before the
+     * (@link Decoder) octet buffer content is going to be changed.
+     * So it will be possible to preserve a read data by
+     * cloning, or perform other actions.
      */
-    public void setMessageContext(MessageContext ctxt);
-
+    public void onBeforeOctetBufferOverwrite();
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/QualifiedName.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/QualifiedName.java
index 8f8d22ace53..488ce38a6db 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/QualifiedName.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/QualifiedName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 
 package com.sun.xml.internal.fastinfoset;
@@ -59,18 +32,20 @@ package com.sun.xml.internal.fastinfoset;
 import javax.xml.namespace.QName;
 
 public class QualifiedName {
-    public final String prefix;
-    public final String namespaceName;
-    public final String localName;
+    public String prefix;
+    public String namespaceName;
+    public String localName;
     public String qName;
-    public final int index;
-    public final int prefixIndex;
-    public final int namespaceNameIndex;
-    public final int localNameIndex;
+    public int index;
+    public int prefixIndex;
+    public int namespaceNameIndex;
+    public int localNameIndex;
     public int attributeId;
     public int attributeHash;
     private QName qNameObject;
 
+    public QualifiedName() { }
+
     public QualifiedName(String prefix, String namespaceName, String localName, String qName) {
         this.prefix = prefix;
         this.namespaceName = namespaceName;
@@ -82,6 +57,18 @@ public class QualifiedName {
         this.localNameIndex = -1;
     }
 
+    public void set(String prefix, String namespaceName, String localName, String qName) {
+        this.prefix = prefix;
+        this.namespaceName = namespaceName;
+        this.localName = localName;
+        this.qName = qName;
+        this.index = -1;
+        this.prefixIndex = 0;
+        this.namespaceNameIndex = 0;
+        this.localNameIndex = -1;
+        this.qNameObject = null;
+    }
+
     public QualifiedName(String prefix, String namespaceName, String localName, String qName, int index) {
         this.prefix = prefix;
         this.namespaceName = namespaceName;
@@ -93,6 +80,19 @@ public class QualifiedName {
         this.localNameIndex = -1;
     }
 
+    public final QualifiedName set(String prefix, String namespaceName, String localName, String qName, int index) {
+        this.prefix = prefix;
+        this.namespaceName = namespaceName;
+        this.localName = localName;
+        this.qName = qName;
+        this.index = index;
+        this.prefixIndex = 0;
+        this.namespaceNameIndex = 0;
+        this.localNameIndex = -1;
+        this.qNameObject = null;
+        return this;
+    }
+
     public QualifiedName(String prefix, String namespaceName, String localName, String qName, int index,
             int prefixIndex, int namespaceNameIndex, int localNameIndex) {
         this.prefix = prefix;
@@ -105,6 +105,20 @@ public class QualifiedName {
         this.localNameIndex = localNameIndex;
     }
 
+    public final QualifiedName set(String prefix, String namespaceName, String localName, String qName, int index,
+            int prefixIndex, int namespaceNameIndex, int localNameIndex) {
+        this.prefix = prefix;
+        this.namespaceName = namespaceName;
+        this.localName = localName;
+        this.qName = qName;
+        this.index = index;
+        this.prefixIndex = prefixIndex + 1;
+        this.namespaceNameIndex = namespaceNameIndex + 1;
+        this.localNameIndex = localNameIndex;
+        this.qNameObject = null;
+        return this;
+    }
+
     public QualifiedName(String prefix, String namespaceName, String localName) {
         this.prefix = prefix;
         this.namespaceName = namespaceName;
@@ -116,6 +130,19 @@ public class QualifiedName {
         this.localNameIndex = -1;
     }
 
+    public final QualifiedName set(String prefix, String namespaceName, String localName) {
+        this.prefix = prefix;
+        this.namespaceName = namespaceName;
+        this.localName = localName;
+        this.qName = createQNameString(prefix, localName);
+        this.index = -1;
+        this.prefixIndex = 0;
+        this.namespaceNameIndex = 0;
+        this.localNameIndex = -1;
+        this.qNameObject = null;
+        return this;
+    }
+
     public QualifiedName(String prefix, String namespaceName, String localName,
             int prefixIndex, int namespaceNameIndex, int localNameIndex,
             char[] charBuffer) {
@@ -145,6 +172,37 @@ public class QualifiedName {
         this.index = -1;
     }
 
+    public final QualifiedName set(String prefix, String namespaceName, String localName,
+            int prefixIndex, int namespaceNameIndex, int localNameIndex,
+            char[] charBuffer) {
+        this.prefix = prefix;
+        this.namespaceName = namespaceName;
+        this.localName = localName;
+
+        if (charBuffer != null) {
+            final int l1 = prefix.length();
+            final int l2 = localName.length();
+            final int total = l1 + l2 + 1;
+            if (total < charBuffer.length) {
+                prefix.getChars(0, l1, charBuffer, 0);
+                charBuffer[l1] = ':';
+                localName.getChars(0, l2, charBuffer, l1 + 1);
+                this.qName = new String(charBuffer, 0, total);
+            } else {
+                this.qName = createQNameString(prefix, localName);
+            }
+        } else {
+            this.qName = this.localName;
+        }
+
+        this.prefixIndex = prefixIndex + 1;
+        this.namespaceNameIndex = namespaceNameIndex + 1;
+        this.localNameIndex = localNameIndex;
+        this.index = -1;
+        this.qNameObject = null;
+        return this;
+    }
+
     public QualifiedName(String prefix, String namespaceName, String localName, int index) {
         this.prefix = prefix;
         this.namespaceName = namespaceName;
@@ -156,6 +214,19 @@ public class QualifiedName {
         this.localNameIndex = -1;
     }
 
+    public final QualifiedName set(String prefix, String namespaceName, String localName, int index) {
+        this.prefix = prefix;
+        this.namespaceName = namespaceName;
+        this.localName = localName;
+        this.qName = createQNameString(prefix, localName);
+        this.index = index;
+        this.prefixIndex = 0;
+        this.namespaceNameIndex = 0;
+        this.localNameIndex = -1;
+        this.qNameObject = null;
+        return this;
+    }
+
     public QualifiedName(String prefix, String namespaceName, String localName, int index,
             int prefixIndex, int namespaceNameIndex, int localNameIndex) {
         this.prefix = prefix;
@@ -168,6 +239,20 @@ public class QualifiedName {
         this.localNameIndex = localNameIndex;
     }
 
+    public final QualifiedName set(String prefix, String namespaceName, String localName, int index,
+            int prefixIndex, int namespaceNameIndex, int localNameIndex) {
+        this.prefix = prefix;
+        this.namespaceName = namespaceName;
+        this.localName = localName;
+        this.qName = createQNameString(prefix, localName);
+        this.index = index;
+        this.prefixIndex = prefixIndex + 1;
+        this.namespaceNameIndex = namespaceNameIndex + 1;
+        this.localNameIndex = localNameIndex;
+        this.qNameObject = null;
+        return this;
+    }
+
     // Qualified Name as a Namespace Name
     public QualifiedName(String prefix, String namespaceName) {
         this.prefix = prefix;
@@ -180,6 +265,19 @@ public class QualifiedName {
         this.localNameIndex = -1;
     }
 
+    public final QualifiedName set(String prefix, String namespaceName) {
+        this.prefix = prefix;
+        this.namespaceName = namespaceName;
+        this.localName = "";
+        this.qName = "";
+        this.index = -1;
+        this.prefixIndex = 0;
+        this.namespaceNameIndex = 0;
+        this.localNameIndex = -1;
+        this.qNameObject = null;
+        return this;
+    }
+
     public final QName getQName() {
         if (qNameObject == null) {
             qNameObject = new QName(namespaceName, localName, prefix);
@@ -202,7 +300,7 @@ public class QualifiedName {
     }
 
     private final String createQNameString(String p, String l) {
-        if (p != null && p != "") {
+        if (p != null && p.length() > 0) {
             final StringBuffer b = new StringBuffer(p);
             b.append(':');
             b.append(l);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/UnparsedEntity.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/UnparsedEntity.java
index adaf428406a..62739b3486b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/UnparsedEntity.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/UnparsedEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 package com.sun.xml.internal.fastinfoset;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BASE64EncodingAlgorithm.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BASE64EncodingAlgorithm.java
index 57d5eb3906b..3eb72c6da3d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BASE64EncodingAlgorithm.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BASE64EncodingAlgorithm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,34 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 
 package com.sun.xml.internal.fastinfoset.algorithm;
 
@@ -64,7 +36,7 @@ import com.sun.xml.internal.fastinfoset.CommonResourceBundle;
 
 public class BASE64EncodingAlgorithm extends BuiltInEncodingAlgorithm {
 
-    protected static final char encodeBase64[] = {
+    /* package */ static final char encodeBase64[] = {
         'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
         'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
         'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
@@ -72,7 +44,7 @@ public class BASE64EncodingAlgorithm extends BuiltInEncodingAlgorithm {
         '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/'
     };
 
-    protected static final int decodeBase64[] = {
+    /* package */ static final int decodeBase64[] = {
         /*'+'*/ 62,
         -1, -1, -1,
         /*'/'*/ 63,
@@ -210,46 +182,10 @@ public class BASE64EncodingAlgorithm extends BuiltInEncodingAlgorithm {
             return;
         }
         final byte[] value = (byte[]) data;
-        if (value.length == 0) {
-            return;
-        }
 
-        final int partialBlockLength = value.length % 3;
-        final int blockCount = (partialBlockLength != 0) ?
-            value.length / 3 + 1 :
-            value.length / 3;
-
-        final int encodedLength = blockCount * 4;
-        s.ensureCapacity(encodedLength);
-
-        int idx = 0;
-        for (int i = 0; i < blockCount; ++i) {
-            int b1 = value[idx++] & 0xFF;
-            int b2 = (idx < value.length) ? value[idx++] & 0xFF : 0;
-            int b3 = (idx < value.length) ? value[idx++] & 0xFF : 0;
-
-            s.append(encodeBase64[b1 >> 2]);
-
-            s.append(encodeBase64[((b1 & 0x03) << 4) | (b2 >> 4)]);
-
-            s.append(encodeBase64[((b2 & 0x0f) << 2) | (b3 >> 6)]);
-
-            s.append(encodeBase64[b3 & 0x3f]);
-        }
-
-        switch (partialBlockLength) {
-            case 1 :
-                s.setCharAt(encodedLength - 1, '=');
-                s.setCharAt(encodedLength - 2, '=');
-                break;
-            case 2 :
-                s.setCharAt(encodedLength - 1, '=');
-                break;
-        }
+        convertToCharacters(value, 0, value.length, s);
     }
 
-
-
     public final int getPrimtiveLengthFromOctetLength(int octetLength) throws EncodingAlgorithmException {
         return octetLength;
     }
@@ -261,4 +197,49 @@ public class BASE64EncodingAlgorithm extends BuiltInEncodingAlgorithm {
     public final void encodeToBytes(Object array, int astart, int alength, byte[] b, int start) {
         System.arraycopy((byte[])array, astart, b, start, alength);
     }
+
+    public final void convertToCharacters(byte[] data, int offset, int length, StringBuffer s) {
+        if (data == null) {
+            return;
+        }
+        final byte[] value = data;
+        if (length == 0) {
+            return;
+        }
+
+        final int partialBlockLength = length % 3;
+        final int blockCount = (partialBlockLength != 0) ?
+            length / 3 + 1 :
+            length / 3;
+
+        final int encodedLength = blockCount * 4;
+        final int originalBufferSize = s.length();
+        s.ensureCapacity(encodedLength + originalBufferSize);
+
+        int idx = offset;
+        int lastIdx = offset + length;
+        for (int i = 0; i < blockCount; ++i) {
+            int b1 = value[idx++] & 0xFF;
+            int b2 = (idx < lastIdx) ? value[idx++] & 0xFF : 0;
+            int b3 = (idx < lastIdx) ? value[idx++] & 0xFF : 0;
+
+            s.append(encodeBase64[b1 >> 2]);
+
+            s.append(encodeBase64[((b1 & 0x03) << 4) | (b2 >> 4)]);
+
+            s.append(encodeBase64[((b2 & 0x0f) << 2) | (b3 >> 6)]);
+
+            s.append(encodeBase64[b3 & 0x3f]);
+        }
+
+        switch (partialBlockLength) {
+            case 1 :
+                s.setCharAt(originalBufferSize + encodedLength - 1, '=');
+                s.setCharAt(originalBufferSize + encodedLength - 2, '=');
+                break;
+            case 2 :
+                s.setCharAt(originalBufferSize + encodedLength - 1, '=');
+                break;
+        }
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BooleanEncodingAlgorithm.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BooleanEncodingAlgorithm.java
index 7b050d3f2d6..f6046916c75 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BooleanEncodingAlgorithm.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BooleanEncodingAlgorithm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,34 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 
 package com.sun.xml.internal.fastinfoset.algorithm;
 
@@ -132,7 +104,7 @@ public class BooleanEncodingAlgorithm extends BuiltInEncodingAlgorithm {
 
             while(bitPosition < bitPositionEnd) {
                 booleanList.add(
-                        new Boolean((value & BIT_TABLE[bitPosition++]) > 0));
+                        Boolean.valueOf((value & BIT_TABLE[bitPosition++]) > 0));
             }
 
             value = valueNext;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithm.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithm.java
index e0918fd8d39..6e12d162991 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithm.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,34 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 
 package com.sun.xml.internal.fastinfoset.algorithm;
 
@@ -86,7 +58,8 @@ public abstract class BuiltInEncodingAlgorithm implements EncodingAlgorithm {
             }
             i = m.end();
         }
-        wl.word(i, cb.length());
+        if (i != cb.length())
+            wl.word(i, cb.length());
     }
 
     public StringBuffer removeWhitespace(char[] ch, int start, int length) {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmFactory.java
index f0482d2e86e..77cdb1e5fd0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmFactory.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,34 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 
 package com.sun.xml.internal.fastinfoset.algorithm;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmState.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmState.java
index d84cccaded5..b061b19c228 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmState.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,34 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 
 package com.sun.xml.internal.fastinfoset.algorithm;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/DoubleEncodingAlgorithm.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/DoubleEncodingAlgorithm.java
index a509793e37a..0f6e4be694a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/DoubleEncodingAlgorithm.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/DoubleEncodingAlgorithm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,34 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 
 package com.sun.xml.internal.fastinfoset.algorithm;
 
@@ -73,7 +45,7 @@ public class DoubleEncodingAlgorithm extends IEEE754FloatingPointEncodingAlgorit
     public final int getPrimtiveLengthFromOctetLength(int octetLength) throws EncodingAlgorithmException {
         if (octetLength % DOUBLE_SIZE != 0) {
             throw new EncodingAlgorithmException(CommonResourceBundle.getInstance().
-                    getString("message.lengthIsNotMultipleOfDouble", new Object[]{new Integer(DOUBLE_SIZE)}));
+                    getString("message.lengthIsNotMultipleOfDouble", new Object[]{Integer.valueOf(DOUBLE_SIZE)}));
         }
 
         return octetLength / DOUBLE_SIZE;
@@ -113,7 +85,7 @@ public class DoubleEncodingAlgorithm extends IEEE754FloatingPointEncodingAlgorit
                 new WordListener() {
             public void word(int start, int end) {
                 String fStringValue = cb.subSequence(start, end).toString();
-                doubleList.add(Float.valueOf(fStringValue));
+                doubleList.add(Double.valueOf(fStringValue));
             }
         }
         );
@@ -168,17 +140,17 @@ public class DoubleEncodingAlgorithm extends IEEE754FloatingPointEncodingAlgorit
                 }
             }
 
-            final int bits =
-                    ((b[0] & 0xFF) << 56) |
-                    ((b[1] & 0xFF) << 48) |
-                    ((b[2] & 0xFF) << 40) |
-                    ((b[3] & 0xFF) << 32) |
+            final long bits =
+                    ((long)(b[0] & 0xFF) << 56) |
+                    ((long)(b[1] & 0xFF) << 48) |
+                    ((long)(b[2] & 0xFF) << 40) |
+                    ((long)(b[3] & 0xFF) << 32) |
                     ((b[4] & 0xFF) << 24) |
                     ((b[5] & 0xFF) << 16) |
                     ((b[6] & 0xFF) << 8) |
                     (b[7] & 0xFF);
 
-            doubleList.add(new Double(Double.longBitsToDouble(bits)));
+            doubleList.add(Double.valueOf(Double.longBitsToDouble(bits)));
         }
 
         return generateArrayFromList(doubleList);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/FloatEncodingAlgorithm.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/FloatEncodingAlgorithm.java
index 7a6ec0553fb..331abb2225e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/FloatEncodingAlgorithm.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/FloatEncodingAlgorithm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,34 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 
 package com.sun.xml.internal.fastinfoset.algorithm;
 
@@ -73,7 +45,7 @@ public class FloatEncodingAlgorithm extends IEEE754FloatingPointEncodingAlgorith
     public final int getPrimtiveLengthFromOctetLength(int octetLength) throws EncodingAlgorithmException {
         if (octetLength % FLOAT_SIZE != 0) {
             throw new EncodingAlgorithmException(CommonResourceBundle.getInstance().
-                    getString("message.lengthNotMultipleOfFloat", new Object[]{new Integer(FLOAT_SIZE)}));
+                    getString("message.lengthNotMultipleOfFloat", new Object[]{Integer.valueOf(FLOAT_SIZE)}));
         }
 
         return octetLength / FLOAT_SIZE;
@@ -167,7 +139,7 @@ public class FloatEncodingAlgorithm extends IEEE754FloatingPointEncodingAlgorith
                     ((b[1] & 0xFF) << 16) |
                     ((b[2] & 0xFF) << 8) |
                     (b[3] & 0xFF);
-            floatList.add(new Float(Float.intBitsToFloat(bits)));
+            floatList.add(Float.valueOf(Float.intBitsToFloat(bits)));
         }
 
         return generateArrayFromList(floatList);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/HexadecimalEncodingAlgorithm.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/HexadecimalEncodingAlgorithm.java
index 4748d2ea6d3..5ecfebb1354 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/HexadecimalEncodingAlgorithm.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/HexadecimalEncodingAlgorithm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,34 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 
 package com.sun.xml.internal.fastinfoset.algorithm;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IEEE754FloatingPointEncodingAlgorithm.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IEEE754FloatingPointEncodingAlgorithm.java
index 5d98a61d60f..ca406ef7165 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IEEE754FloatingPointEncodingAlgorithm.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IEEE754FloatingPointEncodingAlgorithm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,34 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 
 package com.sun.xml.internal.fastinfoset.algorithm;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IntEncodingAlgorithm.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IntEncodingAlgorithm.java
index 5a6f49bfd66..1a921f43cb4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IntEncodingAlgorithm.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IntEncodingAlgorithm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,34 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 
 package com.sun.xml.internal.fastinfoset.algorithm;
 
@@ -73,7 +45,7 @@ public class IntEncodingAlgorithm extends IntegerEncodingAlgorithm {
     public final int getPrimtiveLengthFromOctetLength(int octetLength) throws EncodingAlgorithmException {
         if (octetLength % INT_SIZE != 0) {
             throw new EncodingAlgorithmException(CommonResourceBundle.getInstance().
-                    getString("message.lengthNotMultipleOfInt", new Object[]{new Integer(INT_SIZE)}));
+                    getString("message.lengthNotMultipleOfInt", new Object[]{Integer.valueOf(INT_SIZE)}));
         }
 
         return octetLength / INT_SIZE;
@@ -167,7 +139,7 @@ public class IntEncodingAlgorithm extends IntegerEncodingAlgorithm {
                     ((b[1] & 0xFF) << 16) |
                     ((b[2] & 0xFF) << 8) |
                     (b[3] & 0xFF);
-            integerList.add(new Integer(i));
+            integerList.add(Integer.valueOf(i));
         }
 
         return generateArrayFromList(integerList);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IntegerEncodingAlgorithm.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IntegerEncodingAlgorithm.java
index 38b07941e0e..69b205bf9a2 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IntegerEncodingAlgorithm.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IntegerEncodingAlgorithm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,34 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 
 package com.sun.xml.internal.fastinfoset.algorithm;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/LongEncodingAlgorithm.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/LongEncodingAlgorithm.java
index cb3f9300157..61f186184b2 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/LongEncodingAlgorithm.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/LongEncodingAlgorithm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,34 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 
 package com.sun.xml.internal.fastinfoset.algorithm;
 
@@ -72,7 +44,7 @@ public class LongEncodingAlgorithm extends IntegerEncodingAlgorithm {
     public int getPrimtiveLengthFromOctetLength(int octetLength) throws EncodingAlgorithmException {
         if (octetLength % LONG_SIZE != 0) {
             throw new EncodingAlgorithmException(CommonResourceBundle.getInstance().
-                    getString("message.lengthNotMultipleOfLong", new Object[]{new Integer(LONG_SIZE)}));
+                    getString("message.lengthNotMultipleOfLong", new Object[]{Integer.valueOf(LONG_SIZE)}));
         }
 
         return octetLength / LONG_SIZE;
@@ -167,16 +139,16 @@ public class LongEncodingAlgorithm extends IntegerEncodingAlgorithm {
                 }
             }
 
-            final int l =
-                    ((b[0] & 0xFF) << 56) |
-                    ((b[1] & 0xFF) << 48) |
-                    ((b[2] & 0xFF) << 40) |
-                    ((b[3] & 0xFF) << 32) |
+            final long l =
+                    ((long)(b[0] & 0xFF) << 56) |
+                    ((long)(b[1] & 0xFF) << 48) |
+                    ((long)(b[2] & 0xFF) << 40) |
+                    ((long)(b[3] & 0xFF) << 32) |
                     ((b[4] & 0xFF) << 24) |
                     ((b[5] & 0xFF) << 16) |
                     ((b[6] & 0xFF) << 8) |
                     (b[7] & 0xFF);
-            longList.add(new Long(l));
+            longList.add(Long.valueOf(l));
         }
 
         return generateArrayFromList(longList);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/ShortEncodingAlgorithm.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/ShortEncodingAlgorithm.java
index c328fce3d72..4fb05bc4ade 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/ShortEncodingAlgorithm.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/ShortEncodingAlgorithm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,34 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 
 package com.sun.xml.internal.fastinfoset.algorithm;
 
@@ -78,7 +50,7 @@ public class ShortEncodingAlgorithm extends IntegerEncodingAlgorithm {
     public final int getPrimtiveLengthFromOctetLength(int octetLength) throws EncodingAlgorithmException {
         if (octetLength % SHORT_SIZE != 0) {
             throw new EncodingAlgorithmException(CommonResourceBundle.getInstance().
-                    getString("message.lengthNotMultipleOfShort", new Object[]{new Integer(SHORT_SIZE)}));
+                    getString("message.lengthNotMultipleOfShort", new Object[]{Integer.valueOf(SHORT_SIZE)}));
         }
 
         return octetLength / SHORT_SIZE;
@@ -168,7 +140,7 @@ public class ShortEncodingAlgorithm extends IntegerEncodingAlgorithm {
 
             final int i = ((b[0] & 0xFF) << 8) |
                     (b[1] & 0xFF);
-            shortList.add(new Short((short)i));
+            shortList.add(Short.valueOf((short)i));
         }
 
         return generateArrayFromList(shortList);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/UUIDEncodingAlgorithm.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/UUIDEncodingAlgorithm.java
index a4e079683d3..93f96130ebb 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/UUIDEncodingAlgorithm.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/UUIDEncodingAlgorithm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,34 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 package com.sun.xml.internal.fastinfoset.algorithm;
 
 import java.util.ArrayList;
@@ -66,7 +38,7 @@ public class UUIDEncodingAlgorithm extends LongEncodingAlgorithm {
     public final int getPrimtiveLengthFromOctetLength(int octetLength) throws EncodingAlgorithmException {
         if (octetLength % (LONG_SIZE * 2) != 0) {
             throw new EncodingAlgorithmException(CommonResourceBundle.getInstance().
-                    getString("message.lengthNotMultipleOfUUID",new Object[]{new Integer(LONG_SIZE * 2)}));
+                    getString("message.lengthNotMultipleOfUUID",new Object[]{Integer.valueOf(LONG_SIZE * 2)}));
         }
 
         return octetLength / LONG_SIZE;
@@ -81,8 +53,8 @@ public class UUIDEncodingAlgorithm extends LongEncodingAlgorithm {
             public void word(int start, int end) {
                 String uuidValue = cb.subSequence(start, end).toString();
                 fromUUIDString(uuidValue);
-                longList.add(new Long(_msb));
-                longList.add(new Long(_lsb));
+                longList.add(Long.valueOf(_msb));
+                longList.add(Long.valueOf(_lsb));
             }
         }
         );
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/alphabet/BuiltInRestrictedAlphabets.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/alphabet/BuiltInRestrictedAlphabets.java
index 18e19e4c493..09a36f7dbb3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/alphabet/BuiltInRestrictedAlphabets.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/alphabet/BuiltInRestrictedAlphabets.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,34 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 
 package com.sun.xml.internal.fastinfoset.alphabet;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentParser.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentParser.java
index 3076dcbf73e..fbfc0f1e64a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentParser.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,34 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 package com.sun.xml.internal.fastinfoset.dom;
 
 import com.sun.xml.internal.fastinfoset.Decoder;
@@ -175,7 +147,8 @@ public class DOMDocumentParser extends Decoder {
                 case DecoderStateTables.EII_LITERAL:
                 {
                     final QualifiedName qn = processLiteralQualifiedName(
-                                _b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK);
+                                _b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK,
+                                _elementNameTable.getNext());
                     _elementNameTable.add(qn);
                     processEII(qn, (_b & EncodingConstants.ELEMENT_ATTRIBUTE_FLAG) > 0);
                     firstElementHasOccured = true;
@@ -201,7 +174,6 @@ public class DOMDocumentParser extends Decoder {
                     while (_b == EncodingConstants.PROCESSING_INSTRUCTION) {
                         switch(decodeNonIdentifyingStringOnFirstBit()) {
                             case NISTRING_STRING:
-                                final String data = new String(_charBuffer, 0, _charBufferLength);
                                 if (_addToTable) {
                                     _v.otherString.add(new CharArray(_charBuffer, 0, _charBufferLength, true));
                                 }
@@ -314,7 +286,7 @@ public class DOMDocumentParser extends Decoder {
         }
 
         if ((_b & EncodingConstants.DOCUMENT_VERSION_FLAG) > 0) {
-            String version = decodeVersion();
+            decodeVersion();
             /*
              * TODO
              * how to report the document version?
@@ -363,7 +335,8 @@ public class DOMDocumentParser extends Decoder {
                 case DecoderStateTables.EII_LITERAL:
                 {
                     final QualifiedName qn = processLiteralQualifiedName(
-                                _b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK);
+                                _b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK,
+                                _elementNameTable.getNext());
                     _elementNameTable.add(qn);
                     processEII(qn, (_b & EncodingConstants.ELEMENT_ATTRIBUTE_FLAG) > 0);
                     break;
@@ -375,23 +348,13 @@ public class DOMDocumentParser extends Decoder {
                 {
                     _octetBufferLength = (_b & EncodingConstants.OCTET_STRING_LENGTH_7TH_BIT_SMALL_MASK)
                         + 1;
-                    String v = decodeUtf8StringAsString();
-                    if ((_b & EncodingConstants.CHARACTER_CHUNK_ADD_TO_TABLE_FLAG) > 0) {
-                        _characterContentChunkTable.add(_charBuffer, _charBufferLength);
-                    }
-
-                    _currentNode.appendChild(_document.createTextNode(v));
+                    processUtf8CharacterString();
                     break;
                 }
                 case DecoderStateTables.CII_UTF8_MEDIUM_LENGTH:
                 {
                     _octetBufferLength = read() + EncodingConstants.OCTET_STRING_LENGTH_7TH_BIT_SMALL_LIMIT;
-                    String v = decodeUtf8StringAsString();
-                    if ((_b & EncodingConstants.CHARACTER_CHUNK_ADD_TO_TABLE_FLAG) > 0) {
-                        _characterContentChunkTable.add(_charBuffer, _charBufferLength);
-                    }
-
-                    _currentNode.appendChild(_document.createTextNode(v));
+                    processUtf8CharacterString();
                     break;
                 }
                 case DecoderStateTables.CII_UTF8_LARGE_LENGTH:
@@ -401,12 +364,7 @@ public class DOMDocumentParser extends Decoder {
                         (read() << 8) |
                         read();
                     _octetBufferLength += EncodingConstants.OCTET_STRING_LENGTH_7TH_BIT_MEDIUM_LIMIT;
-                    String v = decodeUtf8StringAsString();
-                    if ((_b & EncodingConstants.CHARACTER_CHUNK_ADD_TO_TABLE_FLAG) > 0) {
-                        _characterContentChunkTable.add(_charBuffer, _charBufferLength);
-                    }
-
-                    _currentNode.appendChild(_document.createTextNode(v));
+                    processUtf8CharacterString();
                     break;
                 }
                 case DecoderStateTables.CII_UTF16_SMALL_LENGTH:
@@ -554,6 +512,21 @@ public class DOMDocumentParser extends Decoder {
         _currentNode = parentCurrentNode;
     }
 
+    private final void processUtf8CharacterString() throws FastInfosetException, IOException {
+        if ((_b & EncodingConstants.CHARACTER_CHUNK_ADD_TO_TABLE_FLAG) > 0) {
+            _characterContentChunkTable.ensureSize(_octetBufferLength);
+            final int charactersOffset = _characterContentChunkTable._arrayIndex;
+            decodeUtf8StringAsCharBuffer(_characterContentChunkTable._array, charactersOffset);
+            _characterContentChunkTable.add(_charBufferLength);
+            _currentNode.appendChild(_document.createTextNode(
+                    _characterContentChunkTable.getString(_characterContentChunkTable._cachedIndex)));
+        } else {
+            decodeUtf8StringAsCharBuffer();
+            _currentNode.appendChild(_document.createTextNode(
+                    new String(_charBuffer, 0, _charBufferLength)));
+        }
+    }
+
     protected final void processEIIWithNamespaces() throws FastInfosetException, IOException {
         final boolean hasAttributes = (_b & EncodingConstants.ELEMENT_ATTRIBUTE_FLAG) > 0;
 
@@ -608,7 +581,7 @@ public class DOMDocumentParser extends Decoder {
                     prefix = decodeIdentifyingNonEmptyStringOnFirstBitAsPrefix(false);
                     a = createAttribute(
                             EncodingConstants.XMLNS_NAMESPACE_NAME,
-                            createQualifiedNameString(EncodingConstants.XMLNS_NAMESPACE_PREFIX_CHARS, prefix),
+                            createQualifiedNameString(XMLNS_NAMESPACE_PREFIX_CHARS, prefix),
                             prefix);
                     a.setValue ("");
 
@@ -621,7 +594,7 @@ public class DOMDocumentParser extends Decoder {
                     prefix = decodeIdentifyingNonEmptyStringOnFirstBitAsPrefix(true);
                     a = createAttribute(
                             EncodingConstants.XMLNS_NAMESPACE_NAME,
-                            createQualifiedNameString(EncodingConstants.XMLNS_NAMESPACE_PREFIX_CHARS, prefix),
+                            createQualifiedNameString(XMLNS_NAMESPACE_PREFIX_CHARS, prefix),
                             prefix);
                     a.setValue (decodeIdentifyingNonEmptyStringOnFirstBitAsNamespaceName(true));
 
@@ -654,7 +627,8 @@ public class DOMDocumentParser extends Decoder {
             case DecoderStateTables.EII_LITERAL:
             {
                 final QualifiedName qn = processLiteralQualifiedName(
-                            _b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK);
+                            _b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK,
+                            _elementNameTable.getNext());
                 _elementNameTable.add(qn);
                 processEII(qn, hasAttributes);
                 break;
@@ -670,7 +644,51 @@ public class DOMDocumentParser extends Decoder {
 
     }
 
-    protected final QualifiedName processLiteralQualifiedName(int state) throws FastInfosetException, IOException {
+    protected final QualifiedName processLiteralQualifiedName(int state, QualifiedName q)
+    throws FastInfosetException, IOException {
+        if (q == null) q = new QualifiedName();
+
+        switch (state) {
+            // no prefix, no namespace
+            case 0:
+                return q.set(
+                        null,
+                        null,
+                        decodeIdentifyingNonEmptyStringOnFirstBit(_v.localName),
+                        -1,
+                        -1,
+                        _identifier,
+                        null);
+            // no prefix, namespace
+            case 1:
+                return q.set(
+                        null,
+                        decodeIdentifyingNonEmptyStringIndexOnFirstBitAsNamespaceName(false),
+                        decodeIdentifyingNonEmptyStringOnFirstBit(_v.localName),
+                        -1,
+                        _namespaceNameIndex,
+                        _identifier,
+                        null);
+            // prefix, no namespace
+            case 2:
+                throw new FastInfosetException(CommonResourceBundle.getInstance().getString("message.qNameMissingNamespaceName"));
+            // prefix, namespace
+            case 3:
+                return q.set(
+                        decodeIdentifyingNonEmptyStringIndexOnFirstBitAsPrefix(true),
+                        decodeIdentifyingNonEmptyStringIndexOnFirstBitAsNamespaceName(true),
+                        decodeIdentifyingNonEmptyStringOnFirstBit(_v.localName),
+                        _prefixIndex,
+                        _namespaceNameIndex,
+                        _identifier,
+                        _charBuffer);
+            default:
+                throw new FastInfosetException(CommonResourceBundle.getInstance().getString("message.decodingEII"));
+        }
+    }
+
+    protected final QualifiedName processLiteralQualifiedName(int state)
+    throws FastInfosetException, IOException {
         switch (state) {
             // no prefix, no namespace
             case 0:
@@ -742,7 +760,8 @@ public class DOMDocumentParser extends Decoder {
                 }
                 case DecoderStateTables.AII_LITERAL:
                     name = processLiteralQualifiedName(
-                            b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK);
+                            b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK,
+                            _attributeNameTable.getNext());
                     name.createAttributeValues(_duplicateAttributeVerifier.MAP_SIZE);
                     _attributeNameTable.add(name);
                     break;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentSerializer.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentSerializer.java
index 8b8e35cf555..7b273326d60 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentSerializer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentSerializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,42 +25,16 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 package com.sun.xml.internal.fastinfoset.dom;
 
 import com.sun.xml.internal.fastinfoset.Encoder;
 import com.sun.xml.internal.fastinfoset.EncodingConstants;
 import com.sun.xml.internal.fastinfoset.QualifiedName;
+import com.sun.xml.internal.fastinfoset.util.NamespaceContextImplementation;
 import com.sun.xml.internal.fastinfoset.util.LocalNameQualifiedNamesMap;
 import java.io.IOException;
 import com.sun.xml.internal.org.jvnet.fastinfoset.FastInfosetException;
+import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -84,6 +58,7 @@ public class DOMDocumentSerializer extends Encoder {
         switch (n.getNodeType()) {
             case Node.DOCUMENT_NODE:
                 serialize((Document)n);
+                break;
             case Node.ELEMENT_NODE:
                 serializeElementAsDocument(n);
                 break;
@@ -134,15 +109,20 @@ public class DOMDocumentSerializer extends Encoder {
         encodeDocumentTermination();
     }
 
+//    protected Node[] _namespaceAttributes = new Node[4];
 
-    protected Node[] _namespaceAttributes = new Node[4];
+    // map which will hold all current scope prefixes and associated attributes
+    // Collection of populated namespace available for current scope
+    protected NamespaceContextImplementation _namespaceScopeContext = new NamespaceContextImplementation();
     protected Node[] _attributes = new Node[32];
 
     protected final void serializeElement(Node e) throws IOException {
         encodeTermination();
 
-        int namespaceAttributesSize = 0;
         int attributesSize = 0;
+
+        _namespaceScopeContext.pushContext();
+
         if (e.hasAttributes()) {
             /*
              * Split the attribute nodes into namespace attributes
@@ -153,12 +133,12 @@ public class DOMDocumentSerializer extends Encoder {
                 final Node a = nnm.item(i);
                 final String namespaceURI = a.getNamespaceURI();
                 if (namespaceURI != null && namespaceURI.equals("http://www.w3.org/2000/xmlns/")) {
-                    if (namespaceAttributesSize == _namespaceAttributes.length) {
-                        final Node[] attributes = new Node[namespaceAttributesSize * 3 / 2 + 1];
-                        System.arraycopy(_namespaceAttributes, 0, attributes, 0, namespaceAttributesSize);
-                        _namespaceAttributes = attributes;
+                    String attrPrefix = a.getLocalName();
+                    String attrNamespace = a.getNodeValue();
+                    if (attrPrefix == "xmlns" || attrPrefix.equals("xmlns")) {
+                        attrPrefix = "";
                     }
-                    _namespaceAttributes[namespaceAttributesSize++] = a;
+                    _namespaceScopeContext.declarePrefix(attrPrefix, attrNamespace);
                 } else {
                     if (attributesSize == _attributes.length) {
                         final Node[] attributes = new Node[attributesSize * 3 / 2 + 1];
@@ -166,11 +146,25 @@ public class DOMDocumentSerializer extends Encoder {
                         _attributes = attributes;
                     }
                     _attributes[attributesSize++] = a;
+
+                    String attrNamespaceURI = a.getNamespaceURI();
+                    String attrPrefix = a.getPrefix();
+                    if (attrPrefix != null && !_namespaceScopeContext.getNamespaceURI(attrPrefix).equals(attrNamespaceURI)) {
+                        _namespaceScopeContext.declarePrefix(attrPrefix, attrNamespaceURI);
+                    }
                 }
             }
         }
 
-        if (namespaceAttributesSize > 0) {
+        String elementNamespaceURI = e.getNamespaceURI();
+        String elementPrefix = e.getPrefix();
+        if (elementPrefix == null)  elementPrefix = "";
+        if (elementNamespaceURI != null &&
+                !_namespaceScopeContext.getNamespaceURI(elementPrefix).equals(elementNamespaceURI)) {
+            _namespaceScopeContext.declarePrefix(elementPrefix, elementNamespaceURI);
+        }
+
+        if (!_namespaceScopeContext.isCurrentContextEmpty()) {
             if (attributesSize > 0) {
                 write(EncodingConstants.ELEMENT | EncodingConstants.ELEMENT_NAMESPACES_FLAG |
                         EncodingConstants.ELEMENT_ATTRIBUTE_FLAG);
@@ -178,18 +172,13 @@ public class DOMDocumentSerializer extends Encoder {
                 write(EncodingConstants.ELEMENT | EncodingConstants.ELEMENT_NAMESPACES_FLAG);
             }
 
-            // Serialize the namespace attributes
-            for (int i = 0; i < namespaceAttributesSize; i++) {
-                final Node a = _namespaceAttributes[i];
-                _namespaceAttributes[i] = null;
-                String prefix = a.getLocalName();
-                if (prefix == "xmlns" || prefix.equals("xmlns")) {
-                    prefix = "";
-                }
-                final String uri = a.getNodeValue();
+            for (int i = _namespaceScopeContext.getCurrentContextStartIndex();
+                     i < _namespaceScopeContext.getCurrentContextEndIndex(); i++) {
+
+                String prefix = _namespaceScopeContext.getPrefix(i);
+                String uri = _namespaceScopeContext.getNamespaceURI(i);
                 encodeNamespaceAttribute(prefix, uri);
             }
-
             write(EncodingConstants.TERMINATOR);
             _b = 0;
         } else {
@@ -197,7 +186,8 @@ public class DOMDocumentSerializer extends Encoder {
                 EncodingConstants.ELEMENT;
         }
 
-        String namespaceURI = e.getNamespaceURI();
+        String namespaceURI = elementNamespaceURI;
+//        namespaceURI = (namespaceURI == null) ? _namespaceScopeContext.getNamespaceURI("") : namespaceURI;
         namespaceURI = (namespaceURI == null) ? "" : namespaceURI;
         encodeElement(namespaceURI, e.getNodeName(), e.getLocalName());
 
@@ -211,7 +201,7 @@ public class DOMDocumentSerializer extends Encoder {
                 encodeAttribute(namespaceURI, a.getNodeName(), a.getLocalName());
 
                 final String value = a.getNodeValue();
-                final boolean addToTable = (value.length() < attributeValueSizeConstraint) ? true : false;
+                final boolean addToTable = isAttributeValueLengthMatchesLimit(value.length());
                 encodeNonIdentifyingStringOnFirstBit(value, _v.attributeValue, addToTable);
             }
 
@@ -244,8 +234,10 @@ public class DOMDocumentSerializer extends Encoder {
             }
         }
         encodeElementTermination();
+        _namespaceScopeContext.popContext();
     }
 
+
     protected final void serializeText(Node t) throws IOException {
         final String text = t.getNodeValue();
 
@@ -334,8 +326,7 @@ public class DOMDocumentSerializer extends Encoder {
         if (localName != null) {
             encodeLiteralElementQualifiedNameOnThirdBit(namespaceURI, getPrefixFromQualifiedName(qName),
                     localName, entry);
-        }
-        else {
+        } else {
             encodeLiteralElementQualifiedNameOnThirdBit(namespaceURI, "", qName, entry);
         }
     }
@@ -356,8 +347,7 @@ public class DOMDocumentSerializer extends Encoder {
         if (localName != null) {
             encodeLiteralAttributeQualifiedNameOnSecondBit(namespaceURI, getPrefixFromQualifiedName(qName),
                     localName, entry);
-        }
-        else {
+        } else {
             encodeLiteralAttributeQualifiedNameOnSecondBit(namespaceURI, "", qName, entry);
         }
     }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/org/apache/xerces/util/XMLChar.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/org/apache/xerces/util/XMLChar.java
index 1cd39fafa44..9bf8375248d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/org/apache/xerces/util/XMLChar.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/org/apache/xerces/util/XMLChar.java
@@ -3,7 +3,7 @@
  * DO NOT REMOVE OR ALTER!
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Portions Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
  * have any questions.
  *
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
  */
 
 /*
@@ -113,6 +112,7 @@ import java.util.Arrays;
  * @author Michael Glavassevich, IBM
  * @author Rahul Srivastava, Sun Microsystems Inc.
  *
+ * @version $Id: XMLChar.java,v 1.1 2005/04/18 12:54:47 sandoz Exp $
  */
 public class XMLChar {
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/resources/ResourceBundle.properties b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/resources/ResourceBundle.properties
index a250f51a789..e76aa6e39fb 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/resources/ResourceBundle.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/resources/ResourceBundle.properties
@@ -1,3 +1,28 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
 # Sample ResourceBundle properties file
 message.optinalValues = Optional values (other than initial vocabulary) of DII not supported
 message.noExternalVocabularies=No external vocabularies registered
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/AttributesHolder.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/AttributesHolder.java
index ed99ad6da8e..7f45b19ed40 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/AttributesHolder.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/AttributesHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 
 package com.sun.xml.internal.fastinfoset.sax;
@@ -229,6 +202,13 @@ public class AttributesHolder implements EncodingAlgorithmAttributes {
         return _algorithmData[index];
     }
 
+    public String getAlpababet(int index) {
+        return null;
+    }
+
+    public boolean getToIndex(int index) {
+        return false;
+    }
 
     // -----
 
@@ -311,4 +291,5 @@ public class AttributesHolder implements EncodingAlgorithmAttributes {
         ea.convertToCharacters(data, sb);
         return sb;
     }
+
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/Features.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/Features.java
index 014da1b3f1a..f62f881ec75 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/Features.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/Features.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 
 package com.sun.xml.internal.fastinfoset.sax;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/Properties.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/Properties.java
index f8108b2cb48..fdf47ab78c3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/Properties.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/Properties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 
 package com.sun.xml.internal.fastinfoset.sax;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentParser.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentParser.java
index f8192b11135..d69461a6f9e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentParser.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,34 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 package com.sun.xml.internal.fastinfoset.sax;
 
 import com.sun.xml.internal.fastinfoset.Decoder;
@@ -428,7 +400,10 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
         try {
             reset();
             decodeHeader();
-            processDII();
+            if (_parseFragments)
+                processDIIFragment();
+            else
+                processDII();
         } catch (RuntimeException e) {
             try {
                 _errorHandler.fatalError(new SAXParseException(e.getClass().getName(), null, e));
@@ -491,7 +466,8 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
                 case DecoderStateTables.EII_LITERAL:
                 {
                     final QualifiedName qn = decodeLiteralQualifiedName(
-                                _b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK);
+                                _b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK,
+                                _elementNameTable.getNext());
                     _elementNameTable.add(qn);
                     processEII(qn, (_b & EncodingConstants.ELEMENT_ATTRIBUTE_FLAG) > 0);
                     firstElementHasOccured = true;
@@ -517,7 +493,6 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
                     while (_b == EncodingConstants.PROCESSING_INSTRUCTION) {
                         switch(decodeNonIdentifyingStringOnFirstBit()) {
                             case NISTRING_STRING:
-                                final String data = new String(_charBuffer, 0, _charBufferLength);
                                 if (_addToTable) {
                                     _v.otherString.add(new CharArray(_charBuffer, 0, _charBufferLength, true));
                                 }
@@ -538,8 +513,8 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
                         _terminate = true;
                     }
 
-                    _notations.clear();
-                    _unparsedEntities.clear();
+                    if (_notations != null) _notations.clear();
+                    if (_unparsedEntities != null) _unparsedEntities.clear();
                     /*
                      * TODO
                      * Report All events associated with DTD, PIs, notations etc
@@ -589,6 +564,249 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
         }
     }
 
+    protected final void processDIIFragment() throws FastInfosetException, IOException {
+        try {
+            _contentHandler.startDocument();
+        } catch (SAXException e) {
+            throw new FastInfosetException("processDII", e);
+        }
+
+        _b = read();
+        if (_b > 0) {
+            processDIIOptionalProperties();
+        }
+
+        while(!_terminate) {
+            _b = read();
+            switch(DecoderStateTables.EII[_b]) {
+                case DecoderStateTables.EII_NO_AIIS_INDEX_SMALL:
+                    processEII(_elementNameTable._array[_b], false);
+                    break;
+                case DecoderStateTables.EII_AIIS_INDEX_SMALL:
+                    processEII(_elementNameTable._array[_b & EncodingConstants.INTEGER_3RD_BIT_SMALL_MASK], true);
+                    break;
+                case DecoderStateTables.EII_INDEX_MEDIUM:
+                    processEII(decodeEIIIndexMedium(), (_b & EncodingConstants.ELEMENT_ATTRIBUTE_FLAG) > 0);
+                    break;
+                case DecoderStateTables.EII_INDEX_LARGE:
+                    processEII(decodeEIIIndexLarge(), (_b & EncodingConstants.ELEMENT_ATTRIBUTE_FLAG) > 0);
+                    break;
+                case DecoderStateTables.EII_LITERAL:
+                {
+                    final QualifiedName qn = decodeLiteralQualifiedName(
+                                _b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK,
+                                _elementNameTable.getNext());
+                    _elementNameTable.add(qn);
+                    processEII(qn, (_b & EncodingConstants.ELEMENT_ATTRIBUTE_FLAG) > 0);
+                    break;
+                }
+                case DecoderStateTables.EII_NAMESPACES:
+                    processEIIWithNamespaces();
+                    break;
+                case DecoderStateTables.CII_UTF8_SMALL_LENGTH:
+                    _octetBufferLength = (_b & EncodingConstants.OCTET_STRING_LENGTH_7TH_BIT_SMALL_MASK)
+                    + 1;
+                    processUtf8CharacterString();
+                    break;
+                case DecoderStateTables.CII_UTF8_MEDIUM_LENGTH:
+                    _octetBufferLength = read() + EncodingConstants.OCTET_STRING_LENGTH_7TH_BIT_SMALL_LIMIT;
+                    processUtf8CharacterString();
+                    break;
+                case DecoderStateTables.CII_UTF8_LARGE_LENGTH:
+                    _octetBufferLength = ((read() << 24) |
+                            (read() << 16) |
+                            (read() << 8) |
+                            read())
+                            + EncodingConstants.OCTET_STRING_LENGTH_7TH_BIT_MEDIUM_LIMIT;
+                    processUtf8CharacterString();
+                    break;
+                case DecoderStateTables.CII_UTF16_SMALL_LENGTH:
+                    _octetBufferLength = (_b & EncodingConstants.OCTET_STRING_LENGTH_7TH_BIT_SMALL_MASK)
+                    + 1;
+                    decodeUtf16StringAsCharBuffer();
+                    if ((_b & EncodingConstants.CHARACTER_CHUNK_ADD_TO_TABLE_FLAG) > 0) {
+                        _characterContentChunkTable.add(_charBuffer, _charBufferLength);
+                    }
+
+                    try {
+                        _contentHandler.characters(_charBuffer, 0, _charBufferLength);
+                    } catch (SAXException e) {
+                        throw new FastInfosetException("processCII", e);
+                    }
+                    break;
+                case DecoderStateTables.CII_UTF16_MEDIUM_LENGTH:
+                    _octetBufferLength = read() + EncodingConstants.OCTET_STRING_LENGTH_7TH_BIT_SMALL_LIMIT;
+                    decodeUtf16StringAsCharBuffer();
+                    if ((_b & EncodingConstants.CHARACTER_CHUNK_ADD_TO_TABLE_FLAG) > 0) {
+                        _characterContentChunkTable.add(_charBuffer, _charBufferLength);
+                    }
+
+                    try {
+                        _contentHandler.characters(_charBuffer, 0, _charBufferLength);
+                    } catch (SAXException e) {
+                        throw new FastInfosetException("processCII", e);
+                    }
+                    break;
+                case DecoderStateTables.CII_UTF16_LARGE_LENGTH:
+                    _octetBufferLength = ((read() << 24) |
+                            (read() << 16) |
+                            (read() << 8) |
+                            read())
+                            + EncodingConstants.OCTET_STRING_LENGTH_7TH_BIT_MEDIUM_LIMIT;
+                    decodeUtf16StringAsCharBuffer();
+                    if ((_b & EncodingConstants.CHARACTER_CHUNK_ADD_TO_TABLE_FLAG) > 0) {
+                        _characterContentChunkTable.add(_charBuffer, _charBufferLength);
+                    }
+
+                    try {
+                        _contentHandler.characters(_charBuffer, 0, _charBufferLength);
+                    } catch (SAXException e) {
+                        throw new FastInfosetException("processCII", e);
+                    }
+                    break;
+                case DecoderStateTables.CII_RA:
+                {
+                    final boolean addToTable = (_b & EncodingConstants.CHARACTER_CHUNK_ADD_TO_TABLE_FLAG) > 0;
+
+                    // Decode resitricted alphabet integer
+                    _identifier = (_b & 0x02) << 6;
+                    _b = read();
+                    _identifier |= (_b & 0xFC) >> 2;
+
+                    decodeOctetsOnSeventhBitOfNonIdentifyingStringOnThirdBit(_b);
+
+                    decodeRestrictedAlphabetAsCharBuffer();
+
+                    if (addToTable) {
+                        _characterContentChunkTable.add(_charBuffer, _charBufferLength);
+                    }
+
+                    try {
+                        _contentHandler.characters(_charBuffer, 0, _charBufferLength);
+                    } catch (SAXException e) {
+                        throw new FastInfosetException("processCII", e);
+                    }
+                    break;
+                }
+                case DecoderStateTables.CII_EA:
+                {
+                    if ((_b & EncodingConstants.NISTRING_ADD_TO_TABLE_FLAG) > 0) {
+                        throw new EncodingAlgorithmException(CommonResourceBundle.getInstance().getString("message.addToTableNotSupported"));
+                    }
+
+                    // Decode encoding algorithm integer
+                    _identifier = (_b & 0x02) << 6;
+                    _b = read();
+                    _identifier |= (_b & 0xFC) >> 2;
+
+                    decodeOctetsOnSeventhBitOfNonIdentifyingStringOnThirdBit(_b);
+
+                    processCIIEncodingAlgorithm();
+                    break;
+                }
+                case DecoderStateTables.CII_INDEX_SMALL:
+                {
+                    final int index = _b & EncodingConstants.INTEGER_4TH_BIT_SMALL_MASK;
+                    try {
+                        _contentHandler.characters(_characterContentChunkTable._array,
+                                _characterContentChunkTable._offset[index],
+                                _characterContentChunkTable._length[index]);
+                    } catch (SAXException e) {
+                        throw new FastInfosetException("processCII", e);
+                    }
+                    break;
+                }
+                case DecoderStateTables.CII_INDEX_MEDIUM:
+                {
+                    final int index = (((_b & EncodingConstants.INTEGER_4TH_BIT_MEDIUM_MASK) << 8) | read())
+                            + EncodingConstants.INTEGER_4TH_BIT_SMALL_LIMIT;
+                    try {
+                        _contentHandler.characters(_characterContentChunkTable._array,
+                                _characterContentChunkTable._offset[index],
+                                _characterContentChunkTable._length[index]);
+                    } catch (SAXException e) {
+                        throw new FastInfosetException("processCII", e);
+                    }
+                    break;
+                }
+                case DecoderStateTables.CII_INDEX_LARGE:
+                {
+                    final int index = (((_b & EncodingConstants.INTEGER_4TH_BIT_LARGE_MASK) << 16) |
+                            (read() << 8) |
+                            read())
+                            + EncodingConstants.INTEGER_4TH_BIT_MEDIUM_LIMIT;
+
+                    try {
+                        _contentHandler.characters(_characterContentChunkTable._array,
+                                _characterContentChunkTable._offset[index],
+                                _characterContentChunkTable._length[index]);
+                    } catch (SAXException e) {
+                        throw new FastInfosetException("processCII", e);
+                    }
+                    break;
+                }
+                case DecoderStateTables.CII_INDEX_LARGE_LARGE:
+                {
+                    final int index = ((read() << 16) |
+                            (read() << 8) |
+                            read())
+                            + EncodingConstants.INTEGER_4TH_BIT_LARGE_LIMIT;
+
+                    try {
+                        _contentHandler.characters(_characterContentChunkTable._array,
+                                _characterContentChunkTable._offset[index],
+                                _characterContentChunkTable._length[index]);
+                    } catch (SAXException e) {
+                        throw new FastInfosetException("processCII", e);
+                    }
+                    break;
+                }
+                case DecoderStateTables.COMMENT_II:
+                    processCommentII();
+                    break;
+                case DecoderStateTables.PROCESSING_INSTRUCTION_II:
+                    processProcessingII();
+                    break;
+                case DecoderStateTables.UNEXPANDED_ENTITY_REFERENCE_II:
+                {
+                    String entity_reference_name = decodeIdentifyingNonEmptyStringOnFirstBit(_v.otherNCName);
+
+                    String system_identifier = ((_b & EncodingConstants.UNEXPANDED_ENTITY_SYSTEM_IDENTIFIER_FLAG) > 0)
+                    ? decodeIdentifyingNonEmptyStringOnFirstBit(_v.otherURI) : "";
+                    String public_identifier = ((_b & EncodingConstants.UNEXPANDED_ENTITY_PUBLIC_IDENTIFIER_FLAG) > 0)
+                    ? decodeIdentifyingNonEmptyStringOnFirstBit(_v.otherURI) : "";
+
+                    try {
+                        /*
+                         * TODO
+                         * Need to verify if the skippedEntity method:
+                         * http://java.sun.com/j2se/1.4.2/docs/api/org/xml/sax/ContentHandler.html#skippedEntity(java.lang.String)
+                         * is the correct method to call. It appears so but a more extensive
+                         * check is necessary.
+                         */
+                        _contentHandler.skippedEntity(entity_reference_name);
+                    } catch (SAXException e) {
+                        throw new FastInfosetException("processUnexpandedEntityReferenceII", e);
+                    }
+                    break;
+                }
+                case DecoderStateTables.TERMINATOR_DOUBLE:
+                    _doubleTerminate = true;
+                case DecoderStateTables.TERMINATOR_SINGLE:
+                    _terminate = true;
+                    break;
+                default:
+                    throw new FastInfosetException(CommonResourceBundle.getInstance().getString("message.IllegalStateDecodingEII"));
+            }
+        }
+
+        try {
+            _contentHandler.endDocument();
+        } catch (SAXException e) {
+            throw new FastInfosetException("processDII", e);
+        }
+    }
+
     protected final void processDIIOptionalProperties() throws FastInfosetException, IOException {
         // Optimize for the most common case
         if (_b == EncodingConstants.DOCUMENT_INITIAL_VOCABULARY_FLAG) {
@@ -647,7 +865,7 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
         }
 
         if ((_b & EncodingConstants.DOCUMENT_VERSION_FLAG) > 0) {
-            String version = decodeVersion();
+            decodeVersion();
             /*
              * TODO
              * how to report the standalone flag?
@@ -694,7 +912,8 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
                 case DecoderStateTables.EII_LITERAL:
                 {
                     final QualifiedName qn = decodeLiteralQualifiedName(
-                                _b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK);
+                                _b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK,
+                                _elementNameTable.getNext());
                     _elementNameTable.add(qn);
                     processEII(qn, (_b & EncodingConstants.ELEMENT_ATTRIBUTE_FLAG) > 0);
                     break;
@@ -705,29 +924,11 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
                 case DecoderStateTables.CII_UTF8_SMALL_LENGTH:
                     _octetBufferLength = (_b & EncodingConstants.OCTET_STRING_LENGTH_7TH_BIT_SMALL_MASK)
                     + 1;
-                    decodeUtf8StringAsCharBuffer();
-                    if ((_b & EncodingConstants.CHARACTER_CHUNK_ADD_TO_TABLE_FLAG) > 0) {
-                        _characterContentChunkTable.add(_charBuffer, _charBufferLength);
-                    }
-
-                    try {
-                        _contentHandler.characters(_charBuffer, 0, _charBufferLength);
-                    } catch (SAXException e) {
-                        throw new FastInfosetException("processCII", e);
-                    }
+                    processUtf8CharacterString();
                     break;
                 case DecoderStateTables.CII_UTF8_MEDIUM_LENGTH:
                     _octetBufferLength = read() + EncodingConstants.OCTET_STRING_LENGTH_7TH_BIT_SMALL_LIMIT;
-                    decodeUtf8StringAsCharBuffer();
-                    if ((_b & EncodingConstants.CHARACTER_CHUNK_ADD_TO_TABLE_FLAG) > 0) {
-                        _characterContentChunkTable.add(_charBuffer, _charBufferLength);
-                    }
-
-                    try {
-                        _contentHandler.characters(_charBuffer, 0, _charBufferLength);
-                    } catch (SAXException e) {
-                        throw new FastInfosetException("processCII", e);
-                    }
+                    processUtf8CharacterString();
                     break;
                 case DecoderStateTables.CII_UTF8_LARGE_LENGTH:
                     _octetBufferLength = ((read() << 24) |
@@ -735,16 +936,7 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
                             (read() << 8) |
                             read())
                             + EncodingConstants.OCTET_STRING_LENGTH_7TH_BIT_MEDIUM_LIMIT;
-                    decodeUtf8StringAsCharBuffer();
-                    if ((_b & EncodingConstants.CHARACTER_CHUNK_ADD_TO_TABLE_FLAG) > 0) {
-                        _characterContentChunkTable.add(_charBuffer, _charBufferLength);
-                    }
-
-                    try {
-                        _contentHandler.characters(_charBuffer, 0, _charBufferLength);
-                    } catch (SAXException e) {
-                        throw new FastInfosetException("processCII", e);
-                    }
+                    processUtf8CharacterString();
                     break;
                 case DecoderStateTables.CII_UTF16_SMALL_LENGTH:
                     _octetBufferLength = (_b & EncodingConstants.OCTET_STRING_LENGTH_7TH_BIT_SMALL_MASK)
@@ -936,6 +1128,27 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
         }
     }
 
+    private final void processUtf8CharacterString() throws FastInfosetException, IOException {
+        if ((_b & EncodingConstants.CHARACTER_CHUNK_ADD_TO_TABLE_FLAG) > 0) {
+            _characterContentChunkTable.ensureSize(_octetBufferLength);
+            final int charactersOffset = _characterContentChunkTable._arrayIndex;
+            decodeUtf8StringAsCharBuffer(_characterContentChunkTable._array, charactersOffset);
+            _characterContentChunkTable.add(_charBufferLength);
+            try {
+                _contentHandler.characters(_characterContentChunkTable._array, charactersOffset, _charBufferLength);
+            } catch (SAXException e) {
+                throw new FastInfosetException("processCII", e);
+            }
+        } else {
+            decodeUtf8StringAsCharBuffer();
+            try {
+                _contentHandler.characters(_charBuffer, 0, _charBufferLength);
+            } catch (SAXException e) {
+                throw new FastInfosetException("processCII", e);
+            }
+        }
+    }
+
     protected final void processEIIWithNamespaces() throws FastInfosetException, IOException {
         final boolean hasAttributes = (_b & EncodingConstants.ELEMENT_ATTRIBUTE_FLAG) > 0;
 
@@ -1032,7 +1245,8 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
             case DecoderStateTables.EII_LITERAL:
             {
                 final QualifiedName qn = decodeLiteralQualifiedName(
-                            _b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK);
+                            _b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK,
+                            _elementNameTable.getNext());
                 _elementNameTable.add(qn);
                 processEII(qn, hasAttributes);
                 break;
@@ -1089,7 +1303,8 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
                 }
                 case DecoderStateTables.AII_LITERAL:
                     name = decodeLiteralQualifiedName(
-                            b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK);
+                            b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK,
+                            _attributeNameTable.getNext());
                     name.createAttributeValues(_duplicateAttributeVerifier.MAP_SIZE);
                     _attributeNameTable.add(name);
                     break;
@@ -1352,7 +1567,7 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
             final String URI = _v.encodingAlgorithm.get(_identifier - EncodingConstants.ENCODING_ALGORITHM_APPLICATION_START);
             if (URI == null) {
                 throw new EncodingAlgorithmException(CommonResourceBundle.getInstance().
-                        getString("message.URINotPresent", new Object[]{new Integer(_identifier)}));
+                        getString("message.URINotPresent", new Object[]{Integer.valueOf(_identifier)}));
             }
 
             final EncodingAlgorithm ea = (EncodingAlgorithm)_registeredEncodingAlgorithms.get(URI);
@@ -1387,8 +1602,6 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
             int length;
             switch(_identifier) {
                 case EncodingAlgorithmIndexes.HEXADECIMAL:
-                    _primitiveHandler.bytes(_octetBuffer, _octetBufferStart, _octetBufferLength);
-                    break;
                 case EncodingAlgorithmIndexes.BASE64:
                     _primitiveHandler.bytes(_octetBuffer, _octetBufferStart, _octetBufferLength);
                     break;
@@ -1502,7 +1715,7 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
                     throw new UnsupportedOperationException("CDATA");
                 default:
                     throw new FastInfosetException(CommonResourceBundle.getInstance().
-                            getString("message.unsupportedAlgorithm", new Object[]{new Integer(_identifier)}));
+                            getString("message.unsupportedAlgorithm", new Object[]{Integer.valueOf(_identifier)}));
             }
         } catch (SAXException e) {
             throw new FastInfosetException(e);
@@ -1524,7 +1737,7 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
             final String URI = _v.encodingAlgorithm.get(_identifier - EncodingConstants.ENCODING_ALGORITHM_APPLICATION_START);
             if (URI == null) {
                 throw new EncodingAlgorithmException(CommonResourceBundle.getInstance().
-                        getString("message.URINotPresent", new Object[]{new Integer(_identifier)}));
+                        getString("message.URINotPresent", new Object[]{Integer.valueOf(_identifier)}));
             }
 
             final EncodingAlgorithm ea = (EncodingAlgorithm)_registeredEncodingAlgorithms.get(URI);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializer.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializer.java
index effce512234..97c137a432f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,34 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 package com.sun.xml.internal.fastinfoset.sax;
 
 import com.sun.xml.internal.fastinfoset.Encoder;
@@ -69,7 +41,6 @@ import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import com.sun.xml.internal.fastinfoset.CommonResourceBundle;
 
-
 /**
  * The Fast Infoset SAX serializer.
  * 
    
@@ -91,6 +62,10 @@ public class SAXDocumentSerializer extends Encoder implements FastInfosetWriter
 
     protected boolean _charactersAsCDATA = false;
 
+    protected SAXDocumentSerializer(boolean v) {
+        super(v);
+    }
+
     public SAXDocumentSerializer() {
     }
 
@@ -122,7 +97,7 @@ public class SAXDocumentSerializer extends Encoder implements FastInfosetWriter
         }
     }
 
-    public final void startPrefixMapping(String prefix, String uri) throws SAXException {
+    public void startPrefixMapping(String prefix, String uri) throws SAXException {
         try {
             if (_elementHasNamespaces == false) {
                 encodeTermination();
@@ -170,35 +145,7 @@ public class SAXDocumentSerializer extends Encoder implements FastInfosetWriter
             encodeElement(namespaceURI, qName, localName);
 
             if (attributeCount > 0) {
-                boolean addToTable;
-                String value;
-                if (atts instanceof EncodingAlgorithmAttributes) {
-                    final EncodingAlgorithmAttributes eAtts = (EncodingAlgorithmAttributes)atts;
-                    for (int i = 0; i < eAtts.getLength(); i++) {
-                        if (encodeAttribute(atts.getURI(i), atts.getQName(i), atts.getLocalName(i))) {
-                            final Object data = eAtts.getAlgorithmData(i);
-                            // If data is null then there is no algorithm data
-                            if (data == null) {
-                                value = eAtts.getValue(i);
-                                addToTable = (value.length() < attributeValueSizeConstraint) ? true : false;
-                                encodeNonIdentifyingStringOnFirstBit(value, _v.attributeValue, addToTable);
-                            } else {
-                                encodeNonIdentifyingStringOnFirstBit(eAtts.getAlgorithmURI(i),
-                                        eAtts.getAlgorithmIndex(i), data);
-                            }
-                        }
-                    }
-                } else {
-                    for (int i = 0; i < atts.getLength(); i++) {
-                        if (encodeAttribute(atts.getURI(i), atts.getQName(i), atts.getLocalName(i))) {
-                            value = atts.getValue(i);
-                            addToTable = (value.length() < attributeValueSizeConstraint) ? true : false;
-                            encodeNonIdentifyingStringOnFirstBit(value, _v.attributeValue, addToTable);
-                        }
-                    }
-                }
-                _b = EncodingConstants.TERMINATOR;
-                _terminate = true;
+                encodeAttributes(atts);
             }
         } catch (IOException e) {
             throw new SAXException("startElement", e);
@@ -207,25 +154,11 @@ public class SAXDocumentSerializer extends Encoder implements FastInfosetWriter
         }
     }
 
-    public final int countAttributes(Attributes atts) {
-        // Count attributes ignoring any in the XMLNS namespace
-        // Note, such attributes may be produced when transforming from a DOM node
-        int count = 0;
-        for (int i = 0; i < atts.getLength(); i++) {
-            final String uri = atts.getURI(i);
-            if (uri == "http://www.w3.org/2000/xmlns/" || uri.equals("http://www.w3.org/2000/xmlns/")) {
-                continue;
-            }
-            count++;
-        }
-        return count;
-    }
-
     public final void endElement(String namespaceURI, String localName, String qName) throws SAXException {
         try {
             encodeElementTermination();
         } catch (IOException e) {
-            throw new SAXException("startElement", e);
+            throw new SAXException("endElement", e);
         }
     }
 
@@ -262,7 +195,7 @@ public class SAXDocumentSerializer extends Encoder implements FastInfosetWriter
         try {
             if (getIgnoreProcesingInstructions()) return;
 
-            if (target == "") {
+            if (target.length() == 0) {
                 throw new SAXException(CommonResourceBundle.getInstance().
                         getString("message.processingInstructionTargetIsEmpty"));
             }
@@ -305,6 +238,16 @@ public class SAXDocumentSerializer extends Encoder implements FastInfosetWriter
     }
 
     public final void startDTD(String name, String publicId, String systemId) throws SAXException {
+        if (getIgnoreDTD()) return;
+
+        try {
+            encodeTermination();
+
+            encodeDocumentTypeDeclaration(publicId, systemId);
+            encodeElementTermination();
+        } catch (IOException e) {
+            throw new SAXException("startDTD", e);
+        }
     }
 
     public final void endDTD() throws SAXException {
@@ -487,7 +430,9 @@ public class SAXDocumentSerializer extends Encoder implements FastInfosetWriter
         try {
             encodeTermination();
 
-            encodeFourBitCharacters(RestrictedAlphabet.NUMERIC_CHARACTERS_INDEX, EncodingConstants.NUMERIC_CHARACTERS_TABLE, ch, start, length);
+            final boolean addToTable = isCharacterContentChunkLengthMatchesLimit(length, _v.characterContentChunk);
+            encodeFourBitCharacters(RestrictedAlphabet.NUMERIC_CHARACTERS_INDEX, NUMERIC_CHARACTERS_TABLE,
+                    ch, start, length, addToTable);
         } catch (IOException e) {
             throw new SAXException(e);
         } catch (FastInfosetException e) {
@@ -503,7 +448,9 @@ public class SAXDocumentSerializer extends Encoder implements FastInfosetWriter
         try {
             encodeTermination();
 
-            encodeFourBitCharacters(RestrictedAlphabet.DATE_TIME_CHARACTERS_INDEX, EncodingConstants.DATE_TIME_CHARACTERS_TABLE, ch, start, length);
+            final boolean addToTable = isCharacterContentChunkLengthMatchesLimit(length, _v.characterContentChunk);
+            encodeFourBitCharacters(RestrictedAlphabet.DATE_TIME_CHARACTERS_INDEX, DATE_TIME_CHARACTERS_TABLE,
+                    ch, start, length, addToTable);
         } catch (IOException e) {
             throw new SAXException(e);
         } catch (FastInfosetException e) {
@@ -519,7 +466,33 @@ public class SAXDocumentSerializer extends Encoder implements FastInfosetWriter
         try {
             encodeTermination();
 
-            encodeAlphabetCharacters(alphabet, ch, start, length);
+            final boolean addToTable = isCharacterContentChunkLengthMatchesLimit(length, _v.characterContentChunk);
+            encodeAlphabetCharacters(alphabet, ch, start, length, addToTable);
+        } catch (IOException e) {
+            throw new SAXException(e);
+        } catch (FastInfosetException e) {
+            throw new SAXException(e);
+        }
+    }
+
+    // ExtendedContentHandler
+
+    public void characters(char[] ch, int start, int length, boolean index) throws SAXException {
+        if (length <= 0) {
+            return;
+        }
+
+        if (getIgnoreWhiteSpaceTextContent() &&
+                isWhiteSpace(ch, start, length)) return;
+
+        try {
+            encodeTermination();
+
+            if (!_charactersAsCDATA) {
+                encodeNonIdentifyingStringOnThirdBit(ch, start, length, _v.characterContentChunk, index, true);
+            } else {
+                encodeCIIBuiltInAlgorithmDataAsCDATA(ch, start, length);
+            }
         } catch (IOException e) {
             throw new SAXException(e);
         } catch (FastInfosetException e) {
@@ -529,12 +502,77 @@ public class SAXDocumentSerializer extends Encoder implements FastInfosetWriter
 
 
 
-    protected final void encodeElement(String namespaceURI, String qName, String localName) throws IOException {
+    protected final int countAttributes(Attributes atts) {
+        // Count attributes ignoring any in the XMLNS namespace
+        // Note, such attributes may be produced when transforming from a DOM node
+        int count = 0;
+        for (int i = 0; i < atts.getLength(); i++) {
+            final String uri = atts.getURI(i);
+            if (uri == "http://www.w3.org/2000/xmlns/" || uri.equals("http://www.w3.org/2000/xmlns/")) {
+                continue;
+            }
+            count++;
+        }
+        return count;
+    }
+
+    protected void encodeAttributes(Attributes atts) throws IOException, FastInfosetException {
+        boolean addToTable;
+        String value;
+        if (atts instanceof EncodingAlgorithmAttributes) {
+            final EncodingAlgorithmAttributes eAtts = (EncodingAlgorithmAttributes)atts;
+            Object data;
+            String alphabet;
+            for (int i = 0; i < eAtts.getLength(); i++) {
+                if (encodeAttribute(atts.getURI(i), atts.getQName(i), atts.getLocalName(i))) {
+                    data = eAtts.getAlgorithmData(i);
+                    // If data is null then there is no algorithm data
+                    if (data == null) {
+                        value = eAtts.getValue(i);
+                        addToTable = eAtts.getToIndex(i) || isAttributeValueLengthMatchesLimit(value.length());
+
+                        alphabet = eAtts.getAlpababet(i);
+                        if (alphabet == null)
+                            encodeNonIdentifyingStringOnFirstBit(value, _v.attributeValue, addToTable);
+                        else if (alphabet == RestrictedAlphabet.DATE_TIME_CHARACTERS)
+                            encodeNonIdentifyingStringOnFirstBit(
+                                    RestrictedAlphabet.DATE_TIME_CHARACTERS_INDEX,
+                                    DATE_TIME_CHARACTERS_TABLE,
+                                    value, addToTable);
+                        else if (alphabet == RestrictedAlphabet.DATE_TIME_CHARACTERS)
+                            encodeNonIdentifyingStringOnFirstBit(
+                                    RestrictedAlphabet.NUMERIC_CHARACTERS_INDEX,
+                                    NUMERIC_CHARACTERS_TABLE,
+                                    value, addToTable);
+                        else
+                            encodeNonIdentifyingStringOnFirstBit(value, _v.attributeValue, addToTable);
+
+                    } else {
+                        encodeNonIdentifyingStringOnFirstBit(eAtts.getAlgorithmURI(i),
+                                eAtts.getAlgorithmIndex(i), data);
+                    }
+                }
+            }
+        } else {
+            for (int i = 0; i < atts.getLength(); i++) {
+                if (encodeAttribute(atts.getURI(i), atts.getQName(i), atts.getLocalName(i))) {
+                    value = atts.getValue(i);
+                    addToTable = isAttributeValueLengthMatchesLimit(value.length());
+                    encodeNonIdentifyingStringOnFirstBit(value, _v.attributeValue, addToTable);
+                }
+            }
+        }
+        _b = EncodingConstants.TERMINATOR;
+        _terminate = true;
+    }
+
+    protected void encodeElement(String namespaceURI, String qName, String localName) throws IOException {
         LocalNameQualifiedNamesMap.Entry entry = _v.elementName.obtainEntry(qName);
         if (entry._valueIndex > 0) {
             QualifiedName[] names = entry._value;
             for (int i = 0; i < entry._valueIndex; i++) {
-                if ((namespaceURI == names[i].namespaceName || namespaceURI.equals(names[i].namespaceName))) {
+                final QualifiedName n = names[i];
+                if ((namespaceURI == n.namespaceName || namespaceURI.equals(n.namespaceName))) {
                     encodeNonZeroIntegerOnThirdBit(names[i].index);
                     return;
                 }
@@ -545,7 +583,7 @@ public class SAXDocumentSerializer extends Encoder implements FastInfosetWriter
                 localName, entry);
     }
 
-    protected final boolean encodeAttribute(String namespaceURI, String qName, String localName) throws IOException {
+    protected boolean encodeAttribute(String namespaceURI, String qName, String localName) throws IOException {
         LocalNameQualifiedNamesMap.Entry entry = _v.attributeName.obtainEntry(qName);
         if (entry._valueIndex > 0) {
             QualifiedName[] names = entry._value;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializerWithPrefixMapping.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializerWithPrefixMapping.java
new file mode 100644
index 00000000000..c943b3a5ff7
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializerWithPrefixMapping.java
@@ -0,0 +1,271 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
+ */
+
+package com.sun.xml.internal.fastinfoset.sax;
+
+import com.sun.xml.internal.fastinfoset.EncodingConstants;
+import com.sun.xml.internal.fastinfoset.QualifiedName;
+import com.sun.xml.internal.fastinfoset.util.KeyIntMap;
+import com.sun.xml.internal.fastinfoset.util.LocalNameQualifiedNamesMap;
+import com.sun.xml.internal.fastinfoset.util.StringIntMap;
+import java.io.IOException;
+import java.util.HashMap;
+import org.xml.sax.SAXException;
+import java.util.Map;
+import com.sun.xml.internal.org.jvnet.fastinfoset.FastInfosetException;
+import com.sun.xml.internal.org.jvnet.fastinfoset.RestrictedAlphabet;
+import com.sun.xml.internal.org.jvnet.fastinfoset.sax.EncodingAlgorithmAttributes;
+import org.xml.sax.Attributes;
+
+/**
+ * The Fast Infoset SAX serializer that maps prefixes to user specified prefixes
+ * that are specified in a namespace URI to prefix map.
+ * 
    
+ * This serializer will not preserve the original prefixes and this serializer
+ * should not be used when prefixes need to be preserved, such as the case
+ * when there are qualified names in content.
+ * 
    
+ * A namespace URI to prefix map is utilized such that the prefixes
+ * in the map are utilized rather than the prefixes specified in
+ * the qualified name for elements and attributes.
+ * 
    
+ * Any namespace declarations with a namespace URI that is not present in
+ * the map are added.
+ * 
    
+ */
+public class SAXDocumentSerializerWithPrefixMapping extends SAXDocumentSerializer {
+    protected Map _namespaceToPrefixMapping;
+    protected Map _prefixToPrefixMapping;
+    protected String _lastCheckedNamespace;
+    protected String _lastCheckedPrefix;
+
+    protected StringIntMap _declaredNamespaces;
+
+    public SAXDocumentSerializerWithPrefixMapping(Map namespaceToPrefixMapping) {
+        // Use the local name to look up elements/attributes
+        super(true);
+        _namespaceToPrefixMapping = new HashMap(namespaceToPrefixMapping);
+        _prefixToPrefixMapping = new HashMap();
+
+        // Empty prefix
+        _namespaceToPrefixMapping.put("", "");
+        // 'xml' prefix
+        _namespaceToPrefixMapping.put(EncodingConstants.XML_NAMESPACE_NAME, EncodingConstants.XML_NAMESPACE_PREFIX);
+
+        _declaredNamespaces = new StringIntMap(4);
+    }
+
+    public final void startPrefixMapping(String prefix, String uri) throws SAXException {
+        try {
+            if (_elementHasNamespaces == false) {
+                encodeTermination();
+
+                // Mark the current buffer position to flag attributes if necessary
+                mark();
+                _elementHasNamespaces = true;
+
+                // Write out Element byte with namespaces
+                write(EncodingConstants.ELEMENT | EncodingConstants.ELEMENT_NAMESPACES_FLAG);
+
+                _declaredNamespaces.clear();
+                _declaredNamespaces.obtainIndex(uri);
+            } else {
+                if (_declaredNamespaces.obtainIndex(uri) != KeyIntMap.NOT_PRESENT) {
+                    final String p = getPrefix(uri);
+                    if (p != null) {
+                        _prefixToPrefixMapping.put(prefix, p);
+                    }
+                    return;
+                }
+            }
+
+            final String p = getPrefix(uri);
+            if (p != null) {
+                encodeNamespaceAttribute(p, uri);
+                _prefixToPrefixMapping.put(prefix, p);
+            } else {
+                putPrefix(uri, prefix);
+                encodeNamespaceAttribute(prefix, uri);
+            }
+
+        } catch (IOException e) {
+            throw new SAXException("startElement", e);
+        }
+    }
+
+    protected final void encodeElement(String namespaceURI, String qName, String localName) throws IOException {
+        LocalNameQualifiedNamesMap.Entry entry = _v.elementName.obtainEntry(localName);
+        if (entry._valueIndex > 0) {
+            if (encodeElementMapEntry(entry, namespaceURI)) return;
+            // Check the entry is a member of the read only map
+            if (_v.elementName.isQNameFromReadOnlyMap(entry._value[0])) {
+                entry = _v.elementName.obtainDynamicEntry(localName);
+                if (entry._valueIndex > 0) {
+                    if (encodeElementMapEntry(entry, namespaceURI)) return;
+                }
+            }
+        }
+
+        encodeLiteralElementQualifiedNameOnThirdBit(namespaceURI, getPrefix(namespaceURI),
+                localName, entry);
+    }
+
+    protected boolean encodeElementMapEntry(LocalNameQualifiedNamesMap.Entry entry, String namespaceURI) throws IOException {
+        QualifiedName[] names = entry._value;
+        for (int i = 0; i < entry._valueIndex; i++) {
+            if ((namespaceURI == names[i].namespaceName || namespaceURI.equals(names[i].namespaceName))) {
+                encodeNonZeroIntegerOnThirdBit(names[i].index);
+                return true;
+            }
+        }
+        return false;
+    }
+
+
+    protected final void encodeAttributes(Attributes atts) throws IOException, FastInfosetException {
+        boolean addToTable;
+        String value;
+        if (atts instanceof EncodingAlgorithmAttributes) {
+            final EncodingAlgorithmAttributes eAtts = (EncodingAlgorithmAttributes)atts;
+            Object data;
+            String alphabet;
+            for (int i = 0; i < eAtts.getLength(); i++) {
+                final String uri = atts.getURI(i);
+                if (encodeAttribute(uri, atts.getQName(i), atts.getLocalName(i))) {
+                    data = eAtts.getAlgorithmData(i);
+                    // If data is null then there is no algorithm data
+                    if (data == null) {
+                        value = eAtts.getValue(i);
+                        addToTable = eAtts.getToIndex(i) || isAttributeValueLengthMatchesLimit(value.length());
+
+                        alphabet = eAtts.getAlpababet(i);
+                        if (alphabet == null) {
+                            if (uri == "http://www.w3.org/2001/XMLSchema-instance" ||
+                                    uri.equals("http://www.w3.org/2001/XMLSchema-instance")) {
+                                value = convertQName(value);
+                            }
+                            encodeNonIdentifyingStringOnFirstBit(value, _v.attributeValue, addToTable);
+                        } else if (alphabet == RestrictedAlphabet.DATE_TIME_CHARACTERS)
+                            encodeNonIdentifyingStringOnFirstBit(
+                                    RestrictedAlphabet.DATE_TIME_CHARACTERS_INDEX,
+                                    DATE_TIME_CHARACTERS_TABLE,
+                                    value, addToTable);
+                        else if (alphabet == RestrictedAlphabet.DATE_TIME_CHARACTERS)
+                            encodeNonIdentifyingStringOnFirstBit(
+                                    RestrictedAlphabet.NUMERIC_CHARACTERS_INDEX,
+                                    NUMERIC_CHARACTERS_TABLE,
+                                    value, addToTable);
+                        else
+                            encodeNonIdentifyingStringOnFirstBit(value, _v.attributeValue, addToTable);
+
+                    } else {
+                        encodeNonIdentifyingStringOnFirstBit(eAtts.getAlgorithmURI(i),
+                                eAtts.getAlgorithmIndex(i), data);
+                    }
+                }
+            }
+        } else {
+            for (int i = 0; i < atts.getLength(); i++) {
+                final String uri = atts.getURI(i);
+                if (encodeAttribute(atts.getURI(i), atts.getQName(i), atts.getLocalName(i))) {
+                    value = atts.getValue(i);
+                    addToTable = isAttributeValueLengthMatchesLimit(value.length());
+
+                    if (uri == "http://www.w3.org/2001/XMLSchema-instance" ||
+                            uri.equals("http://www.w3.org/2001/XMLSchema-instance")) {
+                        value = convertQName(value);
+                    }
+                    encodeNonIdentifyingStringOnFirstBit(value, _v.attributeValue, addToTable);
+                }
+            }
+        }
+        _b = EncodingConstants.TERMINATOR;
+        _terminate = true;
+    }
+
+    private String convertQName(String qName) {
+        int i = qName.indexOf(':');
+        String prefix = "";
+        String localName = qName;
+        if (i != -1) {
+            prefix = qName.substring(0, i);
+            localName = qName.substring(i + 1);
+        }
+
+        String p = (String)_prefixToPrefixMapping.get(prefix);
+        if (p != null) {
+            if (p.length() == 0)
+                return localName;
+            else
+                return p + ":" + localName;
+        } else {
+            return qName;
+        }
+    }
+
+    protected final boolean encodeAttribute(String namespaceURI, String qName, String localName) throws IOException {
+        LocalNameQualifiedNamesMap.Entry entry = _v.attributeName.obtainEntry(localName);
+        if (entry._valueIndex > 0) {
+            if (encodeAttributeMapEntry(entry, namespaceURI)) return true;
+            // Check the entry is a member of the read only map
+            if (_v.attributeName.isQNameFromReadOnlyMap(entry._value[0])) {
+                entry = _v.attributeName.obtainDynamicEntry(localName);
+                if (entry._valueIndex > 0) {
+                    if (encodeAttributeMapEntry(entry, namespaceURI)) return true;
+                }
+            }
+        }
+
+        return encodeLiteralAttributeQualifiedNameOnSecondBit(namespaceURI, getPrefix(namespaceURI),
+                localName, entry);
+    }
+
+    protected boolean encodeAttributeMapEntry(LocalNameQualifiedNamesMap.Entry entry, String namespaceURI) throws IOException {
+        QualifiedName[] names = entry._value;
+        for (int i = 0; i < entry._valueIndex; i++) {
+            if ((namespaceURI == names[i].namespaceName || namespaceURI.equals(names[i].namespaceName))) {
+                encodeNonZeroIntegerOnSecondBitFirstBitZero(names[i].index);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    protected final String getPrefix(String namespaceURI) {
+        if (_lastCheckedNamespace == namespaceURI) return _lastCheckedPrefix;
+
+        _lastCheckedNamespace = namespaceURI;
+        return _lastCheckedPrefix = (String)_namespaceToPrefixMapping.get(namespaceURI);
+    }
+
+    protected final void putPrefix(String namespaceURI, String prefix) {
+        _namespaceToPrefixMapping.put(namespaceURI, prefix);
+
+        _lastCheckedNamespace = namespaceURI;
+        _lastCheckedPrefix = prefix;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/SystemIdResolver.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/SystemIdResolver.java
index d242d948afa..db4df229a30 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/SystemIdResolver.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/SystemIdResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 
 package com.sun.xml.internal.fastinfoset.sax;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/EventLocation.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/EventLocation.java
index 3731c41ffd4..60168381c71 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/EventLocation.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/EventLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 package com.sun.xml.internal.fastinfoset.stax;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentParser.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentParser.java
index 912be44a899..fd13d2fced3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentParser.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,39 +25,12 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 package com.sun.xml.internal.fastinfoset.stax;
 
 import com.sun.xml.internal.fastinfoset.Decoder;
 import com.sun.xml.internal.fastinfoset.DecoderStateTables;
 import com.sun.xml.internal.fastinfoset.EncodingConstants;
+import com.sun.xml.internal.fastinfoset.OctetBufferListener;
 import com.sun.xml.internal.fastinfoset.QualifiedName;
 import com.sun.xml.internal.fastinfoset.algorithm.BuiltInEncodingAlgorithmFactory;
 import com.sun.xml.internal.fastinfoset.sax.AttributesHolder;
@@ -78,6 +51,7 @@ import com.sun.xml.internal.org.jvnet.fastinfoset.EncodingAlgorithmIndexes;
 import com.sun.xml.internal.org.jvnet.fastinfoset.FastInfosetException;
 import com.sun.xml.internal.fastinfoset.CommonResourceBundle;
 import com.sun.xml.internal.fastinfoset.org.apache.xerces.util.XMLChar;
+import com.sun.xml.internal.org.jvnet.fastinfoset.stax.FastInfosetStreamReader;
 
 /**
  * The Fast Infoset StAX parser.
@@ -89,7 +63,8 @@ import com.sun.xml.internal.fastinfoset.org.apache.xerces.util.XMLChar;
  * More than one fast infoset document may be decoded from the
  * {@link java.io.InputStream}.
  */
-public class StAXDocumentParser extends Decoder implements XMLStreamReader {
+public class StAXDocumentParser extends Decoder
+        implements XMLStreamReader, FastInfosetStreamReader, OctetBufferListener {
     protected static final int INTERNAL_STATE_START_DOCUMENT = 0;
     protected static final int INTERNAL_STATE_START_ELEMENT_TERMINATE = 1;
     protected static final int INTERNAL_STATE_SINGLE_TERMINATE_ELEMENT_WITH_NAMESPACES = 2;
@@ -143,6 +118,7 @@ public class StAXDocumentParser extends Decoder implements XMLStreamReader {
 
     protected String _algorithmURI;
     protected int _algorithmId;
+    protected boolean _isAlgorithmDataCloned;
     protected byte[] _algorithmData;
     protected int _algorithmDataOffset;
     protected int _algorithmDataLength;
@@ -161,11 +137,13 @@ public class StAXDocumentParser extends Decoder implements XMLStreamReader {
 
     public StAXDocumentParser() {
         reset();
+        _manager = new StAXManager(StAXManager.CONTEXT_READER);
     }
 
     public StAXDocumentParser(InputStream s) {
         this();
         setInputStream(s);
+        _manager = new StAXManager(StAXManager.CONTEXT_READER);
     }
 
     public StAXDocumentParser(InputStream s, StAXManager manager) {
@@ -181,7 +159,7 @@ public class StAXDocumentParser extends Decoder implements XMLStreamReader {
     public void reset() {
         super.reset();
         if (_internalState != INTERNAL_STATE_START_DOCUMENT &&
-            _internalState != INTERNAL_STATE_END_DOCUMENT) {
+                _internalState != INTERNAL_STATE_END_DOCUMENT) {
 
             for (int i = _namespaceAIIsIndex - 1; i >= 0; i--) {
                 _prefixTable.popScopeWithPrefixEntry(_namespaceAIIsPrefixIndex[i]);
@@ -220,7 +198,7 @@ public class StAXDocumentParser extends Decoder implements XMLStreamReader {
     // -- XMLStreamReader Interface -------------------------------------------
 
     public Object getProperty(java.lang.String name)
-            throws java.lang.IllegalArgumentException {
+    throws java.lang.IllegalArgumentException {
         if (_manager != null) {
             return _manager.getProperty(name);
         }
@@ -276,8 +254,8 @@ public class StAXDocumentParser extends Decoder implements XMLStreamReader {
                         popStack();
 
                         _internalState = (_currentNamespaceAIIsEnd > 0) ?
-                                INTERNAL_STATE_SINGLE_TERMINATE_ELEMENT_WITH_NAMESPACES :
-                                INTERNAL_STATE_VOID;
+                            INTERNAL_STATE_SINGLE_TERMINATE_ELEMENT_WITH_NAMESPACES :
+                            INTERNAL_STATE_VOID;
                         return _eventType = END_ELEMENT;
                     case INTERNAL_STATE_END_DOCUMENT:
                         throw new NoSuchElementException(CommonResourceBundle.getInstance().getString("message.noMoreEvents"));
@@ -307,7 +285,8 @@ public class StAXDocumentParser extends Decoder implements XMLStreamReader {
                 case DecoderStateTables.EII_LITERAL:
                 {
                     final QualifiedName qn = processLiteralQualifiedName(
-                                b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK);
+                            b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK,
+                            _elementNameTable.getNext());
                     _elementNameTable.add(qn);
                     processEII(qn, (b & EncodingConstants.ELEMENT_ATTRIBUTE_FLAG) > 0);
                     return _eventType;
@@ -317,7 +296,7 @@ public class StAXDocumentParser extends Decoder implements XMLStreamReader {
                     return _eventType;
                 case DecoderStateTables.CII_UTF8_SMALL_LENGTH:
                     _octetBufferLength = (b & EncodingConstants.OCTET_STRING_LENGTH_7TH_BIT_SMALL_MASK)
-                            + 1;
+                    + 1;
                     processUtf8CharacterString(b);
                     return _eventType = CHARACTERS;
                 case DecoderStateTables.CII_UTF8_MEDIUM_LENGTH:
@@ -351,7 +330,7 @@ public class StAXDocumentParser extends Decoder implements XMLStreamReader {
                     return _eventType = CHARACTERS;
                 case DecoderStateTables.CII_RA:
                 {
-                    final boolean addToTable = (_b & EncodingConstants.CHARACTER_CHUNK_ADD_TO_TABLE_FLAG) > 0;
+                    final boolean addToTable = (b & EncodingConstants.CHARACTER_CHUNK_ADD_TO_TABLE_FLAG) > 0;
 
                     _identifier = (b & 0x02) << 6;
                     final int b2 = read();
@@ -399,7 +378,7 @@ public class StAXDocumentParser extends Decoder implements XMLStreamReader {
                 case DecoderStateTables.CII_INDEX_MEDIUM:
                 {
                     final int index = (((b & EncodingConstants.INTEGER_4TH_BIT_MEDIUM_MASK) << 8) | read())
-                            + EncodingConstants.INTEGER_4TH_BIT_SMALL_LIMIT;
+                    + EncodingConstants.INTEGER_4TH_BIT_SMALL_LIMIT;
                     _characterContentChunkTable._cachedIndex = index;
 
                     _characters = _characterContentChunkTable._array;
@@ -488,11 +467,14 @@ public class StAXDocumentParser extends Decoder implements XMLStreamReader {
     }
 
     private final void processUtf8CharacterString(final int b) throws IOException {
-        decodeUtf8StringAsCharBuffer();
         if ((b & EncodingConstants.CHARACTER_CHUNK_ADD_TO_TABLE_FLAG) > 0) {
-            _charactersOffset = _characterContentChunkTable.add(_charBuffer, _charBufferLength);
+            _characterContentChunkTable.ensureSize(_octetBufferLength);
             _characters = _characterContentChunkTable._array;
+            _charactersOffset = _characterContentChunkTable._arrayIndex;
+            decodeUtf8StringAsCharBuffer(_characterContentChunkTable._array, _charactersOffset);
+            _characterContentChunkTable.add(_charBufferLength);
         } else {
+            decodeUtf8StringAsCharBuffer();
             _characters = _charBuffer;
             _charactersOffset = 0;
         }
@@ -549,7 +531,7 @@ public class StAXDocumentParser extends Decoder implements XMLStreamReader {
                     CommonResourceBundle.getInstance().getString("message.mustBeOnSTARTELEMENT"), getLocation());
         }
         //current is StartElement, move to the next
-        int eventType = next();
+        next();
         return getElementText(true);
     }
     /**
@@ -599,7 +581,7 @@ public class StAXDocumentParser extends Decoder implements XMLStreamReader {
      * @throws XMLStreamException if the current event is not white space
      */
     public final int nextTag() throws XMLStreamException {
-        int eventType = next();
+        next();
         return nextTag(true);
     }
     /** if the current tag has already read, such as in the case EventReader's
@@ -628,6 +610,10 @@ public class StAXDocumentParser extends Decoder implements XMLStreamReader {
     }
 
     public void close() throws XMLStreamException {
+        try {
+            super.closeIfRequired();
+        } catch (IOException ex) {
+        }
     }
 
     public final String getNamespaceURI(String prefix) {
@@ -993,7 +979,88 @@ public class StAXDocumentParser extends Decoder implements XMLStreamReader {
         }
     }
 
+    // FastInfosetStreamReader impl
 
+    public final int peekNext() throws XMLStreamException {
+        try {
+            switch(DecoderStateTables.EII[peek(this)]) {
+                case DecoderStateTables.EII_NO_AIIS_INDEX_SMALL:
+                case DecoderStateTables.EII_AIIS_INDEX_SMALL:
+                case DecoderStateTables.EII_INDEX_MEDIUM:
+                case DecoderStateTables.EII_INDEX_LARGE:
+                case DecoderStateTables.EII_LITERAL:
+                case DecoderStateTables.EII_NAMESPACES:
+                    return START_ELEMENT;
+                case DecoderStateTables.CII_UTF8_SMALL_LENGTH:
+                case DecoderStateTables.CII_UTF8_MEDIUM_LENGTH:
+                case DecoderStateTables.CII_UTF8_LARGE_LENGTH:
+                case DecoderStateTables.CII_UTF16_SMALL_LENGTH:
+                case DecoderStateTables.CII_UTF16_MEDIUM_LENGTH:
+                case DecoderStateTables.CII_UTF16_LARGE_LENGTH:
+                case DecoderStateTables.CII_RA:
+                case DecoderStateTables.CII_EA:
+                case DecoderStateTables.CII_INDEX_SMALL:
+                case DecoderStateTables.CII_INDEX_MEDIUM:
+                case DecoderStateTables.CII_INDEX_LARGE:
+                case DecoderStateTables.CII_INDEX_LARGE_LARGE:
+                    return CHARACTERS;
+                case DecoderStateTables.COMMENT_II:
+                    return COMMENT;
+                case DecoderStateTables.PROCESSING_INSTRUCTION_II:
+                    return PROCESSING_INSTRUCTION;
+                case DecoderStateTables.UNEXPANDED_ENTITY_REFERENCE_II:
+                    return ENTITY_REFERENCE;
+                case DecoderStateTables.TERMINATOR_DOUBLE:
+                case DecoderStateTables.TERMINATOR_SINGLE:
+                    return (_stackCount != -1) ? END_ELEMENT : END_DOCUMENT;
+                default:
+                    throw new FastInfosetException(
+                            CommonResourceBundle.getInstance().getString("message.IllegalStateDecodingEII"));
+            }
+        } catch (IOException e) {
+            throw new XMLStreamException(e);
+        } catch (FastInfosetException e) {
+            throw new XMLStreamException(e);
+        }
+    }
+
+    public void onBeforeOctetBufferOverwrite() {
+        if (_algorithmData != null) {
+            _algorithmData = getTextAlgorithmBytesClone();
+            _algorithmDataOffset = 0;
+            _isAlgorithmDataCloned = true;
+        }
+    }
+
+    // Faster access methods without checks
+
+    public final int accessNamespaceCount() {
+        return (_currentNamespaceAIIsEnd > 0) ? (_currentNamespaceAIIsEnd - _currentNamespaceAIIsStart) : 0;
+    }
+
+    public final String accessLocalName() {
+        return _qualifiedName.localName;
+    }
+
+    public final String accessNamespaceURI() {
+        return _qualifiedName.namespaceName;
+    }
+
+    public final String accessPrefix() {
+        return _qualifiedName.prefix;
+    }
+
+    public final char[] accessTextCharacters() {
+        return _characters;
+    }
+
+    public final int accessTextStart() {
+        return _charactersOffset;
+    }
+
+    public final int accessTextLength() {
+        return _charBufferLength;
+    }
 
     //
 
@@ -1058,7 +1125,7 @@ public class StAXDocumentParser extends Decoder implements XMLStreamReader {
         }
 
         if ((b & EncodingConstants.DOCUMENT_VERSION_FLAG) > 0) {
-            String version = decodeVersion();
+            decodeVersion();
             /*
              * TODO
              * how to report the standalone flag?
@@ -1104,8 +1171,8 @@ public class StAXDocumentParser extends Decoder implements XMLStreamReader {
 
                     _namespaceNameIndex = _prefixIndex = _namespaceAIIsPrefixIndex[_namespaceAIIsIndex++] = -1;
                     break;
-                // no prefix, namespace
-                // Declaration of default namespace
+                    // no prefix, namespace
+                    // Declaration of default namespace
                 case 1:
                     prefix = _namespaceAIIsPrefix[_namespaceAIIsIndex] = "";
                     namespaceName = _namespaceAIIsNamespaceName[_namespaceAIIsIndex] =
@@ -1113,8 +1180,8 @@ public class StAXDocumentParser extends Decoder implements XMLStreamReader {
 
                     _prefixIndex = _namespaceAIIsPrefixIndex[_namespaceAIIsIndex++] = -1;
                     break;
-                // prefix, no namespace
-                // Undeclaration of namespace
+                    // prefix, no namespace
+                    // Undeclaration of namespace
                 case 2:
                     prefix = _namespaceAIIsPrefix[_namespaceAIIsIndex] =
                             decodeIdentifyingNonEmptyStringOnFirstBitAsPrefix(false);
@@ -1123,8 +1190,8 @@ public class StAXDocumentParser extends Decoder implements XMLStreamReader {
                     _namespaceNameIndex = -1;
                     _namespaceAIIsPrefixIndex[_namespaceAIIsIndex++] = _prefixIndex;
                     break;
-                // prefix, namespace
-                // Declaration of prefixed namespace
+                    // prefix, namespace
+                    // Declaration of prefixed namespace
                 case 3:
                     prefix = _namespaceAIIsPrefix[_namespaceAIIsIndex] =
                             decodeIdentifyingNonEmptyStringOnFirstBitAsPrefix(true);
@@ -1159,7 +1226,8 @@ public class StAXDocumentParser extends Decoder implements XMLStreamReader {
             case DecoderStateTables.EII_LITERAL:
             {
                 final QualifiedName qn = processLiteralQualifiedName(
-                            b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK);
+                        b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK,
+                        _elementNameTable.getNext());
                 _elementNameTable.add(qn);
                 processEII(qn, hasAttributes);
                 break;
@@ -1227,20 +1295,21 @@ public class StAXDocumentParser extends Decoder implements XMLStreamReader {
                 case DecoderStateTables.AII_INDEX_MEDIUM:
                 {
                     final int i = (((b & EncodingConstants.INTEGER_2ND_BIT_MEDIUM_MASK) << 8) | read())
-                            + EncodingConstants.INTEGER_2ND_BIT_SMALL_LIMIT;
+                    + EncodingConstants.INTEGER_2ND_BIT_SMALL_LIMIT;
                     name = _attributeNameTable._array[i];
                     break;
                 }
                 case DecoderStateTables.AII_INDEX_LARGE:
                 {
                     final int i = (((b & EncodingConstants.INTEGER_2ND_BIT_LARGE_MASK) << 16) | (read() << 8) | read())
-                            + EncodingConstants.INTEGER_2ND_BIT_MEDIUM_LIMIT;
+                    + EncodingConstants.INTEGER_2ND_BIT_MEDIUM_LIMIT;
                     name = _attributeNameTable._array[i];
                     break;
                 }
                 case DecoderStateTables.AII_LITERAL:
                     name = processLiteralQualifiedName(
-                            b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK);
+                            b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK,
+                            _attributeNameTable.getNext());
                     name.createAttributeValues(_duplicateAttributeVerifier.MAP_SIZE);
                     _attributeNameTable.add(name);
                     break;
@@ -1396,7 +1465,7 @@ public class StAXDocumentParser extends Decoder implements XMLStreamReader {
 
     protected final QualifiedName processEIIIndexMedium(int b) throws FastInfosetException, IOException {
         final int i = (((b & EncodingConstants.INTEGER_3RD_BIT_MEDIUM_MASK) << 8) | read())
-            + EncodingConstants.INTEGER_3RD_BIT_SMALL_LIMIT;
+        + EncodingConstants.INTEGER_3RD_BIT_SMALL_LIMIT;
         return _elementNameTable._array[i];
     }
 
@@ -1405,20 +1474,23 @@ public class StAXDocumentParser extends Decoder implements XMLStreamReader {
         if ((b & EncodingConstants.INTEGER_3RD_BIT_LARGE_LARGE_FLAG) == 0x20) {
             // EII large index
             i = (((b & EncodingConstants.INTEGER_3RD_BIT_LARGE_MASK) << 16) | (read() << 8) | read())
-                + EncodingConstants.INTEGER_3RD_BIT_MEDIUM_LIMIT;
+            + EncodingConstants.INTEGER_3RD_BIT_MEDIUM_LIMIT;
         } else {
             // EII large large index
             i = (((read() & EncodingConstants.INTEGER_3RD_BIT_LARGE_LARGE_MASK) << 16) | (read() << 8) | read())
-                + EncodingConstants.INTEGER_3RD_BIT_LARGE_LIMIT;
+            + EncodingConstants.INTEGER_3RD_BIT_LARGE_LIMIT;
         }
         return _elementNameTable._array[i];
     }
 
-    protected final QualifiedName processLiteralQualifiedName(int state) throws FastInfosetException, IOException {
+    protected final QualifiedName processLiteralQualifiedName(int state, QualifiedName q)
+    throws FastInfosetException, IOException {
+        if (q == null) q = new QualifiedName();
+
         switch (state) {
             // no prefix, no namespace
             case 0:
-                return new QualifiedName(
+                return q.set(
                         "",
                         "",
                         decodeIdentifyingNonEmptyStringOnFirstBit(_v.localName),
@@ -1427,9 +1499,9 @@ public class StAXDocumentParser extends Decoder implements XMLStreamReader {
                         -1,
                         -1,
                         _identifier);
-            // no prefix, namespace
+                // no prefix, namespace
             case 1:
-                return new QualifiedName(
+                return q.set(
                         "",
                         decodeIdentifyingNonEmptyStringIndexOnFirstBitAsNamespaceName(false),
                         decodeIdentifyingNonEmptyStringOnFirstBit(_v.localName),
@@ -1438,12 +1510,12 @@ public class StAXDocumentParser extends Decoder implements XMLStreamReader {
                         -1,
                         _namespaceNameIndex,
                         _identifier);
-            // prefix, no namespace
+                // prefix, no namespace
             case 2:
                 throw new FastInfosetException(CommonResourceBundle.getInstance().getString("message.qNameMissingNamespaceName"));
-            // prefix, namespace
+                // prefix, namespace
             case 3:
-                return new QualifiedName(
+                return q.set(
                         decodeIdentifyingNonEmptyStringIndexOnFirstBitAsPrefix(true),
                         decodeIdentifyingNonEmptyStringIndexOnFirstBitAsNamespaceName(true),
                         decodeIdentifyingNonEmptyStringOnFirstBit(_v.localName),
@@ -1528,11 +1600,12 @@ public class StAXDocumentParser extends Decoder implements XMLStreamReader {
         _algorithmData = _octetBuffer;
         _algorithmDataOffset = _octetBufferStart;
         _algorithmDataLength = _octetBufferLength;
+        _isAlgorithmDataCloned = false;
 
         if (_algorithmId >= EncodingConstants.ENCODING_ALGORITHM_APPLICATION_START) {
             _algorithmURI = _v.encodingAlgorithm.get(_algorithmId - EncodingConstants.ENCODING_ALGORITHM_APPLICATION_START);
             if (_algorithmURI == null) {
-                throw new EncodingAlgorithmException(CommonResourceBundle.getInstance().getString("message.URINotPresent", new Object[]{new Integer(_identifier)}));
+                throw new EncodingAlgorithmException(CommonResourceBundle.getInstance().getString("message.URINotPresent", new Object[]{Integer.valueOf(_identifier)}));
             }
         } else if (_algorithmId > EncodingConstants.ENCODING_ALGORITHM_BUILTIN_END) {
             // Reserved built-in algorithms for future use
@@ -1547,7 +1620,7 @@ public class StAXDocumentParser extends Decoder implements XMLStreamReader {
         if (_identifier >= EncodingConstants.ENCODING_ALGORITHM_APPLICATION_START) {
             URI = _v.encodingAlgorithm.get(_identifier - EncodingConstants.ENCODING_ALGORITHM_APPLICATION_START);
             if (URI == null) {
-                throw new EncodingAlgorithmException(CommonResourceBundle.getInstance().getString("message.URINotPresent", new Object[]{new Integer(_identifier)}));
+                throw new EncodingAlgorithmException(CommonResourceBundle.getInstance().getString("message.URINotPresent", new Object[]{Integer.valueOf(_identifier)}));
             }
         } else if (_identifier >= EncodingConstants.ENCODING_ALGORITHM_BUILTIN_END) {
             if (_identifier == EncodingAlgorithmIndexes.CDATA) {
@@ -1567,9 +1640,11 @@ public class StAXDocumentParser extends Decoder implements XMLStreamReader {
 
     protected final void convertEncodingAlgorithmDataToCharacters() throws FastInfosetException, IOException {
         StringBuffer buffer = new StringBuffer();
-        if (_algorithmId < EncodingConstants.ENCODING_ALGORITHM_BUILTIN_END) {
+        if (_algorithmId == EncodingAlgorithmIndexes.BASE64) {
+            convertBase64AlorithmDataToCharacters(buffer);
+        } else if (_algorithmId < EncodingConstants.ENCODING_ALGORITHM_BUILTIN_END) {
             Object array = BuiltInEncodingAlgorithmFactory.table[_algorithmId].
-                decodeFromBytes(_algorithmData, _algorithmDataOffset, _algorithmDataLength);
+                    decodeFromBytes(_algorithmData, _algorithmDataOffset, _algorithmDataLength);
             BuiltInEncodingAlgorithmFactory.table[_algorithmId].convertToCharacters(array,  buffer);
         } else if (_algorithmId == EncodingAlgorithmIndexes.CDATA) {
             _octetBufferOffset -= _octetBufferLength;
@@ -1595,6 +1670,93 @@ public class StAXDocumentParser extends Decoder implements XMLStreamReader {
         _charBufferLength = _characters.length;
     }
 
+    /* If base64 data comes is chunks, bytes, which were cut to align 3,
+     * from prev. base64 chunk are stored in this buffer */
+    private byte[] base64TaleBytes = new byte[3];
+    private int base64TaleLength;
+    /*
+     * Method converts _algorithmData to base64 encoded String
+     * Counts with base64 data coming in chunks, aligning input chunks by 3,
+     * avoiding double cloning, happening after possible peek, peek2 cloning by Base64 algorithm
+     */
+    protected void convertBase64AlorithmDataToCharacters(StringBuffer buffer) throws EncodingAlgorithmException, IOException {
+        // How much new came data was serialized with prev. tale
+        int afterTaleOffset = 0;
+
+        if (base64TaleLength > 0) {
+            // Serialize tale left from prev. chunk
+            int bytesToCopy = Math.min(3 - base64TaleLength, _algorithmDataLength);
+            System.arraycopy(_algorithmData, _algorithmDataOffset, base64TaleBytes, base64TaleLength, bytesToCopy);
+            if (base64TaleLength + bytesToCopy == 3) {
+                base64DecodeWithCloning(buffer, base64TaleBytes, 0, 3);
+            } else if (!isBase64Follows()) {
+                // End of text was read to temp array
+                base64DecodeWithCloning(buffer, base64TaleBytes, 0, base64TaleLength + bytesToCopy);
+                return;
+            } else {
+                // If the end of chunk fit to tmp array, but next chunk is expected
+                base64TaleLength += bytesToCopy;
+                return;
+            }
+
+            afterTaleOffset = bytesToCopy;
+            base64TaleLength = 0;
+        }
+
+        int taleBytesRemaining = isBase64Follows() ? (_algorithmDataLength - afterTaleOffset) % 3 : 0;
+
+        if (_isAlgorithmDataCloned) {
+            base64DecodeWithoutCloning(buffer, _algorithmData, _algorithmDataOffset + afterTaleOffset,
+                    _algorithmDataLength - afterTaleOffset - taleBytesRemaining);
+        } else {
+            base64DecodeWithCloning(buffer, _algorithmData, _algorithmDataOffset + afterTaleOffset,
+                    _algorithmDataLength - afterTaleOffset - taleBytesRemaining);
+        }
+
+        if (taleBytesRemaining > 0) {
+            System.arraycopy(_algorithmData, _algorithmDataOffset + _algorithmDataLength - taleBytesRemaining,
+                    base64TaleBytes, 0, taleBytesRemaining);
+            base64TaleLength = taleBytesRemaining;
+        }
+    }
+
+    /*
+     * Encodes incoming data to Base64 string.
+     * Method performs additional input data cloning
+     */
+    private void base64DecodeWithCloning(StringBuffer dstBuffer, byte[] data, int offset, int length) throws EncodingAlgorithmException {
+        Object array = BuiltInEncodingAlgorithmFactory.base64EncodingAlgorithm.
+                decodeFromBytes(data, offset, length);
+        BuiltInEncodingAlgorithmFactory.base64EncodingAlgorithm.convertToCharacters(array, dstBuffer);
+    }
+
+    /*
+     * Encodes incoming data to Base64 string.
+     * Avoids input data cloning
+     */
+    private void base64DecodeWithoutCloning(StringBuffer dstBuffer, byte[] data, int offset, int length) throws EncodingAlgorithmException {
+        BuiltInEncodingAlgorithmFactory.base64EncodingAlgorithm.convertToCharacters(data, offset, length, dstBuffer);
+    }
+
+
+    /*
+     * Looks ahead in InputStream, whether next data is Base64 chunk
+     */
+    public boolean isBase64Follows() throws IOException {
+        // Process information item
+        int b = peek(this);
+        switch (DecoderStateTables.EII[b]) {
+            case DecoderStateTables.CII_EA:
+                int algorithmId = (b & 0x02) << 6;
+                int b2 = peek2(this);
+                algorithmId |= (b2 & 0xFC) >> 2;
+
+                return algorithmId == EncodingAlgorithmIndexes.BASE64;
+            default:
+                return false;
+        }
+    }
+
     protected class NamespaceContextImpl implements NamespaceContext {
         public final String getNamespaceURI(String prefix) {
             return _prefixTable.getNamespaceFromPrefix(prefix);
@@ -1656,5 +1818,4 @@ public class StAXDocumentParser extends Decoder implements XMLStreamReader {
         }
         return "UNKNOWN_EVENT_TYPE";
     }
-
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentSerializer.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentSerializer.java
index 69667d7ef44..5b9b792d184 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentSerializer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentSerializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,49 +25,22 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 package com.sun.xml.internal.fastinfoset.stax;
 
 import com.sun.xml.internal.fastinfoset.Encoder;
 import com.sun.xml.internal.fastinfoset.EncodingConstants;
+import com.sun.xml.internal.fastinfoset.util.NamespaceContextImplementation;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.EmptyStackException;
-import java.util.Enumeration;
-import java.util.Iterator;
 import javax.xml.namespace.NamespaceContext;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
 import com.sun.xml.internal.org.jvnet.fastinfoset.EncodingAlgorithmIndexes;
-import org.xml.sax.helpers.NamespaceSupport;
 import com.sun.xml.internal.fastinfoset.CommonResourceBundle;
+import com.sun.xml.internal.fastinfoset.QualifiedName;
+import com.sun.xml.internal.fastinfoset.util.LocalNameQualifiedNamesMap;
+import com.sun.xml.internal.org.jvnet.fastinfoset.stax.LowLevelFastInfosetStreamWriter;
 
 /**
  * The Fast Infoset StAX serializer.
@@ -79,7 +52,8 @@ import com.sun.xml.internal.fastinfoset.CommonResourceBundle;
  * More than one fast infoset document may be encoded to the
  * {@link java.io.OutputStream}.
  */
-public class StAXDocumentSerializer extends Encoder implements XMLStreamWriter {
+public class StAXDocumentSerializer extends Encoder
+        implements XMLStreamWriter, LowLevelFastInfosetStreamWriter {
     protected StAXManager _manager;
 
     protected String _encoding;
@@ -114,15 +88,14 @@ public class StAXDocumentSerializer extends Encoder implements XMLStreamWriter {
     protected String[] _attributesArray = new String[4 * 16];
     protected int _attributesArrayIndex = 0;
 
-    /**
-     * Mapping between uris and prefixes.
-     */
-    protected NamespaceSupport _nsSupport = new NamespaceSupport();
-
     protected boolean[] _nsSupportContextStack = new boolean[32];
     protected int _stackCount = -1;
 
-    protected NamespaceContext _nsContext = new NamespaceContextImpl();
+    /**
+     * Mapping between uris and prefixes.
+     */
+    protected NamespaceContextImplementation _nsContext =
+            new NamespaceContextImplementation();
 
     /**
      * List of namespaces defined in the current element.
@@ -132,11 +105,13 @@ public class StAXDocumentSerializer extends Encoder implements XMLStreamWriter {
 
     public StAXDocumentSerializer() {
         super(true);
+        _manager = new StAXManager(StAXManager.CONTEXT_WRITER);
     }
 
     public StAXDocumentSerializer(OutputStream outputStream) {
         super(true);
         setOutputStream(outputStream);
+        _manager = new StAXManager(StAXManager.CONTEXT_WRITER);
     }
 
     public StAXDocumentSerializer(OutputStream outputStream, StAXManager manager) {
@@ -150,7 +125,8 @@ public class StAXDocumentSerializer extends Encoder implements XMLStreamWriter {
 
         _attributesArrayIndex = 0;
         _namespacesArrayIndex = 0;
-        _nsSupport.reset();
+
+        _nsContext.reset();
         _stackCount = -1;
 
         _currentUri = _currentPrefix = null;
@@ -183,16 +159,13 @@ public class StAXDocumentSerializer extends Encoder implements XMLStreamWriter {
     }
 
     public void writeEndDocument() throws XMLStreamException {
-        // Need to flush a pending empty element?
-        if (_inStartElement) {
-//            encodeTerminationAndCurrentElement();
-        }
-
         try {
-            // TODO
-            // Use nsSupport to terminate all elements not terminated
-            // by writeEndElement
 
+            // terminate all elements not terminated
+            // by writeEndElement
+            for(;_stackCount >= 0; _stackCount--) {
+                writeEndElement();
+            }
 
             encodeDocumentTermination();
         }
@@ -247,7 +220,6 @@ public class StAXDocumentSerializer extends Encoder implements XMLStreamWriter {
         }
 
         _nsSupportContextStack[_stackCount] = false;
-        // _nsSupport.pushContext();
     }
 
     public void writeEmptyElement(String localName)
@@ -281,7 +253,6 @@ public class StAXDocumentSerializer extends Encoder implements XMLStreamWriter {
         }
 
         _nsSupportContextStack[_stackCount] = false;
-        //_nsSupport.pushContext();
     }
 
     public void writeEndElement() throws XMLStreamException {
@@ -292,7 +263,7 @@ public class StAXDocumentSerializer extends Encoder implements XMLStreamWriter {
         try {
             encodeElementTermination();
             if (_nsSupportContextStack[_stackCount--] == true) {
-                _nsSupport.popContext();
+                _nsContext.popContext();
             }
         }
         catch (IOException e) {
@@ -317,7 +288,7 @@ public class StAXDocumentSerializer extends Encoder implements XMLStreamWriter {
 
         // Find prefix for attribute, ignoring default namespace
         if (namespaceURI.length() > 0) {
-            prefix = _nsSupport.getPrefix(namespaceURI);
+            prefix = _nsContext.getNonDefaultPrefix(namespaceURI);
 
             // Undeclared prefix or ignorable default ns?
             if (prefix == null || prefix.length() == 0) {
@@ -386,6 +357,7 @@ public class StAXDocumentSerializer extends Encoder implements XMLStreamWriter {
 
             _namespacesArray[_namespacesArrayIndex++] = prefix;
             _namespacesArray[_namespacesArrayIndex++] = namespaceURI;
+            setPrefix(prefix, namespaceURI);
         }
     }
 
@@ -404,6 +376,7 @@ public class StAXDocumentSerializer extends Encoder implements XMLStreamWriter {
 
         _namespacesArray[_namespacesArrayIndex++] = "";
         _namespacesArray[_namespacesArrayIndex++] = namespaceURI;
+        setPrefix("", namespaceURI);
     }
 
     public void writeComment(String data) throws XMLStreamException {
@@ -506,7 +479,7 @@ public class StAXDocumentSerializer extends Encoder implements XMLStreamWriter {
     }
 
     public String getPrefix(String uri) throws XMLStreamException {
-        return _nsSupport.getPrefix(uri);
+        return _nsContext.getPrefix(uri);
     }
 
     public void setPrefix(String prefix, String uri)
@@ -514,10 +487,10 @@ public class StAXDocumentSerializer extends Encoder implements XMLStreamWriter {
     {
         if (_stackCount > -1 && _nsSupportContextStack[_stackCount] == false) {
             _nsSupportContextStack[_stackCount] = true;
-            _nsSupport.pushContext();
+            _nsContext.pushContext();
         }
 
-        _nsSupport.declarePrefix(prefix, uri);
+        _nsContext.declarePrefix(prefix, uri);
     }
 
     public void setDefaultNamespace(String uri) throws XMLStreamException {
@@ -565,33 +538,6 @@ public class StAXDocumentSerializer extends Encoder implements XMLStreamWriter {
         _encoding = encoding;
     }
 
-    protected class NamespaceContextImpl implements NamespaceContext {
-        public final String getNamespaceURI(String prefix) {
-            return _nsSupport.getURI(prefix);
-        }
-
-        public final String getPrefix(String namespaceURI) {
-            return _nsSupport.getPrefix(namespaceURI);
-        }
-
-        public final Iterator getPrefixes(String namespaceURI) {
-            final Enumeration e = _nsSupport.getPrefixes(namespaceURI);
-
-            return new Iterator() {
-                    public boolean hasNext() {
-                        return e.hasMoreElements();
-                    }
-
-                    public Object next() {
-                        return e.nextElement();
-                    }
-
-                    public void remove() {
-                        throw new UnsupportedOperationException();
-                    }
-                };
-        }
-    }
 
     public void writeOctets(byte[] b, int start, int len)
         throws XMLStreamException
@@ -634,7 +580,11 @@ public class StAXDocumentSerializer extends Encoder implements XMLStreamWriter {
                     _b = 0;
                 }
 
-                // Encode element and its attributes
+                // If element's prefix is empty - apply default scope namespace
+                if (_currentPrefix.length() == 0 && _currentUri.length() == 0) {
+                    _currentUri = _nsContext.getNamespaceURI("");
+                }
+
                 encodeElementQualifiedNameOnThirdBit(_currentUri, _currentPrefix, _currentLocalName);
 
                 for (int i = 0; i < _attributesArrayIndex;) {
@@ -643,7 +593,7 @@ public class StAXDocumentSerializer extends Encoder implements XMLStreamWriter {
 
                     final String value = _attributesArray[i];
                     _attributesArray[i++] = null;
-                    final boolean addToTable = (value.length() < attributeValueSizeConstraint) ? true : false;
+                    final boolean addToTable = isAttributeValueLengthMatchesLimit(value.length());
                     encodeNonIdentifyingStringOnFirstBit(value, _v.attributeValue, addToTable);
 
                     _b = EncodingConstants.TERMINATOR;
@@ -655,7 +605,7 @@ public class StAXDocumentSerializer extends Encoder implements XMLStreamWriter {
                 if (_isEmptyElement) {
                     encodeElementTermination();
                     if (_nsSupportContextStack[_stackCount--] == true) {
-                        _nsSupport.popContext();
+                        _nsContext.popContext();
                     }
 
                     _isEmptyElement = false;
@@ -669,4 +619,204 @@ public class StAXDocumentSerializer extends Encoder implements XMLStreamWriter {
             throw new XMLStreamException(e);
         }
     }
+
+
+    // LowLevelFastInfosetSerializer
+
+    public final void initiateLowLevelWriting() throws XMLStreamException {
+        encodeTerminationAndCurrentElement(false);
+    }
+
+    public final int getNextElementIndex() {
+        return _v.elementName.getNextIndex();
+    }
+
+    public final int getNextAttributeIndex() {
+        return _v.attributeName.getNextIndex();
+    }
+
+    public final int getLocalNameIndex() {
+        return _v.localName.getIndex();
+    }
+
+    public final int getNextLocalNameIndex() {
+        return _v.localName.getNextIndex();
+    }
+
+    public final void writeLowLevelTerminationAndMark() throws IOException {
+        encodeTermination();
+        mark();
+    }
+
+    public final void writeLowLevelStartElementIndexed(int type, int index) throws IOException {
+        _b = type;
+        encodeNonZeroIntegerOnThirdBit(index);
+    }
+
+    public final boolean writeLowLevelStartElement(int type, String prefix, String localName,
+            String namespaceURI) throws IOException {
+        final boolean isIndexed = encodeElement(type, namespaceURI, prefix, localName);
+
+        if (!isIndexed)
+            encodeLiteral(type | EncodingConstants.ELEMENT_LITERAL_QNAME_FLAG,
+                    namespaceURI, prefix, localName);
+
+        return isIndexed;
+    }
+
+    public final void writeLowLevelStartNamespaces() throws IOException {
+        write(EncodingConstants.ELEMENT | EncodingConstants.ELEMENT_NAMESPACES_FLAG);
+    }
+
+    public final void writeLowLevelNamespace(String prefix, String namespaceName)
+        throws IOException {
+        encodeNamespaceAttribute(prefix, namespaceName);
+    }
+
+    public final void writeLowLevelEndNamespaces() throws IOException {
+        write(EncodingConstants.TERMINATOR);
+    }
+
+    public final void writeLowLevelStartAttributes() throws IOException {
+        if (hasMark()) {
+            _octetBuffer[_markIndex] |= EncodingConstants.ELEMENT_ATTRIBUTE_FLAG;
+            resetMark();
+        }
+    }
+
+    public final void writeLowLevelAttributeIndexed(int index) throws IOException {
+        encodeNonZeroIntegerOnSecondBitFirstBitZero(index);
+    }
+
+    public final boolean writeLowLevelAttribute(String prefix, String namespaceURI, String localName) throws IOException {
+        final boolean isIndexed = encodeAttribute(namespaceURI, prefix, localName);
+
+        if (!isIndexed)
+            encodeLiteral(EncodingConstants.ATTRIBUTE_LITERAL_QNAME_FLAG,
+                    namespaceURI, prefix, localName);
+
+        return isIndexed;
+    }
+
+    public final void writeLowLevelAttributeValue(String value) throws IOException
+    {
+        final boolean addToTable = isAttributeValueLengthMatchesLimit(value.length());
+        encodeNonIdentifyingStringOnFirstBit(value, _v.attributeValue, addToTable);
+    }
+
+    public final void writeLowLevelStartNameLiteral(int type, String prefix, byte[] utf8LocalName,
+            String namespaceURI) throws IOException {
+        encodeLiteralHeader(type, namespaceURI, prefix);
+        encodeNonZeroOctetStringLengthOnSecondBit(utf8LocalName.length);
+        write(utf8LocalName, 0, utf8LocalName.length);
+    }
+
+    public final void writeLowLevelStartNameLiteral(int type, String prefix, int localNameIndex,
+            String namespaceURI) throws IOException {
+        encodeLiteralHeader(type, namespaceURI, prefix);
+        encodeNonZeroIntegerOnSecondBitFirstBitOne(localNameIndex);
+    }
+
+    public final void writeLowLevelEndStartElement() throws IOException {
+        if (hasMark()) {
+            resetMark();
+        } else {
+            // Terminate the attributes
+            _b = EncodingConstants.TERMINATOR;
+            _terminate = true;
+        }
+    }
+
+    public final void writeLowLevelEndElement() throws IOException {
+        encodeElementTermination();
+    }
+
+    public final void writeLowLevelText(char[] text, int length) throws IOException {
+        if (length == 0)
+            return;
+
+        encodeTermination();
+
+        encodeCharacters(text, 0, length);
+    }
+
+    public final void writeLowLevelText(String text) throws IOException {
+        final int length = text.length();
+        if (length == 0)
+            return;
+
+        encodeTermination();
+
+        if (length < _charBuffer.length) {
+            text.getChars(0, length, _charBuffer, 0);
+            encodeCharacters(_charBuffer, 0, length);
+        } else {
+            final char ch[] = text.toCharArray();
+            encodeCharactersNoClone(ch, 0, length);
+        }
+    }
+
+    public final void writeLowLevelOctets(byte[] octets, int length) throws IOException {
+        if (length == 0)
+            return;
+
+        encodeTermination();
+
+        encodeCIIOctetAlgorithmData(EncodingAlgorithmIndexes.BASE64, octets, 0, length);
+    }
+
+    private boolean encodeElement(int type, String namespaceURI, String prefix, String localName) throws IOException {
+        final LocalNameQualifiedNamesMap.Entry entry = _v.elementName.obtainEntry(localName);
+        for (int i = 0; i < entry._valueIndex; i++) {
+            final QualifiedName name = entry._value[i];
+            if ((prefix == name.prefix || prefix.equals(name.prefix))
+                    && (namespaceURI == name.namespaceName || namespaceURI.equals(name.namespaceName))) {
+                _b = type;
+                encodeNonZeroIntegerOnThirdBit(name.index);
+                return true;
+            }
+        }
+
+        entry.addQualifiedName(new QualifiedName(prefix, namespaceURI, localName, "", _v.elementName.getNextIndex()));
+        return false;
+    }
+
+    private boolean encodeAttribute(String namespaceURI, String prefix, String localName) throws IOException {
+        final LocalNameQualifiedNamesMap.Entry entry = _v.attributeName.obtainEntry(localName);
+        for (int i = 0; i < entry._valueIndex; i++) {
+            final QualifiedName name = entry._value[i];
+            if ((prefix == name.prefix || prefix.equals(name.prefix))
+                    && (namespaceURI == name.namespaceName || namespaceURI.equals(name.namespaceName))) {
+                encodeNonZeroIntegerOnSecondBitFirstBitZero(name.index);
+                return true;
+            }
+        }
+
+        entry.addQualifiedName(new QualifiedName(prefix, namespaceURI, localName, "", _v.attributeName.getNextIndex()));
+        return false;
+    }
+
+    private void encodeLiteralHeader(int type, String namespaceURI, String prefix) throws IOException {
+        if (namespaceURI != "") {
+            type |= EncodingConstants.LITERAL_QNAME_NAMESPACE_NAME_FLAG;
+            if (prefix != "")
+                type |= EncodingConstants.LITERAL_QNAME_PREFIX_FLAG;
+
+            write(type);
+            if (prefix != "")
+                encodeNonZeroIntegerOnSecondBitFirstBitOne(_v.prefix.get(prefix));
+            encodeNonZeroIntegerOnSecondBitFirstBitOne(_v.namespaceName.get(namespaceURI));
+        } else
+            write(type);
+    }
+
+    private void encodeLiteral(int type, String namespaceURI, String prefix, String localName) throws IOException {
+        encodeLiteralHeader(type, namespaceURI, prefix);
+
+        final int localNameIndex = _v.localName.obtainIndex(localName);
+        if (localNameIndex == -1) {
+            encodeNonEmptyOctetStringOnSecondBit(localName);
+        } else
+            encodeNonZeroIntegerOnSecondBitFirstBitOne(localNameIndex);
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXManager.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXManager.java
index c37b371fe61..bc88dea0699 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXManager.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 package com.sun.xml.internal.fastinfoset.stax;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java
index b2b6d4191ae..071e3b9da0b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 package com.sun.xml.internal.fastinfoset.stax.events;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/CharactersEvent.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/CharactersEvent.java
index 1f39b7a47db..95c33199dd6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/CharactersEvent.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/CharactersEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 
 package com.sun.xml.internal.fastinfoset.stax.events ;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/CommentEvent.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/CommentEvent.java
index 4731425b5ae..05d99887978 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/CommentEvent.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/CommentEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 package com.sun.xml.internal.fastinfoset.stax.events ;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/DTDEvent.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/DTDEvent.java
index e95c24b4d9f..89154a5ea70 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/DTDEvent.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/DTDEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 package com.sun.xml.internal.fastinfoset.stax.events;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EmptyIterator.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EmptyIterator.java
index 4413d881375..fcf9389c7d7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EmptyIterator.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EmptyIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,37 +25,11 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 package com.sun.xml.internal.fastinfoset.stax.events;
 import java.util.Iterator;
 import com.sun.xml.internal.fastinfoset.CommonResourceBundle;
+import java.util.NoSuchElementException;
 
 
 public class EmptyIterator implements Iterator {
@@ -69,8 +43,8 @@ public class EmptyIterator implements Iterator {
     public boolean hasNext() {
         return false;
     }
-    public Object next() {
-        return null;
+    public Object next() throws NoSuchElementException {
+        throw new NoSuchElementException();
     }
     public void remove() {
          throw new  UnsupportedOperationException(CommonResourceBundle.getInstance().getString("message.emptyIterator"));
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EndDocumentEvent.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EndDocumentEvent.java
index ead84b17268..ac22015c764 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EndDocumentEvent.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EndDocumentEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 package com.sun.xml.internal.fastinfoset.stax.events ;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EndElementEvent.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EndElementEvent.java
index ccb75cc3690..d9721f62286 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EndElementEvent.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EndElementEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 package com.sun.xml.internal.fastinfoset.stax.events ;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EntityDeclarationImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EntityDeclarationImpl.java
index bb7df067967..9f45b97183c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EntityDeclarationImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EntityDeclarationImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 package com.sun.xml.internal.fastinfoset.stax.events;
 
@@ -128,6 +101,18 @@ public class EntityDeclarationImpl extends EventBase implements EntityDeclaratio
         return _baseURI;
     }
 
+    public void setPublicId(String publicId) {
+        _publicId = publicId;
+    }
+
+    public void setSystemId(String systemId) {
+        _systemId = systemId;
+    }
+
+    public void setBaseURI(String baseURI) {
+        _baseURI = baseURI;
+    }
+
     public void setName(String entityName){
         _entityName = entityName;
     }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EntityReferenceEvent.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EntityReferenceEvent.java
index b52b95045c2..36c5e1b244f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EntityReferenceEvent.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EntityReferenceEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 package com.sun.xml.internal.fastinfoset.stax.events ;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EventBase.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EventBase.java
index 9e8e443f1cb..a0bdabf5e3d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EventBase.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EventBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 
 package com.sun.xml.internal.fastinfoset.stax.events ;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/NamespaceBase.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/NamespaceBase.java
index 76b9f2bdb84..1861cdbb6aa 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/NamespaceBase.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/NamespaceBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 package com.sun.xml.internal.fastinfoset.stax.events;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/ProcessingInstructionEvent.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/ProcessingInstructionEvent.java
index f8b95a7d35e..546c0c1e66b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/ProcessingInstructionEvent.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/ProcessingInstructionEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 package com.sun.xml.internal.fastinfoset.stax.events ;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/ReadIterator.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/ReadIterator.java
index a943b3acef9..f4cefa8d6c2 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/ReadIterator.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/ReadIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 
 package com.sun.xml.internal.fastinfoset.stax.events;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocator.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocator.java
index 5ca5067e265..582200e40c5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocator.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 
 package com.sun.xml.internal.fastinfoset.stax.events;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocatorBase.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocatorBase.java
index d12c460f176..82d58d1e52c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocatorBase.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocatorBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 package com.sun.xml.internal.fastinfoset.stax.events;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventReader.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventReader.java
index 4cf1be0ba72..2aeac662fb5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventReader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 package com.sun.xml.internal.fastinfoset.stax.events;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventWriter.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventWriter.java
index 628d6413b0f..b7cbdf5357d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventWriter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 package com.sun.xml.internal.fastinfoset.stax.events;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXFilteredEvent.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXFilteredEvent.java
index cd21ddac595..8587d5fdedd 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXFilteredEvent.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXFilteredEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,9 @@
  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
+ *
+ * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
-
 /*
  * StAXFilteredEvent.java
  *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StartDocumentEvent.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StartDocumentEvent.java
index cd70c06e88a..3bee0138f88 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StartDocumentEvent.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StartDocumentEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 package com.sun.xml.internal.fastinfoset.stax.events ;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StartElementEvent.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StartElementEvent.java
index d7b8f2feca0..dfb40ce604c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StartElementEvent.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StartElementEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 package com.sun.xml.internal.fastinfoset.stax.events ;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/Util.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/Util.java
index e53e7e78a0f..526c464623d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/Util.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/Util.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 package com.sun.xml.internal.fastinfoset.stax.events;
 
 import javax.xml.stream.XMLStreamConstants;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/XMLConstants.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/XMLConstants.java
index 3d1e4af97a0..0fc46a35815 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/XMLConstants.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/XMLConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 
 package com.sun.xml.internal.fastinfoset.stax.events;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXEventFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXEventFactory.java
index 2878360f61c..2622acb8777 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXEventFactory.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXEventFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 
 package com.sun.xml.internal.fastinfoset.stax.factory;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXInputFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXInputFactory.java
index 3709beb6975..0e7c7553448 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXInputFactory.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXInputFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 
 package com.sun.xml.internal.fastinfoset.stax.factory;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXOutputFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXOutputFactory.java
index 2098688c2ef..2fc9db42557 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXOutputFactory.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXOutputFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 
 package com.sun.xml.internal.fastinfoset.stax.factory;
@@ -113,7 +86,7 @@ public class StAXOutputFactory extends XMLOutputFactory {
                 }
             }
         }
-        else if(result instanceof Result){
+        else {
             try{
                 //xxx: should we be using FileOutputStream - nb.
                 FileWriter writer = new FileWriter(new File(result.getSystemId()));
@@ -144,7 +117,7 @@ public class StAXOutputFactory extends XMLOutputFactory {
 
     public Object getProperty(String name) throws java.lang.IllegalArgumentException {
         if(name == null){
-            throw new IllegalArgumentException(CommonResourceBundle.getInstance().getString("message.propertyNotSupported", new Object[]{name}));
+            throw new IllegalArgumentException(CommonResourceBundle.getInstance().getString("message.propertyNotSupported", new Object[]{null}));
         }
         if(_manager.containsProperty(name))
             return _manager.getProperty(name);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/util/StAXFilteredParser.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/util/StAXFilteredParser.java
index 589260ac199..b8f773eb0df 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/util/StAXFilteredParser.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/util/StAXFilteredParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 package com.sun.xml.internal.fastinfoset.stax.util;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/util/StAXParserWrapper.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/util/StAXParserWrapper.java
index ca8ff1b1cde..a1317f34ac5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/util/StAXParserWrapper.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/util/StAXParserWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 package com.sun.xml.internal.fastinfoset.stax.util;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_DOM_Or_XML_DOM_SAX_SAXEvent.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_DOM_Or_XML_DOM_SAX_SAXEvent.java
index 1cc95b10f74..20715b0792b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_DOM_Or_XML_DOM_SAX_SAXEvent.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_DOM_Or_XML_DOM_SAX_SAXEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,34 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 
 package com.sun.xml.internal.fastinfoset.tools;
 
@@ -71,7 +43,7 @@ import org.w3c.dom.Document;
 
 public class FI_DOM_Or_XML_DOM_SAX_SAXEvent extends TransformInputOutput {
 
-    public void parse(InputStream document, OutputStream events) throws Exception {
+    public void parse(InputStream document, OutputStream events, String workingDirectory) throws Exception {
         if (!document.markSupported()) {
             document = new BufferedInputStream(document);
         }
@@ -90,6 +62,9 @@ public class FI_DOM_Or_XML_DOM_SAX_SAXEvent extends TransformInputOutput {
             DOMDocumentParser ddp = new DOMDocumentParser();
             ddp.parse(d, document);
         } else {
+            if (workingDirectory != null) {
+                db.setEntityResolver(createRelativePathResolver(workingDirectory));
+            }
             d = db.parse(document);
         }
 
@@ -100,6 +75,10 @@ public class FI_DOM_Or_XML_DOM_SAX_SAXEvent extends TransformInputOutput {
         t.transform(new DOMSource(d), new SAXResult(ses));
     }
 
+    public void parse(InputStream document, OutputStream events) throws Exception {
+        parse(document, events, null);
+    }
+
     public static void main(String[] args) throws Exception {
         FI_DOM_Or_XML_DOM_SAX_SAXEvent p = new FI_DOM_Or_XML_DOM_SAX_SAXEvent();
         p.parse(args);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_DOM_SAX_SAXEvent.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_DOM_SAX_SAXEvent.java
index ed3a04ac9e7..c72b4b8f887 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_DOM_SAX_SAXEvent.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_DOM_SAX_SAXEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,38 +25,13 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 
 package com.sun.xml.internal.fastinfoset.tools;
 
 import com.sun.xml.internal.fastinfoset.Decoder;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.transform.sax.SAXSource;
 import com.sun.xml.internal.org.jvnet.fastinfoset.FastInfosetSource;
 import java.io.BufferedInputStream;
 import java.io.InputStream;
@@ -67,13 +42,15 @@ import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.sax.SAXResult;
 import javax.xml.transform.stream.StreamSource;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
 
 public class FI_SAX_Or_XML_SAX_DOM_SAX_SAXEvent extends TransformInputOutput {
 
     public FI_SAX_Or_XML_SAX_DOM_SAX_SAXEvent() {
     }
 
-    public void parse(InputStream document, OutputStream events) throws Exception {
+    public void parse(InputStream document, OutputStream events, String workingDirectory) throws Exception {
         if (!document.markSupported()) {
             document = new BufferedInputStream(document);
         }
@@ -88,6 +65,13 @@ public class FI_SAX_Or_XML_SAX_DOM_SAX_SAXEvent extends TransformInputOutput {
 
         if (isFastInfosetDocument) {
             t.transform(new FastInfosetSource(document), dr);
+        } else if (workingDirectory != null) {
+            SAXParser parser = getParser();
+            XMLReader reader = parser.getXMLReader();
+            reader.setEntityResolver(createRelativePathResolver(workingDirectory));
+            SAXSource source = new SAXSource(reader, new InputSource(document));
+
+            t.transform(source, dr);
         } else {
             t.transform(new StreamSource(document), dr);
         }
@@ -96,6 +80,20 @@ public class FI_SAX_Or_XML_SAX_DOM_SAX_SAXEvent extends TransformInputOutput {
         t.transform(new DOMSource(dr.getNode()), new SAXResult(ses));
     }
 
+    public void parse(InputStream document, OutputStream events) throws Exception {
+        parse(document, events, null);
+    }
+
+    private SAXParser getParser() {
+        SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
+        saxParserFactory.setNamespaceAware(true);
+        try {
+            return saxParserFactory.newSAXParser();
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
     public static void main(String[] args) throws Exception {
         FI_SAX_Or_XML_SAX_DOM_SAX_SAXEvent p = new FI_SAX_Or_XML_SAX_DOM_SAX_SAXEvent();
         p.parse(args);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_SAXEvent.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_SAXEvent.java
index 8c10474b8b9..3cd0d730429 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_SAXEvent.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_SAXEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,34 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 
 package com.sun.xml.internal.fastinfoset.tools;
 
@@ -64,13 +36,15 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
 
 public class FI_SAX_Or_XML_SAX_SAXEvent extends TransformInputOutput {
 
     public FI_SAX_Or_XML_SAX_SAXEvent() {
     }
 
-    public void parse(InputStream document, OutputStream events) throws Exception {
+    public void parse(InputStream document, OutputStream events, String workingDirectory) throws Exception {
         if (!document.markSupported()) {
             document = new BufferedInputStream(document);
         }
@@ -90,11 +64,21 @@ public class FI_SAX_Or_XML_SAX_SAXEvent extends TransformInputOutput {
             parserFactory.setNamespaceAware(true);
             SAXParser parser = parserFactory.newSAXParser();
             SAXEventSerializer ses = new SAXEventSerializer(events);
-            parser.setProperty(Properties.LEXICAL_HANDLER_PROPERTY, ses);
-            parser.parse(document, ses);
+
+            XMLReader reader = parser.getXMLReader();
+            reader.setProperty("http://xml.org/sax/properties/lexical-handler", ses);
+            reader.setContentHandler(ses);
+            if (workingDirectory != null) {
+                reader.setEntityResolver(createRelativePathResolver(workingDirectory));
+            }
+            reader.parse(new InputSource(document));
         }
     }
 
+    public void parse(InputStream document, OutputStream events) throws Exception {
+        parse(document, events, null);
+    }
+
     public static void main(String[] args) throws Exception {
         FI_SAX_Or_XML_SAX_SAXEvent p = new FI_SAX_Or_XML_SAX_SAXEvent();
         p.parse(args);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_XML.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_XML.java
index 29043a6a311..36f1e280944 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_XML.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_XML.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 
 package com.sun.xml.internal.fastinfoset.tools;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_StAX_SAX_Or_XML_SAX_SAXEvent.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_StAX_SAX_Or_XML_SAX_SAXEvent.java
index 577ea3dfd14..d87c7e90975 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_StAX_SAX_Or_XML_SAX_SAXEvent.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_StAX_SAX_Or_XML_SAX_SAXEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 
 package com.sun.xml.internal.fastinfoset.tools;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/PrintTable.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/PrintTable.java
index 299dbd644ae..70e7d315cff 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/PrintTable.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/PrintTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 
 package com.sun.xml.internal.fastinfoset.tools;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/SAX2StAXWriter.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/SAX2StAXWriter.java
index c6584027331..20a71e9ec08 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/SAX2StAXWriter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/SAX2StAXWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 
 package com.sun.xml.internal.fastinfoset.tools;
@@ -158,13 +131,15 @@ public class SAX2StAXWriter extends DefaultHandler implements LexicalHandler {
     public void startPrefixMapping(String prefix, String uri)
         throws SAXException
     {
-        try {
-            _writer.setPrefix(prefix, uri);
+    // Commented as in StAX NS are declared for current element?
+    // now _writer.setPrefix() is invoked in _writer.writeNamespace()
+//        try {
+//            _writer.setPrefix(prefix, uri);
             _namespaces.add(new QualifiedName(prefix, uri));
-        }
-        catch (XMLStreamException e) {
-            throw new SAXException(e);
-        }
+//        }
+//        catch (XMLStreamException e) {
+//            throw new SAXException(e);
+//        }
     }
 
     public void endPrefixMapping(String prefix) throws SAXException {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/SAXEventSerializer.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/SAXEventSerializer.java
index 4c416be3bf4..2380cfa4f83 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/SAXEventSerializer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/SAXEventSerializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 
 package com.sun.xml.internal.fastinfoset.tools;
@@ -118,7 +91,7 @@ public class SAXEventSerializer extends DefaultHandler
             _namespaceAttributes = new ArrayList();
         }
 
-        String qName = (prefix == "") ? "xmlns" : "xmlns" + prefix;
+        String qName = (prefix.length() == 0) ? "xmlns" : "xmlns" + prefix;
         AttributeValueHolder attribute = new AttributeValueHolder(
                 qName,
                 prefix,
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/StAX2SAXReader.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/StAX2SAXReader.java
index e641b36a344..f013a5f0e56 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/StAX2SAXReader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/StAX2SAXReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 
 package com.sun.xml.internal.fastinfoset.tools;
@@ -185,7 +158,7 @@ public class StAX2SAXReader {
                 case XMLStreamConstants.END_DOCUMENT:
                     break;
                 default:
-                    throw new RuntimeException(CommonResourceBundle.getInstance().getString("message.StAX2SAXReader", new Object[]{new Integer(event)}));
+                    throw new RuntimeException(CommonResourceBundle.getInstance().getString("message.StAX2SAXReader", new Object[]{Integer.valueOf(event)}));
                 } // switch
             }
         }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/TransformInputOutput.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/TransformInputOutput.java
index dee0db07007..1fc0f38f606 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/TransformInputOutput.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/TransformInputOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,44 +25,23 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 
 package com.sun.xml.internal.fastinfoset.tools;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import com.sun.xml.internal.fastinfoset.CommonResourceBundle;
+import java.net.URI;
+import java.net.URISyntaxException;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
 
 public abstract class TransformInputOutput {
 
@@ -89,5 +68,85 @@ public abstract class TransformInputOutput {
         parse(in, out);
     }
 
-    abstract void parse(InputStream in, OutputStream out) throws Exception;
+    abstract public void parse(InputStream in, OutputStream out) throws Exception;
+
+    // parse alternative with current working directory parameter
+    // is used to process xml documents, which have external imported entities
+    public void parse(InputStream in, OutputStream out, String workingDirectory) throws Exception {
+        throw new UnsupportedOperationException();
+    }
+
+    private static URI currentJavaWorkingDirectory;
+    static {
+        currentJavaWorkingDirectory = new File(System.getProperty("user.dir")).toURI();
+    }
+
+    protected static EntityResolver createRelativePathResolver(final String workingDirectory) {
+        return new EntityResolver() {
+            public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {
+                if (systemId != null && systemId.startsWith("file:/")) {
+                    URI workingDirectoryURI = new File(workingDirectory).toURI();
+                    URI workingFile;
+                    try {
+                        // Construction new File(new URI(String)).toURI() is used to be sure URI has correct representation without redundant '/'
+                        workingFile = convertToNewWorkingDirectory(currentJavaWorkingDirectory, workingDirectoryURI, new File(new URI(systemId)).toURI());
+                        return new InputSource(workingFile.toString());
+                    } catch (URISyntaxException ex) {
+                        //Should not get here
+                    }
+                }
+                return null;
+            }
+        };
+    }
+
+    private static URI convertToNewWorkingDirectory(URI oldwd, URI newwd, URI file) throws IOException, URISyntaxException {
+        String oldwdStr = oldwd.toString();
+        String newwdStr = newwd.toString();
+        String fileStr = file.toString();
+
+        String cmpStr = null;
+        // In simpliest case /file.xml - do it faster
+        if (fileStr.startsWith(oldwdStr) && (cmpStr = fileStr.substring(oldwdStr.length())).indexOf('/') == -1) {
+            return new URI(newwdStr + '/' + cmpStr);
+        }
+
+        String[] oldwdSplit = oldwdStr.split("/");
+        String[] newwdSplit = newwdStr.split("/");
+        String[] fileSplit = fileStr.split("/");
+
+        int diff;
+        for(diff = 0; diff diff) {
+            return file;
+        }
+
+        int elemsToSub = oldwdSplit.length - diff;
+        StringBuffer resultStr = new StringBuffer(100);
+        for(int i=0; i 0) {
             namespaceURIIndex = _serializerVocabulary.namespaceName.get(namespaceURI);
             if (namespaceURIIndex == KeyIntMap.NOT_PRESENT) {
                 throw new SAXException(CommonResourceBundle.getInstance().
-                        getString("message.namespaceURINotIndexed", new Object[]{new Integer(namespaceURIIndex)}));
+                        getString("message.namespaceURINotIndexed", new Object[]{Integer.valueOf(namespaceURIIndex)}));
             }
 
-            if (prefix != "") {
+            if (prefix.length() > 0) {
                 prefixIndex = _serializerVocabulary.prefix.get(prefix);
                 if (prefixIndex == KeyIntMap.NOT_PRESENT) {
                     throw new SAXException(CommonResourceBundle.getInstance().
-                            getString("message.prefixNotIndexed", new Object[]{new Integer(prefixIndex)}));
+                            getString("message.prefixNotIndexed", new Object[]{Integer.valueOf(prefixIndex)}));
                 }
             }
         }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_FI.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_FI.java
index d1b4ab144e9..621d1b077f2 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_FI.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_FI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,9 +21,9 @@
  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
+ *
+ * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
-
-
 package com.sun.xml.internal.fastinfoset.tools;
 
 import com.sun.xml.internal.fastinfoset.dom.DOMDocumentSerializer;
@@ -38,10 +38,13 @@ public class XML_DOM_FI extends TransformInputOutput {
     public XML_DOM_FI() {
     }
 
-    public void parse(InputStream document, OutputStream finf) throws Exception {
+    public void parse(InputStream document, OutputStream finf, String workingDirectory) throws Exception {
         DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
         dbf.setNamespaceAware(true);
         DocumentBuilder db = dbf.newDocumentBuilder();
+        if (workingDirectory != null) {
+            db.setEntityResolver(createRelativePathResolver(workingDirectory));
+        }
         Document d = db.parse(document);
 
         DOMDocumentSerializer s = new DOMDocumentSerializer();
@@ -49,6 +52,10 @@ public class XML_DOM_FI extends TransformInputOutput {
         s.serialize(d);
     }
 
+    public void parse(InputStream document, OutputStream finf) throws Exception {
+        parse(document, finf, null);
+    }
+
     public static void main(String[] args) throws Exception {
         XML_DOM_FI p = new XML_DOM_FI();
         p.parse(args);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_SAX_FI.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_SAX_FI.java
index d50276a0183..9053e25976b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_SAX_FI.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_SAX_FI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,34 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 
 package com.sun.xml.internal.fastinfoset.tools;
 
@@ -73,10 +45,13 @@ public class XML_DOM_SAX_FI extends TransformInputOutput {
     public XML_DOM_SAX_FI() {
     }
 
-    public void parse(InputStream document, OutputStream finf) throws Exception {
+    public void parse(InputStream document, OutputStream finf, String workingDirectory) throws Exception {
         DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
         dbf.setNamespaceAware(true);
         DocumentBuilder db = dbf.newDocumentBuilder();
+        if (workingDirectory != null) {
+            db.setEntityResolver(createRelativePathResolver(workingDirectory));
+        }
         Document d = db.parse(document);
 
         TransformerFactory tf = TransformerFactory.newInstance();
@@ -84,6 +59,10 @@ public class XML_DOM_SAX_FI extends TransformInputOutput {
         t.transform(new DOMSource(d), new FastInfosetResult(finf));
     }
 
+    public void parse(InputStream document, OutputStream finf) throws Exception {
+        parse(document, finf, null);
+    }
+
     public static void main(String[] args) throws Exception {
         XML_DOM_SAX_FI p = new XML_DOM_SAX_FI();
         p.parse(args);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_FI.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_FI.java
index 4377c17efdc..93d5281d6f9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_FI.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_FI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,34 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 
 package com.sun.xml.internal.fastinfoset.tools;
 
@@ -63,18 +35,29 @@ import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 import java.io.Reader;
 import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
 
 public class XML_SAX_FI extends TransformInputOutput {
 
     public XML_SAX_FI() {
     }
 
-    public void parse(InputStream xml, OutputStream finf) throws Exception {
+    public void parse(InputStream xml, OutputStream finf, String workingDirectory) throws Exception {
         SAXParser saxParser = getParser();
         SAXDocumentSerializer documentSerializer = getSerializer(finf);
 
-        saxParser.setProperty("http://xml.org/sax/properties/lexical-handler", documentSerializer);
-        saxParser.parse(xml, documentSerializer);
+        XMLReader reader = saxParser.getXMLReader();
+        reader.setProperty("http://xml.org/sax/properties/lexical-handler", documentSerializer);
+        reader.setContentHandler(documentSerializer);
+
+        if (workingDirectory != null) {
+            reader.setEntityResolver(createRelativePathResolver(workingDirectory));
+        }
+        reader.parse(new InputSource(xml));
+    }
+
+    public void parse(InputStream xml, OutputStream finf) throws Exception {
+        parse(xml, finf, null);
     }
 
     public void convert(Reader reader, OutputStream finf) throws Exception {
@@ -92,8 +75,7 @@ public class XML_SAX_FI extends TransformInputOutput {
         saxParserFactory.setNamespaceAware(true);
         try {
             return saxParserFactory.newSAXParser();
-        } catch (Exception e)
-        {
+        } catch (Exception e) {
             return null;
         }
     }
@@ -103,6 +85,7 @@ public class XML_SAX_FI extends TransformInputOutput {
         documentSerializer.setOutputStream(finf);
         return documentSerializer;
     }
+
     public static void main(String[] args) throws Exception {
         XML_SAX_FI s = new XML_SAX_FI();
         s.parse(args);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_StAX_FI.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_StAX_FI.java
index 81a6f2b0c9f..5cd8d552b81 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_StAX_FI.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_StAX_FI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,34 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 
 package com.sun.xml.internal.fastinfoset.tools;
 
@@ -61,14 +33,15 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
-import com.sun.xml.internal.fastinfoset.tools.SAX2StAXWriter;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
 
 public class XML_SAX_StAX_FI extends TransformInputOutput {
 
     public XML_SAX_StAX_FI() {
     }
 
-    public void parse(InputStream xml, OutputStream finf) throws Exception {
+    public void parse(InputStream xml, OutputStream finf, String workingDirectory) throws Exception {
         StAXDocumentSerializer documentSerializer = new StAXDocumentSerializer();
         documentSerializer.setOutputStream(finf);
 
@@ -78,12 +51,23 @@ public class XML_SAX_StAX_FI extends TransformInputOutput {
         saxParserFactory.setNamespaceAware(true);
         SAXParser saxParser = saxParserFactory.newSAXParser();
 
-        saxParser.setProperty("http://xml.org/sax/properties/lexical-handler", saxTostax);
-        saxParser.parse(xml, saxTostax);
+        XMLReader reader = saxParser.getXMLReader();
+        reader.setProperty("http://xml.org/sax/properties/lexical-handler", saxTostax);
+        reader.setContentHandler(saxTostax);
+
+        if (workingDirectory != null) {
+            reader.setEntityResolver(createRelativePathResolver(workingDirectory));
+        }
+        reader.parse(new InputSource(xml));
+
         xml.close();
         finf.close();
     }
 
+    public void parse(InputStream xml, OutputStream finf) throws Exception {
+        parse(xml, finf, null);
+    }
+
     public static void main(String[] args) throws Exception {
         XML_SAX_StAX_FI s = new XML_SAX_StAX_FI();
         s.parse(args);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArray.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArray.java
index 0d199d74342..a19d961b1ad 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArray.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,34 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 
 package com.sun.xml.internal.fastinfoset.util;
 
@@ -107,6 +79,8 @@ public class CharArray implements CharSequence {
     }
 
     public static final int hashCode(char[] ch, int start, int length) {
+        // Same hash code algorithm as used for String
+        // s[0]*31^(n-1) + s[1]*31^(n-2) + ... + s[n-1]
         int hash = 0;
         for (int i = start; i < start + length; i++) {
             hash = 31*hash + ch[i];
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayArray.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayArray.java
index d223b06684e..f2715d9341c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayArray.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayArray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 
 package com.sun.xml.internal.fastinfoset.util;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayIntMap.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayIntMap.java
index a2aba6cbee5..5fa64221a9f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayIntMap.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayIntMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,42 +25,18 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 
 package com.sun.xml.internal.fastinfoset.util;
+
 import com.sun.xml.internal.fastinfoset.CommonResourceBundle;
 
 public class CharArrayIntMap extends KeyIntMap {
 
     private CharArrayIntMap _readOnlyMap;
 
+    // Total character count of Map
+    protected int _totalCharacterCount;
+
     static class Entry extends BaseEntry {
         final char[] _ch;
         final int _start;
@@ -113,6 +89,7 @@ public class CharArrayIntMap extends KeyIntMap {
             _table[i] = null;
         }
         _size = 0;
+        _totalCharacterCount = 0;
     }
 
     public final void setReadOnlyMap(KeyIntMap readOnlyMap, boolean clear) {
@@ -166,6 +143,10 @@ public class CharArrayIntMap extends KeyIntMap {
         return NOT_PRESENT;
     }
 
+    public final int getTotalCharacterCount() {
+        return _totalCharacterCount;
+    }
+
     private final int get(char[] ch, int start, int length, int hash) {
         if (_readOnlyMap != null) {
             final int i = _readOnlyMap.get(ch, start, length, hash);
@@ -187,7 +168,8 @@ public class CharArrayIntMap extends KeyIntMap {
     private final void addEntry(char[] ch, int start, int length, int hash, int value, int bucketIndex) {
         Entry e = _table[bucketIndex];
         _table[bucketIndex] = new Entry(ch, start, length, hash, value, e);
-        if (_size++ >= _threshold) {
+        _totalCharacterCount += length;
+                if (_size++ >= _threshold) {
             resize(2 * _table.length);
         }
     }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayString.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayString.java
index ff8196c3246..0e9a1dbaf30 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayString.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayString.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 
 package com.sun.xml.internal.fastinfoset.util;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/ContiguousCharArrayArray.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/ContiguousCharArrayArray.java
index e575960dd85..80154d788a0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/ContiguousCharArrayArray.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/ContiguousCharArrayArray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,34 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 
 package com.sun.xml.internal.fastinfoset.util;
 import com.sun.xml.internal.fastinfoset.CommonResourceBundle;
@@ -178,6 +150,24 @@ public class ContiguousCharArrayArray extends ValueArray {
         return _cachedStrings[i] = new String(_array, _offset[i], _length[i]);
     }
 
+    public final void ensureSize(int l) {
+        if (_arrayIndex + l >= _array.length) {
+            resizeArray(_arrayIndex + l);
+        }
+    }
+
+    public final void add(int l) {
+        if (_size == _offset.length) {
+            resize();
+        }
+
+        _cachedIndex = _size;
+        _offset[_size] = _arrayIndex;
+        _length[_size++] = l;
+
+        _arrayIndex += l;
+    }
+
     public final int add(char[] c, int l) {
         if (_size == _offset.length) {
             resize();
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/DuplicateAttributeVerifier.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/DuplicateAttributeVerifier.java
index 9111ef2855c..7a2cb936206 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/DuplicateAttributeVerifier.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/DuplicateAttributeVerifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,9 +21,9 @@
  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
+ *
+ * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
-
-
 package com.sun.xml.internal.fastinfoset.util;
 
 import com.sun.xml.internal.org.jvnet.fastinfoset.FastInfosetException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/FixedEntryStringIntMap.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/FixedEntryStringIntMap.java
index a8ef8668fa1..c1e70ac0dec 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/FixedEntryStringIntMap.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/FixedEntryStringIntMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 
 package com.sun.xml.internal.fastinfoset.util;
@@ -68,7 +41,7 @@ public class FixedEntryStringIntMap extends StringIntMap {
         // Add the fixed entry
         final int hash = hashHash(fixedEntry.hashCode());
         final int tableIndex = indexFor(hash, _table.length);
-        _table[tableIndex] = _fixedEntry = new Entry(fixedEntry, hash, 0, null);
+        _table[tableIndex] = _fixedEntry = new Entry(fixedEntry, hash, _index++, null);
         if (_size++ >= _threshold) {
             resize(2 * _table.length);
         }
@@ -86,11 +59,17 @@ public class FixedEntryStringIntMap extends StringIntMap {
         for (int i = 0; i < _table.length; i++) {
             _table[i] = null;
         }
+        _lastEntry = NULL_ENTRY;
+
         if (_fixedEntry != null) {
             final int tableIndex = indexFor(_fixedEntry._hash, _table.length);
             _table[tableIndex] = _fixedEntry;
             _fixedEntry._next = null;
             _size = 1;
+            _index = _readOnlyMapSize + 1;
+        } else {
+            _size = 0;
+            _index = _readOnlyMapSize;
         }
     }
 
@@ -108,6 +87,7 @@ public class FixedEntryStringIntMap extends StringIntMap {
         if (_readOnlyMap != null) {
             readOnlyMap.removeFixedEntry();
             _readOnlyMapSize = readOnlyMap.size();
+            _index = _readOnlyMapSize + _size;
             if (clear) {
                 clear();
             }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/KeyIntMap.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/KeyIntMap.java
index f81fd000e90..da7aab4a3ad 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/KeyIntMap.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/KeyIntMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 
 package com.sun.xml.internal.fastinfoset.util;
@@ -109,12 +82,12 @@ public abstract class KeyIntMap {
     public KeyIntMap(int initialCapacity, float loadFactor) {
         if (initialCapacity < 0)
             throw new IllegalArgumentException(CommonResourceBundle.getInstance().
-                    getString("message.illegalInitialCapacity", new Object[]{new Integer(initialCapacity)}));
+                    getString("message.illegalInitialCapacity", new Object[]{Integer.valueOf(initialCapacity)}));
         if (initialCapacity > MAXIMUM_CAPACITY)
             initialCapacity = MAXIMUM_CAPACITY;
         if (loadFactor <= 0 || Float.isNaN(loadFactor))
             throw new IllegalArgumentException(CommonResourceBundle.getInstance().
-                    getString("message.illegalLoadFactor", new Object[]{new Float(loadFactor)}));
+                    getString("message.illegalLoadFactor", new Object[]{Float.valueOf(loadFactor)}));
 
         // Find a power of 2 >= initialCapacity
         if (initialCapacity != DEFAULT_INITIAL_CAPACITY) {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/LocalNameQualifiedNamesMap.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/LocalNameQualifiedNamesMap.java
index b91fd4a01c6..efbcef5899b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/LocalNameQualifiedNamesMap.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/LocalNameQualifiedNamesMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 
 package com.sun.xml.internal.fastinfoset.util;
@@ -143,13 +116,16 @@ public class LocalNameQualifiedNamesMap extends KeyIntMap {
         }
     }
 
+    public final boolean isQNameFromReadOnlyMap(QualifiedName name) {
+        return (_readOnlyMap != null && name.index <= _readOnlyMap.getIndex());
+    }
+
     public final int getNextIndex() {
         return _index++;
     }
 
     public final int getIndex() {
         return _index;
-
     }
 
     public final Entry obtainEntry(String key) {
@@ -172,6 +148,19 @@ public class LocalNameQualifiedNamesMap extends KeyIntMap {
         return addEntry(key, hash, tableIndex);
     }
 
+    public final Entry obtainDynamicEntry(String key) {
+        final int hash = hashHash(key.hashCode());
+
+        final int tableIndex = indexFor(hash, _table.length);
+        for (Entry e = _table[tableIndex]; e != null; e = e._next) {
+            if (e._hash == hash && eq(key, e._key)) {
+                return e;
+            }
+        }
+
+        return addEntry(key, hash, tableIndex);
+    }
+
     private final Entry getEntry(String key, int hash) {
         if (_readOnlyMap != null) {
             final Entry entry = _readOnlyMap.getEntry(key, hash);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/NamespaceContextImplementation.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/NamespaceContextImplementation.java
new file mode 100644
index 00000000000..f821395e594
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/NamespaceContextImplementation.java
@@ -0,0 +1,226 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
+ */
+
+package com.sun.xml.internal.fastinfoset.util;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import javax.xml.namespace.NamespaceContext;
+
+/**
+ *
+ * @author Paul.Sandoz@Sun.Com
+ */
+final public class NamespaceContextImplementation implements NamespaceContext {
+    private static int DEFAULT_SIZE = 8;
+
+    private String[] prefixes = new String[DEFAULT_SIZE];
+    private String[] namespaceURIs = new String[DEFAULT_SIZE];
+    private int namespacePosition;
+
+    private int[] contexts = new int[DEFAULT_SIZE];
+    private int contextPosition;
+
+    private int currentContext;
+
+    public NamespaceContextImplementation() {
+        prefixes[0] = "xml";
+        namespaceURIs[0] = "http://www.w3.org/XML/1998/namespace";
+        prefixes[1] = "xmlns";
+        namespaceURIs[1] = "http://www.w3.org/2000/xmlns/";
+
+        currentContext = namespacePosition = 2;
+    }
+
+
+    public String getNamespaceURI(String prefix) {
+        if (prefix == null) throw new IllegalArgumentException();
+
+        prefix = prefix.intern();
+
+        for (int i = namespacePosition - 1; i >= 0; i--) {
+            final String declaredPrefix = prefixes[i];
+            if (declaredPrefix == prefix) {
+                return namespaceURIs[i];
+            }
+        }
+
+        return "";
+    }
+
+    public String getPrefix(String namespaceURI) {
+        if (namespaceURI == null) throw new IllegalArgumentException();
+
+        // namespaceURI = namespaceURI.intern();
+
+        for (int i = namespacePosition - 1; i >= 0; i--) {
+            final String declaredNamespaceURI = namespaceURIs[i];
+            if (declaredNamespaceURI == namespaceURI || declaredNamespaceURI.equals(namespaceURI)) {
+                final String declaredPrefix = prefixes[i];
+
+                // Check if prefix is out of scope
+                for (++i; i < namespacePosition; i++)
+                    if (declaredPrefix == prefixes[i])
+                        return null;
+
+                return declaredPrefix;
+            }
+        }
+
+        return null;
+    }
+
+    public String getNonDefaultPrefix(String namespaceURI) {
+        if (namespaceURI == null) throw new IllegalArgumentException();
+
+        // namespaceURI = namespaceURI.intern();
+
+        for (int i = namespacePosition - 1; i >= 0; i--) {
+            final String declaredNamespaceURI = namespaceURIs[i];
+            if ((declaredNamespaceURI == namespaceURI || declaredNamespaceURI.equals(namespaceURI)) &&
+                prefixes[i].length() > 0){
+                final String declaredPrefix = prefixes[i];
+
+                // Check if prefix is out of scope
+                for (++i; i < namespacePosition; i++)
+                    if (declaredPrefix == prefixes[i])
+                        return null;
+
+                return declaredPrefix;
+            }
+        }
+
+        return null;
+    }
+
+    public Iterator getPrefixes(String namespaceURI) {
+        if (namespaceURI == null) throw new IllegalArgumentException();
+
+        // namespaceURI = namespaceURI.intern();
+
+        List l = new ArrayList();
+
+        NAMESPACE_LOOP: for (int i = namespacePosition - 1; i >= 0; i--) {
+            final String declaredNamespaceURI = namespaceURIs[i];
+            if (declaredNamespaceURI == namespaceURI || declaredNamespaceURI.equals(namespaceURI)) {
+                final String declaredPrefix = prefixes[i];
+
+                // Check if prefix is out of scope
+                for (int j = i + 1; j < namespacePosition; j++)
+                    if (declaredPrefix == prefixes[j])
+                        continue NAMESPACE_LOOP;
+
+                l.add(declaredPrefix);
+            }
+        }
+
+        return l.iterator();
+    }
+
+
+    public String getPrefix(int index) {
+        return prefixes[index];
+    }
+
+    public String getNamespaceURI(int index) {
+        return namespaceURIs[index];
+    }
+
+    public int getCurrentContextStartIndex() {
+        return currentContext;
+    }
+
+    public int getCurrentContextEndIndex() {
+        return namespacePosition;
+    }
+
+    public boolean isCurrentContextEmpty() {
+        return currentContext == namespacePosition;
+    }
+
+    public void declarePrefix(String prefix, String namespaceURI) {
+        prefix = prefix.intern();
+        namespaceURI = namespaceURI.intern();
+
+        // Ignore the "xml" or "xmlns" declarations
+        if (prefix == "xml" || prefix == "xmlns")
+            return;
+
+        // Replace any previous declaration
+        for (int i = currentContext; i < namespacePosition; i++) {
+            final String declaredPrefix = prefixes[i];
+            if (declaredPrefix == prefix) {
+                prefixes[i] = prefix;
+                namespaceURIs[i] = namespaceURI;
+                return;
+            }
+        }
+
+        if (namespacePosition == namespaceURIs.length)
+            resizeNamespaces();
+
+        // Add new declaration
+        prefixes[namespacePosition] = prefix;
+        namespaceURIs[namespacePosition++] = namespaceURI;
+    }
+
+    private void resizeNamespaces() {
+        final int newLength = namespaceURIs.length * 3 / 2 + 1;
+
+        String[] newPrefixes = new String[newLength];
+        System.arraycopy(prefixes, 0, newPrefixes, 0, prefixes.length);
+        prefixes = newPrefixes;
+
+        String[] newNamespaceURIs = new String[newLength];
+        System.arraycopy(namespaceURIs, 0, newNamespaceURIs, 0, namespaceURIs.length);
+        namespaceURIs = newNamespaceURIs;
+    }
+
+    public void pushContext() {
+        if (contextPosition == contexts.length)
+            resizeContexts();
+
+        contexts[contextPosition++] = currentContext = namespacePosition;
+    }
+
+    private void resizeContexts() {
+        int[] newContexts = new int[contexts.length * 3 / 2 + 1];
+        System.arraycopy(contexts, 0, newContexts, 0, contexts.length);
+        contexts = newContexts;
+    }
+
+    public void popContext() {
+        if (contextPosition > 0) {
+            namespacePosition = currentContext = contexts[--contextPosition];
+        }
+    }
+
+    public void reset() {
+        currentContext = namespacePosition = 2;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/PrefixArray.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/PrefixArray.java
index beac788bcee..8860bc9d929 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/PrefixArray.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/PrefixArray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,35 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
-
 package com.sun.xml.internal.fastinfoset.util;
 
 import com.sun.xml.internal.fastinfoset.EncodingConstants;
@@ -302,13 +273,13 @@ public class PrefixArray extends ValueArray {
         System.arraycopy(_array, 0, newArray, 0, _size);
         _array = newArray;
 
-        newSize += _readOnlyArraySize;
-        final NamespaceEntry[] newInScopeNamespaces = new NamespaceEntry[newSize + 2];
-        System.arraycopy(_inScopeNamespaces, 0, newInScopeNamespaces, 0, _readOnlyArraySize + _size + 2);
+        newSize += 2;
+        final NamespaceEntry[] newInScopeNamespaces = new NamespaceEntry[newSize];
+        System.arraycopy(_inScopeNamespaces, 0, newInScopeNamespaces, 0, _inScopeNamespaces.length);
         _inScopeNamespaces = newInScopeNamespaces;
 
-        final int[] newCurrentInScope = new int[newSize + 2];
-        System.arraycopy(_currentInScope, 0, newCurrentInScope, 0, _readOnlyArraySize + _size + 2);
+        final int[] newCurrentInScope = new int[newSize];
+        System.arraycopy(_currentInScope, 0, newCurrentInScope, 0, _currentInScope.length);
         _currentInScope = newCurrentInScope;
     }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/QualifiedNameArray.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/QualifiedNameArray.java
index 8f77810ec98..da92f9da8db 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/QualifiedNameArray.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/QualifiedNameArray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 
 package com.sun.xml.internal.fastinfoset.util;
@@ -75,9 +48,6 @@ public class QualifiedNameArray extends ValueArray {
     }
 
     public final void clear() {
-        for (int i = _readOnlyArraySize; i < _size; i++) {
-            _array[i] = null;
-        }
         _size = _readOnlyArraySize;
     }
 
@@ -119,8 +89,8 @@ public class QualifiedNameArray extends ValueArray {
         }
     }
 
-    public final QualifiedName get(int i) {
-        return _array[i];
+    public final QualifiedName getNext() {
+        return (_size == _array.length) ? null : _array[_size];
     }
 
     public final void add(QualifiedName s) {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/StringArray.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/StringArray.java
index 99c2a91c341..cdc39fb3882 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/StringArray.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/StringArray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 
 package com.sun.xml.internal.fastinfoset.util;
@@ -63,17 +36,20 @@ public class StringArray extends ValueArray {
 
     private StringArray _readOnlyArray;
 
-    public StringArray(int initialCapacity, int maximumCapacity) {
+    private boolean _clear;
+
+    public StringArray(int initialCapacity, int maximumCapacity, boolean clear) {
         _array = new String[initialCapacity];
         _maximumCapacity = maximumCapacity;
+        _clear = clear;
     }
 
     public StringArray() {
-        this(DEFAULT_CAPACITY, MAXIMUM_CAPACITY);
+        this(DEFAULT_CAPACITY, MAXIMUM_CAPACITY, false);
     }
 
     public final void clear() {
-        for (int i = _readOnlyArraySize; i < _size; i++) {
+        if (_clear) for (int i = _readOnlyArraySize; i < _size; i++) {
             _array[i] = null;
         }
         _size = _readOnlyArraySize;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/StringIntMap.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/StringIntMap.java
index b81ea10db82..38a758282df 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/StringIntMap.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/StringIntMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 
 package com.sun.xml.internal.fastinfoset.util;
@@ -59,6 +32,7 @@ package com.sun.xml.internal.fastinfoset.util;
 import com.sun.xml.internal.fastinfoset.CommonResourceBundle;
 
 public class StringIntMap extends KeyIntMap {
+    protected static final Entry NULL_ENTRY = new Entry(null, 0, -1, null);
 
     protected StringIntMap _readOnlyMap;
 
@@ -73,8 +47,15 @@ public class StringIntMap extends KeyIntMap {
         }
     }
 
+    protected Entry _lastEntry = NULL_ENTRY;
+
     protected Entry[] _table;
 
+    protected int _index;
+
+    // Total character count of Map
+    protected int _totalCharacterCount;
+
     public StringIntMap(int initialCapacity, float loadFactor) {
         super(initialCapacity, loadFactor);
 
@@ -93,7 +74,10 @@ public class StringIntMap extends KeyIntMap {
         for (int i = 0; i < _table.length; i++) {
             _table[i] = null;
         }
+        _lastEntry = NULL_ENTRY;
         _size = 0;
+        _index = _readOnlyMapSize;
+        _totalCharacterCount = 0;
     }
 
     public void setReadOnlyMap(KeyIntMap readOnlyMap, boolean clear) {
@@ -109,15 +93,25 @@ public class StringIntMap extends KeyIntMap {
         _readOnlyMap = readOnlyMap;
         if (_readOnlyMap != null) {
             _readOnlyMapSize = _readOnlyMap.size();
+            _index = _size + _readOnlyMapSize;
 
             if (clear) {
                 clear();
             }
         }  else {
             _readOnlyMapSize = 0;
+            _index = _size;
         }
     }
 
+    public final int getNextIndex() {
+        return _index++;
+    }
+
+    public final int getIndex() {
+        return _index;
+    }
+
     public final int obtainIndex(String key) {
         final int hash = hashHash(key.hashCode());
 
@@ -135,20 +129,27 @@ public class StringIntMap extends KeyIntMap {
             }
         }
 
-        addEntry(key, hash, _size + _readOnlyMapSize, tableIndex);
+        addEntry(key, hash, tableIndex);
         return NOT_PRESENT;
     }
 
     public final void add(String key) {
         final int hash = hashHash(key.hashCode());
         final int tableIndex = indexFor(hash, _table.length);
-        addEntry(key, hash, _size + _readOnlyMapSize, tableIndex);
+        addEntry(key, hash, tableIndex);
     }
 
     public final int get(String key) {
+        if (key == _lastEntry._key)
+            return _lastEntry._value;
+
         return get(key, hashHash(key.hashCode()));
     }
 
+    public final int getTotalCharacterCount() {
+        return _totalCharacterCount;
+    }
+
     private final int get(String key, int hash) {
         if (_readOnlyMap != null) {
             final int i = _readOnlyMap.get(key, hash);
@@ -160,6 +161,7 @@ public class StringIntMap extends KeyIntMap {
         final int tableIndex = indexFor(hash, _table.length);
         for (Entry e = _table[tableIndex]; e != null; e = e._next) {
             if (e._hash == hash && eq(key, e._key)) {
+                _lastEntry = e;
                 return e._value;
             }
         }
@@ -168,9 +170,10 @@ public class StringIntMap extends KeyIntMap {
     }
 
 
-    private final void addEntry(String key, int hash, int value, int bucketIndex) {
+    private final void addEntry(String key, int hash, int bucketIndex) {
         Entry e = _table[bucketIndex];
-        _table[bucketIndex] = new Entry(key, hash, value, e);
+        _table[bucketIndex] = new Entry(key, hash, _index++, e);
+        _totalCharacterCount += key.length();
         if (_size++ >= _threshold) {
             resize(2 * _table.length);
         }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/ValueArray.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/ValueArray.java
index 728a9b887e0..11704fe3c7e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/ValueArray.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/ValueArray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 
 package com.sun.xml.internal.fastinfoset.util;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/ValueArrayResourceException.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/ValueArrayResourceException.java
index 41c7571b405..076e6583ecf 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/ValueArrayResourceException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/ValueArrayResourceException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 package com.sun.xml.internal.fastinfoset.util;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/vocab/ParserVocabulary.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/vocab/ParserVocabulary.java
index ab6f90c7675..4849c2f4688 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/vocab/ParserVocabulary.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/vocab/ParserVocabulary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 
 package com.sun.xml.internal.fastinfoset.vocab;
@@ -80,18 +53,12 @@ public class ParserVocabulary extends Vocabulary {
     public static final String NON_IDENTIFYING_STRING_TABLE_MAXIMUM_CHARACTERS_PEOPERTY =
         "com.sun.xml.internal.fastinfoset.vocab.ParserVocabulary.NonIdentifyingStringTable.maximumCharacters";
 
-    protected static int IDENTIFYING_STRING_TABLE_MAXIMUM_ITEMS;
-    protected static int NON_IDENTIFYING_STRING_TABLE_MAXIMUM_ITEMS;
-    protected static int NON_IDENTIFYING_STRING_TABLE_MAXIMUM_CHARACTERS;
-
-    static {
-        IDENTIFYING_STRING_TABLE_MAXIMUM_ITEMS =
-                getIntegerValueFromProperty(IDENTIFYING_STRING_TABLE_MAXIMUM_ITEMS_PEOPERTY);
-        NON_IDENTIFYING_STRING_TABLE_MAXIMUM_ITEMS =
-                getIntegerValueFromProperty(NON_IDENTIFYING_STRING_TABLE_MAXIMUM_ITEMS_PEOPERTY);
-        NON_IDENTIFYING_STRING_TABLE_MAXIMUM_CHARACTERS =
-                getIntegerValueFromProperty(NON_IDENTIFYING_STRING_TABLE_MAXIMUM_CHARACTERS_PEOPERTY);
-    }
+    protected static final int IDENTIFYING_STRING_TABLE_MAXIMUM_ITEMS =
+            getIntegerValueFromProperty(IDENTIFYING_STRING_TABLE_MAXIMUM_ITEMS_PEOPERTY);
+    protected static final int NON_IDENTIFYING_STRING_TABLE_MAXIMUM_ITEMS =
+            getIntegerValueFromProperty(NON_IDENTIFYING_STRING_TABLE_MAXIMUM_ITEMS_PEOPERTY);
+    protected static final int NON_IDENTIFYING_STRING_TABLE_MAXIMUM_CHARACTERS =
+            getIntegerValueFromProperty(NON_IDENTIFYING_STRING_TABLE_MAXIMUM_CHARACTERS_PEOPERTY);
 
     private static int getIntegerValueFromProperty(String property) {
         String value = System.getProperty(property);
@@ -107,7 +74,7 @@ public class ParserVocabulary extends Vocabulary {
     }
 
     public final CharArrayArray restrictedAlphabet = new CharArrayArray(ValueArray.DEFAULT_CAPACITY, 256);
-    public final StringArray encodingAlgorithm = new StringArray(ValueArray.DEFAULT_CAPACITY, 256);
+    public final StringArray encodingAlgorithm = new StringArray(ValueArray.DEFAULT_CAPACITY, 256, true);
 
     public final StringArray namespaceName;
     public final PrefixArray prefix;
@@ -128,12 +95,12 @@ public class ParserVocabulary extends Vocabulary {
 
     /** Creates a new instance of ParserVocabulary */
     public ParserVocabulary() {
-        namespaceName = new StringArray(ValueArray.DEFAULT_CAPACITY, IDENTIFYING_STRING_TABLE_MAXIMUM_ITEMS);
+        namespaceName = new StringArray(ValueArray.DEFAULT_CAPACITY, IDENTIFYING_STRING_TABLE_MAXIMUM_ITEMS, false);
         prefix = new PrefixArray(ValueArray.DEFAULT_CAPACITY, IDENTIFYING_STRING_TABLE_MAXIMUM_ITEMS);
-        localName = new StringArray(ValueArray.DEFAULT_CAPACITY, IDENTIFYING_STRING_TABLE_MAXIMUM_ITEMS);
-        otherNCName = new StringArray(ValueArray.DEFAULT_CAPACITY, IDENTIFYING_STRING_TABLE_MAXIMUM_ITEMS);
-        otherURI = new StringArray(ValueArray.DEFAULT_CAPACITY, IDENTIFYING_STRING_TABLE_MAXIMUM_ITEMS);
-        attributeValue = new StringArray(ValueArray.DEFAULT_CAPACITY, NON_IDENTIFYING_STRING_TABLE_MAXIMUM_ITEMS);
+        localName = new StringArray(ValueArray.DEFAULT_CAPACITY, IDENTIFYING_STRING_TABLE_MAXIMUM_ITEMS, false);
+        otherNCName = new StringArray(ValueArray.DEFAULT_CAPACITY, IDENTIFYING_STRING_TABLE_MAXIMUM_ITEMS, false);
+        otherURI = new StringArray(ValueArray.DEFAULT_CAPACITY, IDENTIFYING_STRING_TABLE_MAXIMUM_ITEMS, true);
+        attributeValue = new StringArray(ValueArray.DEFAULT_CAPACITY, NON_IDENTIFYING_STRING_TABLE_MAXIMUM_ITEMS, true);
         otherString = new CharArrayArray(ValueArray.DEFAULT_CAPACITY, NON_IDENTIFYING_STRING_TABLE_MAXIMUM_ITEMS);
 
         characterContentChunk = new ContiguousCharArrayArray(ValueArray.DEFAULT_CAPACITY,
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/vocab/SerializerVocabulary.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/vocab/SerializerVocabulary.java
index 943374b4481..39cfdaab482 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/vocab/SerializerVocabulary.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/vocab/SerializerVocabulary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 package com.sun.xml.internal.fastinfoset.vocab;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/vocab/Vocabulary.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/vocab/Vocabulary.java
index 9e43a3f3b12..b6b4c7f6868 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/vocab/Vocabulary.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/vocab/Vocabulary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 
 package com.sun.xml.internal.fastinfoset.vocab;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java
index b403bf46045..e986f0351f6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java
@@ -1,11 +1,5 @@
 /*
- * $Id: SOAPExceptionImpl.java,v 1.3 2006/01/27 12:49:17 vj135062 Exp $
- * $Revision: 1.3 $
- * $Date: 2006/01/27 12:49:17 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: SOAPExceptionImpl.java,v 1.3 2006/01/27 12:49:17 vj135062 Exp $
+ * $Revision: 1.3 $
+ * $Date: 2006/01/27 12:49:17 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj;
 
 import java.io.PrintStream;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java
index a9f053522fd..643f2d561f0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java
@@ -1,11 +1,5 @@
 /*
- * $Id: HttpSOAPConnection.java,v 1.41 2006/01/27 12:49:17 vj135062 Exp $
- * $Revision: 1.41 $
- * $Date: 2006/01/27 12:49:17 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: HttpSOAPConnection.java,v 1.41 2006/01/27 12:49:17 vj135062 Exp $
+ * $Revision: 1.41 $
+ * $Date: 2006/01/27 12:49:17 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.client.p2p;
 
 import java.io.*;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java
index 88b180a5f26..340ceac0694 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java
@@ -1,11 +1,5 @@
 /*
- * $Id: HttpSOAPConnectionFactory.java,v 1.6 2006/01/27 12:49:18 vj135062 Exp $
- * $Revision: 1.6 $
- * $Date: 2006/01/27 12:49:18 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: HttpSOAPConnectionFactory.java,v 1.6 2006/01/27 12:49:18 vj135062 Exp $
+ * $Revision: 1.6 $
+ * $Date: 2006/01/27 12:49:18 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.client.p2p;
 
 import javax.xml.soap.*;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings.properties b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings.properties
index 00e2468a173..3a4eaeecc84 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings.properties
@@ -1,3 +1,28 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
 # SAAJ ResourceBundle properties file
 # Contains Log messages
 # Error messages
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/Header.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/Header.java
index e0065b23c3a..778f446830c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/Header.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/Header.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * @(#)Header.java    1.3 02/03/27
+ */
+
+
 
 package com.sun.xml.internal.messaging.saaj.packaging.mime;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java
index d83cea8d811..0d2f1afc8ec 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * @(#)MessagingException.java        1.10 02/06/13
+ */
+
+
 
 package com.sun.xml.internal.messaging.saaj.packaging.mime;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MultipartDataSource.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MultipartDataSource.java
index ed86e59faf7..eb15ad90882 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MultipartDataSource.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MultipartDataSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * @(#)MultipartDataSource.java       1.6 02/03/27
+ */
+
+
 
 package com.sun.xml.internal.messaging.saaj.packaging.mime;
 
@@ -42,6 +47,7 @@ import javax.activation.DataSource;
  * This interface will typically be implemented by providers that
  * preparse multipart bodies, for example an IMAP provider.
  *
+ * @version     1.6, 02/03/27
  * @author      John Mani
  * @see         javax.activation.DataSource
  */
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java
index b7466dfd699..7769bdedb78 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * @(#)MimeMultipart.java     1.31 03/01/29
+ */
+
+
 
 package com.sun.xml.internal.messaging.saaj.packaging.mime.internet;
 
@@ -210,7 +215,6 @@ public  class BMMimeMultipart extends MimeMultipart {
         } catch (IOException ioex) {
             throw new MessagingException("IO Error", ioex);
         } catch (Exception ex) {
-            ex.printStackTrace();
             throw new MessagingException("Error", ex);
         }
 
@@ -496,16 +500,34 @@ public  class BMMimeMultipart extends MimeMultipart {
                     // so if s == 1 : it must be an LF
                     // if s == 2 : it must be a CR LF
                     if (s <= 2) {
-                        String crlf = new String(prevBuffer, 0, s);
-                        if (!"\n".equals(crlf) && !"\r\n".equals(crlf)) {
-                            throw new Exception(
-                                "Boundary characters encountered in part Body " +
-                                "without a preceeding CRLF");
-                        } else {
-                            if (sin != null) {
-                                posVector[0] = endPos;
+                        //it could be "some-char\n" so write some-char
+                        if (s == 2) {
+                            if (prevBuffer[1] == '\n') {
+                                if (prevBuffer[0] != '\r' && prevBuffer[0] != '\n') {
+                                    out.write(prevBuffer,0,1);
+                                }
+                                if (sin != null) {
+                                    posVector[0] = endPos;
+                                }
+
+                            } else {
+                                throw new Exception(
+                                        "Boundary characters encountered in part Body " +
+                                        "without a preceeding CRLF");
+                            }
+
+                        } else if (s==1) {
+                            if (prevBuffer[0] != '\n') {
+                                throw new Exception(
+                                        "Boundary characters encountered in part Body " +
+                                        "without a preceeding CRLF");
+                            }else {
+                                if (sin != null) {
+                                    posVector[0] = endPos;
+                                }
                             }
                         }
+
                     } else if (s > 2) {
                         if ((prevBuffer[s-2] == '\r') && (prevBuffer[s-1] == '\n')) {
                             if (sin != null) {
@@ -530,7 +552,7 @@ public  class BMMimeMultipart extends MimeMultipart {
                 // found the boundary, skip *LWSP-char and CRLF
                 if (!skipLWSPAndCRLF(is)) {
                     //throw new Exception(
-                     //   "Boundary does not terminate with CRLF");
+                    //   "Boundary does not terminate with CRLF");
                 }
                 return true;
             }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentDisposition.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentDisposition.java
index 0774051db01..62724f61f06 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentDisposition.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentDisposition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * @(#)ContentDisposition.java        1.6 02/03/27
+ */
+
+
 
 package com.sun.xml.internal.messaging.saaj.packaging.mime.internet;
 
@@ -31,6 +36,7 @@ package com.sun.xml.internal.messaging.saaj.packaging.mime.internet;
  * methods to parse a ContentDisposition string into individual components
  * and to generate a MIME style ContentDisposition string.
  *
+ * @version 1.6, 02/03/27
  * @author  John Mani
  */
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentType.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentType.java
index 082cc51d8bf..8e18b9d4104 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentType.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * @(#)ContentType.java       1.7 02/03/27
+ */
+
+
 
 package com.sun.xml.internal.messaging.saaj.packaging.mime.internet;
 
@@ -31,6 +36,7 @@ package com.sun.xml.internal.messaging.saaj.packaging.mime.internet;
  * methods to parse a ContentType string into individual components
  * and to generate a MIME style ContentType string.
  *
+ * @version 1.7, 02/03/27
  * @author  John Mani
  */
 public final class ContentType {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/HeaderTokenizer.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/HeaderTokenizer.java
index 7486de60534..acf827aa950 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/HeaderTokenizer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/HeaderTokenizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * @(#)HeaderTokenizer.java   1.9 02/03/27
+ */
+
+
 
 package com.sun.xml.internal.messaging.saaj.packaging.mime.internet;
 
@@ -34,6 +39,7 @@ package com.sun.xml.internal.messaging.saaj.packaging.mime.internet;
  * CRLF SPACE sequences). The folds are removed in the returned
  * tokens.
  *
+ * @version 1.9, 02/03/27
  * @author  John Mani
  */
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java
index 15c106c0126..5e8f7346630 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * @(#)InternetHeaders.java   1.16 02/08/08
+ */
+
+
 
 package com.sun.xml.internal.messaging.saaj.packaging.mime.internet;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeBodyPart.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeBodyPart.java
index 12c9364fe16..a3e810f5777 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeBodyPart.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeBodyPart.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * @(#)MimeBodyPart.java      1.52 03/02/12
+ */
+
+
 
 package com.sun.xml.internal.messaging.saaj.packaging.mime.internet;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java
index 4394aed0b32..693b40a5724 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * @(#)MimeMultipart.java     1.31 03/01/29
+ */
+
+
 
 package com.sun.xml.internal.messaging.saaj.packaging.mime.internet;
 
@@ -61,6 +66,7 @@ import com.sun.xml.internal.messaging.saaj.util.ByteOutputStream;
  * constructor.  For example, to create a "multipart/alternative" object,
  * use new MimeMultipart("alternative").
  *
+ * @version 1.31, 03/01/29
  * @author  John Mani
  * @author  Bill Shannon
  * @author  Max Spivak
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePartDataSource.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePartDataSource.java
index e8d32982762..8d77004bc04 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePartDataSource.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePartDataSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * @(#)MimePartDataSource.java        1.9 02/03/27
+ */
+
+
 
 package com.sun.xml.internal.messaging.saaj.packaging.mime.internet;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeUtility.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeUtility.java
index 95c8f196f82..a5042c2c45d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeUtility.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeUtility.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * @(#)MimeUtility.java       1.45 03/03/10
+ */
+
+
 
 package com.sun.xml.internal.messaging.saaj.packaging.mime.internet;
 
@@ -108,6 +113,7 @@ import com.sun.xml.internal.messaging.saaj.packaging.mime.util.*;
  * mail messages is different than the charset used for files stored on
  * the system, this property should be set.
  *
+ * @version 1.45, 03/03/10
  * @author  John Mani
  * @author  Bill Shannon
  */
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java
index 4fa98ebd039..1baebdb2796 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * @(#)ParameterList.java     1.10 03/02/12
+ */
+
+
 
 package com.sun.xml.internal.messaging.saaj.packaging.mime.internet;
 
@@ -32,6 +37,7 @@ import java.util.Map;
 /**
  * This class holds MIME parameters (attribute-value pairs).
  *
+ * @version 1.10, 03/02/12
  * @author  John Mani
  */
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParseException.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParseException.java
index 724fa67489c..1a7f1d09f3d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParseException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParseException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * @(#)ParseException.java    1.3 02/03/27
+ */
+
+
 
 package com.sun.xml.internal.messaging.saaj.packaging.mime.internet;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/SharedInputStream.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/SharedInputStream.java
index 4b993ad87c0..c1ae4b3f7c3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/SharedInputStream.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/SharedInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * @(#)SharedInputStream.java 1.2 02/03/27
+ */
+
+
 
 package com.sun.xml.internal.messaging.saaj.packaging.mime.internet;
 
@@ -37,6 +42,7 @@ import java.io.OutputStream;
  * original InputStream.  The new InputStream will access the same
  * underlying data as the original, without copying the data.
  *
+ * @version 1.2, 02/03/27
  * @author  Bill Shannon
  * @since JavaMail 1.2
  */
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/UniqueValue.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/UniqueValue.java
index 61d486abb80..5ccd70a228c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/UniqueValue.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/UniqueValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * @(#)UniqueValue.java       1.6 02/03/27
+ */
+
+
 
 package com.sun.xml.internal.messaging.saaj.packaging.mime.internet;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/ASCIIUtility.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/ASCIIUtility.java
index 9f33685f4d2..5b22430a472 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/ASCIIUtility.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/ASCIIUtility.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * @(#)ASCIIUtility.java      1.9 02/03/27
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.packaging.mime.util;
 
 import com.sun.xml.internal.messaging.saaj.util.ByteOutputStream;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64DecoderStream.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64DecoderStream.java
index 470ffde984d..c58cc7df7fe 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64DecoderStream.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64DecoderStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * @(#)BASE64DecoderStream.java       1.8 02/03/27
+ */
+
+
 
 package com.sun.xml.internal.messaging.saaj.packaging.mime.util;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64EncoderStream.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64EncoderStream.java
index 05d9cbc5650..09e592b1cf9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64EncoderStream.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64EncoderStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * @(#)BASE64EncoderStream.java       1.6 02/03/27
+ */
+
+
 
 package com.sun.xml.internal.messaging.saaj.packaging.mime.util;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BEncoderStream.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BEncoderStream.java
index 1170a93869d..5501a79b384 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BEncoderStream.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BEncoderStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * @(#)BEncoderStream.java    1.3 02/03/27
+ */
+
+
 
 package com.sun.xml.internal.messaging.saaj.packaging.mime.util;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/LineInputStream.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/LineInputStream.java
index 93b8775fb6a..927e42b8dc9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/LineInputStream.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/LineInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * @(#)LineInputStream.java   1.7 03/01/07
+ */
+
+
 
 package com.sun.xml.internal.messaging.saaj.packaging.mime.util;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/OutputUtil.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/OutputUtil.java
index d0a6a90ee3c..7dc23fdfa41 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/OutputUtil.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/OutputUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * @(#)OutputUtil.java  1.6 02/03/27
+ */
+
+
 
 package com.sun.xml.internal.messaging.saaj.packaging.mime.util;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QDecoderStream.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QDecoderStream.java
index 358b7ceae23..3762dafda93 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QDecoderStream.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QDecoderStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * @(#)QDecoderStream.java    1.5 02/03/27
+ */
+
+
 
 package com.sun.xml.internal.messaging.saaj.packaging.mime.util;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QEncoderStream.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QEncoderStream.java
index 2b635d2eac2..7ad92717dba 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QEncoderStream.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QEncoderStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * @(#)QEncoderStream.java    1.4 02/03/27
+ */
+
+
 
 package com.sun.xml.internal.messaging.saaj.packaging.mime.util;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPDecoderStream.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPDecoderStream.java
index 3dcc0a12daf..535df0e9ccb 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPDecoderStream.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPDecoderStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * @(#)QPDecoderStream.java   1.9 02/04/02
+ */
+
+
 
 package com.sun.xml.internal.messaging.saaj.packaging.mime.util;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPEncoderStream.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPEncoderStream.java
index ab323db5987..5a5a4902bc6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPEncoderStream.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPEncoderStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * @(#)QPEncoderStream.java   1.6 02/03/27
+ */
+
+
 
 package com.sun.xml.internal.messaging.saaj.packaging.mime.util;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUDecoderStream.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUDecoderStream.java
index 625634c63e9..b625d7cd0c5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUDecoderStream.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUDecoderStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * @(#)UUDecoderStream.java   1.8 02/07/08
+ */
+
+
 
 package com.sun.xml.internal.messaging.saaj.packaging.mime.util;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUEncoderStream.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUEncoderStream.java
index 6287228a2d7..bd52b5389f6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUEncoderStream.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUEncoderStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * @(#)UUEncoderStream.java   1.3 02/03/27
+ */
+
+
 
 package com.sun.xml.internal.messaging.saaj.packaging.mime.util;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java
index 62ee4c48574..9ded9888f7d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java
@@ -1,11 +1,5 @@
 /*
- * $Id: AttachmentPartImpl.java,v 1.45 2006/01/27 12:49:26 vj135062 Exp $
- * $Revision: 1.45 $
- * $Date: 2006/01/27 12:49:26 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: AttachmentPartImpl.java,v 1.1.1.1.2.1 2007/11/27 07:19:29 kumarjayanti Exp $
+ * $Revision: 1.1.1.1.2.1 $
+ * $Date: 2007/11/27 07:19:29 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.soap;
 
 import com.sun.xml.internal.messaging.saaj.SOAPExceptionImpl;
@@ -91,6 +92,7 @@ public class AttachmentPartImpl extends AttachmentPart {
                     "application/fastinfoset"
                         + hndlrStr
                         + "com.sun.xml.internal.messaging.saaj.soap.FastInfosetDataContentHandler");
+                /* Image DataContentHandler handles all image types
                 mailMap.addMailcap(
                     "image/jpeg"
                         + hndlrStr
@@ -98,7 +100,7 @@ public class AttachmentPartImpl extends AttachmentPart {
                 mailMap.addMailcap(
                     "image/gif"
                         + hndlrStr
-                        + "com.sun.xml.internal.messaging.saaj.soap.GifDataContentHandler");
+                        + "com.sun.xml.internal.messaging.saaj.soap.GifDataContentHandler");*/
                 /*mailMap.addMailcap(
                     "multipart/*"
                         + hndlrStr
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/Envelope.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/Envelope.java
index 2c3301d29bf..f136a463686 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/Envelope.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/Envelope.java
@@ -1,11 +1,5 @@
 /*
- * $Id: Envelope.java,v 1.8 2006/01/27 12:49:26 vj135062 Exp $
- * $Revision: 1.8 $
- * $Date: 2006/01/27 12:49:26 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: Envelope.java,v 1.8 2006/01/27 12:49:26 vj135062 Exp $
+ * $Revision: 1.8 $
+ * $Date: 2006/01/27 12:49:26 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.soap;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java
index 1ae2aa12d87..81adca3ce9d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java
@@ -1,11 +1,5 @@
 /*
- * $Id: EnvelopeFactory.java,v 1.24 2006/01/27 12:49:26 vj135062 Exp $
- * $Revision: 1.24 $
- * $Date: 2006/01/27 12:49:26 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: EnvelopeFactory.java,v 1.24 2006/01/27 12:49:26 vj135062 Exp $
+ * $Revision: 1.24 $
+ * $Date: 2006/01/27 12:49:26 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.soap;
 
 import java.util.logging.Logger;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/FastInfosetDataContentHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/FastInfosetDataContentHandler.java
index 8056b0e5f6d..c4e2c23e5c2 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/FastInfosetDataContentHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/FastInfosetDataContentHandler.java
@@ -1,11 +1,5 @@
 /*
- * $Id: FastInfosetDataContentHandler.java,v 1.1.1.1 2006/01/27 13:10:56 kumarjayanti Exp $
- * $Revision: 1.1.1.1 $
- * $Date: 2006/01/27 13:10:56 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: FastInfosetDataContentHandler.java,v 1.1.1.1 2006/01/27 13:10:56 kumarjayanti Exp $
+ * $Revision: 1.1.1.1 $
+ * $Date: 2006/01/27 13:10:56 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.soap;
 
 import java.awt.datatransfer.DataFlavor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/GifDataContentHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/GifDataContentHandler.java
index 30e51545f2f..587b09a315c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/GifDataContentHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/GifDataContentHandler.java
@@ -1,11 +1,5 @@
 /*
- * $Id: GifDataContentHandler.java,v 1.15 2006/01/27 12:49:26 vj135062 Exp $
- * $Revision: 1.15 $
- * $Date: 2006/01/27 12:49:26 $
- */
-
-/*
- * Copyright 2006-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,14 +22,18 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: GifDataContentHandler.java,v 1.2.2.1 2007/11/27 07:19:29 kumarjayanti Exp $
+ * $Revision: 1.2.2.1 $
+ * $Date: 2007/11/27 07:19:29 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.soap;
 
 import java.awt.datatransfer.DataFlavor;
 import java.io.*;
-
-import java.awt.image.BufferedImage;
 import java.awt.*;
-
 import javax.activation.*;
 
 /**
@@ -108,7 +106,7 @@ public class GifDataContentHandler extends Component implements DataContentHandl
      */
     public void writeTo(Object obj, String type, OutputStream os)
                         throws IOException {
-        if (!(obj instanceof Image))
+        if (obj != null && !(obj instanceof Image))
             throw new IOException("\"" + getDF().getMimeType() +
                 "\" DataContentHandler requires Image object, " +
                 "was given object of type " + obj.getClass().toString());
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java
index 23e957e5098..a8eed2e4f81 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java
@@ -1,11 +1,5 @@
 /*
- * $Id: ImageDataContentHandler.java,v 1.5 2006/01/27 12:49:26 vj135062 Exp $
- * $Revision: 1.5 $
- * $Date: 2006/01/27 12:49:26 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: ImageDataContentHandler.java,v 1.1.1.1.2.1 2007/11/27 07:19:28 kumarjayanti Exp $
+ * $Revision: 1.1.1.1.2.1 $
+ * $Date: 2007/11/27 07:19:28 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.soap;
 
 import java.awt.*;
@@ -144,6 +145,7 @@ public class ImageDataContentHandler extends Component
                 stream = ImageIO.createImageOutputStream(os);
                 writer.setOutput(stream);
                 writer.write(bufImage);
+                writer.dispose();
                 stream.close();
             } else {
                 log.log(Level.SEVERE, "SAAJ0526.soap.unsupported.mime.type",
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/JpegDataContentHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/JpegDataContentHandler.java
index e1cae6c8b34..41391b66b11 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/JpegDataContentHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/JpegDataContentHandler.java
@@ -1,11 +1,5 @@
 /*
- * $Id: JpegDataContentHandler.java,v 1.15 2006/01/27 12:49:26 vj135062 Exp $
- * $Revision: 1.15 $
- * $Date: 2006/01/27 12:49:26 $
- */
-
-/*
- * Copyright 2006-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: JpegDataContentHandler.java,v 1.1.1.1.2.1 2007/11/27 07:19:29 kumarjayanti Exp $
+ * $Revision: 1.1.1.1.2.1 $
+ * $Date: 2007/11/27 07:19:29 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.soap;
 
 import java.awt.*;
@@ -37,6 +38,7 @@ import java.io.*;
 
 import javax.activation.*;
 
+//import com.sun.image.codec.jpeg.*;
 import javax.imageio.ImageIO;
 
 /**
@@ -155,7 +157,9 @@ public class JpegDataContentHandler
                 Graphics g = bufImage.createGraphics();
                 g.drawImage(img, 0, 0, null);
             }
+
             ImageIO.write(bufImage, "jpeg", os);
+
         } catch (Exception ex) {
             throw new IOException(
                 "Unable to run the JPEG Encoder on a stream "
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings.properties b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings.properties
index bbb0d0fd8e2..a60c6172d03 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings.properties
@@ -1,3 +1,28 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
 # SAAJ ResourceBundle properties file
 # Contains Log messages for soap pkg
 # Error messages
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java
index 8a8920d05d7..97cff5ad6aa 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java
@@ -1,11 +1,5 @@
 /*
- * $Id: MessageFactoryImpl.java,v 1.23 2006/01/27 12:49:27 vj135062 Exp $
- * $Revision: 1.23 $
- * $Date: 2006/01/27 12:49:27 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: MessageFactoryImpl.java,v 1.23 2006/01/27 12:49:27 vj135062 Exp $
+ * $Revision: 1.23 $
+ * $Date: 2006/01/27 12:49:27 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.soap;
 
 import java.io.*;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java
index 6f49a1c4df7..02be27a92f1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java
@@ -1,11 +1,5 @@
 /*
- * $Id: MessageImpl.java,v 1.3 2006/08/04 09:24:24 ashutoshshahi Exp $
- * $Revision: 1.3 $
- * $Date: 2006/08/04 09:24:24 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: MessageImpl.java,v 1.5 2006/12/12 10:16:33 kumarjayanti Exp $
+ * $Revision: 1.5 $
+ * $Date: 2006/12/12 10:16:33 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.soap;
 
 import java.io.*;
@@ -1253,11 +1254,19 @@ public abstract class MessageImpl
     }
 
     public SOAPBody getSOAPBody() throws SOAPException {
-        return getSOAPPart().getEnvelope().getBody();
+        SOAPBody body = getSOAPPart().getEnvelope().getBody();
+        /*if (body == null) {
+             throw new SOAPException("No SOAP Body was found in the SOAP Message");
+        }*/
+        return body;
     }
 
     public SOAPHeader getSOAPHeader() throws SOAPException {
-        return getSOAPPart().getEnvelope().getHeader();
+        SOAPHeader hdr = getSOAPPart().getEnvelope().getHeader();
+        /*if (hdr == null) {
+            throw new SOAPException("No SOAP Header was found in the SOAP Message");
+        }*/
+        return hdr;
     }
 
     private void initializeAllAttachments ()
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MultipartDataContentHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MultipartDataContentHandler.java
index 6b5defe7fc4..4e0d9028d56 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MultipartDataContentHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MultipartDataContentHandler.java
@@ -1,11 +1,5 @@
 /*
- * $Id: MultipartDataContentHandler.java,v 1.3 2006/01/27 12:49:28 vj135062 Exp $
- * $Revision: 1.3 $
- * $Date: 2006/01/27 12:49:28 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: MultipartDataContentHandler.java,v 1.3 2006/01/27 12:49:28 vj135062 Exp $
+ * $Revision: 1.3 $
+ * $Date: 2006/01/27 12:49:28 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.soap;
 
 import java.io.*;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java
index ea99d4099ba..f06b596c4a1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.messaging.saaj.soap;
 
 import javax.xml.soap.SAAJMetaFactory;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocument.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocument.java
index 92ce2c14757..560f841e9fc 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocument.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocument.java
@@ -1,9 +1,5 @@
 /*
- * $Id: SOAPDocument.java,v 1.5 2006/01/27 12:49:28 vj135062 Exp $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: SOAPDocument.java,v 1.5 2006/01/27 12:49:28 vj135062 Exp $
+ */
+
+
 
 /**
 *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java
index 71c0b282261..41e8981be08 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java
@@ -1,9 +1,5 @@
 /*
- * $Id: SOAPDocumentFragment.java,v 1.6 2006/01/27 12:49:28 vj135062 Exp $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: SOAPDocumentFragment.java,v 1.6 2006/01/27 12:49:28 vj135062 Exp $
+ */
+
+
 
 /**
 *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java
index 5b8d7976f2c..a2e7ae761c7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java
@@ -1,9 +1,5 @@
 /*
- * $Id: SOAPDocumentImpl.java,v 1.15 2006/01/27 12:49:29 vj135062 Exp $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: SOAPDocumentImpl.java,v 1.15 2006/01/27 12:49:29 vj135062 Exp $
+ */
+
+
 
 /**
 *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java
index 897a607806a..2c1f71314cb 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java
@@ -1,11 +1,5 @@
 /*
- * $Id: SOAPFactoryImpl.java,v 1.21 2006/01/27 12:49:29 vj135062 Exp $
- * $Revision: 1.21 $
- * $Date: 2006/01/27 12:49:29 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: SOAPFactoryImpl.java,v 1.21 2006/01/27 12:49:29 vj135062 Exp $
+ * $Revision: 1.21 $
+ * $Date: 2006/01/27 12:49:29 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.soap;
 
 import java.util.logging.Logger;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java
index d9e6ea99af5..4eced47e2f4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,6 +23,7 @@
  * have any questions.
  */
 
+
 /**
  * Created on Nov 19, 2002
  *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java
index 60d4c1c6cec..1125bdc3d83 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java
@@ -1,11 +1,5 @@
 /*
- * $Id: SOAPPartImpl.java,v 1.1.1.1 2006/01/27 13:10:55 kumarjayanti Exp $
- * $Revision: 1.1.1.1 $
- * $Date: 2006/01/27 13:10:55 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: SOAPPartImpl.java,v 1.1.1.1 2006/01/27 13:10:55 kumarjayanti Exp $
+ * $Revision: 1.1.1.1 $
+ * $Date: 2006/01/27 13:10:55 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.soap;
 
 import java.io.*;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPVersionMismatchException.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPVersionMismatchException.java
index db5349290f7..e5c607996b7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPVersionMismatchException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPVersionMismatchException.java
@@ -1,11 +1,5 @@
 /*
- * $Id: SOAPVersionMismatchException.java,v 1.6 2006/01/27 12:49:29 vj135062 Exp $
- * $Revision: 1.6 $
- * $Date: 2006/01/27 12:49:29 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: SOAPVersionMismatchException.java,v 1.6 2006/01/27 12:49:29 vj135062 Exp $
+ * $Revision: 1.6 $
+ * $Date: 2006/01/27 12:49:29 $
+ */
+
+
 
 package com.sun.xml.internal.messaging.saaj.soap;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/StringDataContentHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/StringDataContentHandler.java
index cad725cd464..d810918ca9e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/StringDataContentHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/StringDataContentHandler.java
@@ -1,11 +1,5 @@
 /*
- * $Id: StringDataContentHandler.java,v 1.6 2006/01/27 12:49:29 vj135062 Exp $
- * $Revision: 1.6 $
- * $Date: 2006/01/27 12:49:29 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: StringDataContentHandler.java,v 1.6 2006/01/27 12:49:29 vj135062 Exp $
+ * $Revision: 1.6 $
+ * $Date: 2006/01/27 12:49:29 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.soap;
 
 import java.awt.datatransfer.DataFlavor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/XmlDataContentHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/XmlDataContentHandler.java
index e188cf4045d..46f89c4ff53 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/XmlDataContentHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/XmlDataContentHandler.java
@@ -1,11 +1,5 @@
 /*
- * $Id: XmlDataContentHandler.java,v 1.12 2006/01/27 12:49:30 vj135062 Exp $
- * $Revision: 1.12 $
- * $Date: 2006/01/27 12:49:30 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: XmlDataContentHandler.java,v 1.12 2006/01/27 12:49:30 vj135062 Exp $
+ * $Revision: 1.12 $
+ * $Date: 2006/01/27 12:49:30 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.soap;
 
 import java.awt.datatransfer.DataFlavor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java
index 4331e98e79c..2db889d9ebb 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java
@@ -1,9 +1,5 @@
 /*
- * $Id: SOAPFactoryDynamicImpl.java,v 1.2 2006/01/27 12:49:32 vj135062 Exp $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: SOAPFactoryDynamicImpl.java,v 1.2 2006/01/27 12:49:32 vj135062 Exp $
+ */
+
+
 
 /**
 *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java
index 51afa7b120f..6bba9c84440 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java
@@ -1,9 +1,5 @@
 /*
- * $Id: SOAPMessageFactoryDynamicImpl.java,v 1.4 2006/01/27 12:49:32 vj135062 Exp $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: SOAPMessageFactoryDynamicImpl.java,v 1.4 2006/01/27 12:49:32 vj135062 Exp $
+ */
+
+
 
 /**
 *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java
index a14e58623ce..83f4ac24bdd 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java
@@ -1,11 +1,5 @@
 /*
- * $Id: BodyElementImpl.java,v 1.14 2006/01/27 12:49:33 vj135062 Exp $
- * $Revision: 1.14 $
- * $Date: 2006/01/27 12:49:33 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: BodyElementImpl.java,v 1.14 2006/01/27 12:49:33 vj135062 Exp $
+ * $Revision: 1.14 $
+ * $Date: 2006/01/27 12:49:33 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.soap.impl;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java
index ebf51c5e93f..2ec0855be1e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java
@@ -1,11 +1,5 @@
 /*
- * $Id: BodyImpl.java,v 1.41 2006/01/27 12:49:34 vj135062 Exp $
- * $Revision: 1.41 $
- * $Date: 2006/01/27 12:49:34 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: BodyImpl.java,v 1.41 2006/01/27 12:49:34 vj135062 Exp $
+ * $Revision: 1.41 $
+ * $Date: 2006/01/27 12:49:34 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.soap.impl;
 
 import java.util.Iterator;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java
index 99431d2241f..64110619d38 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java
@@ -1,11 +1,5 @@
 /*
- * $Id: CDATAImpl.java,v 1.19 2006/01/27 12:49:34 vj135062 Exp $
- * $Revision: 1.19 $
- * $Date: 2006/01/27 12:49:34 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: CDATAImpl.java,v 1.19 2006/01/27 12:49:34 vj135062 Exp $
+ * $Revision: 1.19 $
+ * $Date: 2006/01/27 12:49:34 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.soap.impl;
 
 import java.util.logging.Logger;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CommentImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CommentImpl.java
index fe775b11977..6931d53a370 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CommentImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CommentImpl.java
@@ -1,11 +1,5 @@
 /*
- * $Id: CommentImpl.java,v 1.17 2006/01/27 12:49:34 vj135062 Exp $
- * $Revision: 1.17 $
- * $Date: 2006/01/27 12:49:34 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: CommentImpl.java,v 1.17 2006/01/27 12:49:34 vj135062 Exp $
+ * $Revision: 1.17 $
+ * $Date: 2006/01/27 12:49:34 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.soap.impl;
 
 import java.util.ResourceBundle;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java
index 24a8d327f52..d8286f1a6bd 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java
@@ -1,11 +1,5 @@
 /*
- * $Id: DetailEntryImpl.java,v 1.8 2006/01/27 12:49:34 vj135062 Exp $
- * $Revision: 1.8 $
- * $Date: 2006/01/27 12:49:34 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: DetailEntryImpl.java,v 1.8 2006/01/27 12:49:34 vj135062 Exp $
+ * $Revision: 1.8 $
+ * $Date: 2006/01/27 12:49:34 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.soap.impl;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java
index 8c67ca0fa1f..caecc726ba8 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java
@@ -1,11 +1,5 @@
 /*
- * $Id: DetailImpl.java,v 1.16 2006/01/27 12:49:34 vj135062 Exp $
- * $Revision: 1.16 $
- * $Date: 2006/01/27 12:49:34 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: DetailImpl.java,v 1.16 2006/01/27 12:49:34 vj135062 Exp $
+ * $Revision: 1.16 $
+ * $Date: 2006/01/27 12:49:34 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.soap.impl;
 
 import java.util.Iterator;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java
index efae488d1b1..e5e124e9016 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java
@@ -1,11 +1,5 @@
 /*
- * $Id: ElementFactory.java,v 1.16 2006/01/27 12:49:35 vj135062 Exp $
- * $Revision: 1.16 $
- * $Date: 2006/01/27 12:49:35 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: ElementFactory.java,v 1.16 2006/01/27 12:49:35 vj135062 Exp $
+ * $Revision: 1.16 $
+ * $Date: 2006/01/27 12:49:35 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.soap.impl;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java
index f9cfa2a6f0b..2afcf90b997 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java
@@ -1,11 +1,5 @@
 /*
- * $Id: ElementImpl.java,v 1.1.1.1 2006/01/27 13:10:57 kumarjayanti Exp $
- * $Revision: 1.1.1.1 $
- * $Date: 2006/01/27 13:10:57 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: ElementImpl.java,v 1.6 2006/11/16 16:01:14 kumarjayanti Exp $
+ * $Revision: 1.6 $
+ * $Date: 2006/11/16 16:01:14 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.soap.impl;
 
 import java.util.*;
@@ -184,16 +185,24 @@ public class ElementImpl
         } else if (prefix != null) {
             // Find if there's an ancester whose name contains this prefix
             org.w3c.dom.Node currentAncestor = this;
+
+//            String uri = currentAncestor.lookupNamespaceURI(prefix);
+//            return uri;
             while (currentAncestor != null &&
                    !(currentAncestor instanceof Document)) {
-                /*
-                if (prefix.equals(currentAncestor.getPrefix())) {
+
+               /* if (prefix.equals(currentAncestor.getPrefix())) {
                     String uri = currentAncestor.getNamespaceURI();
                     // this is because the javadoc says getNamespaceURI() is not a computed value
                     // and URI for a non-empty prefix cannot be null
                     if (uri != null)
                         return uri;
                 }*/
+                //String uri = currentAncestor.lookupNamespaceURI(prefix);
+                //if (uri != null) {
+                //    return uri;
+                //}
+
                 if (((Element) currentAncestor).hasAttributeNS(
                         NamespaceContext.XMLNS_URI, prefix)) {
                     return ((Element) currentAncestor).getAttributeNS(
@@ -500,7 +509,8 @@ public class ElementImpl
         } else {
             setAttributeNS(NamespaceContext.XMLNS_URI, "xmlns", uri);
         }
-        tryToFindEncodingStyleAttributeName();
+        //Fix for CR:6474641
+        //tryToFindEncodingStyleAttributeName();
         return this;
     }
 
@@ -932,8 +942,9 @@ public class ElementImpl
         if (parent != null) {
             parent.removeChild(this);
         }
-        encodingStyleAttribute.clearName();
-        tryToFindEncodingStyleAttributeName();
+        encodingStyleAttribute.clearNameAndValue();
+        // Fix for CR: 6474641
+        //tryToFindEncodingStyleAttributeName();
     }
 
     public void tryToFindEncodingStyleAttributeName() {
@@ -973,6 +984,13 @@ public class ElementImpl
         public String getValue() {
             return attributeValue;
         }
+
+        /** Note: to be used only in detachNode method */
+        public void clearNameAndValue() {
+            attributeName = null;
+            attributeValue = null;
+        }
+
         private void reconcileAttribute() throws SOAPException {
             if (attributeName != null) {
                 removeAttribute(attributeName);
@@ -1211,7 +1229,18 @@ public class ElementImpl
             prefix = qualifiedName.substring(0, index);
             localName = qualifiedName.substring(index + 1);
         }
-                super.setAttributeNS(namespaceURI,qualifiedName,value);
+
+        // Workaround for bug 6467808 - This needs to be fixed in JAXP
+
+        // Rolling back this fix, this is a wrong fix, infact its causing other regressions in JAXWS tck and
+        // other tests, because of this change the namespace declarations on soapenv:Fault element are never
+        // picked up. The fix for bug 6467808 should be in JAXP.
+//        if(elementQName.getLocalPart().equals("Fault") &&
+//                (SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE.equals(value) ||
+//                SOAPConstants.URI_NS_SOAP_1_2_ENVELOPE.equals(value)))
+//            return;
+
+        super.setAttributeNS(namespaceURI,qualifiedName,value);
         //String tmpLocalName = this.getLocalName();
         String tmpURI = this.getNamespaceURI();
         boolean isIDNS = false;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java
index 76af746714f..1c4cf2b030a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java
@@ -1,11 +1,5 @@
 /*
- * $Id: EnvelopeImpl.java,v 1.1.1.1 2006/01/27 13:10:56 kumarjayanti Exp $
- * $Revision: 1.1.1.1 $
- * $Date: 2006/01/27 13:10:56 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: EnvelopeImpl.java,v 1.1.1.1 2006/01/27 13:10:56 kumarjayanti Exp $
+ * $Revision: 1.1.1.1 $
+ * $Date: 2006/01/27 13:10:56 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.soap.impl;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java
index 8206c5abc1d..47ac1d0cb6d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java
@@ -1,11 +1,5 @@
 /*
- * $Id: FaultElementImpl.java,v 1.10 2006/01/27 12:49:35 vj135062 Exp $
- * $Revision: 1.10 $
- * $Date: 2006/01/27 12:49:35 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: FaultElementImpl.java,v 1.10 2006/01/27 12:49:35 vj135062 Exp $
+ * $Revision: 1.10 $
+ * $Date: 2006/01/27 12:49:35 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.soap.impl;
 
 import java.util.logging.Level;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultImpl.java
index 21c87fc0c50..f9c44744245 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultImpl.java
@@ -1,11 +1,5 @@
 /*
- * $Id: FaultImpl.java,v 1.55 2006/01/27 12:49:35 vj135062 Exp $
- * $Revision: 1.55 $
- * $Date: 2006/01/27 12:49:35 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: FaultImpl.java,v 1.2 2006/11/16 17:39:10 kumarjayanti Exp $
+ * $Revision: 1.2 $
+ * $Date: 2006/11/16 17:39:10 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.soap.impl;
 
 import java.util.Locale;
@@ -65,6 +66,8 @@ public abstract class FaultImpl extends ElementImpl implements SOAPFault {
     protected abstract NameImpl getFaultActorName();
     protected abstract DetailImpl createDetail();
     protected abstract FaultElementImpl createSOAPFaultElement(String localName);
+    protected abstract FaultElementImpl createSOAPFaultElement(QName qname);
+    protected abstract FaultElementImpl createSOAPFaultElement(Name qname);
     protected abstract void checkIfStandardFaultCode(String faultCode, String uri) throws SOAPException;
     protected abstract void finallySetFaultCode(String faultcode) throws SOAPException;
     protected abstract boolean isStandardFaultElement(String localName);
@@ -152,8 +155,8 @@ public abstract class FaultImpl extends ElementImpl implements SOAPFault {
         }
 
         String prefix = code.substring(0, prefixIndex);
-        String nsName =
-            ((ElementImpl) codeContainingElement).getNamespaceURI(prefix);
+        String nsName =((ElementImpl) codeContainingElement).lookupNamespaceURI(prefix);
+            //((ElementImpl) codeContainingElement).getNamespaceURI(prefix);
         return new QName(nsName, getLocalPart(code), prefix);
     }
 
@@ -233,7 +236,7 @@ public abstract class FaultImpl extends ElementImpl implements SOAPFault {
                 if (isStandardFaultElement(localName))
                     return replaceElementWithSOAPElement(
                                element,
-                               createSOAPFaultElement(localName));
+                               createSOAPFaultElement(soapElement.getElementQName()));
                 return soapElement;
             }
         } else {
@@ -245,7 +248,7 @@ public abstract class FaultImpl extends ElementImpl implements SOAPFault {
                 String localName = elementName.getLocalName();
                 if (isStandardFaultElement(localName))
                     newElement =
-                        (ElementImpl) createSOAPFaultElement(localName);
+                        (ElementImpl) createSOAPFaultElement(elementName);
                 else
                     newElement = (ElementImpl) createElement(elementName);
             }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java
index 0d6ec827bec..eab766dfade 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java
@@ -1,11 +1,5 @@
 /*
- * $Id: HeaderElementImpl.java,v 1.26 2006/01/27 12:49:35 vj135062 Exp $
- * $Revision: 1.26 $
- * $Date: 2006/01/27 12:49:35 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: HeaderElementImpl.java,v 1.26 2006/01/27 12:49:35 vj135062 Exp $
+ * $Revision: 1.26 $
+ * $Date: 2006/01/27 12:49:35 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.soap.impl;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java
index 2ea6d07f800..fa87cee148f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java
@@ -1,11 +1,5 @@
 /*
- * $Id: HeaderImpl.java,v 1.33 2006/01/27 12:49:35 vj135062 Exp $
- * $Revision: 1.33 $
- * $Date: 2006/01/27 12:49:35 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: HeaderImpl.java,v 1.33 2006/01/27 12:49:35 vj135062 Exp $
+ * $Revision: 1.33 $
+ * $Date: 2006/01/27 12:49:35 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.soap.impl;
 
 import java.util.*;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties
index 10bec01e81d..2def1f555ba 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties
@@ -1,3 +1,28 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
 # SAAJ ResourceBundle properties file
 # Contains Log messages for impl
 # Error messages
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java
index a1b542ad205..9b6dc60b996 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java
@@ -1,11 +1,5 @@
 /*
- * $Id: TextImpl.java,v 1.19 2006/01/27 12:49:36 vj135062 Exp $
- * $Revision: 1.19 $
- * $Date: 2006/01/27 12:49:36 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: TextImpl.java,v 1.19 2006/01/27 12:49:36 vj135062 Exp $
+ * $Revision: 1.19 $
+ * $Date: 2006/01/27 12:49:36 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.soap.impl;
 
 import java.util.logging.Logger;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TreeException.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TreeException.java
index a21fee8f74c..51453756be1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TreeException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TreeException.java
@@ -1,11 +1,5 @@
 /*
- * $Id: TreeException.java,v 1.5 2006/01/27 12:49:36 vj135062 Exp $
- * $Revision: 1.5 $
- * $Date: 2006/01/27 12:49:36 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: TreeException.java,v 1.5 2006/01/27 12:49:36 vj135062 Exp $
+ * $Revision: 1.5 $
+ * $Date: 2006/01/27 12:49:36 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.soap.impl;
 
 public class TreeException extends RuntimeException {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings.properties b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings.properties
index 616870d7c5c..12b953a18e8 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings.properties
@@ -1,3 +1,28 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
 # SAAJ ResourceBundle properties file
 # Contains Log messages for name pkg
 # Error messages
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java
index f580ef31daf..2b682ca7e63 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java
@@ -1,11 +1,5 @@
 /*
- * $Id: NameImpl.java,v 1.48 2006/01/27 12:49:38 vj135062 Exp $
- * $Revision: 1.48 $
- * $Date: 2006/01/27 12:49:38 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: NameImpl.java,v 1.48 2006/01/27 12:49:38 vj135062 Exp $
+ * $Revision: 1.48 $
+ * $Date: 2006/01/27 12:49:38 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.soap.name;
 
 import java.util.logging.Level;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java
index 600b4a10b91..10ab166c223 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java
@@ -1,9 +1,5 @@
 /*
- * $Id: Body1_1Impl.java,v 1.14 2006/01/27 12:49:38 vj135062 Exp $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: Body1_1Impl.java,v 1.14 2006/01/27 12:49:38 vj135062 Exp $
+ */
+
+
 
 /**
 *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java
index 5cb845f46ea..14607fc5fa3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java
@@ -1,9 +1,5 @@
 /*
- * $Id: BodyElement1_1Impl.java,v 1.13 2006/01/27 12:49:39 vj135062 Exp $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: BodyElement1_1Impl.java,v 1.13 2006/01/27 12:49:39 vj135062 Exp $
+ */
+
+
 
 /**
 *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java
index 29b7ee422a1..8d300bb7654 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java
@@ -1,9 +1,5 @@
 /*
- * $Id: Detail1_1Impl.java,v 1.12 2006/01/27 12:49:40 vj135062 Exp $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: Detail1_1Impl.java,v 1.12 2006/01/27 12:49:40 vj135062 Exp $
+ */
+
+
 
 /**
 *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java
index ab8be346e1c..9b61ae1edb5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java
@@ -1,9 +1,5 @@
 /*
- * $Id: DetailEntry1_1Impl.java,v 1.13 2006/01/27 12:49:40 vj135062 Exp $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: DetailEntry1_1Impl.java,v 1.13 2006/01/27 12:49:40 vj135062 Exp $
+ */
+
+
 
 /**
 *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java
index 5ec27a4ae9c..2369a2244ec 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * $Id: Envelope1_1Impl.java,v 1.8 2006/01/27 12:49:41 vj135062 Exp $
  */
 
+
+
 /**
 *
 * @author SAAJ RI Development Team
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java
index 201551513ae..0eb5fe3a159 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java
@@ -1,9 +1,5 @@
 /*
- * $Id: Fault1_1Impl.java,v 1.20 2006/01/27 12:49:41 vj135062 Exp $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: Fault1_1Impl.java,v 1.1.1.1 2006/01/27 13:10:57 kumarjayanti Exp $
+ */
+
+
 
 /**
 *
@@ -301,4 +302,17 @@ public class Fault1_1Impl extends FaultImpl {
         }
         return super.addChildElement(element);
     }
+
+    protected FaultElementImpl createSOAPFaultElement(QName qname) {
+         return new FaultElement1_1Impl(
+                       ((SOAPDocument) getOwnerDocument()).getDocument(),
+                       qname);
+    }
+
+    protected FaultElementImpl createSOAPFaultElement(Name qname) {
+         return new FaultElement1_1Impl(
+                       ((SOAPDocument) getOwnerDocument()).getDocument(),
+                       (NameImpl)qname);
+    }
+
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java
index 53487d17c46..45225bf5b98 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java
@@ -1,9 +1,5 @@
 /*
- * $Id: FaultElement1_1Impl.java,v 1.12 2006/01/27 12:49:41 vj135062 Exp $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: FaultElement1_1Impl.java,v 1.12 2006/01/27 12:49:41 vj135062 Exp $
+ */
+
+
 
 /**
 *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java
index 73a22b2eb4f..99eedfa9afa 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java
@@ -1,9 +1,5 @@
 /*
- * $Id: Header1_1Impl.java,v 1.29 2006/01/27 12:49:41 vj135062 Exp $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: Header1_1Impl.java,v 1.29 2006/01/27 12:49:41 vj135062 Exp $
+ */
+
+
 
 /**
 *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java
index 9c24353ddc0..fbc54bd771a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java
@@ -1,9 +1,5 @@
 /*
- * $Id: HeaderElement1_1Impl.java,v 1.29 2006/01/27 12:49:41 vj135062 Exp $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: HeaderElement1_1Impl.java,v 1.29 2006/01/27 12:49:41 vj135062 Exp $
+ */
+
+
 
 /**
 *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings.properties b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings.properties
index 5a9f7f63f47..695a2316bbf 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings.properties
@@ -1,3 +1,28 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
 # SAAJ ResourceBundle properties file
 # Contains Log messages for ver1_1 pkg
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java
index 2af5bf01a74..c1d60c0c277 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java
@@ -1,9 +1,5 @@
 /*
- * $Id: Message1_1Impl.java,v 1.24 2006/01/27 12:49:41 vj135062 Exp $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: Message1_1Impl.java,v 1.24 2006/01/27 12:49:41 vj135062 Exp $
+ */
+
+
 
 /**
 *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java
index 8f09a659a9d..641c1233940 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java
@@ -1,9 +1,5 @@
 /*
- * $Id: SOAPFactory1_1Impl.java,v 1.4 2006/01/27 12:49:42 vj135062 Exp $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: SOAPFactory1_1Impl.java,v 1.1.1.1 2006/01/27 13:10:57 kumarjayanti Exp $
+ */
+
+
 
 /**
 *
@@ -53,9 +54,17 @@ public class SOAPFactory1_1Impl extends SOAPFactoryImpl {
 
     public SOAPFault createFault(String reasonText, QName faultCode)
         throws SOAPException {
+        if (faultCode == null) {
+            throw new IllegalArgumentException("faultCode argument for createFault was passed NULL");
+        }
+        if (reasonText == null) {
+            throw new IllegalArgumentException("reasonText argument for createFault was passed NULL");
+        }
         Fault1_1Impl fault = new Fault1_1Impl(createDocument(), null);
         fault.setFaultString(reasonText);
+
         fault.setFaultCode(faultCode);
+
         return fault;
     }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java
index 845d2bfab6b..365326af36c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java
@@ -1,9 +1,5 @@
 /*
- * $Id: SOAPMessageFactory1_1Impl.java,v 1.7 2006/01/27 12:49:42 vj135062 Exp $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: SOAPMessageFactory1_1Impl.java,v 1.7 2006/01/27 12:49:42 vj135062 Exp $
+ */
+
+
 
 /**
 *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java
index 69d534a83e4..805b20c526e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java
@@ -1,9 +1,5 @@
 /*
- * $Id: SOAPPart1_1Impl.java,v 1.1.1.1 2006/01/27 13:10:57 kumarjayanti Exp $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: SOAPPart1_1Impl.java,v 1.1.1.1 2006/01/27 13:10:57 kumarjayanti Exp $
+ */
+
+
 
 /**
 *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java
index 357bd0a1c10..b5dd821b9e3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java
@@ -1,9 +1,5 @@
 /*
- * $Id: Body1_2Impl.java,v 1.32 2006/01/27 12:49:44 vj135062 Exp $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: Body1_2Impl.java,v 1.32 2006/01/27 12:49:44 vj135062 Exp $
+ */
+
+
 
 /**
 *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java
index 3a1340decd2..ddc753da713 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java
@@ -1,9 +1,5 @@
 /*
- * $Id: BodyElement1_2Impl.java,v 1.13 2006/01/27 12:49:44 vj135062 Exp $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: BodyElement1_2Impl.java,v 1.13 2006/01/27 12:49:44 vj135062 Exp $
+ */
+
+
 
 /**
 *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java
index 45c670bdd90..bf7cbcb4e7d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java
@@ -1,9 +1,5 @@
 /*
- * $Id: Detail1_2Impl.java,v 1.24 2006/01/27 12:49:45 vj135062 Exp $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: Detail1_2Impl.java,v 1.24 2006/01/27 12:49:45 vj135062 Exp $
+ */
+
+
 
 /**
 *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java
index 64af1a32087..06a4fec00b3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java
@@ -1,9 +1,5 @@
 /*
- * $Id: DetailEntry1_2Impl.java,v 1.13 2006/01/27 12:49:45 vj135062 Exp $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: DetailEntry1_2Impl.java,v 1.13 2006/01/27 12:49:45 vj135062 Exp $
+ */
+
+
 
 /**
 *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java
index 9c0b5689dfd..468ee62cddc 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java
@@ -1,9 +1,5 @@
 /*
- * $Id: Envelope1_2Impl.java,v 1.26 2006/01/27 12:49:47 vj135062 Exp $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: Envelope1_2Impl.java,v 1.26 2006/01/27 12:49:47 vj135062 Exp $
+ */
+
+
 
 /**
 *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java
index 73d3236a5b8..431c94b1d02 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java
@@ -1,9 +1,5 @@
 /*
- * $Id: Fault1_2Impl.java,v 1.45 2006/01/27 12:49:47 vj135062 Exp $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: Fault1_2Impl.java,v 1.1.1.1 2006/01/27 13:10:57 kumarjayanti Exp $
+ */
+
+
 
 /**
 *
@@ -300,7 +301,7 @@ public class Fault1_2Impl extends FaultImpl {
         if (faultNode != null) {
             faultNode.detachNode();
         }
-        faultNode = createSOAPFaultElement(getFaultNodeName().getLocalName());
+        faultNode = createSOAPFaultElement(getFaultNodeName());
         faultNode = faultNode.addTextNode(uri);
         if (getFaultRole() != null) {
             insertBefore(faultNode, this.faultActorElement);
@@ -323,7 +324,7 @@ public class Fault1_2Impl extends FaultImpl {
         if (this.faultActorElement != null)
             this.faultActorElement.detachNode();
         this.faultActorElement =
-            createSOAPFaultElement(getFaultActorName().getLocalName());
+            createSOAPFaultElement(getFaultActorName());
         this.faultActorElement.addTextNode(uri);
         if (hasDetail()) {
             insertBefore(this.faultActorElement, this.detail);
@@ -547,4 +548,16 @@ public class Fault1_2Impl extends FaultImpl {
         return SOAPConstants.SOAP_SENDER_FAULT;
     }
 
+     protected FaultElementImpl createSOAPFaultElement(QName qname) {
+         return new FaultElement1_2Impl(
+                       ((SOAPDocument) getOwnerDocument()).getDocument(),
+                       qname);
+    }
+
+    protected FaultElementImpl createSOAPFaultElement(Name qname) {
+         return new FaultElement1_2Impl(
+                       ((SOAPDocument) getOwnerDocument()).getDocument(),
+                       (NameImpl)qname);
+    }
+
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java
index d82058ae758..3bcd71bbc1a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java
@@ -1,9 +1,5 @@
 /*
- * $Id: FaultElement1_2Impl.java,v 1.13 2006/01/27 12:49:48 vj135062 Exp $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: FaultElement1_2Impl.java,v 1.13 2006/01/27 12:49:48 vj135062 Exp $
+ */
+
+
 
 /**
 *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java
index 7f99063a72f..20d64a33c9b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java
@@ -1,9 +1,5 @@
 /*
- * $Id: Header1_2Impl.java,v 1.36 2006/01/27 12:49:48 vj135062 Exp $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: Header1_2Impl.java,v 1.36 2006/01/27 12:49:48 vj135062 Exp $
+ */
+
+
 
 /**
 *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java
index 41f97b6eba5..afdf5c8eb18 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java
@@ -1,9 +1,5 @@
 /*
- * $Id: HeaderElement1_2Impl.java,v 1.29 2006/01/27 12:49:48 vj135062 Exp $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: HeaderElement1_2Impl.java,v 1.29 2006/01/27 12:49:48 vj135062 Exp $
+ */
+
+
 
 /**
 *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings.properties b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings.properties
index 79d1f3b05b0..d2f776946ff 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings.properties
@@ -1,3 +1,28 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
 # SAAJ ResourceBundle properties file
 # Contains Log messages for ver1_2 pkg
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java
index fbe3527b230..5bae9a1d84a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java
@@ -1,9 +1,5 @@
 /*
- * $Id: Message1_2Impl.java,v 1.18 2006/01/27 12:49:48 vj135062 Exp $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: Message1_2Impl.java,v 1.18 2006/01/27 12:49:48 vj135062 Exp $
+ */
+
+
 
 /**
 *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java
index 0fa8a532bdb..e1ffa63ca85 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java
@@ -1,9 +1,5 @@
 /*
- * $Id: SOAPFactory1_2Impl.java,v 1.4 2006/01/27 12:49:48 vj135062 Exp $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: SOAPFactory1_2Impl.java,v 1.1.1.1 2006/01/27 13:10:57 kumarjayanti Exp $
+ */
+
+
 
 /**
 *
@@ -53,6 +54,12 @@ public class SOAPFactory1_2Impl extends SOAPFactoryImpl {
 
     public SOAPFault createFault(String reasonText, QName faultCode)
         throws SOAPException {
+         if (faultCode == null) {
+            throw new IllegalArgumentException("faultCode argument for createFault was passed NULL");
+        }
+        if (reasonText == null) {
+            throw new IllegalArgumentException("reasonText argument for createFault was passed NULL");
+        }
         Fault1_2Impl fault = new Fault1_2Impl(createDocument(), null);
         fault.setFaultString(reasonText);
         fault.setFaultCode(faultCode);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java
index 0bd20e127a7..433cb695922 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java
@@ -1,9 +1,5 @@
 /*
- * $Id: SOAPMessageFactory1_2Impl.java,v 1.7 2006/01/27 12:49:48 vj135062 Exp $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: SOAPMessageFactory1_2Impl.java,v 1.7 2006/01/27 12:49:48 vj135062 Exp $
+ */
+
+
 
 /**
 *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java
index 91ceb398807..25afd910f10 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java
@@ -1,9 +1,5 @@
 /*
- * $Id: SOAPPart1_2Impl.java,v 1.1.1.1 2006/01/27 13:10:57 kumarjayanti Exp $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: SOAPPart1_2Impl.java,v 1.1.1.1 2006/01/27 13:10:57 kumarjayanti Exp $
+ */
+
+
 
 /**
 *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/Base64.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/Base64.java
index e8d3b0c9f97..44319d3218e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/Base64.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/Base64.java
@@ -1,11 +1,5 @@
 /*
- * $Id: Base64.java,v 1.4 2006/01/27 12:49:50 vj135062 Exp $
- * $Revision: 1.4 $
- * $Date: 2006/01/27 12:49:50 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: Base64.java,v 1.4 2006/01/27 12:49:50 vj135062 Exp $
+ * $Revision: 1.4 $
+ * $Date: 2006/01/27 12:49:50 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.util;
 
 
@@ -42,6 +43,7 @@ package com.sun.xml.internal.messaging.saaj.util;
  * This class is used by XML Schema binary format validation
  *
  * @author Jeffrey Rodriguez
+ * @version $Revision: 1.4 $ $Date: 2006/01/27 12:49:50 $
  */
 public final class Base64 {
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java
index 8b06d454c6b..25405079f82 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java
@@ -1,10 +1,5 @@
 /*
- * $Id: ByteInputStream.java,v 1.6 2006/01/27 12:49:51 vj135062 Exp $ $Revision:
- * 1.3 $ $Date: 2006/01/27 12:49:51 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 +22,12 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: ByteInputStream.java,v 1.6 2006/01/27 12:49:51 vj135062 Exp $ $Revision:
+ * 1.3 $ $Date: 2006/01/27 12:49:51 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.util;
 
 import java.io.ByteArrayInputStream;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteOutputStream.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteOutputStream.java
index 569a05b6ff4..96b95a82042 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteOutputStream.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteOutputStream.java
@@ -1,10 +1,5 @@
 /*
- * $Id: ByteOutputStream.java,v 1.7 2006/01/27 12:49:51 vj135062 Exp $
- * $Revision: 1.7 $ $Date: 2006/01/27 12:49:51 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 +22,12 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: ByteOutputStream.java,v 1.7 2006/01/27 12:49:51 vj135062 Exp $
+ * $Revision: 1.7 $ $Date: 2006/01/27 12:49:51 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.util;
 
 import java.io.BufferedOutputStream;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/CharReader.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/CharReader.java
index c1af31f6018..e2be17128b0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/CharReader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/CharReader.java
@@ -1,11 +1,5 @@
 /*
- * $Id: CharReader.java,v 1.6 2006/01/27 12:49:51 vj135062 Exp $
- * $Revision: 1.6 $
- * $Date: 2006/01/27 12:49:51 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: CharReader.java,v 1.6 2006/01/27 12:49:51 vj135062 Exp $
+ * $Revision: 1.6 $
+ * $Date: 2006/01/27 12:49:51 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.util;
 
 import java.io.CharArrayReader;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/CharWriter.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/CharWriter.java
index 9b3be81a38a..6755232c6f1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/CharWriter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/CharWriter.java
@@ -1,11 +1,5 @@
 /*
- * $Id: CharWriter.java,v 1.6 2006/01/27 12:49:51 vj135062 Exp $
- * $Revision: 1.6 $
- * $Date: 2006/01/27 12:49:51 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: CharWriter.java,v 1.6 2006/01/27 12:49:51 vj135062 Exp $
+ * $Revision: 1.6 $
+ * $Date: 2006/01/27 12:49:51 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.util;
 
 import java.io.CharArrayWriter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/FastInfosetReflection.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/FastInfosetReflection.java
index 526c0ce2524..52d2946678e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/FastInfosetReflection.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/FastInfosetReflection.java
@@ -1,11 +1,5 @@
 /*
- * $Id: FastInfosetReflection.java,v 1.2 2006/06/06 18:46:01 sandoz Exp $
- * $Revision: 1.2 $
- * $Date: 2006/06/06 18:46:01 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: FastInfosetReflection.java,v 1.2 2006/06/06 18:46:01 sandoz Exp $
+ * $Revision: 1.2 $
+ * $Date: 2006/06/06 18:46:01 $
+ */
+
+
 
 package com.sun.xml.internal.messaging.saaj.util;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/FinalArrayList.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/FinalArrayList.java
index 22768e6e3c2..66991a9b2c9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/FinalArrayList.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/FinalArrayList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java
index 81dc4855c2d..ea897bc1d39 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java
@@ -1,11 +1,5 @@
 /*
- * $Id: JAXMStreamSource.java,v 1.9 2006/01/27 12:49:51 vj135062 Exp $
- * $Revision: 1.9 $
- * $Date: 2006/01/27 12:49:51 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: JAXMStreamSource.java,v 1.9 2006/01/27 12:49:51 vj135062 Exp $
+ * $Revision: 1.9 $
+ * $Date: 2006/01/27 12:49:51 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.util;
 
 import java.io.*;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/JaxmURI.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/JaxmURI.java
index e805e7e51df..1bfc1edff8e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/JaxmURI.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/JaxmURI.java
@@ -1,11 +1,5 @@
 /*
- * $Id: JaxmURI.java,v 1.4 2006/01/27 12:49:51 vj135062 Exp $
- * $Revision: 1.4 $
- * $Date: 2006/01/27 12:49:51 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: JaxmURI.java,v 1.4 2006/01/27 12:49:51 vj135062 Exp $
+ * $Revision: 1.4 $
+ * $Date: 2006/01/27 12:49:51 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.util;
 
 // Imported from: org.apache.xerces.util
@@ -66,6 +67,7 @@ import java.io.Serializable;
 * default port for a specific scheme). Rather, it only knows the
 * grammar and basic set of operations that can be applied to a URI.
 *
+* @version  $Id: JaxmURI.java,v 1.4 2006/01/27 12:49:51 vj135062 Exp $
 *
 **********************************************************************/
  public class JaxmURI implements Serializable {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings.properties b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings.properties
index ecfbb430ae3..c6ec37757cb 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings.properties
@@ -1,3 +1,28 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
 # SAAJ ResourceBundle properties file
 # Contains Log messages for util pkg
 # Error messages
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/LogDomainConstants.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/LogDomainConstants.java
index 2896864bb1c..0493b401057 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/LogDomainConstants.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/LogDomainConstants.java
@@ -1,11 +1,5 @@
 /*
- * $Id: LogDomainConstants.java,v 1.5 2006/01/27 12:49:52 vj135062 Exp $
- * $Revision: 1.5 $
- * $Date: 2006/01/27 12:49:52 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: LogDomainConstants.java,v 1.5 2006/01/27 12:49:52 vj135062 Exp $
+ * $Revision: 1.5 $
+ * $Date: 2006/01/27 12:49:52 $
+ */
+
+
 
 package com.sun.xml.internal.messaging.saaj.util;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/MimeHeadersUtil.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/MimeHeadersUtil.java
index 5847e5497ab..79e0b6896f4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/MimeHeadersUtil.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/MimeHeadersUtil.java
@@ -1,9 +1,5 @@
 /*
- * $Id: MimeHeadersUtil.java,v 1.5 2006/01/27 12:49:52 vj135062 Exp $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: MimeHeadersUtil.java,v 1.5 2006/01/27 12:49:52 vj135062 Exp $
+ */
+
+
 
 /**
 *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java
index a78d1efba63..e1e3f2f25c1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java
@@ -1,9 +1,5 @@
 /*
- * $Id: NamespaceContextIterator.java,v 1.8 2006/01/27 12:49:52 vj135062 Exp $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: NamespaceContextIterator.java,v 1.8 2006/01/27 12:49:52 vj135062 Exp $
+ */
+
+
 
 /**
 *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ParseUtil.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ParseUtil.java
index fef90d34e52..6b736cf9dc3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ParseUtil.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ParseUtil.java
@@ -1,11 +1,5 @@
 /*
- * $Id: ParseUtil.java,v 1.5 2006/01/27 12:49:52 vj135062 Exp $
- * $Revision: 1.5 $
- * $Date: 2006/01/27 12:49:52 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: ParseUtil.java,v 1.5 2006/01/27 12:49:52 vj135062 Exp $
+ * $Revision: 1.5 $
+ * $Date: 2006/01/27 12:49:52 $
+ */
+
+
 package com.sun.xml.internal.messaging.saaj.util;
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ParserPool.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ParserPool.java
index 75fb28cecad..00c11303826 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ParserPool.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ParserPool.java
@@ -1,11 +1,5 @@
 /*
- * $Id: ParserPool.java,v 1.5 2006/01/27 12:49:52 vj135062 Exp $
- * $Revision: 1.5 $
- * $Date: 2006/01/27 12:49:52 $
- */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+/*
+ * $Id: ParserPool.java,v 1.5 2006/01/27 12:49:52 vj135062 Exp $
+ * $Revision: 1.5 $
+ * $Date: 2006/01/27 12:49:52 $
+ */
+
+
 
 package com.sun.xml.internal.messaging.saaj.util;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java
index 4ea1c902b0c..9a83344cd6d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,6 +23,7 @@
  * have any questions.
  */
 
+
 package com.sun.xml.internal.messaging.saaj.util;
 
 import java.util.logging.Logger;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java
index 79aace8e841..584fd801044 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,6 +23,7 @@
  * have any questions.
  */
 
+
 /*
  * Created on Feb 28, 2003
  *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/XMLDeclarationParser.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/XMLDeclarationParser.java
index 720a28d224a..c404867501b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/XMLDeclarationParser.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/XMLDeclarationParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.messaging.saaj.util;
 
 import java.io.*;
@@ -35,6 +36,7 @@ import javax.xml.transform.TransformerException;
  *  
  *
  * @author Panos Kougiouris (panos@acm.org)
+ * @version $Revision: 1.1.1.1 $ $Date: 2006/01/27 13:10:58 $
  */
 
 public class XMLDeclarationParser {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java
index 540f606682b..620f9c526f9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,6 +23,7 @@
  * have any questions.
  */
 
+
 /*
  * EfficientStreamingTransformer.java
  *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithm.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithm.java
index 20b64299e48..779d982e07a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithm.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,34 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 package com.sun.xml.internal.org.jvnet.fastinfoset;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmException.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmException.java
index 579ab9540d0..717b77410fd 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,34 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 
 package com.sun.xml.internal.org.jvnet.fastinfoset;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmIndexes.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmIndexes.java
index 15b321a2a0e..ed6920100c6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmIndexes.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmIndexes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 package com.sun.xml.internal.org.jvnet.fastinfoset;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/ExternalVocabulary.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/ExternalVocabulary.java
index 917ec32e2aa..7d8e0a394be 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/ExternalVocabulary.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/ExternalVocabulary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 package com.sun.xml.internal.org.jvnet.fastinfoset;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetException.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetException.java
index 632dc890a94..9a2fa90face 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,34 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 
 package com.sun.xml.internal.org.jvnet.fastinfoset;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetParser.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetParser.java
index c668f58ec1e..4dd83ae41d5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetParser.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,34 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 package com.sun.xml.internal.org.jvnet.fastinfoset;
 
 import java.util.Map;
@@ -98,6 +70,13 @@ public interface FastInfosetParser {
     public static final String EXTERNAL_VOCABULARIES_PROPERTY =
         "http://jvnet.org/fastinfoset/parser/properties/external-vocabularies";
 
+   /**
+     * The property name to be used for getting and setting the
+     * flag, which will indicate whether underlying Parser's
+     * input stream should be really closed
+     */
+    public static final String FORCE_STREAM_CLOSE_PROPERTY =
+        "http://jvnet.org/fastinfoset/parser/properties/force-stream-close";
 
     /**
      * Set the string interning property.
@@ -172,4 +151,38 @@ public interface FastInfosetParser {
      */
     public Map getExternalVocabularies();
 
+    /**
+     * Set the parse fragments property.
+     *
+     * 
    If the parse fragments property is set to true then
+     * fragments of an XML infoset may be parsed.
+     *
+     * @param parseFragments The parse fragments property.
+     */
+    public void setParseFragments(boolean parseFragments);
+
+    /**
+     * Return the parse fragments property.
+     *
+     * @return The parse fragments property.
+     */
+    public boolean getParseFragments();
+
+    /**
+     * Set the force stream close property.
+     *
+     * 
    If the force stream property is set to true then
+     * Parser's underlying InputStream will be closed.
+     *
+     * @param needForceStreamClose The force stream close property.
+     */
+    public void setForceStreamClose(boolean needForceStreamClose);
+
+    /**
+     * Return the force stream close property.
+     *
+     * @return The force stream close property.
+     */
+    public boolean getForceStreamClose();
+
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetResult.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetResult.java
index 53f66c7ea18..37e0ef01ffb 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetResult.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 
 package com.sun.xml.internal.org.jvnet.fastinfoset;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSerializer.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSerializer.java
index 3570433ff38..128c7711983 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSerializer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSerializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,34 +24,6 @@
  *
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 package com.sun.xml.internal.org.jvnet.fastinfoset;
 
 import java.io.OutputStream;
@@ -68,6 +40,16 @@ import java.util.Map;
  * @author Paul.Sandoz@Sun.Com
  */
 public interface FastInfosetSerializer {
+    /**
+     * The feature to ignore the document type declaration and the
+     * internal subset.
+     * 
    
+     * The default value is false. If true a serializer shall ignore document
+     * type declaration and the internal subset.
+     */
+    public static final String IGNORE_DTD_FEATURE =
+        "http://jvnet.org/fastinfoset/serializer/feature/ignore/DTD";
+
     /**
      * The feature to ignore comments.
      * 
    
@@ -123,13 +105,25 @@ public interface FastInfosetSerializer {
      * The default value for the limit on the size of character content chunks
      * that will be indexed.
      */
-    public final static int CHARACTER_CONTENT_CHUNK_SIZE_CONSTRAINT = 7;
+    public final static int CHARACTER_CONTENT_CHUNK_SIZE_CONSTRAINT = 32;
+
+    /**
+     * The default value for limit on the size of indexed Map for attribute values
+     * Limit is measured in bytes not in number of entries
+     */
+    public static final int CHARACTER_CONTENT_CHUNK_MAP_MEMORY_CONSTRAINT = Integer.MAX_VALUE;
 
     /**
      * The default value for the limit on the size of attribute values
      * that will be indexed.
      */
-    public final static int ATTRIBUTE_VALUE_SIZE_CONSTRAINT = 7;
+    public final static int ATTRIBUTE_VALUE_SIZE_CONSTRAINT = 32;
+
+    /**
+     * The default value for limit on the size of indexed Map for character content chunks
+     * Limit is measured in bytes not in number of entries
+     */
+    public static final int ATTRIBUTE_VALUE_MAP_MEMORY_CONSTRAINT = Integer.MAX_VALUE;
 
     /**
      * The character encoding scheme string for UTF-8.
@@ -141,6 +135,18 @@ public interface FastInfosetSerializer {
      */
     public static final String UTF_16BE = "UTF-16BE";
 
+    /**
+     * Set the {@link #IGNORE_DTD_FEATURE}.
+     * @param ignoreDTD true if the feature shall be ignored.
+     */
+    public void setIgnoreDTD(boolean ignoreDTD);
+
+    /**
+     * Get the {@link #IGNORE_DTD_FEATURE}.
+     * @return true if the feature is ignored, false otherwise.
+     */
+    public boolean getIgnoreDTD();
+
     /**
      * Set the {@link #IGNORE_COMMENTS_FEATURE}.
      * @param ignoreComments true if the feature shall be ignored.
@@ -227,6 +233,23 @@ public interface FastInfosetSerializer {
      */
     public int getCharacterContentChunkSizeLimit();
 
+    /**
+     * Sets the limit on the memory size of Map of attribute values
+     * that will be indexed.
+     *
+     * @param size The attribute value size limit. Any value less
+     * that a length of size limit will be indexed.
+     */
+    public void setCharacterContentChunkMapMemoryLimit(int size);
+
+    /**
+     * Gets the limit on the memory size of Map of attribute values
+     * that will be indexed.
+     *
+     * @return The attribute value size limit.
+     */
+    public int getCharacterContentChunkMapMemoryLimit();
+
     /**
      * Sets the limit on the size of attribute values
      * that will be indexed.
@@ -244,6 +267,23 @@ public interface FastInfosetSerializer {
      */
     public int getAttributeValueSizeLimit();
 
+    /**
+     * Sets the limit on the memory size of Map of attribute values
+     * that will be indexed.
+     *
+     * @param size The attribute value size limit. Any value less
+     * that a length of size limit will be indexed.
+     */
+    public void setAttributeValueMapMemoryLimit(int size);
+
+    /**
+     * Gets the limit on the memory size of Map of attribute values
+     * that will be indexed.
+     *
+     * @return The attribute value size limit.
+     */
+    public int getAttributeValueMapMemoryLimit();
+
     /**
      * Set the external vocabulary that shall be used when serializing.
      *
@@ -251,6 +291,20 @@ public interface FastInfosetSerializer {
      */
     public void setExternalVocabulary(ExternalVocabulary v);
 
+    /**
+     * Set the application data to be associated with the serializer vocabulary.
+     *
+     * @param data the application data.
+     */
+    public void setVocabularyApplicationData(VocabularyApplicationData data);
+
+    /**
+     * Get the application data associated with the serializer vocabulary.
+     *
+     * @return the application data.
+     */
+    public VocabularyApplicationData getVocabularyApplicationData();
+
     /**
      * Reset the serializer for reuse serializing another XML infoset.
      */
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSource.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSource.java
index d68dc5eaf8e..d682a507c99 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSource.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 
 package com.sun.xml.internal.org.jvnet.fastinfoset;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/RestrictedAlphabet.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/RestrictedAlphabet.java
index 03ced3267e3..cab8d1d0fad 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/RestrictedAlphabet.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/RestrictedAlphabet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 package com.sun.xml.internal.org.jvnet.fastinfoset;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/Vocabulary.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/Vocabulary.java
index 15cfcede1f1..fc8c4bc9cd1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/Vocabulary.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/Vocabulary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 package com.sun.xml.internal.org.jvnet.fastinfoset;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/VocabularyApplicationData.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/VocabularyApplicationData.java
new file mode 100644
index 00000000000..2071c94a09e
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/VocabularyApplicationData.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
+ */
+
+
+package com.sun.xml.internal.org.jvnet.fastinfoset;
+
+/**
+ * Application data that can be associated with a vocabulary.
+ * 
    
+ * The application will implement this inteface and provide
+ * application specific functionality related to a vocabulary.
+ *
+ * @author Paul.Sandoz@Sun.Com
+ */
+public interface VocabularyApplicationData {
+    /**
+     *  Clear the vocabulary  application data.
+     *  
    
+     *  This method will be invoked when a parser or serializer clears
+     *  the vocabulary.
+     */
+    public void clear();
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmAttributes.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmAttributes.java
index 7d2d1d5ab3c..2a9b3dd911e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmAttributes.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmAttributes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,34 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 package com.sun.xml.internal.org.jvnet.fastinfoset.sax;
 
 import org.xml.sax.Attributes;
@@ -122,4 +94,22 @@ public interface EncodingAlgorithmAttributes extends Attributes {
      * @return The data. If the index is out of range then null is returned.
      */
     public Object getAlgorithmData(int index);
+
+    /**
+     * Return the alphabet associated with the attribute value.
+     *
+     * @param index The attribute index (zero-based).
+     * @return The alphabet.
+     *         If the index is out of range then null is returned.
+     *         If there is is no alphabet then null is returned.
+     */
+    public String getAlpababet(int index);
+
+    /**
+     * Return the whether the attribute value should be indexed or not.
+     *
+     * @param index The attribute index (zero-based).
+     * @return True if attribute value should be indexed, otherwise false.
+     */
+    public boolean getToIndex(int index);
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmContentHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmContentHandler.java
index 8975eb51479..1f04e536dd0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmContentHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmContentHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,34 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 package com.sun.xml.internal.org.jvnet.fastinfoset.sax;
 
 import org.xml.sax.SAXException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/ExtendedContentHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/ExtendedContentHandler.java
new file mode 100644
index 00000000000..008fae54334
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/ExtendedContentHandler.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
+ */
+
+package com.sun.xml.internal.org.jvnet.fastinfoset.sax;
+
+import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
+
+public interface ExtendedContentHandler extends ContentHandler {
+
+    /**
+     * Receive notification of character data.
+     *
+     * @param ch the characters from the XML document
+     * @param start the start position in the array
+     * @param length the number of characters to read from the array
+     * @param index true if the characters are indexed, otherwise false.
+     * @throws org.xml.sax.SAXException any SAX exception, possibly
+     *            wrapping another exception
+     * @see ContentHandler#characters
+     */
+    public void characters(char[] ch, int start, int length, boolean index) throws SAXException;
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetReader.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetReader.java
index 0b1871a4ab7..fdfb77c6154 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetReader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,34 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 package com.sun.xml.internal.org.jvnet.fastinfoset.sax;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetWriter.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetWriter.java
index 5ff2c895003..a3eb7d2088f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetWriter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,9 @@
  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
+ *
+ * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
-
 package com.sun.xml.internal.org.jvnet.fastinfoset.sax;
 
 import com.sun.xml.internal.org.jvnet.fastinfoset.FastInfosetSerializer;
@@ -31,5 +32,6 @@ import org.xml.sax.ext.LexicalHandler;
 
 public interface FastInfosetWriter extends ContentHandler, LexicalHandler,
         EncodingAlgorithmContentHandler, PrimitiveTypeContentHandler,
-        RestrictedAlphabetContentHandler, FastInfosetSerializer {
+        RestrictedAlphabetContentHandler, ExtendedContentHandler,
+        FastInfosetSerializer {
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/PrimitiveTypeContentHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/PrimitiveTypeContentHandler.java
index 17021a6bece..190e7dceaa0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/PrimitiveTypeContentHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/PrimitiveTypeContentHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,33 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 
 package com.sun.xml.internal.org.jvnet.fastinfoset.sax;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/RestrictedAlphabetContentHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/RestrictedAlphabetContentHandler.java
index f60bc6a0379..d4653a2f293 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/RestrictedAlphabetContentHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/RestrictedAlphabetContentHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,34 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 package com.sun.xml.internal.org.jvnet.fastinfoset.sax;
 
 import org.xml.sax.SAXException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/EncodingAlgorithmAttributesImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/EncodingAlgorithmAttributesImpl.java
index 24e1bda4ef9..8ade78da43f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/EncodingAlgorithmAttributesImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/EncodingAlgorithmAttributesImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,34 +24,6 @@
  *
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
-
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
 package com.sun.xml.internal.org.jvnet.fastinfoset.sax.helpers;
 
 import com.sun.xml.internal.fastinfoset.CommonResourceBundle;
@@ -105,6 +77,10 @@ public class EncodingAlgorithmAttributesImpl implements EncodingAlgorithmAttribu
 
     private Object[] _algorithmData;
 
+    private String[] _alphabets;
+
+    private boolean[] _toIndex;
+
     /**
      * Construct a new, empty EncodingAlgorithmAttributesImpl object.
      */
@@ -139,6 +115,8 @@ public class EncodingAlgorithmAttributesImpl implements EncodingAlgorithmAttribu
         _data = new String[DEFAULT_CAPACITY * SIZE];
         _algorithmIds = new int[DEFAULT_CAPACITY];
         _algorithmData = new Object[DEFAULT_CAPACITY];
+        _alphabets = new String[DEFAULT_CAPACITY];
+        _toIndex = new boolean[DEFAULT_CAPACITY];
 
         _registeredEncodingAlgorithms = registeredEncodingAlgorithms;
 
@@ -192,6 +170,46 @@ public class EncodingAlgorithmAttributesImpl implements EncodingAlgorithmAttribu
         _data[i++] = replaceNull(qName);
         _data[i++] = replaceNull(type);
         _data[i++] = replaceNull(value);
+        _toIndex[_length] = false;
+        _alphabets[_length] = null;
+
+        _length++;
+    }
+
+    /**
+     * Add an attribute to the end of the list.
+     *
+     * 
    For the sake of speed, this method does no checking
+     * to see if the attribute is already in the list: that is
+     * the responsibility of the application.
    
+     *
+     * @param uri The Namespace URI, or the empty string if
+     *        none is available or Namespace processing is not
+     *        being performed.
+     * @param localName The local name, or the empty string if
+     *        Namespace processing is not being performed.
+     * @param qName The qualified (prefixed) name, or the empty string
+     *        if qualified names are not available.
+     * @param type The attribute type as a string.
+     * @param value The attribute value.
+     * @param index True if attribute should be indexed.
+     * @param index The alphabet associated with the attribute value,
+     *              may be null if there is no associated alphabet.
+     */
+    public void addAttribute(String URI, String localName, String qName,
+            String type, String value, boolean index, String alphabet) {
+        if (_length >= _algorithmData.length) {
+            resize();
+        }
+
+        int i = _length * SIZE;
+        _data[i++] = replaceNull(URI);
+        _data[i++] = replaceNull(localName);
+        _data[i++] = replaceNull(qName);
+        _data[i++] = replaceNull(type);
+        _data[i++] = replaceNull(value);
+        _toIndex[_length] = index;
+        _alphabets[_length] = alphabet;
 
         _length++;
     }
@@ -228,6 +246,8 @@ public class EncodingAlgorithmAttributesImpl implements EncodingAlgorithmAttribu
         _data[i++] = null;
         _algorithmIds[_length] = builtInAlgorithmID;
         _algorithmData[_length] = algorithmData;
+        _toIndex[_length] = false;
+        _alphabets[_length] = null;
 
         _length++;
     }
@@ -265,6 +285,8 @@ public class EncodingAlgorithmAttributesImpl implements EncodingAlgorithmAttribu
         _data[i++] = algorithmURI;
         _algorithmIds[_length] = algorithmID;
         _algorithmData[_length] = algorithmData;
+        _toIndex[_length] = false;
+        _alphabets[_length] = null;
 
         _length++;
     }
@@ -290,6 +312,8 @@ public class EncodingAlgorithmAttributesImpl implements EncodingAlgorithmAttribu
         _data[i + ALGORITHMURI_OFFSET] = algorithmURI;
         _algorithmIds[index] = algorithmID;
         _algorithmData[index] = algorithmData;
+        _toIndex[index] = false;
+        _alphabets[index] = null;
     }
 
     /**
@@ -313,6 +337,8 @@ public class EncodingAlgorithmAttributesImpl implements EncodingAlgorithmAttribu
                 _data[index++] = atts.getType(i);
                 _data[index++] = atts.getValue(i);
                 index++;
+                _toIndex[i] = false;
+                _alphabets[i] = null;
             }
         }
     }
@@ -340,6 +366,8 @@ public class EncodingAlgorithmAttributesImpl implements EncodingAlgorithmAttribu
                 _data[index++] = atts.getAlgorithmURI(i);
                 _algorithmIds[i] = atts.getAlgorithmIndex(i);
                 _algorithmData[i] = atts.getAlgorithmData(i);
+                _toIndex[i] = false;
+                _alphabets[i] = null;
             }
         }
     }
@@ -487,6 +515,23 @@ public class EncodingAlgorithmAttributesImpl implements EncodingAlgorithmAttribu
         }
     }
 
+    // ExtendedAttributes
+
+    public final String getAlpababet(int index) {
+        if (index >= 0 && index < _length) {
+            return _alphabets[index];
+        } else {
+            return null;
+        }
+    }
+
+    public final boolean getToIndex(int index) {
+        if (index >= 0 && index < _length) {
+            return _toIndex[index];
+        } else {
+            return false;
+        }
+    }
 
     // -----
 
@@ -508,14 +553,20 @@ public class EncodingAlgorithmAttributesImpl implements EncodingAlgorithmAttribu
         String[] data = new String[newLength * SIZE];
         int[] algorithmIds = new int[newLength];
         Object[] algorithmData = new Object[newLength];
+        String[] alphabets = new String[newLength];
+        boolean[] toIndex = new boolean[newLength];
 
         System.arraycopy(_data, 0, data, 0, _length * SIZE);
         System.arraycopy(_algorithmIds, 0, algorithmIds, 0, _length);
         System.arraycopy(_algorithmData, 0, algorithmData, 0, _length);
+        System.arraycopy(_alphabets, 0, alphabets, 0, _length);
+        System.arraycopy(_toIndex, 0, toIndex, 0, _length);
 
         _data = data;
         _algorithmIds = algorithmIds;
         _algorithmData = algorithmData;
+        _alphabets = alphabets;
+        _toIndex = toIndex;
     }
 
     private final StringBuffer convertEncodingAlgorithmDataToString(
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/FastInfosetDefaultHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/FastInfosetDefaultHandler.java
index 50b87239536..1489f82ec27 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/FastInfosetDefaultHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/FastInfosetDefaultHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,34 +25,6 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- *
- */
-
 
 package com.sun.xml.internal.org.jvnet.fastinfoset.sax.helpers;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/FastInfosetStreamReader.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/FastInfosetStreamReader.java
new file mode 100644
index 00000000000..43f7ec37966
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/FastInfosetStreamReader.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
+ */
+
+package com.sun.xml.internal.org.jvnet.fastinfoset.stax;
+
+import javax.xml.stream.XMLStreamException;
+
+/**
+ * Fast Infoset Stream Reader.
+ * 
    
+ * This interface provides additional optimized methods to that of
+ * {@link javax.xml.stream.XMLStreamReader}.
+ */
+public interface FastInfosetStreamReader {
+    /**
+     * Peek at the next event.
+     *
+     * @return the event, which will be the same as that returned from
+     *         {@link #next}.
+     */
+    public int peekNext() throws XMLStreamException;
+
+    // Faster access methods without checks
+
+    public int accessNamespaceCount();
+
+    public String accessLocalName();
+
+    public String accessNamespaceURI();
+
+    public String accessPrefix();
+
+    public char[] accessTextCharacters();
+
+    public int accessTextStart();
+
+    public int accessTextLength();
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/LowLevelFastInfosetStreamWriter.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/LowLevelFastInfosetStreamWriter.java
new file mode 100644
index 00000000000..4f68ac3ec0a
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/LowLevelFastInfosetStreamWriter.java
@@ -0,0 +1,207 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
+ */
+
+package com.sun.xml.internal.org.jvnet.fastinfoset.stax;
+
+import com.sun.xml.internal.fastinfoset.EncodingConstants;
+import java.io.IOException;
+import javax.xml.stream.XMLStreamException;
+import com.sun.xml.internal.org.jvnet.fastinfoset.EncodingAlgorithmIndexes;
+
+/**
+ * Low level Fast Infoset stream writer.
+ * 
    
+ * This interface provides additional stream-based serialization methods for the
+ * case where an application is in specific control of the serialization
+ * process and has the knowledge to call the LowLevel methods in the required
+ * order.
+ * 
    
+ * For example, the application may be able to perform efficient information
+ * to indexing mapping and to provide certain information in UTF-8 encoded form.
+ * 
    
+ * These methods may be used in conjuction with {@link javax.xml.stream.XMLStreamWriter}
+ * as long as an element fragment written using the efficient streaming methods
+ * are self-contained and no sub-fragment is written using methods from
+ * {@link javax.xml.stream.XMLStreamWriter}.
+ * 
    
+ * The required call sequence is as follows:
+ * 
    + * CALLSEQUENCE    := {@link #startDocument startDocument}
+ *                    initiateLowLevelWriting ELEMENT
+ *                    {@link #endDocument endDocument}
+ *                 |  initiateLowLevelWriting ELEMENT   // for fragment
+ *
+ * ELEMENT         := writeLowLevelTerminationAndMark
+ *                    NAMESPACES?
+ *                    ELEMENT_NAME
+ *                    ATTRIBUTES?
+ *                    writeLowLevelEndStartElement
+ *                    CONTENTS
+ *                    writeLowLevelEndElement
+ *
+ * NAMESPACES      := writeLowLevelStartNamespaces
+ *                    writeLowLevelNamespace*
+ *                    writeLowLevelEndNamespaces
+ *
+ * ELEMENT_NAME    := writeLowLevelStartElementIndexed
+ *                 |  writeLowLevelStartNameLiteral
+ *                 |  writeLowLevelStartElement
+ *
+ * ATTRUBUTES      := writeLowLevelStartAttributes
+ *                   (ATTRIBUTE_NAME writeLowLevelAttributeValue)*
+ *
+ * ATTRIBUTE_NAME  := writeLowLevelAttributeIndexed
+ *                 |  writeLowLevelStartNameLiteral
+ *                 |  writeLowLevelAttribute
+ *
+ *
+ * CONTENTS      := (ELEMENT | writeLowLevelText writeLowLevelOctets)*
+ * 
    
+ * 
    
+ * Some methods defer to the application for the mapping of information
+ * to indexes.
+ */
+public interface LowLevelFastInfosetStreamWriter {
+    /**
+     * Initiate low level writing of an element fragment.
+     * 
    
+     * This method must be invoked before other low level method.
+     */
+    public void initiateLowLevelWriting()
+    throws XMLStreamException;
+
+    /**
+     * Get the next index to apply to an Element Information Item.
+     * 
    
+     * This will increment the next obtained index such that:
+     * 
    +     * i = w.getNextElementIndex();
+     * j = w.getNextElementIndex();
+     * i == j + 1;
+     * 
    
+     * @return the index.
+     */
+    public int getNextElementIndex();
+
+    /**
+     * Get the next index to apply to an Attribute Information Item.
+     * This will increment the next obtained index such that:
+     * 
    +     * i = w.getNextAttributeIndex();
+     * j = w.getNextAttributeIndex();
+     * i == j + 1;
+     * 
    
+     * @return the index.
+     */
+    public int getNextAttributeIndex();
+
+    /**
+     * Get the current index that was applied to an [local name] of an
+     * Element or Attribute Information Item.
+     * 
+     * @return the index.
+     */
+    public int getLocalNameIndex();
+
+    /**
+     * Get the next index to apply to an [local name] of an Element or Attribute
+     * Information Item.
+     * This will increment the next obtained index such that:
+     * 
    +     * i = w.getNextLocalNameIndex();
+     * j = w.getNextLocalNameIndex();
+     * i == j + 1;
+     * 
    
+     * @return the index.
+     */
+    public int getNextLocalNameIndex();
+
+    public void writeLowLevelTerminationAndMark()
+    throws IOException;
+
+    public void writeLowLevelStartElementIndexed(int type, int index)
+    throws IOException;
+
+    /**
+     * Write the start of an element.
+     *
+     * @return true if element is indexed, otherwise false.
+     */
+    public boolean writeLowLevelStartElement(int type,
+            String prefix, String localName, String namespaceURI)
+            throws IOException;
+
+    public void writeLowLevelStartNamespaces()
+    throws IOException;
+
+    public void writeLowLevelNamespace(String prefix, String namespaceName)
+        throws IOException;
+
+    public void writeLowLevelEndNamespaces()
+    throws IOException;
+
+    public void writeLowLevelStartAttributes()
+    throws IOException;
+
+    public void writeLowLevelAttributeIndexed(int index)
+    throws IOException;
+
+    /**
+     * Write an attribute.
+     *
+     * @return true if attribute is indexed, otherwise false.
+     */
+    public boolean writeLowLevelAttribute(
+            String prefix, String namespaceURI, String localName)
+            throws IOException;
+
+    public void writeLowLevelAttributeValue(String value)
+    throws IOException;
+
+    public void writeLowLevelStartNameLiteral(int type,
+            String prefix, byte[] utf8LocalName, String namespaceURI)
+            throws IOException;
+
+    public void writeLowLevelStartNameLiteral(int type,
+            String prefix, int localNameIndex, String namespaceURI)
+            throws IOException;
+
+    public void writeLowLevelEndStartElement()
+    throws IOException;
+
+    public void writeLowLevelEndElement()
+    throws IOException;
+
+    public void writeLowLevelText(char[] text, int length)
+    throws IOException;
+
+    public void writeLowLevelText(String text)
+    throws IOException;
+
+    public void writeLowLevelOctets(byte[] octets, int length)
+    throws IOException;
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64Data.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64Data.java
new file mode 100644
index 00000000000..1f49ce33e11
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64Data.java
@@ -0,0 +1,313 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.org.jvnet.staxex;
+
+import javax.activation.DataHandler;
+import javax.activation.DataSource;
+import java.io.InputStream;
+import java.io.IOException;
+import java.io.ByteArrayInputStream;
+import java.io.OutputStream;
+
+/**
+ * Binary data represented as base64-encoded string
+ * in XML.
+ *
+ * 
    
+ * Used in conjunction with {@link XMLStreamReaderEx}
+ * and {@link XMLStreamWriterEx}.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public class Base64Data implements CharSequence, Cloneable {
+
+    // either dataHandler or (data,dataLen,mimeType?) must be present
+
+    private DataHandler dataHandler;
+
+    private byte[] data;
+    /**
+     * Length of the valid data in {@link #data}.
+     */
+    private int dataLen;
+    /**
+     * True if {@link #data} can be cloned by reference
+     * if Base64Data instance is cloned.
+     */
+    private boolean dataCloneByRef;
+    /**
+     * Optional MIME type of {@link #data}.
+     *
+     * Unused when {@link #dataHandler} is set.
+     * Use {@link DataHandler#getContentType()} in that case.
+     */
+    private String mimeType;
+
+    /**
+     * Default constructor
+     */
+    public Base64Data() {
+    }
+
+    /**
+     * Clone constructor
+     */
+    public Base64Data(Base64Data that) {
+        that.get();
+        if (that.dataCloneByRef) {
+            this.data = that.data;
+        } else {
+            this.data = new byte[that.dataLen];
+            System.arraycopy(that.data, 0, this.data, 0, that.dataLen);
+        }
+
+        this.dataCloneByRef = true;
+        this.dataLen = that.dataLen;
+        this.dataHandler = null;
+        this.mimeType = that.mimeType;
+    }
+
+    /**
+     * Fills in the data object by a portion of the byte[].
+     *
+     * @param len
+     *      data[0] to data[len-1] are treated as the data.
+     * @param cloneByRef
+     *      true if data[] can be cloned by reference
+     */
+    public void set(byte[] data, int len, String mimeType, boolean cloneByRef) {
+        this.data = data;
+        this.dataLen = len;
+        this.dataCloneByRef = cloneByRef;
+        this.dataHandler = null;
+        this.mimeType = mimeType;
+    }
+
+    /**
+     * Fills in the data object by a portion of the byte[].
+     *
+     * @param len
+     *      data[0] to data[len-1] are treated as the data.
+     */
+    public void set(byte[] data, int len, String mimeType) {
+        set(data,len,mimeType,false);
+    }
+
+    /**
+     * Fills in the data object by the byte[] of the exact length.
+     *
+     * @param data
+     *      this buffer may be owned directly by the unmarshaleld JAXB object.
+     */
+    public void set(byte[] data,String mimeType) {
+        set(data,data.length,mimeType,false);
+    }
+
+    /**
+     * Fills in the data object by a {@link DataHandler}.
+     */
+    public void set(DataHandler data) {
+        assert data!=null;
+        this.dataHandler = data;
+        this.data = null;
+    }
+
+    /**
+     * Gets the raw data.
+     */
+    public DataHandler getDataHandler() {
+        if(dataHandler==null){
+            dataHandler = new DataHandler(new DataSource() {
+                public String getContentType() {
+                    return getMimeType();
+                }
+
+                public InputStream getInputStream() {
+                    return new ByteArrayInputStream(data,0,dataLen);
+                }
+
+                public String getName() {
+                    return null;
+                }
+
+                public OutputStream getOutputStream() {
+                    throw new UnsupportedOperationException();
+                }
+            });
+        }
+        return dataHandler;
+    }
+
+    /**
+     * Gets the byte[] of the exact length.
+     */
+    public byte[] getExact() {
+        get();
+        if(dataLen!=data.length) {
+            byte[] buf = new byte[dataLen];
+            System.arraycopy(data,0,buf,0,dataLen);
+            data = buf;
+        }
+        return data;
+    }
+
+    /**
+     * Gets the data as an {@link InputStream}.
+     */
+    public InputStream getInputStream() throws IOException {
+        if(dataHandler!=null)
+            return dataHandler.getInputStream();
+        else
+            return new ByteArrayInputStream(data,0,dataLen);
+    }
+
+    /**
+     * Returns false if this object only has {@link DataHandler} and therefore
+     * {@link #get()} operation is likely going to be expensive.
+     */
+    public boolean hasData() {
+        return data!=null;
+    }
+
+    /**
+     * Gets the raw data. The size of the byte array maybe larger than the actual length.
+     */
+    public byte[] get() {
+        if(data==null) {
+            try {
+                ByteArrayOutputStreamEx baos = new ByteArrayOutputStreamEx(1024);
+                InputStream is = dataHandler.getDataSource().getInputStream();
+                baos.readFrom(is);
+                is.close();
+                data = baos.getBuffer();
+                dataLen = baos.size();
+                dataCloneByRef = true;
+            } catch (IOException e) {
+                // TODO: report the error to the unmarshaller
+                dataLen = 0;    // recover by assuming length-0 data
+            }
+        }
+        return data;
+    }
+
+    public int getDataLen() {
+        return dataLen;
+    }
+
+    public String getMimeType() {
+        if(mimeType==null)
+            return "application/octet-stream";
+        return mimeType;
+    }
+
+    /**
+     * Gets the number of characters needed to represent
+     * this binary data in the base64 encoding.
+     */
+    public int length() {
+        // for each 3 bytes you use 4 chars
+        // if the remainder is 1 or 2 there will be 4 more
+        get();  // fill in the buffer if necessary
+        return ((dataLen+2)/3)*4;
+    }
+
+    /**
+     * Encode this binary data in the base64 encoding
+     * and returns the character at the specified position.
+     */
+    public char charAt(int index) {
+        // we assume that the length() method is called before this method
+        // (otherwise how would the caller know that the index is valid?)
+        // so we assume that the byte[] is already populated
+
+        int offset = index%4;
+        int base = (index/4)*3;
+
+        byte b1,b2;
+
+        switch(offset) {
+        case 0:
+            return Base64Encoder.encode(data[base]>>2);
+        case 1:
+            if(base+1>4)&0xF));
+        case 2:
+            if(base+1>6)&0x3));
+            } else
+                return '=';
+        case 3:
+            if(base+2>2);
+                buf[ptr++] = encode(((input[i])&0x3)<<4);
+                buf[ptr++] = '=';
+                buf[ptr++] = '=';
+                break;
+            case 2:
+                buf[ptr++] = encode(input[i]>>2);
+                buf[ptr++] = encode(
+                            ((input[i]&0x3)<<4) |
+                            ((input[i+1]>>4)&0xF));
+                buf[ptr++] = encode((input[i+1]&0xF)<<2);
+                buf[ptr++] = '=';
+                break;
+            default:
+                buf[ptr++] = encode(input[i]>>2);
+                buf[ptr++] = encode(
+                            ((input[i]&0x3)<<4) |
+                            ((input[i+1]>>4)&0xF));
+                buf[ptr++] = encode(
+                            ((input[i+1]&0xF)<<2)|
+                            ((input[i+2]>>6)&0x3));
+                buf[ptr++] = encode(input[i+2]&0x3F);
+                break;
+            }
+        }
+        return ptr;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/ByteArrayOutputStreamEx.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/ByteArrayOutputStreamEx.java
new file mode 100644
index 00000000000..b435885c7b1
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/ByteArrayOutputStreamEx.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.org.jvnet.staxex;
+
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.IOException;
+
+/**
+ * {@link ByteArrayOutputStream} with access to its raw buffer.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+final class ByteArrayOutputStreamEx extends ByteArrayOutputStream {
+    public ByteArrayOutputStreamEx() {
+    }
+
+    public ByteArrayOutputStreamEx(int size) {
+        super(size);
+    }
+
+    public void set(Base64Data dt,String mimeType) {
+        dt.set(buf,count,mimeType);
+    }
+
+    public byte[] getBuffer() {
+        return buf;
+    }
+
+    /**
+     * Reads the given {@link InputStream} completely into the buffer.
+     */
+    public void readFrom(InputStream is) throws IOException {
+        while(true) {
+            if(count==buf.length) {
+                // realllocate
+                byte[] data = new byte[buf.length*2];
+                System.arraycopy(buf,0,data,0,buf.length);
+                buf = data;
+            }
+
+            int sz = is.read(buf,count,buf.length-count);
+            if(sz<0)     return;
+            count += sz;
+        }
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/NamespaceContextEx.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/NamespaceContextEx.java
new file mode 100644
index 00000000000..04bc27bcbf2
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/NamespaceContextEx.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.org.jvnet.staxex;
+
+import javax.xml.namespace.NamespaceContext;
+import java.util.Iterator;
+
+/**
+ * Extended {@link NamespaceContext}.
+ *
+ * @author Kohsuke Kawaguchi
+ * @author Paul Sandoz
+ */
+public interface NamespaceContextEx extends NamespaceContext, Iterable {
+
+    /**
+     * Iterates all the in-scope namespace bindings.
+     *
+     * 
    
+     * This method enumerates all the active in-scope namespace bindings.
+     * This does not include implicit bindings, such as
+     * "xml"->"http://www.w3.org/XML/1998/namespace"
+     * or ""->"" (the implicit default namespace URI.)
+     *
+     * 
    
+     * The returned iterator may not include the same prefix more than once.
+     * For example, the returned iterator may only contain f=ns2
+     * if the document is as follows and this method is used at the bar element.
+     *
+     * 
    
+     * <foo xmlns:f='ns1'>
+     *   <bar xmlns:f='ns2'>
+     *     ...
+     * 
    
+     *
+     * 
    
+     * The iteration may be done in no particular order.
+     *
+     * @return
+     *      may return an empty iterator, but never null.
+     */
+    Iterator iterator();
+
+    /**
+     * Prefix to namespace URI binding.
+     */
+    interface Binding {
+        /**
+         * Gets the prefix.
+         *
+         * 
    
+         * The default namespace URI is represented by using an
+         * empty string "", not null.
+         *
+         * @return
+         *      never null. String like "foo", "ns12", or "".
+         */
+        String getPrefix();
+
+        /**
+         * Gets the namespace URI.
+         *
+         * 
    
+         * The empty namespace URI is represented by using
+         * an empty string "", not null.
+         *
+         * @return
+         *      never null. String like "http://www.w3.org/XML/1998/namespace",
+         *      "urn:oasis:names:specification:docbook:dtd:xml:4.1.2", or "".
+         */
+        String getNamespaceURI();
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamReaderEx.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamReaderEx.java
new file mode 100644
index 00000000000..8bf0f1c4e15
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamReaderEx.java
@@ -0,0 +1,184 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.org.jvnet.staxex;
+
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamException;
+
+/**
+ * {@link XMLStreamReader} extended for reading binary data.
+ *
+ * 
    
+ * Some producer of infoset (in particular, such as FastInfoset,
+ * XOP deecoder), usees a native format that enables efficient
+ * treatment of binary data. For ordinary infoset consumer
+ * (that just uses {@link XMLStreamReader}, those binary data
+ * will just look like base64-encoded string, but this interface
+ * allows consumers of such infoset to access this raw binary data.
+ * Such infoset producer may choose to implement this additoinal
+ * interface, to expose this functionality.
+ *
+ * 
    
+ * Consumers that are capable of using this interface can query
+ * {@link XMLStreamReader} if it supports this by simply downcasting
+ * it to this interface like this:
+ *
+ * 
    + * XMLStreamReader reader = ...;
+ * if( reader instanceof XMLStreamReaderEx ) {
+ *   // this reader supports binary data exchange
+ *   ...
+ * } else {
+ *   // noop
+ *   ...
+ * }
+ * 
    
+ *
+ * 
    
+ * Also note that it is also allowed for the infoset producer
+ * to implement this interface in such a way that {@link #getPCDATA()}
+ * always delegate to {@link #getText()}, although it's not desirable.
+ *
+ * 
    
+ * This interface is a private contract between such producers
+ * and consumers to allow them to exchange binary data without
+ * converting it to base64.
+ *
+ * @see XMLStreamWriterEx
+ * @author Kohsuke Kawaguchi
+ * @author Paul Sandoz
+ */
+public interface XMLStreamReaderEx extends XMLStreamReader {
+    ///**
+    // * Works like {@link XMLStreamReader#getText()}
+    // * but returns text as {@link DataSource}.
+    // *
+    // * 
    
+    // * This method can be invoked whenever {@link XMLStreamReader#getText()}
+    // * can be invoked. Invoking this method means the caller is assuming
+    // * that the text is (conceptually) base64-encoded binary data.
+    // *
+    // * 
    
+    // * This abstraction is necessary to treat XOP as infoset encoding.
+    // * That is, you can either access the XOP-attached binary through
+    // * {@link XMLStreamReader#getText()} (in which case you'll see the
+    // * base64 encoded string), or you can access it as a binary data
+    // * directly by using this method.
+    // *
+    // * 
    
+    // * Note that even if you are reading from non XOP-aware {@link XMLStreamReader},
+    // * this method must be still supported; if the reader is pointing
+    // * to a text, this method is responsible for decoding base64 and
+    // * producing a {@link DataHandler} with "application/octet-stream"
+    // * as the content type.
+    // *
+    // * @return
+    // *      always non-null valid object.
+    // *      Invocations of this method may return the same object as long
+    // *      as the {@link XMLStreamReader#next()} method is not used,
+    // *      but otherwise {@link DataSource} object returned from this method
+    // *      is considered to be owned by the client, and therefore it shouldn't
+    // *      be reused by the implementation of this method.
+    // *
+    // *      
    
+    // *      The returned {@link DataSource} is read-only, and the caller
+    // *      must not invoke {@link DataSource#getOutputStream()}.
+    // *
+    // * @throws IllegalStateException
+    // *      if the parser is not pointing at characters infoset item.
+    // * @throws XMLStreamException
+    // *      if the parser points to text but text is not base64-encoded text,
+    // *      or if some other parsing error occurs (such as if the <xop:Include>
+    // *      points to a non-existing attachment.)
+    // *
+    // *      
    
+    // *      It is also OK for this method to return successfully, only to fail
+    // *      during an {@link InputStream} is read from {@link DataSource}.
+    // */
+    //DataSource getTextAsDataHandler() throws XMLStreamException;
+
+    ///**
+    // * Works like {@link XMLStreamReader#getText()}
+    // * but returns text as {@link byte[]}.
+    // *
+    // * 
    
+    // * The contract of this method is mostly the same as
+    // * {@link #getTextAsDataHandler()}, except that this
+    // * method returns the binary datas as an exact-size byte[].
+    // *
+    // * 
    
+    // * This method is also not capable of reporting the content type
+    // * of this binary data, even if it is available to the parser.
+    // *
+    // * @see #getTextAsDataHandler()
+    // */
+    //byte[] getTextAsByteArray() throws XMLStreamException;
+
+    /**
+     * Works like {@link #getText()}
+     * but hides the actual data representation.
+     *
+     * @return
+     *      The {@link CharSequence} that represents the
+     *      character infoset items at the current position.
+     *
+     *      
    
+     *      The {@link CharSequence} is normally a {@link String},
+     *      but can be any other {@link CharSequence} implementation.
+     *      For binary data, however, use of {@link Base64Data} is
+     *      recommended (so that the consumer interested in seeing it
+     *      as binary data may take advantage of mor efficient
+     *      data representation.)
+     *
+     *      
    
+     *      The object returned from this method belongs to the parser,
+     *      and its content is guaranteed to be the same only until
+     *      the {@link #next()} method is invoked.
+     *
+     * @throws IllegalStateException
+     *      if the parser is not pointing at characters infoset item.
+     *
+     * TODO:
+     *      fix the dependency to JAXB internal class.
+     */
+    CharSequence getPCDATA() throws XMLStreamException;
+
+    /**
+     * {@inheritDoc}
+     */
+    NamespaceContextEx getNamespaceContext();
+
+    /**
+     * Works like {@link #getElementText()} but trims the leading
+     * and trailing whitespace.
+     *
+     * 
    
+     * The parser can often do this more efficiently than
+     * {@code getElementText().trim()}.
+     *
+     * @see #getElementText()
+     */
+    String getElementTextTrim() throws XMLStreamException;
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamWriterEx.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamWriterEx.java
new file mode 100644
index 00000000000..255b32d562b
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamWriterEx.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.org.jvnet.staxex;
+
+import com.sun.xml.internal.org.jvnet.staxex.XMLStreamReaderEx;
+
+import javax.xml.stream.XMLStreamWriter;
+import javax.xml.stream.XMLStreamException;
+import javax.activation.DataHandler;
+import java.io.OutputStream;
+
+/**
+ * {@link XMLStreamWriter} extended to support XOP.
+ *
+ * 
    
+ * Some infoset serializer (such as XOP encoder, FastInfoset) uses a format
+ * that can represent binary data more efficiently than base64 encoding.
+ * Such infoset serializer may choose to implement this interface, to allow
+ * the caller to pass in binary data more efficiently without first converting
+ * it to binary data.
+ *
+ * 
    
+ * Callers capable of using this interface can see if the serializer supports
+ * it by simply downcasting {@link XMLStreamWriter} to {@link XMLStreamWriterEx}.
+ *
+ * 
    TODO
    
+ * 
      
+ * 
    1. 
+ *   Add methods to write other primitive types, such as hex and integers
+ *   (and arrays of).
+ *   A textual implementation would write characters in accordance
+ *   to the canonical lexical definitions specified in W3C XML Schema: datatypes.
+ *   A MTOM implementation would write characters except for the case where octets
+ *   that would otherwise be base64 encoded when using the textual implementation.
+ *   A Fast Infoset implementation would encoded binary data the primitive types in
+ *   binary form.
+ * 
    2. 
+ *   Consider renaming writeBinary to writeBytesAsBase64 to be consistent with
+ *   infoset abstraction.
+ * 
    3. 
+ *   Add the ability to writeStart and writeEnd on attributes so that the same
+ *   methods for writing primitive types (and characters, which will require new methods)
+ *   can be used for writing attribute values as well as element content.
+ * 
    
+ *
+ * @see XMLStreamReaderEx
+ * @author Kohsuke Kawaguchi
+ * @author Paul Sandoz
+ */
+public interface XMLStreamWriterEx extends XMLStreamWriter {
+
+    /**
+     * Write the binary data.
+     *
+     * 
    
+     * Conceptually (infoset-wise), this produces the base64-encoded binary data on the
+     * output. But this allows implementations like FastInfoset or XOP to do the smart
+     * thing.
+     *
+     * 
    
+     * The use of this method has some restriction to support XOP. Namely, this method
+     * must be invoked as a sole content of an element.
+     *
+     * 
    
+     * (data,start,len) triplet identifies the binary data to be written.
+     *
+     * @param contentType
+     *      this mandatory parameter identifies the MIME type of the binary data.
+     *      If the MIME type isn't known by the caller, "application/octet-stream" can
+     *      be always used to indicate "I don't know." Never null.
+     */
+    void writeBinary(byte[] data, int start, int len, String contentType) throws XMLStreamException;
+
+    /**
+     * Writes the binary data.
+     *
+     * 
    
+     * This method works like the {@link #writeBinary(byte[], int, int, String)} method,
+     * except that it takes the binary data in the form of {@link DataHandler}, which
+     * contains a MIME type ({@link DataHandler#getContentType()} as well as the payload
+     * {@link DataHandler#getInputStream()}.
+     *
+     * @param data
+     *      always non-null.
+     */
+    void writeBinary(DataHandler data) throws XMLStreamException;
+
+    /**
+     * Writes the binary data.
+     *
+     * 
    
+     * This version of the writeBinary method allows the caller to produce
+     * the binary data by writing it to {@link OutputStream}.
+     *
+     * 
    
+     * It is the caller's responsibility to write and close
+     * a stream before it invokes any other methods on {@link XMLStreamWriter}.
+     *
+     * TODO: experimental. appreciate feedback
+     * @param contentType
+     *      See the content-type parameter of
+     *      {@link #writeBinary(byte[], int, int, String)}. Must not be null.
+     *
+     * @return
+     *      always return a non-null {@link OutputStream}.
+     */
+    OutputStream writeBinary(String contentType) throws XMLStreamException;
+
+    /**
+     * Writes like {@link #writeCharacters(String)} but hides
+     * actual data format.
+     *
+     * @return
+     *      The {@link CharSequence} that represents the
+     *      character infoset items to be written.
+     *
+     *      
    
+     *      The {@link CharSequence} is normally a {@link String},
+     *      but can be any other {@link CharSequence} implementation.
+     *      For binary data, however, use of {@link Base64Data} is
+     *      recommended (so that the consumer interested in seeing it
+     *      as binary data may take advantage of mor efficient
+     *      data representation.)
+     *
+     *      
    
+     *      The object returned from this method belongs to the parser,
+     *      and its content is guaranteed to be the same only until
+     *      the {@link #next()} method is invoked.
+     */
+    void writePCDATA(CharSequence data) throws XMLStreamException;
+
+    /**
+     * {@inheritDoc}
+     */
+    NamespaceContextEx getNamespaceContext();
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/Annotations.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/Annotations.java
index 3e6f4b48d33..e6d16708cd3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/Annotations.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/Annotations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.ast.builder;
 
 import com.sun.xml.internal.rngom.ast.om.Location;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/BuildException.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/BuildException.java
index 3b62400f597..ee8ca3ec118 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/BuildException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/BuildException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.ast.builder;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/CommentList.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/CommentList.java
index 39c28793123..e7116708b74 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/CommentList.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/CommentList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.ast.builder;
 
 import com.sun.xml.internal.rngom.ast.om.Location;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/DataPatternBuilder.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/DataPatternBuilder.java
index 6826c329139..53a73c6fd8a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/DataPatternBuilder.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/DataPatternBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.ast.builder;
 
 import com.sun.xml.internal.rngom.ast.om.Location;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/Div.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/Div.java
index 759c3244db9..3f3127ee199 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/Div.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/Div.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.ast.builder;
 
 import com.sun.xml.internal.rngom.ast.om.Location;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/ElementAnnotationBuilder.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/ElementAnnotationBuilder.java
index 9e52d48ff5b..e0d33bd1367 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/ElementAnnotationBuilder.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/ElementAnnotationBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.ast.builder;
 
 import com.sun.xml.internal.rngom.ast.om.Location;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/Grammar.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/Grammar.java
index c6658d08981..9a45b76b738 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/Grammar.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/Grammar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.ast.builder;
 
 import com.sun.xml.internal.rngom.ast.om.Location;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/GrammarSection.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/GrammarSection.java
index caf78e08ea5..ef0a461b2e9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/GrammarSection.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/GrammarSection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.ast.builder;
 
 import com.sun.xml.internal.rngom.ast.om.Location;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/Include.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/Include.java
index 7acbce71a90..b6490da530a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/Include.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/Include.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.ast.builder;
 
 import com.sun.xml.internal.rngom.ast.om.Location;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/IncludedGrammar.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/IncludedGrammar.java
index f7ff8786242..c58dbc18ed6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/IncludedGrammar.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/IncludedGrammar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.ast.builder;
 
 import com.sun.xml.internal.rngom.ast.om.Location;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/NameClassBuilder.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/NameClassBuilder.java
index 8a342a37c03..e018b5ca920 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/NameClassBuilder.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/NameClassBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.ast.builder;
 
 import com.sun.xml.internal.rngom.ast.om.Location;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/SchemaBuilder.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/SchemaBuilder.java
index cd20f03f7d1..78d9f643a65 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/SchemaBuilder.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/SchemaBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.ast.builder;
 
 import com.sun.xml.internal.rngom.ast.om.Location;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/Scope.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/Scope.java
index 5f208bced60..c9ce2c634c8 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/Scope.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/builder/Scope.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.ast.builder;
 
 import com.sun.xml.internal.rngom.ast.om.Location;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/om/Location.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/om/Location.java
index a078fba074e..14a3ac50cc0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/om/Location.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/om/Location.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.ast.om;
 
 public interface Location { }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/om/ParsedElementAnnotation.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/om/ParsedElementAnnotation.java
index ceb22d8a79e..c9cf4fb959a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/om/ParsedElementAnnotation.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/om/ParsedElementAnnotation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.ast.om;
 
 public interface ParsedElementAnnotation { }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/om/ParsedNameClass.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/om/ParsedNameClass.java
index e9da9c42f2c..57f5f3cd652 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/om/ParsedNameClass.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/om/ParsedNameClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.ast.om;
 
 public interface ParsedNameClass { }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/om/ParsedPattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/om/ParsedPattern.java
index d3a1ff90272..15fd9d5ddd4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/om/ParsedPattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/om/ParsedPattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.ast.om;
 
 public interface ParsedPattern { }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/util/CheckingSchemaBuilder.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/util/CheckingSchemaBuilder.java
index ff2a977c8c5..9dfcd48501c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/util/CheckingSchemaBuilder.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/util/CheckingSchemaBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.ast.util;
 
 import com.sun.xml.internal.rngom.ast.builder.BuildException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/util/LocatorImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/util/LocatorImpl.java
index e85e96cbe9b..79ee25d9ea9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/util/LocatorImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/util/LocatorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.ast.util;
 
 import com.sun.xml.internal.rngom.ast.om.Location;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/util/package.html b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/util/package.html
index 2e916641755..30a3633fd35 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/util/package.html
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/ast/util/package.html
@@ -1,3 +1,27 @@
+
 Typical implementations of the ast.builder/ast.om packages.
 
 Those classes are solely intended to make the AST implementation easier.
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/AfterPattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/AfterPattern.java
index 034ebef1168..0eda64c8c43 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/AfterPattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/AfterPattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.binary;
 
 import com.sun.xml.internal.rngom.binary.visitor.PatternFunction;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/Alphabet.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/Alphabet.java
index e93bd853b6c..d071cc04c2e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/Alphabet.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/Alphabet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.binary;
 
 import com.sun.xml.internal.rngom.nc.ChoiceNameClass;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/AttributePattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/AttributePattern.java
index bce2aad83cd..48f9655c999 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/AttributePattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/AttributePattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.binary;
 
 import com.sun.xml.internal.rngom.binary.visitor.PatternFunction;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/BinaryPattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/BinaryPattern.java
index b1ca8c966e7..99888f9b96b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/BinaryPattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/BinaryPattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.binary;
 
 import org.xml.sax.SAXException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/ChoicePattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/ChoicePattern.java
index 14cbea70827..f2606427b86 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/ChoicePattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/ChoicePattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.binary;
 
 import com.sun.xml.internal.rngom.binary.visitor.PatternFunction;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/DataExceptPattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/DataExceptPattern.java
index 7e3cdd427bb..f95172088dc 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/DataExceptPattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/DataExceptPattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.binary;
 
 import com.sun.xml.internal.rngom.binary.visitor.PatternFunction;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/DataPattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/DataPattern.java
index 2c4573cef70..3091f4c9a24 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/DataPattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/DataPattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.binary;
 
 import com.sun.xml.internal.rngom.binary.visitor.PatternFunction;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/DuplicateAttributeDetector.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/DuplicateAttributeDetector.java
index aa9d8b5e011..61b12930cc1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/DuplicateAttributeDetector.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/DuplicateAttributeDetector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.binary;
 
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/ElementPattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/ElementPattern.java
index 59bf0bac9bb..ee5694ed3c0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/ElementPattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/ElementPattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.binary;
 
 import com.sun.xml.internal.rngom.binary.visitor.PatternFunction;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/EmptyPattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/EmptyPattern.java
index 3a6db7e14a1..d09834d0e01 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/EmptyPattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/EmptyPattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.binary;
 
 import com.sun.xml.internal.rngom.binary.visitor.PatternFunction;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/ErrorPattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/ErrorPattern.java
index 2fad94346e7..0fb9530bea5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/ErrorPattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/ErrorPattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.binary;
 
 import com.sun.xml.internal.rngom.binary.visitor.PatternFunction;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/GroupPattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/GroupPattern.java
index 86bd95bfaef..23060084a4f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/GroupPattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/GroupPattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.binary;
 
 import com.sun.xml.internal.rngom.binary.visitor.*;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/InterleavePattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/InterleavePattern.java
index 068ca23ff5f..c52f4f64948 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/InterleavePattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/InterleavePattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.binary;
 
 import com.sun.xml.internal.rngom.binary.visitor.PatternFunction;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/ListPattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/ListPattern.java
index c898dd15b8f..8da2c034fa8 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/ListPattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/ListPattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.binary;
 
 import com.sun.xml.internal.rngom.binary.visitor.PatternFunction;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/Messages.properties b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/Messages.properties
index 0b71e64955f..5cc5b00c262 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/Messages.properties
@@ -1,3 +1,28 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
 # Properties file specifying messages
 illegal_href_attribute=illegal \"href\" attribute
 ns_attribute_ignored=\"ns\" attribute ignored
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/NotAllowedPattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/NotAllowedPattern.java
index ccb97c0fffa..e7809b27b26 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/NotAllowedPattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/NotAllowedPattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.binary;
 
 import com.sun.xml.internal.rngom.binary.visitor.PatternFunction;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/OneOrMorePattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/OneOrMorePattern.java
index 8c9f1bdf79a..d2e933f14fe 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/OneOrMorePattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/OneOrMorePattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.binary;
 
 import com.sun.xml.internal.rngom.binary.visitor.PatternFunction;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/Pattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/Pattern.java
index 6f04f431e7a..489e92a345c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/Pattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/Pattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.binary;
 
 import com.sun.xml.internal.rngom.ast.om.ParsedPattern;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/PatternBuilder.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/PatternBuilder.java
index 4086d7288d2..ae5b9b1b869 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/PatternBuilder.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/PatternBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.binary;
 
 public class PatternBuilder {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/PatternInterner.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/PatternInterner.java
index 5ae8d1e50c4..0b7bc25ebec 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/PatternInterner.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/PatternInterner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.binary;
 
 final class PatternInterner {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/RefPattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/RefPattern.java
index 4e02208af9e..92a78dec489 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/RefPattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/RefPattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.binary;
 
 import com.sun.xml.internal.rngom.binary.visitor.PatternFunction;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/RestrictionViolationException.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/RestrictionViolationException.java
index a9de621b893..d0393640c2e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/RestrictionViolationException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/RestrictionViolationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.binary;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/SchemaBuilderImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/SchemaBuilderImpl.java
index 75546b80c60..cd789fa0076 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/SchemaBuilderImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/SchemaBuilderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.binary;
 
 import java.util.Enumeration;
@@ -48,6 +47,7 @@ import com.sun.xml.internal.rngom.ast.om.ParsedNameClass;
 import com.sun.xml.internal.rngom.ast.om.ParsedPattern;
 import com.sun.xml.internal.rngom.ast.util.LocatorImpl;
 import com.sun.xml.internal.rngom.dt.builtin.BuiltinDatatypeLibraryFactory;
+import com.sun.xml.internal.rngom.dt.CascadingDatatypeLibraryFactory;
 import com.sun.xml.internal.rngom.nc.NameClass;
 import com.sun.xml.internal.rngom.nc.NameClassBuilderImpl;
 import com.sun.xml.internal.rngom.parse.Context;
@@ -117,7 +117,10 @@ public class SchemaBuilderImpl implements SchemaBuilder, ElementAnnotationBuilde
    *        Error handler to receive errors while building the schema.
    */
   public SchemaBuilderImpl(ErrorHandler eh) {
-      this(eh,new BuiltinDatatypeLibraryFactory(new DatatypeLibraryLoader()),new SchemaPatternBuilder());
+      this(eh,
+          new CascadingDatatypeLibraryFactory(new DatatypeLibraryLoader(),
+            new BuiltinDatatypeLibraryFactory(new DatatypeLibraryLoader())),
+          new SchemaPatternBuilder());
   }
 
   /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/SchemaPatternBuilder.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/SchemaPatternBuilder.java
index 919fa2767b1..b849630fc59 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/SchemaPatternBuilder.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/SchemaPatternBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.binary;
 
 import com.sun.xml.internal.rngom.nc.NameClass;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/StringPattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/StringPattern.java
index 09d8da1cf58..2d38e5f5f64 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/StringPattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/StringPattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.binary;
 
 abstract class StringPattern extends Pattern {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/TextPattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/TextPattern.java
index 6b1546385eb..03e9edd7689 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/TextPattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/TextPattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.binary;
 
 import com.sun.xml.internal.rngom.binary.visitor.PatternFunction;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/ValuePattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/ValuePattern.java
index 18e4c59d30e..e3e82985d52 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/ValuePattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/ValuePattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.binary;
 
 import com.sun.xml.internal.rngom.binary.visitor.PatternFunction;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/package.html b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/package.html
index b924926ac89..eb6e205dab3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/package.html
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/package.html
@@ -1,3 +1,27 @@
+
 
   
     Minimal binarized pattern object model (one example of ast.om implementation).
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/visitor/ChildElementFinder.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/visitor/ChildElementFinder.java
index 4a407407096..ec65da315f8 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/visitor/ChildElementFinder.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/visitor/ChildElementFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.binary.visitor;
 
 import com.sun.xml.internal.rngom.binary.Pattern;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternFunction.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternFunction.java
index ef7bef94a3e..cd5d6887a9c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternFunction.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternFunction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.binary.visitor;
 
 import com.sun.xml.internal.rngom.binary.AfterPattern;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternVisitor.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternVisitor.java
index adaab60f38c..78b5cf9dc60 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternVisitor.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.binary.visitor;
 
 import com.sun.xml.internal.rngom.binary.Pattern;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternWalker.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternWalker.java
index fa52209f806..e2b99ed27fb 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternWalker.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternWalker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.binary.visitor;
 
 import com.sun.xml.internal.rngom.binary.Pattern;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/Annotation.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/Annotation.java
index 381e6b0e9a7..f96caf6fd44 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/Annotation.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/Annotation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 import com.sun.xml.internal.rngom.ast.builder.Annotations;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/CommentListImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/CommentListImpl.java
index 843a59222e6..952ae6165f3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/CommentListImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/CommentListImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 import com.sun.xml.internal.rngom.ast.builder.CommentList;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DAnnotation.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DAnnotation.java
index b4d4609a049..d565dfe0a25 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DAnnotation.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DAnnotation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 import org.xml.sax.Locator;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DAttributePattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DAttributePattern.java
index eb08aed9794..2d25d4eda73 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DAttributePattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DAttributePattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 import com.sun.xml.internal.rngom.nc.NameClass;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DChoicePattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DChoicePattern.java
index 863fed077ea..8225c4d11ed 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DChoicePattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DChoicePattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DContainerPattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DContainerPattern.java
index 5e29a5fca43..6a7cad3695b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DContainerPattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DContainerPattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 import java.util.Iterator;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DDataPattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DDataPattern.java
index 38aa868a31e..c4763491e3e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DDataPattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DDataPattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 import com.sun.xml.internal.rngom.ast.om.Location;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DDefine.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DDefine.java
index 8401f183231..4929a13d1c4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DDefine.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DDefine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DElementPattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DElementPattern.java
index c0b0b7db4bf..26e8ad2e77d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DElementPattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DElementPattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 import com.sun.xml.internal.rngom.nc.NameClass;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DEmptyPattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DEmptyPattern.java
index 36226a03d2a..ad6890686e4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DEmptyPattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DEmptyPattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DGrammarPattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DGrammarPattern.java
index 7690a77cec0..e45916bae37 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DGrammarPattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DGrammarPattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 import java.util.HashMap;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DGroupPattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DGroupPattern.java
index 403b6cf6875..b1cf486912d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DGroupPattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DGroupPattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DInterleavePattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DInterleavePattern.java
index d0b220184e1..6559c281baf 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DInterleavePattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DInterleavePattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DListPattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DListPattern.java
index 7655d66b907..0a9ad4d454e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DListPattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DListPattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DMixedPattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DMixedPattern.java
index 8b4de880733..722de6902be 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DMixedPattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DMixedPattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DNotAllowedPattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DNotAllowedPattern.java
index fa3aa69dd1a..96a62c0b931 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DNotAllowedPattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DNotAllowedPattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DOMPrinter.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DOMPrinter.java
index d65d6fed4c7..d6a3033dc4b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DOMPrinter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DOMPrinter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 import org.w3c.dom.Attr;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DOneOrMorePattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DOneOrMorePattern.java
index c8a77c8ddbc..1a56dc1e4aa 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DOneOrMorePattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DOneOrMorePattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DOptionalPattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DOptionalPattern.java
index 3956f199736..a27d19d08a4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DOptionalPattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DOptionalPattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DPattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DPattern.java
index 118d1485204..2a120b1505f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DPattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DPattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 import com.sun.xml.internal.rngom.ast.om.ParsedPattern;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DPatternVisitor.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DPatternVisitor.java
index d879298c533..15870f95095 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DPatternVisitor.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DPatternVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DPatternWalker.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DPatternWalker.java
index 3ca7fb6b588..bb1d9d12745 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DPatternWalker.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DPatternWalker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DRefPattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DRefPattern.java
index 7eb09cf3e4c..8aea0dbadec 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DRefPattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DRefPattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DSchemaBuilderImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DSchemaBuilderImpl.java
index ff9fb909f5b..3cc7be8f25b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DSchemaBuilderImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DSchemaBuilderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 import com.sun.xml.internal.rngom.ast.builder.BuildException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DTextPattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DTextPattern.java
index dcdc9b685be..6330cbb3b70 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DTextPattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DTextPattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DUnaryPattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DUnaryPattern.java
index f83deb78d8a..e641c4745fe 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DUnaryPattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DUnaryPattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DValuePattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DValuePattern.java
index ed7bfdfef7c..30444ac1fa5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DValuePattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DValuePattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 import com.sun.xml.internal.rngom.parse.Context;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DXMLPrinter.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DXMLPrinter.java
index fb17c24b20a..1d0c19b58a3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DXMLPrinter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DXMLPrinter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 import java.io.FileOutputStream;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DXmlTokenPattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DXmlTokenPattern.java
index 41a75849229..1e2dee5ceab 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DXmlTokenPattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DXmlTokenPattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 import com.sun.xml.internal.rngom.nc.NameClass;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DZeroOrMorePattern.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DZeroOrMorePattern.java
index 77fbf8aaa0b..40ce70f1120 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DZeroOrMorePattern.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DZeroOrMorePattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DataPatternBuilderImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DataPatternBuilderImpl.java
index 896529fa9a8..da5031a62eb 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DataPatternBuilderImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/DataPatternBuilderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 import com.sun.xml.internal.rngom.ast.builder.Annotations;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/ElementAnnotationBuilderImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/ElementAnnotationBuilderImpl.java
index 22046d3c7ac..884aae487cc 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/ElementAnnotationBuilderImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/ElementAnnotationBuilderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 import com.sun.xml.internal.rngom.ast.builder.BuildException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/ElementWrapper.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/ElementWrapper.java
index dc3cf31b24c..6fd82bc47a0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/ElementWrapper.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/ElementWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 import com.sun.xml.internal.rngom.ast.om.ParsedElementAnnotation;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/GrammarBuilderImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/GrammarBuilderImpl.java
index 31d8a47a557..c412705d034 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/GrammarBuilderImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/GrammarBuilderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 import com.sun.xml.internal.rngom.ast.builder.Annotations;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/IncludeImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/IncludeImpl.java
index 34f4d1a51f9..f3d1001f5ef 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/IncludeImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/IncludeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 import com.sun.xml.internal.rngom.ast.builder.Annotations;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/Main.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/Main.java
index d5db94fe7b0..de9531de4bc 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/Main.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 import com.sun.xml.internal.rngom.ast.builder.BuildException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/PatternParseable.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/PatternParseable.java
index 6ba41e35d41..2735e7b6aa8 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/PatternParseable.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/PatternParseable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.digested;
 
 import com.sun.xml.internal.rngom.ast.builder.Annotations;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/package.html b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/package.html
index e6f75b90289..b6657b6747d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/package.html
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/digested/package.html
@@ -1,3 +1,27 @@
+
 
 Another RELAX NG AST implementation that optimizes away
 inclusions and some other syntax sugars, while still retaining
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/CachedDatatypeLibraryFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/CachedDatatypeLibraryFactory.java
index 415efffd50a..cc18d4f2eb4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/CachedDatatypeLibraryFactory.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/CachedDatatypeLibraryFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.dt;
 
 import org.relaxng.datatype.DatatypeLibrary;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/CascadingDatatypeLibraryFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/CascadingDatatypeLibraryFactory.java
index 6f79fb35359..6b158e06a03 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/CascadingDatatypeLibraryFactory.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/CascadingDatatypeLibraryFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.dt;
 
 import org.relaxng.datatype.DatatypeLibrary;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/DoNothingDatatypeLibraryFactoryImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/DoNothingDatatypeLibraryFactoryImpl.java
index af62b734cc5..f3f89b6b8c5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/DoNothingDatatypeLibraryFactoryImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/DoNothingDatatypeLibraryFactoryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.dt;
 
 import org.relaxng.datatype.DatatypeLibraryFactory;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeBuilder.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeBuilder.java
index ac5d825616d..c5c5c2e1e89 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeBuilder.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.dt.builtin;
 
 import org.relaxng.datatype.Datatype;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibrary.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibrary.java
index 4c2c2ffd99d..622b795712c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibrary.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibrary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.dt.builtin;
 
 import org.relaxng.datatype.Datatype;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibraryFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibraryFactory.java
index b7b2f5f1424..e5e49155916 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibraryFactory.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibraryFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.dt.builtin;
 
 import org.relaxng.datatype.DatatypeLibrary;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/CompatibilityDatatypeLibrary.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/CompatibilityDatatypeLibrary.java
index ab62681a014..ec032ff7e79 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/CompatibilityDatatypeLibrary.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/CompatibilityDatatypeLibrary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.dt.builtin;
 
 import org.relaxng.datatype.Datatype;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/Messages.properties b/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/Messages.properties
index 42e74f4b878..be8e2e5e50b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/Messages.properties
@@ -1,3 +1,28 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
 # Properties file specifying messages
 builtin_param=builtin datatypes do not have any parameters
  
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/package.html b/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/package.html
index c12e27d2ea2..3e8f23ecf24 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/package.html
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/package.html
@@ -1 +1,25 @@
+
 RELAX NG built-in datatype implementation.
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/AnyNameClass.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/AnyNameClass.java
index eb5751ce0bd..3a957008305 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/AnyNameClass.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/AnyNameClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.nc;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/AnyNameExceptNameClass.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/AnyNameExceptNameClass.java
index 6d75a297dc8..ab727eccb23 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/AnyNameExceptNameClass.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/AnyNameExceptNameClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.nc;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/ChoiceNameClass.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/ChoiceNameClass.java
index ccc0f73a9df..68788dffcfa 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/ChoiceNameClass.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/ChoiceNameClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.nc;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/NameClass.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/NameClass.java
index f15d4a46635..2f33115749f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/NameClass.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/NameClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.nc;
 
 import com.sun.xml.internal.rngom.ast.om.ParsedNameClass;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/NameClassBuilderImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/NameClassBuilderImpl.java
index 278cf1aca47..dabc469eeb6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/NameClassBuilderImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/NameClassBuilderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.nc;
 
 import com.sun.xml.internal.rngom.ast.builder.Annotations;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/NameClassVisitor.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/NameClassVisitor.java
index b527fe90969..e6a7c3d4ab0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/NameClassVisitor.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/NameClassVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.nc;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/NameClassWalker.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/NameClassWalker.java
index 2fca7d2f9b8..21e5f130435 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/NameClassWalker.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/NameClassWalker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.nc;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/NsNameClass.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/NsNameClass.java
index 9a45c0dba99..6cbc6a04bab 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/NsNameClass.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/NsNameClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.nc;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/NsNameExceptNameClass.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/NsNameExceptNameClass.java
index ead30dd8ae1..fecb0c413da 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/NsNameExceptNameClass.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/NsNameExceptNameClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.nc;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/NullNameClass.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/NullNameClass.java
index 16121dbc2dc..3dd94644afe 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/NullNameClass.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/NullNameClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.nc;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/OverlapDetector.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/OverlapDetector.java
index ab453b9cf75..5fcd8a93c93 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/OverlapDetector.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/OverlapDetector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.nc;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/SimpleNameClass.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/SimpleNameClass.java
index 8b4429bfa5d..6881feb34b5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/SimpleNameClass.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/SimpleNameClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.nc;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/package.html b/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/package.html
index 90a792a82cc..bda75a676c4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/package.html
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/nc/package.html
@@ -1,3 +1,27 @@
+
 
   
     Default Name Class Object Model (one example of ast.om implementation).
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/Context.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/Context.java
index 2e74e43b690..7c8697276c3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/Context.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/Context.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.parse;
 
 import java.util.Enumeration;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/IllegalSchemaException.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/IllegalSchemaException.java
index b83223b21ed..ce97dbe9c60 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/IllegalSchemaException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/IllegalSchemaException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.parse;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/Messages.properties b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/Messages.properties
index 011c2a66b55..141893fd91d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/Messages.properties
@@ -1,3 +1,28 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
 # common messages between XML and compact syntax parser
 parent_ref_outside_grammar=parentRef is used outside a grammar
 ref_outside_grammar=ref is used outside a grammar
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/Parseable.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/Parseable.java
index eef5efb23aa..e6503d88a18 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/Parseable.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/Parseable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.parse;
 
 import com.sun.xml.internal.rngom.ast.builder.*;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactParseable.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactParseable.java
index b60d9c058a1..35e66462b99 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactParseable.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactParseable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.parse.compact;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntax.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntax.java
index cf0d0773d3f..540a112459a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntax.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntax.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 /* Generated By:JavaCC: Do not edit this line. CompactSyntax.java */
 package com.sun.xml.internal.rngom.parse.compact;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxConstants.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxConstants.java
index 0872c1313a8..9f75a2a6c2c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxConstants.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 /* Generated By:JavaCC: Do not edit this line. CompactSyntaxConstants.java */
 package com.sun.xml.internal.rngom.parse.compact;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxTokenManager.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxTokenManager.java
index 963b0cd2df7..32d3d949bc0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxTokenManager.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxTokenManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 /* Generated By:JavaCC: Do not edit this line. CompactSyntaxTokenManager.java */
 package com.sun.xml.internal.rngom.parse.compact;
 import java.io.Reader;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/EOFException.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/EOFException.java
index b7cca0a338c..537f564ab62 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/EOFException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/EOFException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.parse.compact;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/EscapeSyntaxException.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/EscapeSyntaxException.java
index 57d51be19bd..6bdf3cd27bf 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/EscapeSyntaxException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/EscapeSyntaxException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.parse.compact;
 
 class EscapeSyntaxException extends RuntimeException {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/JavaCharStream.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/JavaCharStream.java
index bb0a0852050..15484a409b7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/JavaCharStream.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/JavaCharStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 /* Generated By:JavaCC: Do not edit this line. JavaCharStream.java Version 3.0 */
 package com.sun.xml.internal.rngom.parse.compact;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/Messages.properties b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/Messages.properties
index 45c8940ce79..9f53da09f61 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/Messages.properties
@@ -1,3 +1,28 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
 syntax_error=syntax error: {0}
 undeclared_prefix=undeclared prefix \"{0}\"
 xmlns_prefix=prefix must not be \"xmlns\"
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/ParseException.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/ParseException.java
index 5e198e88fa8..a48f0ea3156 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/ParseException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/ParseException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 /* Generated By:JavaCC: Do not edit this line. ParseException.java Version 3.0 */
 package com.sun.xml.internal.rngom.parse.compact;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/Token.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/Token.java
index 3e56daa1fec..d3d23f83c15 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/Token.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/Token.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 /* Generated By:JavaCC: Do not edit this line. Token.java Version 3.0 */
 package com.sun.xml.internal.rngom.parse.compact;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/TokenMgrError.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/TokenMgrError.java
index 6cba0d24956..1ffe53d1b46 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/TokenMgrError.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/TokenMgrError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 /* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 3.0 */
 package com.sun.xml.internal.rngom.parse.compact;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/UCode_UCodeESC_CharStream.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/UCode_UCodeESC_CharStream.java
index 86ac3e96fd5..2129a1643e4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/UCode_UCodeESC_CharStream.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/UCode_UCodeESC_CharStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 /* Generated By:JavaCC: Do not edit this line. UCode_UCodeESC_CharStream.java Version 0.7pre6 */
 /* The previous line keeps JavaCC quiet. In fact, the JavaCC generated file
    has been edited to fix some bugs. */
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/AnnotationsHost.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/AnnotationsHost.java
index 0e2e64687d6..54e5644642f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/AnnotationsHost.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/AnnotationsHost.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.parse.host;
 
 import com.sun.xml.internal.rngom.ast.builder.Annotations;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/Base.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/Base.java
index f48cd2b4941..3f8d7e8d163 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/Base.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/Base.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.parse.host;
 
 import com.sun.xml.internal.rngom.ast.builder.Annotations;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/CommentListHost.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/CommentListHost.java
index 4b42441834c..1149eeea2f5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/CommentListHost.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/CommentListHost.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.parse.host;
 
 import com.sun.xml.internal.rngom.ast.builder.BuildException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/DataPatternBuilderHost.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/DataPatternBuilderHost.java
index c80b7ba3941..fc554e9b699 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/DataPatternBuilderHost.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/DataPatternBuilderHost.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.parse.host;
 
 import com.sun.xml.internal.rngom.ast.builder.Annotations;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/DivHost.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/DivHost.java
index 1493bfac2be..5b669e8740d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/DivHost.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/DivHost.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.parse.host;
 
 import com.sun.xml.internal.rngom.ast.builder.Annotations;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/ElementAnnotationBuilderHost.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/ElementAnnotationBuilderHost.java
index bf81d57488e..608b575bdc9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/ElementAnnotationBuilderHost.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/ElementAnnotationBuilderHost.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.parse.host;
 
 import com.sun.xml.internal.rngom.ast.builder.BuildException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/GrammarHost.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/GrammarHost.java
index a35ab1d2b5b..2a996b9a9f8 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/GrammarHost.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/GrammarHost.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.parse.host;
 
 import com.sun.xml.internal.rngom.ast.builder.Annotations;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/GrammarSectionHost.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/GrammarSectionHost.java
index 48ef7da6a2a..4aef51daa60 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/GrammarSectionHost.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/GrammarSectionHost.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.parse.host;
 
 import com.sun.xml.internal.rngom.ast.builder.Annotations;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/IncludeHost.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/IncludeHost.java
index 0385ec7892e..6959a146732 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/IncludeHost.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/IncludeHost.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.parse.host;
 
 import com.sun.xml.internal.rngom.ast.builder.Annotations;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/LocationHost.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/LocationHost.java
index 363ec50c6e0..6aa1664154e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/LocationHost.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/LocationHost.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.parse.host;
 
 import com.sun.xml.internal.rngom.ast.om.Location;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/NameClassBuilderHost.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/NameClassBuilderHost.java
index 039520cf175..8d15c8d5013 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/NameClassBuilderHost.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/NameClassBuilderHost.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.parse.host;
 
 import com.sun.xml.internal.rngom.ast.builder.Annotations;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedElementAnnotationHost.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedElementAnnotationHost.java
index d6fc53ea663..acccb67a0b5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedElementAnnotationHost.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedElementAnnotationHost.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.parse.host;
 
 import com.sun.xml.internal.rngom.ast.om.ParsedElementAnnotation;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedNameClassHost.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedNameClassHost.java
index a6a11f85ed5..dc0cac92e18 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedNameClassHost.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedNameClassHost.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.parse.host;
 
 import com.sun.xml.internal.rngom.ast.om.ParsedNameClass;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedPatternHost.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedPatternHost.java
index c6cc785d510..8a9f7f82e7f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedPatternHost.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedPatternHost.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.parse.host;
 
 import com.sun.xml.internal.rngom.ast.om.ParsedPattern;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/SchemaBuilderHost.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/SchemaBuilderHost.java
index 1260b6cb145..661bfaa23a9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/SchemaBuilderHost.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/SchemaBuilderHost.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.parse.host;
 
 import com.sun.xml.internal.rngom.ast.builder.Annotations;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/ScopeHost.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/ScopeHost.java
index c5b12da48f7..aec20afb344 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/ScopeHost.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/ScopeHost.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.parse.host;
 
 import com.sun.xml.internal.rngom.ast.builder.Annotations;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/package.html b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/package.html
index c3635be8a28..d65170ff10a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/package.html
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/host/package.html
@@ -1,2 +1,26 @@
+
 implementation of the asm.builder package that uses two
 other builds simultaneously.
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/xml/DtdContext.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/xml/DtdContext.java
index ca15677c1a0..300b225bf43 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/xml/DtdContext.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/xml/DtdContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.parse.xml;
 
 import org.xml.sax.DTDHandler;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/xml/Messages.properties b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/xml/Messages.properties
index 5aa4b02a0c1..9fc08f382fc 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/xml/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/xml/Messages.properties
@@ -1,3 +1,28 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# 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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
 no_comment_support=SAX parser \"{0}\" cannot report comments
 any_name_except_contains_any_name=\"except\" in \"anyName\" contains \"anyName\"
 attribute_multi_pattern=\"attribute\" pattern must contain at most one pattern
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/xml/SAXParseable.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/xml/SAXParseable.java
index e1c0dc87c27..56e921ef997 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/xml/SAXParseable.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/xml/SAXParseable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.parse.xml;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/xml/SchemaParser.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/xml/SchemaParser.java
index f755a5e9746..4d03f2198c6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/xml/SchemaParser.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/xml/SchemaParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.parse.xml;
 
 import java.util.Enumeration;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/util/Localizer.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/util/Localizer.java
index 22eea0c3d6a..afc606ad9cc 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/util/Localizer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/util/Localizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.util;
 
 import java.text.MessageFormat;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/util/Uri.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/util/Uri.java
index 7724b386f04..fdd5db71bdf 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/util/Uri.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/util/Uri.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.util;
 
 import java.net.URL;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/util/Utf16.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/util/Utf16.java
index caebb73abe2..85c66af388c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/util/Utf16.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/util/Utf16.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.util;
 
 public abstract class Utf16 {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/xml/sax/AbstractLexicalHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/xml/sax/AbstractLexicalHandler.java
index 605c146a93e..369d1032336 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/xml/sax/AbstractLexicalHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/xml/sax/AbstractLexicalHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.xml.sax;
 
 import org.xml.sax.ext.LexicalHandler;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/xml/sax/JAXPXMLReaderCreator.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/xml/sax/JAXPXMLReaderCreator.java
index 58998a86f26..64b5cfc8d86 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/xml/sax/JAXPXMLReaderCreator.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/xml/sax/JAXPXMLReaderCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.xml.sax;
 
 import javax.xml.parsers.ParserConfigurationException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/xml/sax/XMLReaderCreator.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/xml/sax/XMLReaderCreator.java
index d7641a0f496..99a79fd72c8 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/xml/sax/XMLReaderCreator.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/xml/sax/XMLReaderCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.xml.sax;
 
 import org.xml.sax.SAXException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/xml/sax/XmlBaseHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/xml/sax/XmlBaseHandler.java
index d11044d1e4a..d892c0d69f1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/xml/sax/XmlBaseHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/xml/sax/XmlBaseHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.xml.sax;
 
 import com.sun.xml.internal.rngom.util.Uri;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/xml/util/EncodingMap.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/xml/util/EncodingMap.java
index 4a25f021a84..880a22d7616 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/xml/util/EncodingMap.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/xml/util/EncodingMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.xml.util;
 
 import java.io.UnsupportedEncodingException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/xml/util/Naming.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/xml/util/Naming.java
index e333360e7ff..aade9c37f3e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/xml/util/Naming.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/xml/util/Naming.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.xml.util;
 
 public class Naming {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/xml/util/WellKnownNamespaces.java b/jaxws/src/share/classes/com/sun/xml/internal/rngom/xml/util/WellKnownNamespaces.java
index 2c7021ccbc4..5133395a258 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/xml/util/WellKnownNamespaces.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/xml/util/WellKnownNamespaces.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.rngom.xml.util;
 
 public class WellKnownNamespaces {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/AbstractCreator.java b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/AbstractCreator.java
new file mode 100644
index 00000000000..fccd44b365c
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/AbstractCreator.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.stream.buffer;
+
+/**
+ * Base class for classes that creates {@link MutableXMLStreamBuffer}
+ * and from infoset in API-specific form.
+ */
+public class AbstractCreator extends AbstractCreatorProcessor {
+
+    protected MutableXMLStreamBuffer _buffer;
+
+    public void setXMLStreamBuffer(MutableXMLStreamBuffer buffer) {
+        if (buffer == null) {
+            throw new NullPointerException("buffer cannot be null");
+        }
+        setBuffer(buffer);
+    }
+
+    public MutableXMLStreamBuffer getXMLStreamBuffer() {
+        return _buffer;
+    }
+
+
+    protected final void createBuffer() {
+        setBuffer(new MutableXMLStreamBuffer());
+    }
+
+    /**
+     * Should be called whenever a new tree is stored on the buffer.
+     */
+    protected final void increaseTreeCount() {
+        _buffer.treeCount++;
+    }
+
+    protected final void setBuffer(MutableXMLStreamBuffer buffer) {
+        _buffer = buffer;
+
+        _currentStructureFragment = _buffer.getStructure();
+        _structure = _currentStructureFragment.getArray();
+        _structurePtr = 0;
+
+        _currentStructureStringFragment = _buffer.getStructureStrings();
+        _structureStrings = _currentStructureStringFragment.getArray();
+        _structureStringsPtr = 0;
+
+        _currentContentCharactersBufferFragment = _buffer.getContentCharactersBuffer();
+        _contentCharactersBuffer = _currentContentCharactersBufferFragment.getArray();
+        _contentCharactersBufferPtr = 0;
+
+        _currentContentObjectFragment = _buffer.getContentObjects();
+        _contentObjects = _currentContentObjectFragment.getArray();
+        _contentObjectsPtr = 0;
+    }
+
+    protected final void setHasInternedStrings(boolean hasInternedStrings) {
+        _buffer.setHasInternedStrings(hasInternedStrings);
+    }
+
+    protected final void storeStructure(int b) {
+        _structure[_structurePtr++] = (byte)b;
+        if (_structurePtr == _structure.length) {
+            resizeStructure();
+        }
+    }
+
+    protected final void resizeStructure() {
+        _structurePtr = 0;
+        if (_currentStructureFragment.getNext() != null) {
+            _currentStructureFragment = _currentStructureFragment.getNext();
+            _structure = _currentStructureFragment.getArray();
+        } else {
+            _structure = new byte[_structure.length];
+            _currentStructureFragment = new FragmentedArray(_structure, _currentStructureFragment);
+        }
+    }
+
+    protected final void storeStructureString(String s) {
+        _structureStrings[_structureStringsPtr++] = s;
+        if (_structureStringsPtr == _structureStrings.length) {
+            resizeStructureStrings();
+        }
+    }
+
+    protected final void resizeStructureStrings() {
+        _structureStringsPtr = 0;
+        if (_currentStructureStringFragment.getNext() != null) {
+            _currentStructureStringFragment = _currentStructureStringFragment.getNext();
+            _structureStrings = _currentStructureStringFragment.getArray();
+        } else {
+            _structureStrings = new String[_structureStrings.length];
+            _currentStructureStringFragment = new FragmentedArray(_structureStrings, _currentStructureStringFragment);
+        }
+    }
+
+    protected final void storeContentString(String s) {
+        storeContentObject(s);
+    }
+
+    protected final void storeContentCharacters(int type, char[] ch, int start, int length) {
+        if (_contentCharactersBufferPtr + length >= _contentCharactersBuffer.length) {
+            if (length >= 512) {
+                storeStructure(type | CONTENT_TYPE_CHAR_ARRAY_COPY);
+                storeContentCharactersCopy(ch, start, length);
+                return;
+            }
+            resizeContentCharacters();
+        }
+
+        if (length < CHAR_ARRAY_LENGTH_SMALL_SIZE) {
+            storeStructure(type | CHAR_ARRAY_LENGTH_SMALL);
+            storeStructure(length);
+            System.arraycopy(ch, start, _contentCharactersBuffer, _contentCharactersBufferPtr, length);
+            _contentCharactersBufferPtr += length;
+        } else if (length < CHAR_ARRAY_LENGTH_MEDIUM_SIZE) {
+            storeStructure(type | CHAR_ARRAY_LENGTH_MEDIUM);
+            storeStructure(length >> 8);
+            storeStructure(length & 255);
+            System.arraycopy(ch, start, _contentCharactersBuffer, _contentCharactersBufferPtr, length);
+            _contentCharactersBufferPtr += length;
+        } else {
+            storeStructure(type | CONTENT_TYPE_CHAR_ARRAY_COPY);
+            storeContentCharactersCopy(ch, start, length);
+        }
+    }
+
+    protected final void resizeContentCharacters() {
+        _contentCharactersBufferPtr = 0;
+        if (_currentContentCharactersBufferFragment.getNext() != null) {
+            _currentContentCharactersBufferFragment = _currentContentCharactersBufferFragment.getNext();
+            _contentCharactersBuffer = _currentContentCharactersBufferFragment.getArray();
+        } else {
+            _contentCharactersBuffer = new char[_contentCharactersBuffer.length];
+            _currentContentCharactersBufferFragment = new FragmentedArray(_contentCharactersBuffer,
+                    _currentContentCharactersBufferFragment);
+        }
+    }
+
+    protected final void storeContentCharactersCopy(char[] ch, int start, int length) {
+        char[] copyOfCh = new char[length];
+        System.arraycopy(ch, start, copyOfCh, 0, length);
+        storeContentObject(copyOfCh);
+    }
+
+    protected final Object peekAtContentObject() {
+        return _contentObjects[_contentObjectsPtr];
+    }
+
+    protected final void storeContentObject(Object s) {
+        _contentObjects[_contentObjectsPtr++] = s;
+        if (_contentObjectsPtr == _contentObjects.length) {
+            resizeContentObjects();
+        }
+    }
+
+    protected final void resizeContentObjects() {
+        _contentObjectsPtr = 0;
+        if (_currentContentObjectFragment.getNext() != null) {
+            _currentContentObjectFragment = _currentContentObjectFragment.getNext();
+            _contentObjects = _currentContentObjectFragment.getArray();
+        } else {
+            _contentObjects = new Object[_contentObjects.length];
+            _currentContentObjectFragment = new FragmentedArray(_contentObjects, _currentContentObjectFragment);
+        }
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/AbstractCreatorProcessor.java b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/AbstractCreatorProcessor.java
new file mode 100644
index 00000000000..282766923df
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/AbstractCreatorProcessor.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.stream.buffer;
+
+public abstract class AbstractCreatorProcessor {
+    /**
+     * Flag on a T_DOCUMENT to indicate if a fragment
+     */
+    protected static final int FLAG_DOCUMENT_FRAGMENT      = 1 << 0;
+
+    /*
+     * Flags on T_ELEMENT, T_ATTRIBUTE, T_NAMESPACE_ATTRIBUTE
+     * to indicate namespace information is represent
+     */
+    protected static final int FLAG_PREFIX                 = 1 << 0;
+    protected static final int FLAG_URI                    = 1 << 1;
+    protected static final int FLAG_QUALIFIED_NAME         = 1 << 2;
+
+    /*
+     * Types of content for T_TEXT and T_COMMENT
+     * 
    
+     * Highest 2 bits of lower nibble are used.
+     */
+    protected static final int CONTENT_TYPE_CHAR_ARRAY        = 0 << 2;
+    protected static final int CONTENT_TYPE_CHAR_ARRAY_COPY   = 1 << 2;
+    protected static final int CONTENT_TYPE_STRING            = 2 << 2;
+    protected static final int CONTENT_TYPE_OBJECT            = 3 << 2;
+
+    /*
+     * Size of the length of character content for CONTENT_TYPE_CHAR_ARRAY
+     * 
    
+     * Last bit of lower nibble is used.
+     */
+    protected static final int CHAR_ARRAY_LENGTH_SMALL        = 0;
+    protected static final int CHAR_ARRAY_LENGTH_MEDIUM       = 1;
+    protected static final int CHAR_ARRAY_LENGTH_SMALL_SIZE   = 1 << 8;
+    protected static final int CHAR_ARRAY_LENGTH_MEDIUM_SIZE  = 1 << 16;
+
+    /*
+     * Types of value for T_ATTRIBUTE
+     * 
    
+     * Highest bit of lower nibble is used.
+     */
+    protected static final int VALUE_TYPE_STRING              = 0;
+    protected static final int VALUE_TYPE_OBJECT              = 1 << 3;
+
+    /*
+     * Mask for types.
+     * 
    
+     * Highest nibble is used.
+     */
+    protected static final int TYPE_MASK                     = 0xF0;
+    protected static final int T_END                         = 0x00;
+    protected static final int T_DOCUMENT                    = 0x10;
+    protected static final int T_ELEMENT                     = 0x20;
+    protected static final int T_ATTRIBUTE                   = 0x30;
+    protected static final int T_NAMESPACE_ATTRIBUTE         = 0x40;
+    protected static final int T_TEXT                        = 0x50;
+    protected static final int T_COMMENT                     = 0x60;
+    protected static final int T_PROCESSING_INSTRUCTION      = 0x70;
+    protected static final int T_UNEXPANDED_ENTITY_REFERENCE = 0x80;
+
+    /*
+     * Composed types.
+     * 
    
+     * One octet is used.
+     */
+    protected static final int T_DOCUMENT_FRAGMENT           = T_DOCUMENT | FLAG_DOCUMENT_FRAGMENT;
+
+    protected static final int T_ELEMENT_U_LN_QN             = T_ELEMENT | FLAG_URI | FLAG_QUALIFIED_NAME;
+    protected static final int T_ELEMENT_P_U_LN              = T_ELEMENT | FLAG_PREFIX | FLAG_URI;
+    protected static final int T_ELEMENT_U_LN                = T_ELEMENT | FLAG_URI;
+    protected static final int T_ELEMENT_LN                  = T_ELEMENT;
+
+    protected static final int T_NAMESPACE_ATTRIBUTE_P       = T_NAMESPACE_ATTRIBUTE | FLAG_PREFIX;
+    protected static final int T_NAMESPACE_ATTRIBUTE_P_U     = T_NAMESPACE_ATTRIBUTE | FLAG_PREFIX | FLAG_URI;
+    protected static final int T_NAMESPACE_ATTRIBUTE_U       = T_NAMESPACE_ATTRIBUTE | FLAG_URI;
+
+    protected static final int T_ATTRIBUTE_U_LN_QN           = T_ATTRIBUTE | FLAG_URI | FLAG_QUALIFIED_NAME;
+    protected static final int T_ATTRIBUTE_P_U_LN            = T_ATTRIBUTE | FLAG_PREFIX | FLAG_URI;
+    protected static final int T_ATTRIBUTE_U_LN              = T_ATTRIBUTE | FLAG_URI;
+    protected static final int T_ATTRIBUTE_LN                = T_ATTRIBUTE;
+    protected static final int T_ATTRIBUTE_U_LN_QN_OBJECT    = T_ATTRIBUTE_U_LN_QN | VALUE_TYPE_OBJECT;
+    protected static final int T_ATTRIBUTE_P_U_LN_OBJECT     = T_ATTRIBUTE_P_U_LN | VALUE_TYPE_OBJECT;
+    protected static final int T_ATTRIBUTE_U_LN_OBJECT       = T_ATTRIBUTE_U_LN | VALUE_TYPE_OBJECT;
+    protected static final int T_ATTRIBUTE_LN_OBJECT         = T_ATTRIBUTE_LN | VALUE_TYPE_OBJECT;
+
+    protected static final int T_TEXT_AS_CHAR_ARRAY          = T_TEXT;
+    protected static final int T_TEXT_AS_CHAR_ARRAY_SMALL    = T_TEXT | CHAR_ARRAY_LENGTH_SMALL;
+    protected static final int T_TEXT_AS_CHAR_ARRAY_MEDIUM   = T_TEXT | CHAR_ARRAY_LENGTH_MEDIUM;
+    protected static final int T_TEXT_AS_CHAR_ARRAY_COPY     = T_TEXT | CONTENT_TYPE_CHAR_ARRAY_COPY;
+    protected static final int T_TEXT_AS_STRING              = T_TEXT | CONTENT_TYPE_STRING;
+    protected static final int T_TEXT_AS_OBJECT              = T_TEXT | CONTENT_TYPE_OBJECT;
+
+    protected static final int T_COMMENT_AS_CHAR_ARRAY        = T_COMMENT;
+    protected static final int T_COMMENT_AS_CHAR_ARRAY_SMALL  = T_COMMENT | CHAR_ARRAY_LENGTH_SMALL;
+    protected static final int T_COMMENT_AS_CHAR_ARRAY_MEDIUM = T_COMMENT | CHAR_ARRAY_LENGTH_MEDIUM;
+    protected static final int T_COMMENT_AS_CHAR_ARRAY_COPY   = T_COMMENT | CONTENT_TYPE_CHAR_ARRAY_COPY;
+    protected static final int T_COMMENT_AS_STRING            = T_COMMENT | CONTENT_TYPE_STRING;
+
+    protected static final int T_END_OF_BUFFER               = -1;
+
+    protected FragmentedArray _currentStructureFragment;
+    protected byte[] _structure;
+    protected int _structurePtr;
+
+    protected FragmentedArray _currentStructureStringFragment;
+    protected String[] _structureStrings;
+    protected int _structureStringsPtr;
+
+    protected FragmentedArray _currentContentCharactersBufferFragment;
+    protected char[] _contentCharactersBuffer;
+    protected int _contentCharactersBufferPtr;
+
+    protected FragmentedArray _currentContentObjectFragment;
+    protected Object[] _contentObjects;
+    protected int _contentObjectsPtr;
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/AbstractProcessor.java b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/AbstractProcessor.java
new file mode 100644
index 00000000000..b9f15baa54d
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/AbstractProcessor.java
@@ -0,0 +1,246 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.stream.buffer;
+
+/**
+ * Base class for classes that processes {@link XMLStreamBuffer}
+ * and produces infoset in API-specific form.
+ */
+public abstract class AbstractProcessor extends AbstractCreatorProcessor {
+    protected  static final int STATE_ILLEGAL                       = 0;
+
+    protected  static final int STATE_DOCUMENT                      = 1;
+    protected  static final int STATE_DOCUMENT_FRAGMENT             = 2;
+    protected  static final int STATE_ELEMENT_U_LN_QN               = 3;
+    protected  static final int STATE_ELEMENT_P_U_LN                = 4;
+    protected  static final int STATE_ELEMENT_U_LN                  = 5;
+    protected  static final int STATE_ELEMENT_LN                    = 6;
+    protected  static final int STATE_TEXT_AS_CHAR_ARRAY_SMALL      = 7;
+    protected  static final int STATE_TEXT_AS_CHAR_ARRAY_MEDIUM     = 8;
+    protected  static final int STATE_TEXT_AS_CHAR_ARRAY_COPY       = 9;
+    protected  static final int STATE_TEXT_AS_STRING                = 10;
+    protected  static final int STATE_TEXT_AS_OBJECT                = 11;
+    protected  static final int STATE_COMMENT_AS_CHAR_ARRAY_SMALL   = 12;
+    protected  static final int STATE_COMMENT_AS_CHAR_ARRAY_MEDIUM  = 13;
+    protected  static final int STATE_COMMENT_AS_CHAR_ARRAY_COPY    = 14;
+    protected  static final int STATE_COMMENT_AS_STRING             = 15;
+    protected  static final int STATE_PROCESSING_INSTRUCTION        = 16;
+    protected  static final int STATE_END                           = 17;
+    protected  static final int[] _eiiStateTable = new int[256];
+
+    protected  static final int STATE_NAMESPACE_ATTRIBUTE           = 1;
+    protected  static final int STATE_NAMESPACE_ATTRIBUTE_P         = 2;
+    protected  static final int STATE_NAMESPACE_ATTRIBUTE_P_U       = 3;
+    protected  static final int STATE_NAMESPACE_ATTRIBUTE_U         = 4;
+    protected  static final int[] _niiStateTable = new int[256];
+
+    protected  static final int STATE_ATTRIBUTE_U_LN_QN             = 1;
+    protected  static final int STATE_ATTRIBUTE_P_U_LN              = 2;
+    protected  static final int STATE_ATTRIBUTE_U_LN                = 3;
+    protected  static final int STATE_ATTRIBUTE_LN                  = 4;
+    protected  static final int STATE_ATTRIBUTE_U_LN_QN_OBJECT      = 5;
+    protected  static final int STATE_ATTRIBUTE_P_U_LN_OBJECT       = 6;
+    protected  static final int STATE_ATTRIBUTE_U_LN_OBJECT         = 7;
+    protected  static final int STATE_ATTRIBUTE_LN_OBJECT           = 8;
+    protected  static final int[] _aiiStateTable = new int[256];
+
+    static {
+        /*
+         * Create a state table from information items and options.
+         * The swtich statement using such states will often generate a more
+         * efficient byte code representation that can be hotspotted using
+         * jump tables.
+         */
+        _eiiStateTable[T_DOCUMENT] = STATE_DOCUMENT;
+        _eiiStateTable[T_DOCUMENT_FRAGMENT] = STATE_DOCUMENT_FRAGMENT;
+        _eiiStateTable[T_ELEMENT_U_LN_QN] = STATE_ELEMENT_U_LN_QN;
+        _eiiStateTable[T_ELEMENT_P_U_LN] = STATE_ELEMENT_P_U_LN;
+        _eiiStateTable[T_ELEMENT_U_LN] = STATE_ELEMENT_U_LN;
+        _eiiStateTable[T_ELEMENT_LN] = STATE_ELEMENT_LN;
+        _eiiStateTable[T_TEXT_AS_CHAR_ARRAY_SMALL] = STATE_TEXT_AS_CHAR_ARRAY_SMALL;
+        _eiiStateTable[T_TEXT_AS_CHAR_ARRAY_MEDIUM] = STATE_TEXT_AS_CHAR_ARRAY_MEDIUM;
+        _eiiStateTable[T_TEXT_AS_CHAR_ARRAY_COPY] = STATE_TEXT_AS_CHAR_ARRAY_COPY;
+        _eiiStateTable[T_TEXT_AS_STRING] = STATE_TEXT_AS_STRING;
+        _eiiStateTable[T_TEXT_AS_OBJECT] = STATE_TEXT_AS_OBJECT;
+        _eiiStateTable[T_COMMENT_AS_CHAR_ARRAY_SMALL] = STATE_COMMENT_AS_CHAR_ARRAY_SMALL;
+        _eiiStateTable[T_COMMENT_AS_CHAR_ARRAY_MEDIUM] = STATE_COMMENT_AS_CHAR_ARRAY_MEDIUM;
+        _eiiStateTable[T_COMMENT_AS_CHAR_ARRAY_COPY] = STATE_COMMENT_AS_CHAR_ARRAY_COPY;
+        _eiiStateTable[T_COMMENT_AS_STRING] = STATE_COMMENT_AS_STRING;
+        _eiiStateTable[T_PROCESSING_INSTRUCTION] = STATE_PROCESSING_INSTRUCTION;
+        _eiiStateTable[T_END] = STATE_END;
+
+        _niiStateTable[T_NAMESPACE_ATTRIBUTE] = STATE_NAMESPACE_ATTRIBUTE;
+        _niiStateTable[T_NAMESPACE_ATTRIBUTE_P] = STATE_NAMESPACE_ATTRIBUTE_P;
+        _niiStateTable[T_NAMESPACE_ATTRIBUTE_P_U] = STATE_NAMESPACE_ATTRIBUTE_P_U;
+        _niiStateTable[T_NAMESPACE_ATTRIBUTE_U] = STATE_NAMESPACE_ATTRIBUTE_U;
+
+        _aiiStateTable[T_ATTRIBUTE_U_LN_QN] = STATE_ATTRIBUTE_U_LN_QN;
+        _aiiStateTable[T_ATTRIBUTE_P_U_LN] = STATE_ATTRIBUTE_P_U_LN;
+        _aiiStateTable[T_ATTRIBUTE_U_LN] = STATE_ATTRIBUTE_U_LN;
+        _aiiStateTable[T_ATTRIBUTE_LN] = STATE_ATTRIBUTE_LN;
+        _aiiStateTable[T_ATTRIBUTE_U_LN_QN_OBJECT] = STATE_ATTRIBUTE_U_LN_QN_OBJECT;
+        _aiiStateTable[T_ATTRIBUTE_P_U_LN_OBJECT] = STATE_ATTRIBUTE_P_U_LN_OBJECT;
+        _aiiStateTable[T_ATTRIBUTE_U_LN_OBJECT] = STATE_ATTRIBUTE_U_LN_OBJECT;
+        _aiiStateTable[T_ATTRIBUTE_LN_OBJECT] = STATE_ATTRIBUTE_LN_OBJECT;
+    }
+
+    protected XMLStreamBuffer _buffer;
+
+    /**
+     * True if this processor should create a fragment of XML, without the start/end document markers.
+     */
+    protected boolean _fragmentMode;
+
+    protected boolean _stringInterningFeature = false;
+
+    /**
+     * Number of remaining XML element trees that should be visible
+     * through this {@link AbstractProcessor}.
+     */
+    protected int _treeCount;
+
+    /**
+     * @deprecated
+     *      Use {@link #setBuffer(XMLStreamBuffer, boolean)}
+     */
+    protected final void setBuffer(XMLStreamBuffer buffer) {
+        setBuffer(buffer,buffer.isFragment());
+    }
+    protected final void setBuffer(XMLStreamBuffer buffer, boolean fragmentMode) {
+        _buffer = buffer;
+        _fragmentMode = fragmentMode;
+
+        _currentStructureFragment = _buffer.getStructure();
+        _structure = _currentStructureFragment.getArray();
+        _structurePtr = _buffer.getStructurePtr();
+
+        _currentStructureStringFragment = _buffer.getStructureStrings();
+        _structureStrings = _currentStructureStringFragment.getArray();
+        _structureStringsPtr = _buffer.getStructureStringsPtr();
+
+        _currentContentCharactersBufferFragment = _buffer.getContentCharactersBuffer();
+        _contentCharactersBuffer = _currentContentCharactersBufferFragment.getArray();
+        _contentCharactersBufferPtr = _buffer.getContentCharactersBufferPtr();
+
+        _currentContentObjectFragment = _buffer.getContentObjects();
+        _contentObjects = _currentContentObjectFragment.getArray();
+        _contentObjectsPtr = _buffer.getContentObjectsPtr();
+
+        _stringInterningFeature = _buffer.hasInternedStrings();
+        _treeCount = _buffer.treeCount;
+    }
+
+    protected final int peekStructure() {
+        if (_structurePtr < _structure.length) {
+            return _structure[_structurePtr] & 255;
+        }
+
+        return readFromNextStructure(0);
+    }
+
+    protected final int readStructure() {
+        if (_structurePtr < _structure.length) {
+            return _structure[_structurePtr++] & 255;
+        }
+
+        return readFromNextStructure(1);
+    }
+
+    protected final int readEiiState() {
+        return _eiiStateTable[readStructure()];
+    }
+
+    protected final int readStructure16() {
+        return (readStructure() << 8) | readStructure();
+    }
+
+    private int readFromNextStructure(int v) {
+        _structurePtr = v;
+        _currentStructureFragment = _currentStructureFragment.getNext();
+        _structure = _currentStructureFragment.getArray();
+        return _structure[0] & 255;
+    }
+
+    protected final String readStructureString() {
+        if (_structureStringsPtr < _structureStrings.length) {
+            return _structureStrings[_structureStringsPtr++];
+        }
+
+        _structureStringsPtr = 1;
+        _currentStructureStringFragment = _currentStructureStringFragment.getNext();
+        _structureStrings = _currentStructureStringFragment.getArray();
+        return _structureStrings[0];
+    }
+
+    protected final String readContentString() {
+        return (String)readContentObject();
+    }
+
+    protected final char[] readContentCharactersCopy() {
+        return (char[])readContentObject();
+    }
+
+    protected final int readContentCharactersBuffer(int length) {
+        if (_contentCharactersBufferPtr + length < _contentCharactersBuffer.length) {
+            final int start = _contentCharactersBufferPtr;
+            _contentCharactersBufferPtr += length;
+            return start;
+        }
+
+        _contentCharactersBufferPtr = length;
+        _currentContentCharactersBufferFragment = _currentContentCharactersBufferFragment.getNext();
+        _contentCharactersBuffer = _currentContentCharactersBufferFragment.getArray();
+        return 0;
+    }
+
+    protected final Object readContentObject() {
+        if (_contentObjectsPtr < _contentObjects.length) {
+            return _contentObjects[_contentObjectsPtr++];
+        }
+
+        _contentObjectsPtr = 1;
+        _currentContentObjectFragment = _currentContentObjectFragment.getNext();
+        _contentObjects = _currentContentObjectFragment.getArray();
+        return _contentObjects[0];
+    }
+
+    protected final StringBuilder _qNameBuffer = new StringBuilder();
+
+    protected final String getQName(String prefix, String localName) {
+        _qNameBuffer.append(prefix).append(':').append(localName);
+        final String qName = _qNameBuffer.toString();
+        _qNameBuffer.setLength(0);
+        return (_stringInterningFeature) ? qName.intern() : qName;
+    }
+
+    protected final String getPrefixFromQName(String qName) {
+        int pIndex = qName.indexOf(':');
+        if (_stringInterningFeature) {
+            return (pIndex != -1) ? qName.substring(0,pIndex).intern() : "";
+        } else {
+            return (pIndex != -1) ? qName.substring(0,pIndex) : "";
+        }
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/AttributesHolder.java b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/AttributesHolder.java
new file mode 100644
index 00000000000..9daa2ceeffe
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/AttributesHolder.java
@@ -0,0 +1,192 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.stream.buffer;
+
+import org.xml.sax.Attributes;
+
+/**
+ * Class for holding attributes.
+ *
+ * Since it implements {@link Attributes}, this class follows the SAX convention
+ * of using "" instead of null.
+ */
+@SuppressWarnings({"PointlessArithmeticExpression"})
+public final class AttributesHolder implements Attributes {
+    protected static final int DEFAULT_CAPACITY = 8;
+    protected static final int ITEM_SIZE = 1 << 3;
+
+    protected static final int PREFIX     = 0;
+    protected static final int URI        = 1;
+    protected static final int LOCAL_NAME = 2;
+    protected static final int QNAME      = 3;
+    protected static final int TYPE       = 4;
+    protected static final int VALUE      = 5;
+
+    protected int _attributeCount;
+
+    protected String[] _strings;
+
+    public AttributesHolder() {
+        _strings = new String[DEFAULT_CAPACITY * ITEM_SIZE];
+    }
+
+    public final int getLength() {
+        return _attributeCount;
+    }
+
+    public final String getPrefix(int index) {
+        return (index >= 0 && index < _attributeCount) ?
+            _strings[(index << 3) + PREFIX] : null;
+    }
+
+    public final String getLocalName(int index) {
+        return (index >= 0 && index < _attributeCount) ?
+            _strings[(index << 3) + LOCAL_NAME] : null;
+    }
+
+    public final String getQName(int index) {
+        return (index >= 0 && index < _attributeCount) ?
+            _strings[(index << 3) + QNAME] : null;
+    }
+
+    public final String getType(int index) {
+        return (index >= 0 && index < _attributeCount) ?
+            _strings[(index << 3) + TYPE] : null;
+    }
+
+    public final String getURI(int index) {
+        return (index >= 0 && index < _attributeCount) ?
+            _strings[(index << 3) + URI] : null;
+    }
+
+    public final String getValue(int index) {
+        return (index >= 0 && index < _attributeCount) ?
+            _strings[(index << 3) + VALUE] : null;
+    }
+
+    public final int getIndex(String qName) {
+        for (int i = 0; i < _attributeCount; i++) {
+            if (qName.equals(_strings[(i << 3) + QNAME])) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    public final String getType(String qName) {
+        final int i = (getIndex(qName) << 3) + TYPE;
+        return (i >= 0) ? _strings[i] : null;
+    }
+
+    public final String getValue(String qName) {
+        final int i = (getIndex(qName) << 3) + VALUE;
+        return (i >= 0) ? _strings[i] : null;
+    }
+
+    public final int getIndex(String uri, String localName) {
+        for (int i = 0; i < _attributeCount; i++) {
+            if (localName.equals(_strings[(i << 3) + LOCAL_NAME]) &&
+                uri.equals(_strings[(i << 3) + URI])) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    public final String getType(String uri, String localName) {
+        final int i = (getIndex(uri, localName) << 3) + TYPE;
+        return (i >= 0) ? _strings[i] : null;
+    }
+
+    public final String getValue(String uri, String localName) {
+        final int i = (getIndex(uri, localName) << 3) + VALUE;
+        return (i >= 0) ? _strings[i] : null;
+    }
+
+    public final void clear() {
+        if (_attributeCount > 0) {
+            for (int i = 0; i < _attributeCount; i++) {
+                _strings[(i << 3) + VALUE] = null;
+            }
+            _attributeCount = 0;
+        }
+    }
+
+
+    /**
+     * Add an attribute using a qualified name that contains the
+     * prefix and local name.
+     *
+     * @param uri
+     *      This can be empty but not null, just like everywhere else in SAX.
+     */
+    public final void addAttributeWithQName(String uri, String localName, String qName, String type, String value) {
+        final int i = _attributeCount << 3;
+        if (i == _strings.length) {
+            resize(i);
+        }
+
+        _strings[i + PREFIX] = null;
+        _strings[i + URI] = uri;
+        _strings[i + LOCAL_NAME] = localName;
+        _strings[i + QNAME] = qName;
+        _strings[i + TYPE] = type;
+        _strings[i + VALUE] = value;
+
+        _attributeCount++;
+    }
+
+    /**
+     * Add an attribute using a prefix.
+     *
+     * @param prefix
+     *      This can be empty but not null, just like everywhere else in SAX.
+     * @param uri
+     *      This can be empty but not null, just like everywhere else in SAX.
+     */
+    public final void addAttributeWithPrefix(String prefix, String uri, String localName, String type, String value) {
+        final int i = _attributeCount << 3;
+        if (i == _strings.length) {
+            resize(i);
+        }
+
+        _strings[i + PREFIX] = prefix;
+        _strings[i + URI] = uri;
+        _strings[i + LOCAL_NAME] = localName;
+        _strings[i + QNAME] = null;
+        _strings[i + TYPE] = type;
+        _strings[i + VALUE] = value;
+
+        _attributeCount++;
+    }
+
+    private void resize(int length) {
+        final int newLength = length * 2;
+        final String[] strings = new String[newLength];
+        System.arraycopy(_strings, 0, strings, 0, length);
+        _strings = strings;
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/config/HandlerChainInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/FragmentedArray.java
similarity index 53%
rename from jaxws/src/share/classes/com/sun/tools/internal/ws/processor/config/HandlerChainInfo.java
rename to jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/FragmentedArray.java
index 9ac381eb943..9175167b866 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/config/HandlerChainInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/FragmentedArray.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,61 +22,54 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+package com.sun.xml.internal.stream.buffer;
 
-package com.sun.tools.internal.ws.processor.config;
+class FragmentedArray {
+    protected T _item;
+    protected FragmentedArray _next;
+    protected FragmentedArray _previous;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-/**
- *
- * @author WS Development Team
- */
-public class HandlerChainInfo {
-
-    public HandlerChainInfo() {
-        handlers = new ArrayList();
-        roles = new HashSet();
+    FragmentedArray(T item) {
+        this(item, null);
     }
 
-    public void add(HandlerInfo i) {
-        handlers.add(i);
+    FragmentedArray(T item, FragmentedArray previous) {
+        setArray(item);
+        if (previous != null) {
+            previous._next = this;
+            _previous = previous;
+        }
     }
 
-    public Iterator getHandlers() {
-        return handlers.iterator();
+    T getArray() {
+        return _item;
     }
 
-    public int getHandlersCount() {
-        return handlers.size();
+    void setArray(T item) {
+        assert(item.getClass().isArray());
+
+        _item = item;
     }
 
-    /* serialization */
-    public List getHandlersList() {
-        return handlers;
+    FragmentedArray getNext() {
+        return _next;
     }
 
-    /* serialization */
-    public void setHandlersList(List l) {
-        handlers = l;
+    void setNext(FragmentedArray next) {
+        _next = next;
+        if (next != null) {
+            next._previous = this;
+        }
     }
 
-    public void addRole(String s) {
-        roles.add(s);
+    FragmentedArray getPrevious() {
+        return _previous;
     }
 
-    public Set getRoles() {
-        return roles;
+    void setPrevious(FragmentedArray previous) {
+        _previous = previous;
+        if (previous != null) {
+            previous._next = this;
+        }
     }
-
-    /* serialization */
-    public void setRoles(Set s) {
-        roles = s;
-    }
-
-    private List handlers;
-    private Set roles;
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/MutableXMLStreamBuffer.java b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/MutableXMLStreamBuffer.java
new file mode 100644
index 00000000000..cf699aca967
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/MutableXMLStreamBuffer.java
@@ -0,0 +1,246 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.stream.buffer;
+
+import com.sun.xml.internal.stream.buffer.sax.Properties;
+import com.sun.xml.internal.stream.buffer.sax.SAXBufferCreator;
+import com.sun.xml.internal.stream.buffer.stax.StreamReaderBufferCreator;
+import com.sun.xml.internal.stream.buffer.stax.StreamWriterBufferCreator;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ *
+ * A mutable stream-based buffer of an XML infoset.
+ *
+ * 
    
+ * A MutableXMLStreamBuffer is created using specific SAX and StAX-based
+ * creators. Utility methods on MutableXMLStreamBuffer are provided for
+ * such functionality that utilize SAX and StAX-based creators.
+ *
+ * 
    
+ * Once instantiated the same instance of a MutableXMLStreamBuffer may be reused for
+ * creation to reduce the amount of Objects instantiated and garbage
+ * collected that are required for internally representing an XML infoset.
+ *
+ * 
    
+ * A MutableXMLStreamBuffer is not designed to be created and processed
+ * concurrently. If done so unspecified behaviour may occur.
+ */
+public class MutableXMLStreamBuffer extends XMLStreamBuffer {
+    /**
+     * The default array size for the arrays used in internal representation
+     * of the XML infoset.
+     */
+    public static int DEFAULT_ARRAY_SIZE = 512;
+
+    /**
+     * Create a new MutableXMLStreamBuffer using the
+     * {@link MutableXMLStreamBuffer#DEFAULT_ARRAY_SIZE}.
+     */
+    public MutableXMLStreamBuffer() {
+        this(DEFAULT_ARRAY_SIZE);
+    }
+
+    /**
+     * Set the system identifier for this buffer.
+     * @param systemId The system identifier.
+     */
+    public void setSystemId(String systemId) {
+        this.systemId = systemId;
+    }
+
+    /**
+     * Create a new MutableXMLStreamBuffer.
+     *
+     * @param size
+     * The size of the arrays used in the internal representation
+     * of the XML infoset.
+     * @throws NegativeArraySizeException
+     * If the size argument is less than 0.
+     */
+    public MutableXMLStreamBuffer(int size) {
+        _structure = new FragmentedArray(new byte[size]);
+        _structureStrings = new FragmentedArray(new String[size]);
+        _contentCharactersBuffer = new FragmentedArray(new char[4096]);
+        _contentObjects = new FragmentedArray(new Object[size]);
+
+        // Set the first element of structure array to indicate an empty buffer
+        // that has not been created
+        _structure.getArray()[0] = AbstractCreatorProcessor.T_END;
+    }
+
+    /**
+     * Create contents of a buffer from a XMLStreamReader.
+     *
+     * 
    
+     * The MutableXMLStreamBuffer is reset (see {@link #reset}) before creation.
+     *
+     * 
    
+     * The MutableXMLStreamBuffer is created by consuming the events on the XMLStreamReader using
+     * an instance of {@link StreamReaderBufferCreator}.
+     *
+     * @param reader
+     * A XMLStreamReader to read from to create.
+     */
+    public void createFromXMLStreamReader(XMLStreamReader reader) throws XMLStreamException {
+        reset();
+        StreamReaderBufferCreator c = new StreamReaderBufferCreator(this);
+        c.create(reader);
+    }
+
+    /**
+     * Create contents of a buffer from a XMLStreamWriter.
+     *
+     * 
    
+     * The MutableXMLStreamBuffer is reset (see {@link #reset}) before creation.
+     *
+     * 
    
+     * The MutableXMLStreamBuffer is created by consuming events on a XMLStreamWriter using
+     * an instance of {@link StreamWriterBufferCreator}.
+     */
+    public XMLStreamWriter createFromXMLStreamWriter() {
+        reset();
+        return new StreamWriterBufferCreator(this);
+    }
+
+    /**
+     * Create contents of a buffer from a {@link SAXBufferCreator}.
+     *
+     * 
    
+     * The MutableXMLStreamBuffer is reset (see {@link #reset}) before creation.
+     *
+     * 
    
+     * The MutableXMLStreamBuffer is created by consuming events from a {@link ContentHandler} using
+     * an instance of {@link SAXBufferCreator}.
+     *
+     * @return The {@link SAXBufferCreator} to create from.
+     */
+    public SAXBufferCreator createFromSAXBufferCreator() {
+        reset();
+        SAXBufferCreator c = new SAXBufferCreator();
+        c.setBuffer(this);
+        return c;
+    }
+
+    /**
+     * Create contents of a buffer from a {@link XMLReader} and {@link InputStream}.
+     *
+     * 
    
+     * The MutableXMLStreamBuffer is reset (see {@link #reset}) before creation.
+     *
+     * 
    
+     * The MutableXMLStreamBuffer is created by using an instance of {@link SAXBufferCreator}
+     * and registering associated handlers on the {@link XMLReader}.
+     *
+     * @param reader
+     * The {@link XMLReader} to use for parsing.
+     * @param in
+     * The {@link InputStream} to be parsed.
+     */
+    public void createFromXMLReader(XMLReader reader, InputStream in) throws SAXException, IOException {
+        createFromXMLReader(reader, in, null);
+    }
+
+    /**
+     * Create contents of a buffer from a {@link XMLReader} and {@link InputStream}.
+     *
+     * 
    
+     * The MutableXMLStreamBuffer is reset (see {@link #reset}) before creation.
+     *
+     * 
    
+     * The MutableXMLStreamBuffer is created by using an instance of {@link SAXBufferCreator}
+     * and registering associated handlers on the {@link XMLReader}.
+     *
+     * @param reader
+     * The {@link XMLReader} to use for parsing.
+     * @param in
+     * The {@link InputStream} to be parsed.
+     * @param systemId
+     * The system ID of the input stream.
+     */
+    public void createFromXMLReader(XMLReader reader, InputStream in, String systemId) throws SAXException, IOException {
+        reset();
+        SAXBufferCreator c = new SAXBufferCreator(this);
+
+        reader.setContentHandler(c);
+        reader.setDTDHandler(c);
+        reader.setProperty(Properties.LEXICAL_HANDLER_PROPERTY, c);
+
+        c.create(reader, in, systemId);
+    }
+
+    /**
+     * Reset the MutableXMLStreamBuffer.
+     *
+     * 
    
+     * This method will reset the MutableXMLStreamBuffer to a state of being "uncreated"
+     * similar to the state of a newly instantiated MutableXMLStreamBuffer.
+     *
+     * 
    
+     * As many Objects as possible will be retained for reuse in future creation.
+     */
+    public void reset() {
+        // Reset the ptrs in arrays to 0
+        _structurePtr =
+                _structureStringsPtr =
+                _contentCharactersBufferPtr =
+                _contentObjectsPtr = 0;
+
+        // Set the first element of structure array to indicate an empty buffer
+        // that has not been created
+        _structure.getArray()[0] = AbstractCreatorProcessor.T_END;
+
+        // Clean up content objects
+        _contentObjects.setNext(null);
+        final Object[] o = _contentObjects.getArray();
+        for (int i = 0; i < o.length; i++) {
+            if (o[i] != null) {
+                o[i] = null;
+            } else {
+                break;
+            }
+        }
+
+        treeCount = 0;
+
+        /*
+         * TODO consider truncating the size of _structureStrings and
+         * _contentCharactersBuffer to limit the memory used by the buffer
+         */
+    }
+
+
+    protected void setHasInternedStrings(boolean hasInternedStrings) {
+        _hasInternedStrings = hasInternedStrings;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java
new file mode 100644
index 00000000000..b7394e3fa91
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java
@@ -0,0 +1,473 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.stream.buffer;
+
+import com.sun.xml.internal.stream.buffer.sax.SAXBufferProcessor;
+import com.sun.xml.internal.stream.buffer.stax.StreamReaderBufferProcessor;
+import com.sun.xml.internal.stream.buffer.stax.StreamWriterBufferProcessor;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collections;
+import java.util.Map;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.dom.DOMResult;
+
+import org.xml.sax.ContentHandler;
+import org.xml.sax.DTDHandler;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+import org.xml.sax.ext.LexicalHandler;
+import org.w3c.dom.Node;
+
+/**
+ * An immutable stream-based buffer of an XML infoset.
+ *
+ * 
    
+ * A XMLStreamBuffer is an abstract class. It is immutable with
+ * respect to the methods on the class, which are non-modifying in terms
+ * of state.
+ *
+ * 
    
+ * A XMLStreamBuffer can be processed using specific SAX and StAX-based
+ * processors. Utility methods on XMLStreamBuffer are provided for
+ * such functionality that utilize SAX and StAX-based processors.
+ * The same instance of a XMLStreamBuffer may be processed
+ * multiple times and concurrently by more than one processor.
+ *
+ * 
    
+ * There are two concrete implementations of XMLStreamBuffer.
+ * The first, {@link MutableXMLStreamBuffer}, can be instantiated for the creation
+ * of a buffer using SAX and StAX-based creators, and from which may be
+ * processed as an XMLStreamBuffer. The second,
+ * {@link XMLStreamBufferMark}, can be instantiated to mark into an existing
+ * buffer that is being created or processed. This allows a subtree of
+ * {@link XMLStreamBuffer} to be treated as its own {@link XMLStreamBuffer}.
+ *
+ * 
    
+ * A XMLStreamBuffer can represent a complete XML infoset or a subtree
+ * of an XML infoset. It is also capable of representing a "forest",
+ * where the buffer represents multiple adjacent XML elements, although
+ * in this mode there are restrictions about how you can consume such
+ * forest, because not all XML APIs handle forests very well.
+ */
+public abstract class XMLStreamBuffer {
+
+    /**
+     * In scope namespaces on a fragment
+     */
+    protected Map _inscopeNamespaces = Collections.emptyMap();
+
+    /**
+     * True if the buffer was created from a parser that interns Strings
+     * as specified by the SAX interning features
+     */
+    protected boolean _hasInternedStrings;
+
+    /**
+     * Fragmented array to hold structural information
+     */
+    protected FragmentedArray _structure;
+    protected int _structurePtr;
+
+    /**
+     * Fragmented array to hold structural information as strings
+     */
+    protected FragmentedArray _structureStrings;
+    protected int _structureStringsPtr;
+
+    /**
+     * Fragmented array to hold content information in a shared char[]
+     */
+    protected FragmentedArray _contentCharactersBuffer;
+    protected int _contentCharactersBufferPtr;
+
+    /**
+     * Fragmented array to hold content information as objects
+     */
+    protected FragmentedArray _contentObjects;
+    protected int _contentObjectsPtr;
+
+    /**
+     * Number of trees in this stream buffer.
+     *
+     * 
    
+     * 1 if there's only one, which is the normal case. When the buffer
+     * holds a forest, this value is greater than 1. If the buffer is empty, then 0.
+     *
+     * 
    
+     * Notice that we cannot infer this value by looking at the {@link FragmentedArray}s,
+     * because this {@link XMLStreamBuffer} maybe a view of a portion of another bigger
+     * {@link XMLStreamBuffer}.
+     */
+    protected int treeCount;
+
+    /**
+     * The system identifier associated with the buffer
+     */
+    protected String systemId;
+
+    /**
+     * Is the buffer created by creator.
+     *
+     * @return
+     * true if the buffer has been created.
+     */
+    public final boolean isCreated() {
+        return _structure.getArray()[0] != AbstractCreatorProcessor.T_END;
+    }
+
+    /**
+     * Is the buffer a representation of a fragment of an XML infoset.
+     *
+     * @return
+     * true if the buffer is a representation of a fragment
+     * of an XML infoset.
+     */
+    public final boolean isFragment() {
+        return (isCreated() && (_structure.getArray()[_structurePtr] & AbstractCreatorProcessor.TYPE_MASK)
+                != AbstractCreatorProcessor.T_DOCUMENT);
+    }
+
+    /**
+     * Is the buffer a representation of a fragment of an XML infoset
+     * that is an element (and its contents).
+     *
+     * @return
+     * true if the buffer a representation
+     * of a fragment of an XML infoset that is an element (and its contents).
+     */
+    public final boolean isElementFragment() {
+        return (isCreated() && (_structure.getArray()[_structurePtr] & AbstractCreatorProcessor.TYPE_MASK)
+                == AbstractCreatorProcessor.T_ELEMENT);
+    }
+
+    /**
+     * Returns ture if this buffer represents a forest, which is
+     * are more than one adjacent XML elements.
+     */
+    public final boolean isForest() {
+        return isCreated() && treeCount>1;
+    }
+
+    /**
+     * Get the system identifier associated with the buffer.
+     * @return The system identifier.
+     */
+    public final String getSystemId() {
+        return systemId;
+    }
+
+    /**
+     * Get the in-scope namespaces.
+     *
+     * 
    
+     *
+     * The in-scope namespaces will be empty if the buffer is not a
+     * fragment ({@link #isFragment} returns false).
+     *
+     * The in-scope namespace will correspond to the in-scope namespaces of the
+     * fragment if the buffer is a fragment ({@link #isFragment}
+     * returns false). The in-scope namespaces will include any
+     * namespace delcarations on an element if the fragment correspond to that
+     * of an element ({@link #isElementFragment} returns false).
+     *
+     * @return
+     *      The in-scope namespaces of the XMLStreamBuffer.
+     *      Prefix to namespace URI.
+     */
+    public final Map getInscopeNamespaces() {
+        return _inscopeNamespaces;
+    }
+
+    /**
+     * Has the buffer been created using Strings that have been interned
+     * for certain properties of information items. The Strings that are interned
+     * are those that correspond to Strings that are specified by the SAX API
+     * "string-interning" property
+     * (see here).
+     *
+     * 
    
+     * An buffer may have been created, for example, from an XML document parsed
+     * using the Xerces SAX parser. The Xerces SAX parser will have interned certain Strings
+     * according to the SAX string interning property.
+     * This method enables processors to avoid the duplication of
+     * String interning if such a feature is required by a procesing application and the
+     * buffer being processed was created using Strings that have been interned.
+     *
+     * @return
+     * true if the buffer has been created using Strings that
+     * have been interned.
+     */
+    public final boolean hasInternedStrings() {
+        return _hasInternedStrings;
+    }
+
+    /**
+     * Read the contents of the buffer as a {@link XMLStreamReader}.
+     *
+     * @return
+     * A an instance of a {@link StreamReaderBufferProcessor}. Always non-null.
+     */
+    public final StreamReaderBufferProcessor readAsXMLStreamReader() throws XMLStreamException {
+        return new StreamReaderBufferProcessor(this);
+    }
+
+    /**
+     * Write the contents of the buffer to an XMLStreamWriter.
+     *
+     * 
    
+     * The XMLStreamBuffer will be written out to the XMLStreamWriter using
+     * an instance of {@link StreamWriterBufferProcessor}.
+     *
+     * @param writer
+     *      A XMLStreamWriter to write to.
+     * @param writeAsFragment
+     *      If true, {@link XMLStreamWriter} will not receive {@link XMLStreamWriter#writeStartDocument()}
+     *      nor {@link XMLStreamWriter#writeEndDocument()}. This is desirable behavior when
+     *      you are writing the contents of a buffer into a bigger document.
+     */
+    public final void writeToXMLStreamWriter(XMLStreamWriter writer, boolean writeAsFragment) throws XMLStreamException {
+        StreamWriterBufferProcessor p = new StreamWriterBufferProcessor(this,writeAsFragment);
+        p.process(writer);
+    }
+
+    /**
+     * @deprecated
+     *      Use {@link #writeToXMLStreamWriter(XMLStreamWriter, boolean)}
+     */
+    public final void writeToXMLStreamWriter(XMLStreamWriter writer) throws XMLStreamException {
+        writeToXMLStreamWriter(writer, this.isFragment());
+    }
+
+    /**
+     * Reads the contents of the buffer from a {@link XMLReader}.
+     *
+     * @return
+     * A an instance of a {@link SAXBufferProcessor}.
+     * @deprecated
+     *      Use {@link #readAsXMLReader(boolean)}
+     */
+    public final SAXBufferProcessor readAsXMLReader() {
+        return new SAXBufferProcessor(this,isFragment());
+    }
+
+    /**
+     * Reads the contents of the buffer from a {@link XMLReader}.
+     *
+     * @param produceFragmentEvent
+     *      True to generate fragment SAX events without start/endDocument.
+     *      False to generate a full document SAX events.
+     * @return
+     *      A an instance of a {@link SAXBufferProcessor}.
+     */
+    public final SAXBufferProcessor readAsXMLReader(boolean produceFragmentEvent) {
+        return new SAXBufferProcessor(this,produceFragmentEvent);
+    }
+
+    /**
+     * Write the contents of the buffer to a {@link ContentHandler}.
+     *
+     * 
    
+     * If the handler is also an instance of other SAX-based
+     * handlers, such as {@link LexicalHandler}, than corresponding SAX events
+     * will be reported to those handlers.
+     *
+     * @param handler
+     *      The ContentHandler to receive SAX events.
+     * @param produceFragmentEvent
+     *      True to generate fragment SAX events without start/endDocument.
+     *      False to generate a full document SAX events.
+     *
+     * @throws SAXException
+     *      if a parsing fails, or if {@link ContentHandler} throws a {@link SAXException}.
+     */
+    public final void writeTo(ContentHandler handler, boolean produceFragmentEvent) throws SAXException {
+        SAXBufferProcessor p = readAsXMLReader(produceFragmentEvent);
+        p.setContentHandler(handler);
+        if (p instanceof LexicalHandler) {
+            p.setLexicalHandler((LexicalHandler)handler);
+        }
+        if (p instanceof DTDHandler) {
+            p.setDTDHandler((DTDHandler)handler);
+        }
+        if (p instanceof ErrorHandler) {
+            p.setErrorHandler((ErrorHandler)handler);
+        }
+        p.process();
+    }
+
+    /**
+     * @deprecated
+     *      Use {@link #writeTo(ContentHandler,boolean)}
+     */
+    public final void writeTo(ContentHandler handler) throws SAXException {
+        writeTo(handler,isFragment());
+    }
+
+    /**
+     * Write the contents of the buffer to a {@link ContentHandler} with errors
+     * report to a {@link ErrorHandler}.
+     *
+     * 
    
+     * If the handler is also an instance of other SAX-based
+     * handlers, such as {@link LexicalHandler}, than corresponding SAX events
+     * will be reported to those handlers.
+     *
+     * @param handler
+     * The ContentHandler to receive SAX events.
+     * @param errorHandler
+     * The ErrorHandler to receive error events.
+     *
+     * @throws SAXException
+     *      if a parsing fails and {@link ErrorHandler} throws a {@link SAXException},
+     *      or if {@link ContentHandler} throws a {@link SAXException}.
+     */
+    public final void writeTo(ContentHandler handler, ErrorHandler errorHandler, boolean produceFragmentEvent) throws SAXException {
+        SAXBufferProcessor p = readAsXMLReader(produceFragmentEvent);
+        p.setContentHandler(handler);
+        if (p instanceof LexicalHandler) {
+            p.setLexicalHandler((LexicalHandler)handler);
+        }
+        if (p instanceof DTDHandler) {
+            p.setDTDHandler((DTDHandler)handler);
+        }
+
+        p.setErrorHandler(errorHandler);
+
+        p.process();
+    }
+
+    public final void writeTo(ContentHandler handler, ErrorHandler errorHandler) throws SAXException {
+        writeTo(handler, errorHandler, isFragment());
+    }
+
+    private static final TransformerFactory trnsformerFactory = TransformerFactory.newInstance();
+
+    /**
+     * Writes out the contents of this buffer as DOM node and append that to the given node.
+     *
+     * Faster implementation would be desirable.
+     *
+     * @return
+     *      The newly added child node.
+     */
+    public final Node writeTo(Node n) throws XMLStreamBufferException {
+        try {
+            Transformer t = trnsformerFactory.newTransformer();
+            t.transform(new XMLStreamBufferSource(this), new DOMResult(n));
+            return n.getLastChild();
+        } catch (TransformerException e) {
+            throw new XMLStreamBufferException(e);
+        }
+    }
+
+    /**
+     * Create a new buffer from a XMLStreamReader.
+     *
+     * @param reader
+     * A XMLStreamReader to read from to create.
+     * @return XMLStreamBuffer the created buffer
+     * @see MutableXMLStreamBuffer#createFromXMLStreamReader(XMLStreamReader)
+     */
+    public static XMLStreamBuffer createNewBufferFromXMLStreamReader(XMLStreamReader reader)
+            throws XMLStreamException {
+        MutableXMLStreamBuffer b = new MutableXMLStreamBuffer();
+        b.createFromXMLStreamReader(reader);
+        return b;
+    }
+
+    /**
+     * Create a new buffer from a {@link XMLReader} and {@link InputStream}.
+     *
+     * @param reader
+     * The {@link XMLReader} to use for parsing.
+     * @param in
+     * The {@link InputStream} to be parsed.
+     * @return XMLStreamBuffer the created buffer
+     * @see MutableXMLStreamBuffer#createFromXMLReader(XMLReader, InputStream)
+     */
+    public static XMLStreamBuffer createNewBufferFromXMLReader(XMLReader reader, InputStream in) throws SAXException, IOException {
+        MutableXMLStreamBuffer b = new MutableXMLStreamBuffer();
+        b.createFromXMLReader(reader, in);
+        return b;
+    }
+
+    /**
+     * Create a new buffer from a {@link XMLReader} and {@link InputStream}.
+     *
+     * @param reader
+     * The {@link XMLReader} to use for parsing.
+     * @param in
+     * The {@link InputStream} to be parsed.
+     * @param systemId
+     * The system ID of the input stream.
+     * @return XMLStreamBuffer the created buffer
+     * @see MutableXMLStreamBuffer#createFromXMLReader(XMLReader, InputStream, String)
+     */
+    public static XMLStreamBuffer createNewBufferFromXMLReader(XMLReader reader, InputStream in,
+                                                               String systemId) throws SAXException, IOException {
+        MutableXMLStreamBuffer b = new MutableXMLStreamBuffer();
+        b.createFromXMLReader(reader, in, systemId);
+        return b;
+    }
+
+    protected final FragmentedArray getStructure() {
+        return _structure;
+    }
+
+    protected final int getStructurePtr() {
+        return _structurePtr;
+    }
+
+    protected final FragmentedArray getStructureStrings() {
+        return _structureStrings;
+    }
+
+    protected final int getStructureStringsPtr() {
+        return _structureStringsPtr;
+    }
+
+    protected final FragmentedArray getContentCharactersBuffer() {
+        return _contentCharactersBuffer;
+    }
+
+    protected final int getContentCharactersBufferPtr() {
+        return _contentCharactersBufferPtr;
+    }
+
+    protected final FragmentedArray getContentObjects() {
+        return _contentObjects;
+    }
+
+    protected final int getContentObjectsPtr() {
+        return _contentObjectsPtr;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferException.java b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferException.java
new file mode 100644
index 00000000000..df71e52ed3c
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferException.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.stream.buffer;
+
+public class XMLStreamBufferException extends Exception {
+
+    public XMLStreamBufferException(String message) {
+        super(message);
+    }
+
+    public XMLStreamBufferException(String message, Exception e) {
+        super(message, e);
+    }
+
+    public XMLStreamBufferException(Exception e) {
+        super(e);
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferMark.java b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferMark.java
new file mode 100644
index 00000000000..42fc447d851
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferMark.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.stream.buffer;
+
+import java.util.Map;
+
+/**
+ * A mark into a buffer.
+ *
+ * 
    
+ * A mark can be processed in the same manner as a XMLStreamBuffer.
+ *
+ * 
    
+ * A mark will share a sub set of information of the buffer that is
+ * marked. If the buffer is directly or indirectly associated with a
+ * (mutable) {@link XMLStreamBuffer} which is reset and/or re-created
+ * then this will invalidate the mark and processing behvaiour of the mark
+ * is undefined. It is the responsibility of the application to manage the
+ * relationship between the marked XMLStreamBuffer and one or more marks.
+ */
+public class XMLStreamBufferMark extends XMLStreamBuffer {
+
+    /**
+     * Create a mark from the buffer that is being created.
+     *
+     * 
    
+     * A mark will be created from the current position of creation of the
+     * {@link XMLStreamBuffer} that is being created by a {@link AbstractCreator}.
+     *
+     * @param inscopeNamespaces
+     * The in-scope namespaces on the fragment of XML infoset that is
+     * to be marked.
+     *
+     * @param src
+     * The {@link AbstractCreator} or {@link AbstractProcessor} from which the current
+     * position of creation of the XMLStreamBuffer will be taken as the mark.
+     */
+    public XMLStreamBufferMark(Map inscopeNamespaces, AbstractCreatorProcessor src) {
+        _inscopeNamespaces = inscopeNamespaces;
+
+        _structure = src._currentStructureFragment;
+        _structurePtr = src._structurePtr;
+
+        _structureStrings = src._currentStructureStringFragment;
+        _structureStringsPtr = src._structureStringsPtr;
+
+        _contentCharactersBuffer = src._currentContentCharactersBufferFragment;
+        _contentCharactersBufferPtr = src._contentCharactersBufferPtr;
+
+        _contentObjects = src._currentContentObjectFragment;
+        _contentObjectsPtr = src._contentObjectsPtr;
+        treeCount = 1; // TODO: define a way to create a mark over a forest
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferResult.java b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferResult.java
new file mode 100644
index 00000000000..b4d90452057
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferResult.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.stream.buffer;
+
+import com.sun.xml.internal.stream.buffer.sax.SAXBufferCreator;
+import javax.xml.transform.sax.SAXResult;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.ext.LexicalHandler;
+
+/**
+ * A JAXP Result implementation that supports the serialization to an
+ * {@link MutableXMLStreamBuffer} for use by applications that expect a Result.
+ *
+ * 
    
+ * Reuse of a XMLStreamBufferResult more than once will require that the
+ * MutableXMLStreamBuffer is reset by called
+ * {@link #.getXMLStreamBuffer()}.reset(), or by calling
+ * {@link #.setXMLStreamBuffer()} with a new instance of
+ * {@link MutableXMLStreamBuffer}.
+ *
+ * 
    
+ * The derivation of XMLStreamBufferResult from SAXResult is an implementation
+ * detail.
+ *
+ * 
    General applications shall not call the following methods:
+ * 
      
+ * 
    • setHandler
      • 
+ * 
    • setLexicalHandler
      • 
+ * 
    • setSystemId
      • 
+ * 
    
+ */
+public class XMLStreamBufferResult extends SAXResult {
+    protected MutableXMLStreamBuffer _buffer;
+    protected SAXBufferCreator _bufferCreator;
+
+    /**
+     * The default XMLStreamBufferResult constructor.
+     *
+     * 
    
+     * A {@link MutableXMLStreamBuffer} is instantiated and used.
+     */
+    public XMLStreamBufferResult() {
+        setXMLStreamBuffer(new MutableXMLStreamBuffer());
+    }
+
+    /**
+     * XMLStreamBufferResult constructor.
+     *
+     * @param buffer the {@link MutableXMLStreamBuffer} to use.
+     */
+    public XMLStreamBufferResult(MutableXMLStreamBuffer buffer) {
+        setXMLStreamBuffer(buffer);
+    }
+
+    /**
+     * Get the {@link MutableXMLStreamBuffer} that is used.
+     *
+     * @return the {@link MutableXMLStreamBuffer}.
+     */
+    public MutableXMLStreamBuffer getXMLStreamBuffer() {
+        return _buffer;
+    }
+
+    /**
+     * Set the {@link MutableXMLStreamBuffer} to use.
+     *
+     * @param buffer the {@link MutableXMLStreamBuffer}.
+     */
+    public void setXMLStreamBuffer(MutableXMLStreamBuffer buffer) {
+        if (buffer == null) {
+            throw new NullPointerException("buffer cannot be null");
+        }
+        _buffer = buffer;
+        setSystemId(_buffer.getSystemId());
+
+        if (_bufferCreator != null) {
+            _bufferCreator.setXMLStreamBuffer(_buffer);
+        }
+    }
+
+    public ContentHandler getHandler() {
+        if (_bufferCreator == null) {
+            _bufferCreator = new SAXBufferCreator(_buffer);
+            setHandler(_bufferCreator);
+        } else if (super.getHandler() == null) {
+            setHandler(_bufferCreator);
+        }
+
+        return _bufferCreator;
+    }
+
+    public LexicalHandler getLexicalHandler() {
+        return (LexicalHandler) getHandler();
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferSource.java b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferSource.java
new file mode 100644
index 00000000000..d2830078c33
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferSource.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.stream.buffer;
+
+import com.sun.xml.internal.stream.buffer.sax.SAXBufferProcessor;
+import java.io.ByteArrayInputStream;
+import javax.xml.transform.sax.SAXSource;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
+
+/**
+ * A JAXP Source implementation that supports the parsing
+ * of {@link XMLStreamBuffer} for use by applications that expect a Source.
+ *
+ * 
    
+ * The derivation of XMLStreamBufferSource from SAXSource is an implementation
+ * detail.
+ *
+ * 
    Applications shall obey the following restrictions:
+ * 
      
+ * 
    • The setXMLReader and setInputSource shall not be called.
      • 
+ * 
    • The XMLReader object obtained by the getXMLReader method shall
+ *     be used only for parsing the InputSource object returned by
+ *     the getInputSource method.
      • 
+ * 
    • The InputSource object obtained by the getInputSource method shall
+ *     be used only for being parsed by the XMLReader object returned by
+ *     the getXMLReader method.
      • 
+ * 
    
+ */
+public class XMLStreamBufferSource extends SAXSource {
+    protected XMLStreamBuffer _buffer;
+    protected SAXBufferProcessor _bufferProcessor;
+
+    /**
+     * XMLStreamBufferSource constructor.
+     *
+     * @param buffer the {@link XMLStreamBuffer} to use.
+     */
+    public XMLStreamBufferSource(XMLStreamBuffer buffer) {
+        super(new InputSource(
+                new ByteArrayInputStream(new byte[0])));
+        setXMLStreamBuffer(buffer);
+    }
+
+    /**
+     * Get the {@link XMLStreamBuffer} that is used.
+     *
+     * @return the {@link XMLStreamBuffer}.
+     */
+    public XMLStreamBuffer getXMLStreamBuffer() {
+        return _buffer;
+    }
+
+    /**
+     * Set the {@link XMLStreamBuffer} to use.
+     *
+     * @param buffer the {@link XMLStreamBuffer}.
+     */
+    public void setXMLStreamBuffer(XMLStreamBuffer buffer) {
+        if (buffer == null) {
+            throw new NullPointerException("buffer cannot be null");
+        }
+        _buffer = buffer;
+
+        if (_bufferProcessor != null) {
+            _bufferProcessor.setBuffer(_buffer,false);
+        }
+    }
+
+    public XMLReader getXMLReader() {
+        if (_bufferProcessor == null) {
+            _bufferProcessor = new SAXBufferProcessor(_buffer,false);
+            setXMLReader(_bufferProcessor);
+        } else if (super.getXMLReader() == null) {
+            setXMLReader(_bufferProcessor);
+        }
+
+        return _bufferProcessor;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/SOAPVersion.java b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/sax/DefaultWithLexicalHandler.java
similarity index 59%
rename from jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/SOAPVersion.java
rename to jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/sax/DefaultWithLexicalHandler.java
index dc6b15289a6..159b036f51f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/SOAPVersion.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/sax/DefaultWithLexicalHandler.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,32 +22,26 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+package com.sun.xml.internal.stream.buffer.sax;
 
-package com.sun.xml.internal.ws.encoding.soap;
+import org.xml.sax.SAXException;
+import org.xml.sax.ext.LexicalHandler;
+import org.xml.sax.helpers.DefaultHandler;
 
-import javax.xml.ws.soap.SOAPBinding;
+public class DefaultWithLexicalHandler extends DefaultHandler implements LexicalHandler {
 
+    public void comment(char[] ch, int start, int length) throws SAXException { }
 
-/**
- * @author WS Development Team
- */
+    public void startDTD(String name, String publicId, String systemId) throws SAXException { }
 
-public class SOAPVersion {
+    public void endDTD() throws SAXException { }
 
-    private final String version;
+    public void startEntity(String name) throws SAXException { }
 
-    private SOAPVersion(String ver) {
-        this.version = ver;
-    }
+    public void endEntity(String name) throws SAXException { }
 
-    public String toString() {
-        return this.version;
-    }
+    public void startCDATA() throws SAXException { }
 
-    public boolean equals(String strVersion) {
-        return version.equals(strVersion);
-    }
+    public void endCDATA() throws SAXException { }
 
-    public static final SOAPVersion SOAP_11 = new SOAPVersion(SOAPBinding.SOAP11HTTP_BINDING);
-    public static final SOAPVersion SOAP_12 = new SOAPVersion(SOAPBinding.SOAP12HTTP_BINDING);
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/ProcessorAction.java b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/sax/Features.java
similarity index 61%
rename from jaxws/src/share/classes/com/sun/tools/internal/ws/processor/ProcessorAction.java
rename to jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/sax/Features.java
index 626d73d1dc7..4605ef68cf5 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/ProcessorAction.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/sax/Features.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,20 +23,19 @@
  * have any questions.
  */
 
-package com.sun.tools.internal.ws.processor;
 
-import java.util.Properties;
 
-import com.sun.tools.internal.ws.processor.model.Model;
-import com.sun.tools.internal.ws.processor.config.Configuration;
+package com.sun.xml.internal.stream.buffer.sax;
 
-/**
- * A ProcessorAction is used to perform some operation on a
- * {@link com.sun.tools.internal.ws.processor.model.Model Model} such as
- * generating a Java source file.
- *
- * @author WS Development Team
- */
-public interface ProcessorAction {
-    public void perform(Model model, Configuration config, Properties options);
+public class Features {
+    public static final String NAMESPACES_FEATURE =
+        "http://xml.org/sax/features/namespaces";
+    public static final String NAMESPACE_PREFIXES_FEATURE =
+        "http://xml.org/sax/features/namespace-prefixes";
+    public static final String EXTERNAL_GENERAL_ENTITIES =
+        "http://xml.org/sax/features/external-general-entities";
+    public static final String EXTERNAL_PARAMETER_ENTITIES =
+        "http://xml.org/sax/features/external-parameter-entities";
+    public static final String STRING_INTERNING_FEATURE =
+        "http://xml.org/sax/features/string-interning";
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/sax/Properties.java b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/sax/Properties.java
new file mode 100644
index 00000000000..e596b361185
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/sax/Properties.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+
+
+package com.sun.xml.internal.stream.buffer.sax;
+
+public class Properties {
+    public static final String LEXICAL_HANDLER_PROPERTY =
+            "http://xml.org/sax/properties/lexical-handler";
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferCreator.java b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferCreator.java
new file mode 100644
index 00000000000..01fe77e0bbc
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferCreator.java
@@ -0,0 +1,265 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.stream.buffer.sax;
+
+import com.sun.xml.internal.stream.buffer.AbstractCreator;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import com.sun.xml.internal.stream.buffer.MutableXMLStreamBuffer;
+import java.io.IOException;
+import java.io.InputStream;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.DTDHandler;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.XMLReader;
+import org.xml.sax.ext.LexicalHandler;
+
+/**
+ * Writes into {@link MutableXMLStreamBuffer} from SAX.
+ *
+ * TODO
+ * Implement the marking the stream on the element when an ID
+ * attribute on the element is defined
+ */
+public class SAXBufferCreator extends AbstractCreator
+        implements EntityResolver, DTDHandler, ContentHandler, ErrorHandler, LexicalHandler {
+    protected String[] _namespaceAttributes;
+
+    protected int _namespaceAttributesPtr;
+
+    private int depth = 0;
+
+    public SAXBufferCreator() {
+        _namespaceAttributes = new String[16 * 2];
+    }
+
+    public SAXBufferCreator(MutableXMLStreamBuffer buffer) {
+        this();
+        setBuffer(buffer);
+    }
+
+    public MutableXMLStreamBuffer create(XMLReader reader, InputStream in) throws IOException, SAXException {
+        return create(reader, in, null);
+    }
+
+    public MutableXMLStreamBuffer create(XMLReader reader, InputStream in, String systemId) throws IOException, SAXException {
+        if (_buffer == null) {
+            createBuffer();
+        }
+        _buffer.setSystemId(systemId);
+        reader.setContentHandler(this);
+        reader.setProperty(Properties.LEXICAL_HANDLER_PROPERTY, this);
+
+        try {
+            setHasInternedStrings(reader.getFeature(Features.STRING_INTERNING_FEATURE));
+        } catch (SAXException e) {
+        }
+
+
+        if (systemId != null) {
+            InputSource s = new InputSource(systemId);
+            s.setByteStream(in);
+            reader.parse(s);
+        } else {
+            reader.parse(new InputSource(in));
+        }
+
+        return getXMLStreamBuffer();
+    }
+
+    public void reset() {
+        _buffer = null;
+        _namespaceAttributesPtr = 0;
+        depth=0;
+    }
+
+    public void startDocument() throws SAXException {
+        storeStructure(T_DOCUMENT);
+    }
+
+    public void endDocument() throws SAXException {
+        storeStructure(T_END);
+    }
+
+    public void startPrefixMapping(String prefix, String uri) throws SAXException {
+        cacheNamespaceAttribute(prefix, uri);
+    }
+
+    public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
+        storeQualifiedName(T_ELEMENT_LN,
+                uri, localName, qName);
+
+        // Has namespaces attributes
+        if (_namespaceAttributesPtr > 0) {
+            storeNamespaceAttributes();
+        }
+
+        // Has attributes
+        if (attributes.getLength() > 0) {
+            storeAttributes(attributes);
+        }
+        depth++;
+    }
+
+    public void endElement(String uri, String localName, String qName) throws SAXException {
+        storeStructure(T_END);
+        if(--depth==0)
+            increaseTreeCount();    // one tree processed
+    }
+
+    public void characters(char ch[], int start, int length) throws SAXException {
+        storeContentCharacters(T_TEXT_AS_CHAR_ARRAY, ch, start, length);
+    }
+
+    public void ignorableWhitespace(char ch[], int start, int length) throws SAXException {
+        characters(ch, start, length);
+    }
+
+    public void processingInstruction(String target, String data) throws SAXException {
+        storeStructure(T_PROCESSING_INSTRUCTION);
+        storeStructureString(target);
+        storeStructureString(data);
+    }
+
+    public void comment(char[] ch, int start, int length) throws SAXException {
+        storeContentCharacters(T_COMMENT_AS_CHAR_ARRAY, ch, start, length);
+    }
+
+    //
+
+    private void cacheNamespaceAttribute(String prefix, String uri) {
+        _namespaceAttributes[_namespaceAttributesPtr++] = prefix;
+        _namespaceAttributes[_namespaceAttributesPtr++] = uri;
+
+        if (_namespaceAttributesPtr == _namespaceAttributes.length) {
+            final String[] namespaceAttributes = new String[_namespaceAttributesPtr * 3 / 2 + 1];
+            System.arraycopy(_namespaceAttributes, 0, namespaceAttributes, 0, _namespaceAttributesPtr);
+            _namespaceAttributes = namespaceAttributes;
+        }
+    }
+
+    private void storeNamespaceAttributes() {
+        for (int i = 0; i < _namespaceAttributesPtr; i += 2) {
+            int item = T_NAMESPACE_ATTRIBUTE;
+            if (_namespaceAttributes[i].length() > 0) {
+                item |= FLAG_PREFIX;
+                storeStructureString(_namespaceAttributes[i]);
+            }
+            if (_namespaceAttributes[i + 1].length() > 0) {
+                item |= FLAG_URI;
+                storeStructureString(_namespaceAttributes[i + 1]);
+            }
+            storeStructure(item);
+        }
+        _namespaceAttributesPtr = 0;
+    }
+
+    private void storeAttributes(Attributes attributes) {
+        for (int i = 0; i < attributes.getLength(); i++) {
+            storeQualifiedName(T_ATTRIBUTE_LN,
+                    attributes.getURI(i),
+                    attributes.getLocalName(i),
+                    attributes.getQName(i));
+
+            storeStructureString(attributes.getType(i));
+            storeContentString(attributes.getValue(i));
+        }
+    }
+
+    private void storeQualifiedName(int item, String uri, String localName, String qName) {
+        if (uri.length() > 0) {
+            item |= FLAG_URI;
+            storeStructureString(uri);
+        }
+
+        storeStructureString(localName);
+
+        if (qName.indexOf(':') >= 0) {
+            item |= FLAG_QUALIFIED_NAME;
+            storeStructureString(qName);
+        }
+
+        storeStructure(item);
+    }
+
+
+    // Empty methods for SAX handlers
+
+    // Entity resolver handler
+
+    public InputSource resolveEntity (String publicId, String systemId)
+        throws IOException, SAXException
+    {
+        return null;
+    }
+
+    // DTD handler
+
+    public void notationDecl (String name, String publicId, String systemId)
+        throws SAXException
+    { }
+
+    public void unparsedEntityDecl (String name, String publicId,
+                                    String systemId, String notationName)
+        throws SAXException
+    { }
+
+    // Content handler
+
+    public void setDocumentLocator (Locator locator) { }
+
+    public void endPrefixMapping (String prefix) throws SAXException { }
+
+    public void skippedEntity (String name) throws SAXException { }
+
+    // Lexical handler
+
+    public void startDTD(String name, String publicId, String systemId) throws SAXException { }
+
+    public void endDTD() throws SAXException { }
+
+    public void startEntity(String name) throws SAXException { }
+
+    public void endEntity(String name) throws SAXException { }
+
+    public void startCDATA() throws SAXException { }
+
+    public void endCDATA() throws SAXException { }
+
+    // Error handler
+
+    public void warning(SAXParseException e) throws SAXException { }
+
+    public void error(SAXParseException e) throws SAXException { }
+
+    public void fatalError(SAXParseException e) throws SAXException
+    {
+        throw e;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferProcessor.java b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferProcessor.java
new file mode 100644
index 00000000000..795d596e575
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferProcessor.java
@@ -0,0 +1,671 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.stream.buffer.sax;
+
+import com.sun.xml.internal.stream.buffer.AbstractProcessor;
+import com.sun.xml.internal.stream.buffer.AttributesHolder;
+import com.sun.xml.internal.stream.buffer.XMLStreamBuffer;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.DTDHandler;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.XMLReader;
+import org.xml.sax.ext.LexicalHandler;
+import org.xml.sax.helpers.LocatorImpl;
+
+import javax.xml.XMLConstants;
+import java.io.IOException;
+
+/**
+ * A processor of a {@link XMLStreamBuffer} that that reads the XML infoset as
+ * {@link XMLReader}.
+ */
+public class SAXBufferProcessor extends AbstractProcessor implements XMLReader {
+    /**
+     * Reference to entity resolver.
+     */
+    protected EntityResolver _entityResolver = DEFAULT_LEXICAL_HANDLER;
+
+    /**
+     * Reference to dtd handler.
+     */
+    protected DTDHandler _dtdHandler = DEFAULT_LEXICAL_HANDLER;
+
+    /**
+     * Reference to content handler.
+     */
+    protected ContentHandler _contentHandler = DEFAULT_LEXICAL_HANDLER;
+
+    /**
+     * Reference to error handler.
+     */
+    protected ErrorHandler _errorHandler = DEFAULT_LEXICAL_HANDLER;
+
+    /**
+     * Reference to lexical handler.
+     */
+    protected LexicalHandler _lexicalHandler = DEFAULT_LEXICAL_HANDLER;
+
+    /**
+     * SAX Namespace attributes features
+     */
+    protected boolean _namespacePrefixesFeature = false;
+
+    protected AttributesHolder _attributes = new AttributesHolder();
+
+    protected String[] _namespacePrefixes = new String[16];
+    protected int _namespacePrefixesIndex;
+
+    protected int[] _namespaceAttributesStack = new int[16];
+    protected int _namespaceAttributesStackIndex;
+
+    public SAXBufferProcessor() {
+    }
+
+    /**
+     * @deprecated
+     *      Use {@link #SAXBufferProcessor(XMLStreamBuffer, boolean)}
+     */
+    public SAXBufferProcessor(XMLStreamBuffer buffer) {
+        setXMLStreamBuffer(buffer);
+    }
+
+    /**
+     * @param produceFragmentEvent
+     *      True to generate fragment SAX events without start/endDocument.
+     *      False to generate a full document SAX events.
+     */
+    public SAXBufferProcessor(XMLStreamBuffer buffer, boolean produceFragmentEvent) {
+        setXMLStreamBuffer(buffer,produceFragmentEvent);
+    }
+
+    public boolean getFeature(String name)
+            throws SAXNotRecognizedException, SAXNotSupportedException {
+        if (name.equals(Features.NAMESPACES_FEATURE)) {
+            return true;
+        } else if (name.equals(Features.NAMESPACE_PREFIXES_FEATURE)) {
+            return _namespacePrefixesFeature;
+        } else if (name.equals(Features.EXTERNAL_GENERAL_ENTITIES)) {
+            return true;
+        } else if (name.equals(Features.EXTERNAL_PARAMETER_ENTITIES)) {
+            return true;
+        } else if (name.equals(Features.STRING_INTERNING_FEATURE)) {
+            return _stringInterningFeature;
+        } else {
+            throw new SAXNotRecognizedException(
+                    "Feature not supported: " + name);
+        }
+    }
+
+    public void setFeature(String name, boolean value)
+            throws SAXNotRecognizedException, SAXNotSupportedException {
+        if (name.equals(Features.NAMESPACES_FEATURE)) {
+            if (!value) {
+                throw new SAXNotSupportedException(name + ":" + value);
+            }
+        } else if (name.equals(Features.NAMESPACE_PREFIXES_FEATURE)) {
+            _namespacePrefixesFeature = value;
+        } else if (name.equals(Features.EXTERNAL_GENERAL_ENTITIES)) {
+            // ignore
+        } else if (name.equals(Features.EXTERNAL_PARAMETER_ENTITIES)) {
+            // ignore
+        } else if (name.equals(Features.STRING_INTERNING_FEATURE)) {
+            if (value != _stringInterningFeature) {
+                throw new SAXNotSupportedException(name + ":" + value);
+            }
+        } else {
+            throw new SAXNotRecognizedException(
+                    "Feature not supported: " + name);
+        }
+    }
+
+    public Object getProperty(String name)
+            throws SAXNotRecognizedException, SAXNotSupportedException {
+        if (name.equals(Properties.LEXICAL_HANDLER_PROPERTY)) {
+            return getLexicalHandler();
+        } else {
+            throw new SAXNotRecognizedException("Property not recognized: " + name);
+        }
+    }
+
+    public void setProperty(String name, Object value)
+            throws SAXNotRecognizedException, SAXNotSupportedException {
+        if (name.equals(Properties.LEXICAL_HANDLER_PROPERTY)) {
+            if (value instanceof LexicalHandler) {
+                setLexicalHandler((LexicalHandler)value);
+            } else {
+                throw new SAXNotSupportedException(Properties.LEXICAL_HANDLER_PROPERTY);
+            }
+        } else {
+            throw new SAXNotRecognizedException("Property not recognized: " + name);
+        }
+    }
+
+    public void setEntityResolver(EntityResolver resolver) {
+        _entityResolver = resolver;
+    }
+
+    public EntityResolver getEntityResolver() {
+        return _entityResolver;
+    }
+
+    public void setDTDHandler(DTDHandler handler) {
+        _dtdHandler = handler;
+    }
+
+    public DTDHandler getDTDHandler() {
+        return _dtdHandler;
+    }
+
+    public void setContentHandler(ContentHandler handler) {
+        _contentHandler = handler;
+    }
+
+    public ContentHandler getContentHandler() {
+        return _contentHandler;
+    }
+
+    public void setErrorHandler(ErrorHandler handler) {
+        _errorHandler = handler;
+    }
+
+    public ErrorHandler getErrorHandler() {
+        return _errorHandler;
+    }
+
+    public void setLexicalHandler(LexicalHandler handler) {
+        _lexicalHandler = handler;
+    }
+
+    public LexicalHandler getLexicalHandler() {
+        return _lexicalHandler;
+    }
+
+    public void parse(InputSource input) throws IOException, SAXException {
+        // InputSource is ignored
+        process();
+    }
+
+    public void parse(String systemId) throws IOException, SAXException {
+        // systemId is ignored
+        process();
+    }
+
+    /**
+     * Short-hand for {@link #setXMLStreamBuffer(XMLStreamBuffer)} then {@link #process()}.
+     *
+     * @deprecated
+     *      Use {@link #process(XMLStreamBuffer, boolean)}
+     */
+    public final void process(XMLStreamBuffer buffer) throws SAXException {
+        setXMLStreamBuffer(buffer);
+        process();
+    }
+
+    /**
+     * Short-hand for {@link #setXMLStreamBuffer(XMLStreamBuffer,boolean)} then {@link #process()}.
+     *
+     * @param produceFragmentEvent
+     *      True to generate fragment SAX events without start/endDocument.
+     *      False to generate a full document SAX events.
+     */
+    public final void process(XMLStreamBuffer buffer, boolean produceFragmentEvent) throws SAXException {
+        setXMLStreamBuffer(buffer);
+        process();
+    }
+
+    /**
+     * Resets the parser to read from the beginning of the given {@link XMLStreamBuffer}.
+     *
+     * @deprecated
+     *      Use {@link #setXMLStreamBuffer(XMLStreamBuffer, boolean)}.
+     */
+    public void setXMLStreamBuffer(XMLStreamBuffer buffer) {
+        setBuffer(buffer);
+    }
+
+    /**
+     * Resets the parser to read from the beginning of the given {@link XMLStreamBuffer}.
+     *
+     * @param produceFragmentEvent
+     *      True to generate fragment SAX events without start/endDocument.
+     *      False to generate a full document SAX events.
+     */
+    public void setXMLStreamBuffer(XMLStreamBuffer buffer, boolean produceFragmentEvent) {
+        if(!produceFragmentEvent && _treeCount>1)
+            throw new IllegalStateException("Can't write a forest to a full XML infoset");
+        setBuffer(buffer,produceFragmentEvent);
+    }
+
+    /**
+     * Parse the sub-tree (or a whole document) that {@link XMLStreamBuffer}
+     * points to, and sends events to handlers.
+     *
+     * 
    
+     * TODO:
+     * We probably need two modes for a sub-tree event generation. One for
+     * firing a sub-tree as if it's a whole document (in which case start/endDocument
+     * and appropriate additional namespace bindings are necessary), and the other
+     * mode for firing a subtree as a subtree, like it does today.
+     * A stream buffer SAX feature could be used to specify this.
+     *
+     * @throws SAXException
+     *      Follow the same semantics as {@link XMLReader#parse(InputSource)}.
+     */
+    public final void process() throws SAXException {
+        if(!_fragmentMode) {
+            LocatorImpl nullLocator = new LocatorImpl();
+            nullLocator.setSystemId(_buffer.getSystemId());
+            nullLocator.setLineNumber(-1);
+            nullLocator.setColumnNumber(-1);
+            _contentHandler.setDocumentLocator(nullLocator);
+
+            _contentHandler.startDocument();
+            // TODO: if we are writing a fragment stream buffer as a full XML document,
+            // we need to declare in-scope namespaces as if they are on the root element.
+        }
+
+        while (_treeCount>0) {
+            final int item = readEiiState();
+            switch(item) {
+                case STATE_DOCUMENT:
+                    processDocument();
+                    _treeCount--;
+                    break;
+                case STATE_END:
+                    // Empty buffer
+                    return;
+                case STATE_ELEMENT_U_LN_QN:
+                    processElement(readStructureString(), readStructureString(), readStructureString());
+                    _treeCount--;
+                    break;
+                case STATE_ELEMENT_P_U_LN:
+                {
+                    final String prefix = readStructureString();
+                    final String uri = readStructureString();
+                    final String localName = readStructureString();
+                    processElement(uri, localName, getQName(prefix, localName));
+                    _treeCount--;
+                    break;
+                }
+                case STATE_ELEMENT_U_LN: {
+                    final String uri = readStructureString();
+                    final String localName = readStructureString();
+                    processElement(uri, localName, localName);
+                    _treeCount--;
+                    break;
+                }
+                case STATE_ELEMENT_LN:
+                {
+                    final String localName = readStructureString();
+                    processElement("", localName, localName);
+                    _treeCount--;
+                    break;
+                }
+                case STATE_COMMENT_AS_CHAR_ARRAY_SMALL:
+                    processCommentAsCharArraySmall();
+                    break;
+                case STATE_COMMENT_AS_CHAR_ARRAY_MEDIUM:
+                    processCommentAsCharArrayMedium();
+                    break;
+                case STATE_COMMENT_AS_CHAR_ARRAY_COPY:
+                    processCommentAsCharArrayCopy();
+                    break;
+                case STATE_COMMENT_AS_STRING:
+                    processComment(readContentString());
+                    break;
+                case STATE_PROCESSING_INSTRUCTION:
+                    processProcessingInstruction(readStructureString(), readStructureString());
+                    break;
+                default:
+                    throw reportFatalError("Illegal state for DIIs: "+item);
+            }
+        }
+
+        if(!_fragmentMode)
+            _contentHandler.endDocument();
+    }
+
+    private void processCommentAsCharArraySmall() throws SAXException {
+        final int length = readStructure();
+        final int start = readContentCharactersBuffer(length);
+        processComment(_contentCharactersBuffer, start, length);
+    }
+
+    /**
+     * Report a fatal error and abort.
+     *
+     * This is necessary to follow the SAX semantics of error handling.
+     */
+    private SAXParseException reportFatalError(String msg) throws SAXException {
+        SAXParseException spe = new SAXParseException(msg, null);
+        if(_errorHandler!=null)
+            _errorHandler.fatalError(spe);
+        return spe;
+    }
+
+    private void processDocument() throws SAXException {
+        while(true) {
+            int item = readEiiState();
+            switch(item) {
+                case STATE_ELEMENT_U_LN_QN:
+                    processElement(readStructureString(), readStructureString(), readStructureString());
+                    break;
+                case STATE_ELEMENT_P_U_LN:
+                {
+                    final String prefix = readStructureString();
+                    final String uri = readStructureString();
+                    final String localName = readStructureString();
+                    processElement(uri, localName, getQName(prefix, localName));
+                    break;
+                }
+                case STATE_ELEMENT_U_LN: {
+                    final String uri = readStructureString();
+                    final String localName = readStructureString();
+                    processElement(uri, localName, localName);
+                    break;
+                }
+                case STATE_ELEMENT_LN:
+                {
+                    final String localName = readStructureString();
+                    processElement("", localName, localName);
+                    break;
+                }
+                case STATE_COMMENT_AS_CHAR_ARRAY_SMALL:
+                    processCommentAsCharArraySmall();
+                    break;
+                case STATE_COMMENT_AS_CHAR_ARRAY_MEDIUM:
+                    processCommentAsCharArrayMedium();
+                    break;
+                case STATE_COMMENT_AS_CHAR_ARRAY_COPY:
+                    processCommentAsCharArrayCopy();
+                    break;
+                case STATE_COMMENT_AS_STRING:
+                    processComment(readContentString());
+                    break;
+                case STATE_PROCESSING_INSTRUCTION:
+                    processProcessingInstruction(readStructureString(), readStructureString());
+                    break;
+                case STATE_END:
+                    return;
+                default:
+                    throw reportFatalError("Illegal state for child of DII: "+item);
+            }
+        }
+    }
+
+    protected void processElement(String uri, String localName, String qName) throws SAXException {
+        boolean hasAttributes = false;
+        boolean hasNamespaceAttributes = false;
+        int item = peekStructure();
+        if ((item & TYPE_MASK) == T_NAMESPACE_ATTRIBUTE) {
+            hasNamespaceAttributes = true;
+            item = processNamespaceAttributes(item);
+        }
+        if ((item & TYPE_MASK) == T_ATTRIBUTE) {
+            hasAttributes = true;
+            processAttributes(item);
+        }
+
+        _contentHandler.startElement(uri, localName, qName, _attributes);
+
+        if (hasAttributes) {
+            _attributes.clear();
+        }
+
+        do {
+            item = readEiiState();
+            switch(item) {
+                case STATE_ELEMENT_U_LN_QN:
+                    processElement(readStructureString(), readStructureString(), readStructureString());
+                    break;
+                case STATE_ELEMENT_P_U_LN:
+                {
+                    final String p = readStructureString();
+                    final String u = readStructureString();
+                    final String ln = readStructureString();
+                    processElement(u, ln, getQName(p, ln));
+                    break;
+                }
+                case STATE_ELEMENT_U_LN: {
+                    final String u = readStructureString();
+                    final String ln = readStructureString();
+                    processElement(u, ln, ln);
+                    break;
+                }
+                case STATE_ELEMENT_LN: {
+                    final String ln = readStructureString();
+                    processElement("", ln, ln);
+                    break;
+                }
+                case STATE_TEXT_AS_CHAR_ARRAY_SMALL:
+                {
+                    final int length = readStructure();
+                    int start = readContentCharactersBuffer(length);
+                    _contentHandler.characters(_contentCharactersBuffer, start, length);
+                    break;
+                }
+                case STATE_TEXT_AS_CHAR_ARRAY_MEDIUM:
+                {
+                    final int length = readStructure16();
+                    int start = readContentCharactersBuffer(length);
+                    _contentHandler.characters(_contentCharactersBuffer, start, length);
+                    break;
+                }
+                case STATE_TEXT_AS_CHAR_ARRAY_COPY:
+                {
+                    final char[] ch = readContentCharactersCopy();
+
+                    _contentHandler.characters(ch, 0, ch.length);
+                    break;
+                }
+                case STATE_TEXT_AS_STRING:
+                {
+                    final String s = readContentString();
+                    _contentHandler.characters(s.toCharArray(), 0, s.length());
+                    break;
+                }
+                case STATE_TEXT_AS_OBJECT:
+                {
+                    final CharSequence c = (CharSequence)readContentObject();
+                    final String s = c.toString();
+                    _contentHandler.characters(s.toCharArray(), 0, s.length());
+                    break;
+                }
+                case STATE_COMMENT_AS_CHAR_ARRAY_SMALL:
+                    processCommentAsCharArraySmall();
+                    break;
+                case STATE_COMMENT_AS_CHAR_ARRAY_MEDIUM:
+                    processCommentAsCharArrayMedium();
+                    break;
+                case STATE_COMMENT_AS_CHAR_ARRAY_COPY:
+                    processCommentAsCharArrayCopy();
+                    break;
+                case T_COMMENT_AS_STRING:
+                    processComment(readContentString());
+                    break;
+                case STATE_PROCESSING_INSTRUCTION:
+                    processProcessingInstruction(readStructureString(), readStructureString());
+                    break;
+                case STATE_END:
+                    break;
+                default:
+                    throw reportFatalError("Illegal state for child of EII: "+item);
+            }
+        } while(item != STATE_END);
+
+        _contentHandler.endElement(uri, localName, qName);
+
+        if (hasNamespaceAttributes) {
+            processEndPrefixMapping();
+        }
+    }
+
+    private void processCommentAsCharArrayCopy() throws SAXException {
+        final char[] ch = readContentCharactersCopy();
+        processComment(ch, 0, ch.length);
+    }
+
+    private void processCommentAsCharArrayMedium() throws SAXException {
+        final int length = readStructure16();
+        final int start = readContentCharactersBuffer(length);
+        processComment(_contentCharactersBuffer, start, length);
+    }
+
+    private void processEndPrefixMapping() throws SAXException {
+        final int end = _namespaceAttributesStack[--_namespaceAttributesStackIndex];
+        final int start = (_namespaceAttributesStackIndex > 0) ? _namespaceAttributesStack[_namespaceAttributesStackIndex] : 0;
+
+        for (int i = end - 1; i >= start; i--) {
+            _contentHandler.endPrefixMapping(_namespacePrefixes[i]);
+        }
+        _namespacePrefixesIndex = start;
+    }
+
+    private int processNamespaceAttributes(int item) throws SAXException {
+        do {
+            switch(_niiStateTable[item]) {
+                case STATE_NAMESPACE_ATTRIBUTE:
+                    // Undeclaration of default namespace
+                    processNamespaceAttribute("", "");
+                    break;
+                case STATE_NAMESPACE_ATTRIBUTE_P:
+                    // Undeclaration of namespace
+                    processNamespaceAttribute(readStructureString(), "");
+                    break;
+                case STATE_NAMESPACE_ATTRIBUTE_P_U:
+                    // Declaration with prefix
+                    processNamespaceAttribute(readStructureString(), readStructureString());
+                    break;
+                case STATE_NAMESPACE_ATTRIBUTE_U:
+                    // Default declaration
+                    processNamespaceAttribute("", readStructureString());
+                    break;
+                default:
+                    throw reportFatalError("Illegal state: "+item);
+            }
+            readStructure();
+
+            item = peekStructure();
+        } while((item & TYPE_MASK) == T_NAMESPACE_ATTRIBUTE);
+
+
+        cacheNamespacePrefixIndex();
+
+        return item;
+    }
+
+    private void processAttributes(int item) throws SAXException {
+        do {
+            switch(_aiiStateTable[item]) {
+                case STATE_ATTRIBUTE_U_LN_QN:
+                    _attributes.addAttributeWithQName(readStructureString(), readStructureString(), readStructureString(), readStructureString(), readContentString());
+                    break;
+                case STATE_ATTRIBUTE_P_U_LN:
+                {
+                    final String p = readStructureString();
+                    final String u = readStructureString();
+                    final String ln = readStructureString();
+                    _attributes.addAttributeWithQName(u, ln, getQName(p, ln), readStructureString(), readContentString());
+                    break;
+                }
+                case STATE_ATTRIBUTE_U_LN: {
+                    final String u = readStructureString();
+                    final String ln = readStructureString();
+                    _attributes.addAttributeWithQName(u, ln, ln, readStructureString(), readContentString());
+                    break;
+                }
+                case STATE_ATTRIBUTE_LN: {
+                    final String ln = readStructureString();
+                    _attributes.addAttributeWithQName("", ln, ln, readStructureString(), readContentString());
+                    break;
+                }
+                default:
+                    throw reportFatalError("Illegal state: "+item);
+            }
+            readStructure();
+
+            item = peekStructure();
+        } while((item & TYPE_MASK) == T_ATTRIBUTE);
+    }
+
+    private void processNamespaceAttribute(String prefix, String uri) throws SAXException {
+        _contentHandler.startPrefixMapping(prefix, uri);
+
+        if (_namespacePrefixesFeature) {
+            // Add the namespace delcaration as an attribute
+            if (prefix != "") {
+                _attributes.addAttributeWithQName(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, prefix,
+                        getQName(XMLConstants.XMLNS_ATTRIBUTE, prefix),
+                        "CDATA", uri);
+            } else {
+                _attributes.addAttributeWithQName(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, XMLConstants.XMLNS_ATTRIBUTE,
+                        XMLConstants.XMLNS_ATTRIBUTE,
+                        "CDATA", uri);
+            }
+        }
+
+        cacheNamespacePrefix(prefix);
+    }
+
+    private void cacheNamespacePrefix(String prefix) {
+        if (_namespacePrefixesIndex == _namespacePrefixes.length) {
+            final String[] namespaceAttributes = new String[_namespacePrefixesIndex * 3 / 2 + 1];
+            System.arraycopy(_namespacePrefixes, 0, namespaceAttributes, 0, _namespacePrefixesIndex);
+            _namespacePrefixes = namespaceAttributes;
+        }
+
+        _namespacePrefixes[_namespacePrefixesIndex++] = prefix;
+    }
+
+    private void cacheNamespacePrefixIndex() {
+        if (_namespaceAttributesStackIndex == _namespaceAttributesStack.length) {
+            final int[] namespaceAttributesStack = new int[_namespaceAttributesStackIndex * 3 /2 + 1];
+            System.arraycopy(_namespaceAttributesStack, 0, namespaceAttributesStack, 0, _namespaceAttributesStackIndex);
+            _namespaceAttributesStack = namespaceAttributesStack;
+        }
+
+        _namespaceAttributesStack[_namespaceAttributesStackIndex++] = _namespacePrefixesIndex;
+    }
+
+    private void processComment(String s)  throws SAXException {
+        processComment(s.toCharArray(), 0, s.length());
+    }
+
+    private void processComment(char[] ch, int start, int length) throws SAXException {
+        _lexicalHandler.comment(ch, start, length);
+    }
+
+    private void processProcessingInstruction(String target, String data) throws SAXException {
+        _contentHandler.processingInstruction(target, data);
+    }
+
+    private static final DefaultWithLexicalHandler DEFAULT_LEXICAL_HANDLER = new DefaultWithLexicalHandler();
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/NamespaceContexHelper.java b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/NamespaceContexHelper.java
new file mode 100644
index 00000000000..a903625e209
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/NamespaceContexHelper.java
@@ -0,0 +1,289 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.stream.buffer.stax;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import com.sun.xml.internal.org.jvnet.staxex.NamespaceContextEx;
+
+/**
+ * A helper class for managing the declaration of namespaces.
+ * 
    
+ * A namespace is declared on a namespace context.
+ * Namespace contexts are pushed on and popped off the namespace context stack.
+ * 
    
+ * A declared namespace will be in scope iff the context that it was declared on
+ * has not been popped off the stack.
+ * 
    
+ * When instantiated the namespace stack consists of the root namespace context,
+ * which contains, by default, the "xml" and "xmlns" declarations.
+ * Namespaces may be declarations may be declared on the root context.
+ * The root context cannot be popped but can be reset to contain just the
+ * "xml" and "xmlns" declarations.
+ * 
    
+ * Implementation note: determining the prefix from a namespace URI
+ * (or vice versa) is efficient when there are few namespace
+ * declarations i.e. what is considered to be the case for namespace
+ * declarations in 'average' XML documents. The look up of a namespace URI
+ * given a prefix is performed in O(n) time. The look up of a prefix given
+ * a namespace URI is performed in O(2n) time.
+ * 
    
+ * The implementation does not scale when there are many namespace
+ * declarations. TODO: Use a hash map when there are many namespace
+ * declarations.
+ *
+ * @author Paul.Sandoz@Sun.Com
+ */
+final public class NamespaceContexHelper implements NamespaceContextEx {
+    private static int DEFAULT_SIZE = 8;
+
+    // The prefixes of the namespace declarations
+    private String[] prefixes = new String[DEFAULT_SIZE];
+    // The URIs of the namespace declarations
+    private String[] namespaceURIs = new String[DEFAULT_SIZE];
+    // Current position to store the next namespace declaration
+    private int namespacePosition;
+
+    // The namespace contexts
+    private int[] contexts = new int[DEFAULT_SIZE];
+    // Current position to store the next namespace context
+    private int contextPosition;
+
+    // The current namespace context
+    private int currentContext;
+
+    /**
+     * Create a new NamespaceContexHelper.
+     *
+     */
+    public NamespaceContexHelper() {
+        // The default namespace declarations that are always in scope
+        prefixes[0] = "xml";
+        namespaceURIs[0] = "http://www.w3.org/XML/1998/namespace";
+        prefixes[1] = "xmlns";
+        namespaceURIs[1] = "http://www.w3.org/2000/xmlns/";
+
+        currentContext = namespacePosition = 2;
+    }
+
+
+    // NamespaceContext interface
+
+    public String getNamespaceURI(String prefix) {
+        if (prefix == null) throw new IllegalArgumentException();
+
+        prefix = prefix.intern();
+
+        for (int i = namespacePosition - 1; i >= 0; i--) {
+            final String declaredPrefix = prefixes[i];
+            if (declaredPrefix == prefix) {
+                return namespaceURIs[i];
+            }
+        }
+
+        return "";
+    }
+
+    public String getPrefix(String namespaceURI) {
+        if (namespaceURI == null) throw new IllegalArgumentException();
+
+        for (int i = namespacePosition - 1; i >= 0; i--) {
+            final String declaredNamespaceURI = namespaceURIs[i];
+            if (declaredNamespaceURI == namespaceURI || declaredNamespaceURI.equals(namespaceURI)) {
+                final String declaredPrefix = prefixes[i];
+
+                // Check if prefix is out of scope
+                for (++i; i < namespacePosition; i++)
+                    if (declaredPrefix == prefixes[i])
+                        return null;
+
+                return declaredPrefix;
+            }
+        }
+
+        return null;
+    }
+
+    public Iterator getPrefixes(String namespaceURI) {
+        if (namespaceURI == null) throw new IllegalArgumentException();
+
+        List l = new ArrayList();
+
+        NAMESPACE_LOOP: for (int i = namespacePosition - 1; i >= 0; i--) {
+            final String declaredNamespaceURI = namespaceURIs[i];
+            if (declaredNamespaceURI == namespaceURI || declaredNamespaceURI.equals(namespaceURI)) {
+                final String declaredPrefix = prefixes[i];
+
+                // Check if prefix is out of scope
+                for (int j = i + 1; j < namespacePosition; j++)
+                    if (declaredPrefix == prefixes[j])
+                        continue NAMESPACE_LOOP;
+
+                l.add(declaredPrefix);
+            }
+        }
+
+        return l.iterator();
+    }
+
+    // NamespaceContextEx interface
+
+    public Iterator iterator() {
+        if (namespacePosition == 2)
+            return Collections.EMPTY_LIST.iterator();
+
+        final List namespaces =
+                new ArrayList(namespacePosition);
+
+        NAMESPACE_LOOP: for (int i = namespacePosition - 1; i >= 2; i--) {
+            final String declaredPrefix = prefixes[i];
+
+            // Check if prefix is out of scope
+            for (int j = i + 1; j < namespacePosition; j++) {
+                if (declaredPrefix == prefixes[j])
+                    continue NAMESPACE_LOOP;
+
+                namespaces.add(new NamespaceBindingImpl(i));
+            }
+        }
+
+        return namespaces.iterator();
+    }
+
+    final private class NamespaceBindingImpl implements NamespaceContextEx.Binding {
+        int index;
+
+        NamespaceBindingImpl(int index) {
+            this.index = index;
+        }
+
+        public String getPrefix() {
+            return prefixes[index];
+        }
+
+        public String getNamespaceURI() {
+            return namespaceURIs[index];
+        }
+    }
+
+    /**
+     * Declare a default namespace.
+     * 
    
+     * @param namespaceURI the namespace URI to declare, may be null.
+     */
+    public void declareDefaultNamespace(String namespaceURI) {
+        declareNamespace("", namespaceURI);
+    }
+
+    /**
+     * Declare a namespace.
+     * 
    
+     * The namespace will be declared on the current namespace context.
+     * 
    
+     * The namespace can be removed by popping the current namespace
+     * context, or, if the declaration occured in the root context, by
+     * reseting the namespace context.
+     * 
    
+     * A default namespace can be declared by passing "" as
+     * the value of the prefix parameter.
+     * A namespace may be undeclared by passing null as the
+     * value of the namespaceURI parameter.
+     * 
    
+     * @param prefix the namespace prefix to declare, may not be null.
+     * @param namespaceURI the namespace URI to declare, may be null.
+     * @throws IllegalArgumentException, if the prefix is null.
+     */
+    public void declareNamespace(String prefix, String namespaceURI) {
+        if (prefix == null) throw new IllegalArgumentException();
+
+        prefix = prefix.intern();
+        // Ignore the "xml" or "xmlns" declarations
+        if (prefix == "xml" || prefix == "xmlns")
+            return;
+
+        // Check for undeclaration
+        if (namespaceURI != null)
+            namespaceURI = namespaceURI.intern();
+
+        if (namespacePosition == namespaceURIs.length)
+            resizeNamespaces();
+
+        // Add new declaration
+        prefixes[namespacePosition] = prefix;
+        namespaceURIs[namespacePosition++] = namespaceURI;
+    }
+
+    private void resizeNamespaces() {
+        final int newLength = namespaceURIs.length * 3 / 2 + 1;
+
+        String[] newPrefixes = new String[newLength];
+        System.arraycopy(prefixes, 0, newPrefixes, 0, prefixes.length);
+        prefixes = newPrefixes;
+
+        String[] newNamespaceURIs = new String[newLength];
+        System.arraycopy(namespaceURIs, 0, newNamespaceURIs, 0, namespaceURIs.length);
+        namespaceURIs = newNamespaceURIs;
+    }
+
+    /**
+     * Push a namespace context on the stack.
+     */
+    public void pushContext() {
+        if (contextPosition == contexts.length)
+            resizeContexts();
+
+        contexts[contextPosition++] = currentContext = namespacePosition;
+    }
+
+    private void resizeContexts() {
+        int[] newContexts = new int[contexts.length * 3 / 2 + 1];
+        System.arraycopy(contexts, 0, newContexts, 0, contexts.length);
+        contexts = newContexts;
+    }
+
+    /**
+     * Pop the namespace context off the stack.
+     * 
    
+     * Namespaces declared within the context (to be popped)
+     * will be removed and no longer be in scope.
+     */
+    public void popContext() {
+        if (contextPosition > 0) {
+            namespacePosition = currentContext = contexts[--contextPosition];
+        }
+    }
+
+    /**
+     * Reset namespace contexts.
+     * 
    
+     * Pop all namespace contexts and reset the root context.
+     */
+    public void resetContexts() {
+        currentContext = namespacePosition = 2;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamBufferCreator.java b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamBufferCreator.java
new file mode 100644
index 00000000000..88c8fd9e857
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamBufferCreator.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.stream.buffer.stax;
+
+import com.sun.xml.internal.stream.buffer.AbstractCreator;
+
+/**
+ * {@link AbstractCreator} with additional convenience code.
+ *
+ * @author Paul Sandoz
+ * @author Venu
+ * @author Kohsuke Kawaguchi
+ */
+abstract class StreamBufferCreator extends AbstractCreator {
+    protected void storeQualifiedName(int item, String prefix, String uri, String localName) {
+        if (uri != null && uri.length() > 0) {
+            if (prefix != null && prefix.length() > 0) {
+                item |= FLAG_PREFIX;
+                storeStructureString(prefix);
+            }
+
+            item |= FLAG_URI;
+            storeStructureString(uri);
+        }
+
+        storeStructureString(localName);
+
+        storeStructure(item);
+    }
+
+    protected final void storeNamespaceAttribute(String prefix, String uri) {
+        int item = T_NAMESPACE_ATTRIBUTE;
+
+        if (prefix != null && prefix.length() > 0) {
+            item |= FLAG_PREFIX;
+            storeStructureString(prefix);
+        }
+
+        if (uri != null && uri.length() > 0) {
+            item |= FLAG_URI;
+            storeStructureString(uri);
+        }
+
+        storeStructure(item);
+    }
+
+    protected final void storeAttribute(String prefix, String uri, String localName, String type, String value) {
+        storeQualifiedName(T_ATTRIBUTE_LN, prefix, uri, localName);
+
+        storeStructureString(type);
+        storeContentString(value);
+    }
+
+    protected final void storeProcessingInstruction(String target, String data) {
+        storeStructure(T_PROCESSING_INSTRUCTION);
+        storeStructureString(target);
+        storeStructureString(data);
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferCreator.java b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferCreator.java
new file mode 100644
index 00000000000..7f07e4bb22c
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferCreator.java
@@ -0,0 +1,339 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.stream.buffer.stax;
+
+import com.sun.xml.internal.stream.buffer.MutableXMLStreamBuffer;
+import com.sun.xml.internal.org.jvnet.staxex.Base64Data;
+import com.sun.xml.internal.org.jvnet.staxex.XMLStreamReaderEx;
+
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Create a buffer using an {@link XMLStreamReader}.
+ * 
    
+ * TODO: Implement the marking the stream on the element when an ID
+ * attribute on the element is defined
+ */
+public class StreamReaderBufferCreator extends StreamBufferCreator {
+    private int _eventType;
+    private boolean _storeInScopeNamespacesOnElementFragment;
+    private Map _inScopePrefixes;
+
+    /**
+     * Create a stream reader buffer creator.
+     * 
    
+     * A stream buffer will be created for storing the infoset
+     * from a stream reader.
+     */
+    public StreamReaderBufferCreator() {
+    }
+
+    /**
+     * Create a stream reader buffer creator using a mutable stream buffer.
+     * 
    
+     * @param buffer the mutable stream buffer.
+     */
+    public StreamReaderBufferCreator(MutableXMLStreamBuffer buffer) {
+        setBuffer(buffer);
+    }
+
+    /**
+     * Create the buffer from a stream reader.
+     * 
    
+     * The stream reader must be positioned at the start of the document
+     * or the start of an element.
+     * 
    
+     * If the stream is positioned at the start of the document then the
+     * whole document is stored and after storing the stream will be positioned
+     * at the end of the document.
+     * 
    
+     * If the stream is positioned at the start of an element then the
+     * element and all its children will be stored and after storing the stream
+     * will be positioned at the next event after the end of the element.
+     * 
    
+     * @return the mutable stream buffer.
+     * @throws XMLStreamException if the stream reader is not positioned at
+     *         the start of the document or at an element.
+     */
+    public MutableXMLStreamBuffer create(XMLStreamReader reader) throws XMLStreamException {
+        if (_buffer == null) {
+            createBuffer();
+        }
+        store(reader);
+
+        return getXMLStreamBuffer();
+    }
+
+    /**
+     * Creates the buffer from a stream reader that is an element fragment.
+     * 
    
+     * The stream reader will be moved to the position of the next start of
+     * an element if the stream reader is not already positioned at the start
+     * of an element.
+     * 
    
+     * The element and all its children will be stored and after storing the stream
+     * will be positioned at the next event after the end of the element.
+     * 
    
+     * @param storeInScopeNamespaces true if in-scope namespaces of the element
+     *        fragment should be stored.
+     * @return the mutable stream buffer.
+     * @throws XMLStreamException if the stream reader cannot be positioned at
+     *         the start of an element.
+     */
+    public MutableXMLStreamBuffer createElementFragment(XMLStreamReader reader,
+            boolean storeInScopeNamespaces) throws XMLStreamException {
+        if (_buffer == null) {
+            createBuffer();
+        }
+
+        if (!reader.hasNext()) {
+            return _buffer;
+        }
+
+        _storeInScopeNamespacesOnElementFragment = storeInScopeNamespaces;
+
+        _eventType = reader.getEventType();
+        if (_eventType != XMLStreamReader.START_ELEMENT) {
+            do {
+                _eventType = reader.next();
+            } while(_eventType != XMLStreamReader.START_ELEMENT && _eventType != XMLStreamReader.END_DOCUMENT);
+        }
+
+        if (storeInScopeNamespaces) {
+            _inScopePrefixes = new HashMap();
+        }
+
+        storeElementAndChildren(reader);
+
+        return getXMLStreamBuffer();
+    }
+
+    private void store(XMLStreamReader reader) throws XMLStreamException {
+        if (!reader.hasNext()) {
+            return;
+        }
+
+        _eventType = reader.getEventType();
+        switch (_eventType) {
+            case XMLStreamReader.START_DOCUMENT:
+                storeDocumentAndChildren(reader);
+                break;
+            case XMLStreamReader.START_ELEMENT:
+                storeElementAndChildren(reader);
+                break;
+            default:
+                throw new XMLStreamException("XMLStreamReader not positioned at a document or element");
+        }
+
+        increaseTreeCount();
+    }
+
+    private void storeDocumentAndChildren(XMLStreamReader reader) throws XMLStreamException {
+        storeStructure(T_DOCUMENT);
+
+        _eventType = reader.next();
+        while (_eventType != XMLStreamReader.END_DOCUMENT) {
+            switch (_eventType) {
+                case XMLStreamReader.START_ELEMENT:
+                    storeElementAndChildren(reader);
+                    continue;
+                case XMLStreamReader.COMMENT:
+                    storeComment(reader);
+                    break;
+                case XMLStreamReader.PROCESSING_INSTRUCTION:
+                    storeProcessingInstruction(reader);
+                    break;
+            }
+            _eventType = reader.next();
+        }
+
+        storeStructure(T_END);
+    }
+
+    private void storeElementAndChildren(XMLStreamReader reader) throws XMLStreamException {
+        if (reader instanceof XMLStreamReaderEx) {
+            storeElementAndChildrenEx((XMLStreamReaderEx)reader);
+        } else {
+            storeElementAndChildrenNoEx(reader);
+        }
+    }
+
+    private void storeElementAndChildrenEx(XMLStreamReaderEx reader) throws XMLStreamException {
+        int depth = 1;
+        if (_storeInScopeNamespacesOnElementFragment) {
+            storeElementWithInScopeNamespaces(reader);
+        } else {
+            storeElement(reader);
+        }
+
+        while(depth > 0) {
+            _eventType = reader.next();
+            switch (_eventType) {
+                case XMLStreamReader.START_ELEMENT:
+                    depth++;
+                    storeElement(reader);
+                    break;
+                case XMLStreamReader.END_ELEMENT:
+                    depth--;
+                    storeStructure(T_END);
+                    break;
+                case XMLStreamReader.NAMESPACE:
+                    storeNamespaceAttributes(reader);
+                    break;
+                case XMLStreamReader.ATTRIBUTE:
+                    storeAttributes(reader);
+                    break;
+                case XMLStreamReader.SPACE:
+                case XMLStreamReader.CHARACTERS:
+                case XMLStreamReader.CDATA: {
+                    CharSequence c = reader.getPCDATA();
+                    if (c instanceof Base64Data) {
+                        storeStructure(T_TEXT_AS_OBJECT);
+                        storeContentObject(((Base64Data)c).clone());
+                    } else {
+                        storeContentCharacters(T_TEXT_AS_CHAR_ARRAY,
+                                reader.getTextCharacters(), reader.getTextStart(),
+                                reader.getTextLength());
+                    }
+                    break;
+                }
+                case XMLStreamReader.COMMENT:
+                    storeComment(reader);
+                    break;
+                case XMLStreamReader.PROCESSING_INSTRUCTION:
+                    storeProcessingInstruction(reader);
+                    break;
+            }
+        }
+
+        /*
+         * Move to next item after the end of the element
+         * that has been stored
+         */
+        _eventType = reader.next();
+    }
+
+    private void storeElementAndChildrenNoEx(XMLStreamReader reader) throws XMLStreamException {
+        int depth = 1;
+        if (_storeInScopeNamespacesOnElementFragment) {
+            storeElementWithInScopeNamespaces(reader);
+        } else {
+            storeElement(reader);
+        }
+
+        while(depth > 0) {
+            _eventType = reader.next();
+            switch (_eventType) {
+                case XMLStreamReader.START_ELEMENT:
+                    depth++;
+                    storeElement(reader);
+                    break;
+                case XMLStreamReader.END_ELEMENT:
+                    depth--;
+                    storeStructure(T_END);
+                    break;
+                case XMLStreamReader.NAMESPACE:
+                    storeNamespaceAttributes(reader);
+                    break;
+                case XMLStreamReader.ATTRIBUTE:
+                    storeAttributes(reader);
+                    break;
+                case XMLStreamReader.SPACE:
+                case XMLStreamReader.CHARACTERS:
+                case XMLStreamReader.CDATA: {
+                    storeContentCharacters(T_TEXT_AS_CHAR_ARRAY,
+                            reader.getTextCharacters(), reader.getTextStart(),
+                            reader.getTextLength());
+                    break;
+                }
+                case XMLStreamReader.COMMENT:
+                    storeComment(reader);
+                    break;
+                case XMLStreamReader.PROCESSING_INSTRUCTION:
+                    storeProcessingInstruction(reader);
+                    break;
+            }
+        }
+
+        /*
+         * Move to next item after the end of the element
+         * that has been stored
+         */
+        _eventType = reader.next();
+    }
+
+    private void storeElementWithInScopeNamespaces(XMLStreamReader reader) {
+        storeQualifiedName(T_ELEMENT_LN,
+                reader.getPrefix(), reader.getNamespaceURI(), reader.getLocalName());
+
+        if (reader.getNamespaceCount() > 0) {
+            storeNamespaceAttributes(reader);
+        }
+
+        if (reader.getAttributeCount() > 0) {
+            storeAttributes(reader);
+        }
+    }
+
+    private void storeElement(XMLStreamReader reader) {
+        storeQualifiedName(T_ELEMENT_LN,
+                reader.getPrefix(), reader.getNamespaceURI(), reader.getLocalName());
+
+        if (reader.getNamespaceCount() > 0) {
+            storeNamespaceAttributes(reader);
+        }
+
+        if (reader.getAttributeCount() > 0) {
+            storeAttributes(reader);
+        }
+    }
+
+    private void storeNamespaceAttributes(XMLStreamReader reader) {
+        int count = reader.getNamespaceCount();
+        for (int i = 0; i < count; i++) {
+            storeNamespaceAttribute(reader.getNamespacePrefix(i), reader.getNamespaceURI(i));
+        }
+    }
+
+    private void storeAttributes(XMLStreamReader reader) {
+        int count = reader.getAttributeCount();
+        for (int i = 0; i < count; i++) {
+            storeAttribute(reader.getAttributePrefix(i), reader.getAttributeNamespace(i), reader.getAttributeLocalName(i),
+                    reader.getAttributeType(i), reader.getAttributeValue(i));
+        }
+    }
+
+    private void storeComment(XMLStreamReader reader) {
+        storeContentCharacters(T_COMMENT_AS_CHAR_ARRAY,
+                reader.getTextCharacters(), reader.getTextStart(), reader.getTextLength());
+    }
+
+    private void storeProcessingInstruction(XMLStreamReader reader) {
+        storeProcessingInstruction(reader.getPITarget(), reader.getPIData());
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferProcessor.java b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferProcessor.java
new file mode 100644
index 00000000000..d1e5bc69ded
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferProcessor.java
@@ -0,0 +1,1081 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.stream.buffer.stax;
+
+import com.sun.xml.internal.stream.buffer.AbstractProcessor;
+import com.sun.xml.internal.stream.buffer.AttributesHolder;
+import com.sun.xml.internal.stream.buffer.XMLStreamBuffer;
+import com.sun.xml.internal.stream.buffer.XMLStreamBufferMark;
+import com.sun.xml.internal.org.jvnet.staxex.NamespaceContextEx;
+import com.sun.xml.internal.org.jvnet.staxex.XMLStreamReaderEx;
+
+import javax.xml.XMLConstants;
+import javax.xml.namespace.QName;
+import javax.xml.stream.Location;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NoSuchElementException;
+
+/**
+ * A processor of a {@link XMLStreamBuffer} that reads the XML infoset as
+ * {@link XMLStreamReader}.
+ *
+ * 
    
+ * Because of {@link XMLStreamReader} design, this processor always produce
+ * a full document infoset, even if the buffer just contains a fragment.
+ *
+ * 
    
+ * When {@link XMLStreamBuffer} contains a multiple tree (AKA "forest"),
+ * {@link XMLStreamReader} will behave as if there are multiple root elements
+ * (so you'll see {@link #START_ELEMENT} event where you'd normally expect
+ * {@link #END_DOCUMENT}.)
+ *
+ * @author Paul.Sandoz@Sun.Com
+ * @author K.Venugopal@sun.com
+ */
+public class StreamReaderBufferProcessor extends AbstractProcessor implements XMLStreamReaderEx {
+    private static final int CACHE_SIZE = 16;
+
+    // Stack to hold element and namespace declaration information
+    protected ElementStackEntry[] _stack = new ElementStackEntry[CACHE_SIZE];
+    /** The top-most active entry of the {@link #_stack}. */
+    protected ElementStackEntry _stackTop;
+    /** The element depth that we are in. Used to determine when we are done with a tree. */
+    protected int _depth;
+
+    // Arrays to hold all namespace declarations
+    /**
+     * Namespace prefixes. Can be empty but not null.
+     */
+    protected String[] _namespaceAIIsPrefix = new String[CACHE_SIZE];
+    protected String[] _namespaceAIIsNamespaceName = new String[CACHE_SIZE];
+    protected int _namespaceAIIsEnd;
+
+    // Internal namespace context implementation
+    protected InternalNamespaceContext _nsCtx = new InternalNamespaceContext();
+
+    // The current event type
+    protected int _eventType;
+
+    /**
+     * Holder of the attributes.
+     *
+     * Be careful that this follows the SAX convention of using "" instead of null.
+     */
+    protected AttributesHolder _attributeCache;
+
+    // Characters as a CharSequence
+    protected CharSequence _charSequence;
+
+    // Characters as a char array with offset and length
+    protected char[] _characters;
+    protected int _textOffset;
+    protected int _textLen;
+
+    protected String _piTarget;
+    protected String _piData;
+
+    //
+    // Represents the parser state wrt the end of parsing.
+    //
+    /**
+     * The parser is in the middle of parsing a document,
+     * with no end in sight.
+     */
+    private static final int PARSING = 1;
+    /**
+     * The parser has already reported the {@link #END_ELEMENT},
+     * and we are parsing a fragment. We'll report {@link #END_DOCUMENT}
+     * next and be done.
+     */
+    private static final int PENDING_END_DOCUMENT = 2;
+    /**
+     * The parser has reported the {@link #END_DOCUMENT} event,
+     * so we are really done parsing.
+     */
+    private static final int COMPLETED = 3;
+
+    /**
+     * True if processing is complete.
+     */
+    private int _completionState;
+
+    public StreamReaderBufferProcessor() {
+        for (int i=0; i < _stack.length; i++){
+            _stack[i] = new ElementStackEntry();
+        }
+
+        _attributeCache = new AttributesHolder();
+    }
+
+    public StreamReaderBufferProcessor(XMLStreamBuffer buffer) throws XMLStreamException {
+        this();
+        setXMLStreamBuffer(buffer);
+    }
+
+    public void setXMLStreamBuffer(XMLStreamBuffer buffer) throws XMLStreamException {
+        setBuffer(buffer,buffer.isFragment());
+
+        _completionState = PARSING;
+        _namespaceAIIsEnd = 0;
+        _characters = null;
+        _charSequence = null;
+        _eventType = START_DOCUMENT;
+    }
+
+    /**
+     * Does {@link #nextTag()} and if the parser moved to a new start tag,
+     * returns a {@link XMLStreamBufferMark} that captures the infoset starting
+     * from the newly discovered element.
+     *
+     * 
    
+     * (Ideally we should have a method that works against the current position,
+     * but the way the data structure is read makes this somewhat difficult.)
+     *
+     * This creates a new {@link XMLStreamBufferMark} that shares the underlying
+     * data storage, thus it's fairly efficient.
+     */
+    public XMLStreamBuffer nextTagAndMark() throws XMLStreamException {
+        while (true) {
+            int s = peekStructure();
+            if((s &TYPE_MASK)==T_ELEMENT) {
+                // next is start element.
+                Map inscope = new HashMap(_namespaceAIIsEnd);
+
+                for (int i=0 ; i<_namespaceAIIsEnd; i++)
+                    inscope.put(_namespaceAIIsPrefix[i],_namespaceAIIsNamespaceName[i]);
+
+                XMLStreamBufferMark mark = new XMLStreamBufferMark(inscope, this);
+                next();
+                return mark;
+            }
+
+            if(next()==END_ELEMENT)
+                return null;
+        }
+    }
+
+    public Object getProperty(String name) {
+        return null;
+    }
+
+    public int next() throws XMLStreamException {
+        switch(_completionState) {
+            case COMPLETED:
+                throw new XMLStreamException("Invalid State");
+            case PENDING_END_DOCUMENT:
+                _namespaceAIIsEnd = 0;
+                _completionState = COMPLETED;
+                return _eventType = END_DOCUMENT;
+        }
+
+        // Pop the stack of elements
+        // This is a post-processing operation
+        // The stack of the element should be poppoed after
+        // the END_ELEMENT event is returned so that the correct element name
+        // and namespace scope is returned
+        switch(_eventType) {
+            case END_ELEMENT:
+                if (_depth > 1) {
+                    _depth--;
+                    // _depth index is always set to the next free stack entry
+                    // to push
+                    popElementStack(_depth);
+                } else if (_depth == 1) {
+                    _depth--;
+                }
+        }
+
+        _characters = null;
+        _charSequence = null;
+        while(true) {// loop only if we read STATE_DOCUMENT
+            switch(readEiiState()) {
+                case STATE_DOCUMENT:
+                    // we'll always produce a full document, and we've already report START_DOCUMENT event.
+                    // so simply skil this
+                    continue;
+                case STATE_ELEMENT_U_LN_QN: {
+                    final String uri = readStructureString();
+                    final String localName = readStructureString();
+                    final String prefix = getPrefixFromQName(readStructureString());
+
+                    processElement(prefix, uri, localName);
+                    return _eventType = START_ELEMENT;
+                }
+                case STATE_ELEMENT_P_U_LN:
+                    processElement(readStructureString(), readStructureString(), readStructureString());
+                    return _eventType = START_ELEMENT;
+                case STATE_ELEMENT_U_LN:
+                    processElement(null, readStructureString(), readStructureString());
+                    return _eventType = START_ELEMENT;
+                case STATE_ELEMENT_LN:
+                    processElement(null, null, readStructureString());
+                    return _eventType = START_ELEMENT;
+                case STATE_TEXT_AS_CHAR_ARRAY_SMALL:
+                    _textLen = readStructure();
+                    _textOffset = readContentCharactersBuffer(_textLen);
+                    _characters = _contentCharactersBuffer;
+
+                    return _eventType = CHARACTERS;
+                case STATE_TEXT_AS_CHAR_ARRAY_MEDIUM:
+                    _textLen = readStructure16();
+                    _textOffset = readContentCharactersBuffer(_textLen);
+                    _characters = _contentCharactersBuffer;
+
+                    return _eventType = CHARACTERS;
+                case STATE_TEXT_AS_CHAR_ARRAY_COPY:
+                    _characters = readContentCharactersCopy();
+                    _textLen = _characters.length;
+                    _textOffset = 0;
+
+                    return _eventType = CHARACTERS;
+                case STATE_TEXT_AS_STRING:
+                    _eventType = CHARACTERS;
+                    _charSequence = readContentString();
+
+                    return _eventType = CHARACTERS;
+                case STATE_TEXT_AS_OBJECT:
+                    _eventType = CHARACTERS;
+                    _charSequence = (CharSequence)readContentObject();
+
+                    return _eventType = CHARACTERS;
+                case STATE_COMMENT_AS_CHAR_ARRAY_SMALL:
+                    _textLen = readStructure();
+                    _textOffset = readContentCharactersBuffer(_textLen);
+                    _characters = _contentCharactersBuffer;
+
+                    return _eventType = COMMENT;
+                case STATE_COMMENT_AS_CHAR_ARRAY_MEDIUM:
+                    _textLen = readStructure16();
+                    _textOffset = readContentCharactersBuffer(_textLen);
+                    _characters = _contentCharactersBuffer;
+
+                    return _eventType = COMMENT;
+                case STATE_COMMENT_AS_CHAR_ARRAY_COPY:
+                    _characters = readContentCharactersCopy();
+                    _textLen = _characters.length;
+                    _textOffset = 0;
+
+                    return _eventType = COMMENT;
+                case STATE_COMMENT_AS_STRING:
+                    _charSequence = readContentString();
+
+                    return _eventType = COMMENT;
+                case STATE_PROCESSING_INSTRUCTION:
+                    _piTarget = readStructureString();
+                    _piData = readStructureString();
+
+                    return _eventType = PROCESSING_INSTRUCTION;
+                case STATE_END:
+                    if (_depth > 1) {
+                        // normal case
+                        return _eventType = END_ELEMENT;
+                    } else if (_depth == 1) {
+                        // this is the last end element for the current tree.
+                        if (_fragmentMode) {
+                            if(--_treeCount==0) // is this the last tree in the forest?
+                                _completionState = PENDING_END_DOCUMENT;
+                        }
+                        return _eventType = END_ELEMENT;
+                    } else {
+                        // this only happens when we are processing a full document
+                        // and we hit the "end of document" marker
+                        _namespaceAIIsEnd = 0;
+                        _completionState = COMPLETED;
+                        return _eventType = END_DOCUMENT;
+                    }
+                default:
+                    throw new XMLStreamException("Invalid State");
+            }
+            // this should be unreachable
+        }
+    }
+
+    public final void require(int type, String namespaceURI, String localName) throws XMLStreamException {
+        if( type != _eventType) {
+            throw new XMLStreamException("");
+        }
+        if( namespaceURI != null && !namespaceURI.equals(getNamespaceURI())) {
+            throw new XMLStreamException("");
+        }
+        if(localName != null && !localName.equals(getLocalName())) {
+            throw new XMLStreamException("");
+        }
+    }
+
+    public final String getElementTextTrim() throws XMLStreamException {
+        // TODO getElementText* methods more efficiently
+        return getElementText().trim();
+    }
+
+    public final String getElementText() throws XMLStreamException {
+        if(_eventType != START_ELEMENT) {
+            throw new XMLStreamException("");
+        }
+
+        next();
+        return getElementText(true);
+    }
+
+    public final String getElementText(boolean startElementRead) throws XMLStreamException {
+        if (!startElementRead) {
+            throw new XMLStreamException("");
+        }
+
+        int eventType = getEventType();
+        StringBuffer content = new StringBuffer();
+        while(eventType != END_ELEMENT ) {
+            if(eventType == CHARACTERS
+                    || eventType == CDATA
+                    || eventType == SPACE
+                    || eventType == ENTITY_REFERENCE) {
+                content.append(getText());
+            } else if(eventType == PROCESSING_INSTRUCTION
+                    || eventType == COMMENT) {
+                // skipping
+            } else if(eventType == END_DOCUMENT) {
+                throw new XMLStreamException("");
+            } else if(eventType == START_ELEMENT) {
+                throw new XMLStreamException("");
+            } else {
+                throw new XMLStreamException("");
+            }
+            eventType = next();
+        }
+        return content.toString();
+    }
+
+    public final int nextTag() throws XMLStreamException {
+        next();
+        return nextTag(true);
+    }
+
+    public final int nextTag(boolean currentTagRead) throws XMLStreamException {
+        int eventType = getEventType();
+        if (!currentTagRead) {
+            eventType = next();
+        }
+        while((eventType == CHARACTERS && isWhiteSpace()) // skip whitespace
+        || (eventType == CDATA && isWhiteSpace())
+        || eventType == SPACE
+        || eventType == PROCESSING_INSTRUCTION
+        || eventType == COMMENT) {
+            eventType = next();
+        }
+        if (eventType != START_ELEMENT && eventType != END_ELEMENT) {
+            throw new XMLStreamException("");
+        }
+        return eventType;
+    }
+
+    public final boolean hasNext() {
+        return (_eventType != END_DOCUMENT);
+    }
+
+    public void close() throws XMLStreamException {
+    }
+
+    public final boolean isStartElement() {
+        return (_eventType == START_ELEMENT);
+    }
+
+    public final boolean isEndElement() {
+        return (_eventType == END_ELEMENT);
+    }
+
+    public final boolean isCharacters() {
+        return (_eventType == CHARACTERS);
+    }
+
+    public final boolean isWhiteSpace() {
+        if(isCharacters() || (_eventType == CDATA)){
+            char [] ch = this.getTextCharacters();
+            int start = this.getTextStart();
+            int length = this.getTextLength();
+            for (int i = start; i < length; i++){
+                final char c = ch[i];
+                if (!(c == 0x20 || c == 0x9 || c == 0xD || c == 0xA))
+                    return false;
+            }
+            return true;
+        }
+        return false;
+    }
+
+    public final String getAttributeValue(String namespaceURI, String localName) {
+        if (_eventType != START_ELEMENT) {
+            throw new IllegalStateException("");
+        }
+
+        if (namespaceURI == null) {
+            // Set to the empty string to be compatible with the
+            // org.xml.sax.Attributes interface
+            namespaceURI = "";
+        }
+
+        return _attributeCache.getValue(namespaceURI, localName);
+    }
+
+    public final int getAttributeCount() {
+        if (_eventType != START_ELEMENT) {
+            throw new IllegalStateException("");
+        }
+
+        return _attributeCache.getLength();
+    }
+
+    public final javax.xml.namespace.QName getAttributeName(int index) {
+        if (_eventType != START_ELEMENT) {
+            throw new IllegalStateException("");
+        }
+
+        final String prefix = _attributeCache.getPrefix(index);
+        final String localName = _attributeCache.getLocalName(index);
+        final String uri = _attributeCache.getURI(index);
+        return new QName(uri,localName,prefix);
+    }
+
+
+    public final String getAttributeNamespace(int index) {
+        if (_eventType != START_ELEMENT) {
+            throw new IllegalStateException("");
+        }
+        return fixEmptyString(_attributeCache.getURI(index));
+    }
+
+    public final String getAttributeLocalName(int index) {
+        if (_eventType != START_ELEMENT) {
+            throw new IllegalStateException("");
+        }
+        return _attributeCache.getLocalName(index);
+    }
+
+    public final String getAttributePrefix(int index) {
+        if (_eventType != START_ELEMENT) {
+            throw new IllegalStateException("");
+        }
+        return fixEmptyString(_attributeCache.getPrefix(index));
+    }
+
+    public final String getAttributeType(int index) {
+        if (_eventType != START_ELEMENT) {
+            throw new IllegalStateException("");
+        }
+        return _attributeCache.getType(index);
+    }
+
+    public final String getAttributeValue(int index) {
+        if (_eventType != START_ELEMENT) {
+            throw new IllegalStateException("");
+        }
+
+        return _attributeCache.getValue(index);
+    }
+
+    public final boolean isAttributeSpecified(int index) {
+        return false;
+    }
+
+    public final int getNamespaceCount() {
+        if (_eventType == START_ELEMENT || _eventType == END_ELEMENT) {
+            return _stackTop.namespaceAIIsEnd - _stackTop.namespaceAIIsStart;
+        }
+
+        throw new IllegalStateException("");
+    }
+
+    public final String getNamespacePrefix(int index) {
+        if (_eventType == START_ELEMENT || _eventType == END_ELEMENT) {
+            return _namespaceAIIsPrefix[_stackTop.namespaceAIIsStart + index];
+        }
+
+        throw new IllegalStateException("");
+    }
+
+    public final String getNamespaceURI(int index) {
+        if (_eventType == START_ELEMENT || _eventType == END_ELEMENT) {
+            return _namespaceAIIsNamespaceName[_stackTop.namespaceAIIsStart + index];
+        }
+
+        throw new IllegalStateException("");
+    }
+
+    public final String getNamespaceURI(String prefix) {
+        return _nsCtx.getNamespaceURI(prefix);
+    }
+
+    public final NamespaceContextEx getNamespaceContext() {
+        return _nsCtx;
+    }
+
+    public final int getEventType() {
+        return _eventType;
+    }
+
+    public final String getText() {
+        if (_characters != null) {
+            String s = new String(_characters, _textOffset, _textLen);
+            _charSequence = s;
+            return s;
+        } else if (_charSequence != null) {
+            return _charSequence.toString();
+        } else {
+            throw new IllegalStateException();
+        }
+    }
+
+    public final char[] getTextCharacters() {
+        if (_characters != null) {
+            return _characters;
+        } else if (_charSequence != null) {
+            // TODO try to avoid creation of a temporary String for some
+            // CharSequence implementations
+            _characters = _charSequence.toString().toCharArray();
+            _textLen = _characters.length;
+            _textOffset = 0;
+            return _characters;
+        } else {
+            throw new IllegalStateException();
+        }
+    }
+
+    public final int getTextStart() {
+        if (_characters != null) {
+            return _textOffset;
+        } else if (_charSequence != null) {
+            return 0;
+        } else {
+            throw new IllegalStateException();
+        }
+    }
+
+    public final int getTextLength() {
+        if (_characters != null) {
+            return _textLen;
+        } else if (_charSequence != null) {
+            return _charSequence.length();
+        } else {
+            throw new IllegalStateException();
+        }
+    }
+
+    public final int getTextCharacters(int sourceStart, char[] target,
+                                       int targetStart, int length) throws XMLStreamException {
+        if (_characters != null) {
+        } else if (_charSequence != null) {
+            _characters = _charSequence.toString().toCharArray();
+            _textLen = _characters.length;
+            _textOffset = 0;
+        } else {
+            throw new IllegalStateException("");
+        }
+
+        try {
+            System.arraycopy(_characters, sourceStart, target,
+                    targetStart, length);
+            return length;
+        } catch (IndexOutOfBoundsException e) {
+            throw new XMLStreamException(e);
+        }
+    }
+
+    private class CharSequenceImpl implements CharSequence {
+        private final int _offset;
+        private final int _length;
+
+        CharSequenceImpl(int offset, int length) {
+            _offset = offset;
+            _length = length;
+        }
+
+        public int length() {
+            return _length;
+        }
+
+        public char charAt(int index) {
+            if (index >= 0 && index < _textLen) {
+                return _characters[_textOffset + index];
+            } else {
+                throw new IndexOutOfBoundsException();
+            }
+        }
+
+        public CharSequence subSequence(int start, int end) {
+            final int length = end - start;
+            if (end < 0 || start < 0 || end > length || start > end) {
+                throw new IndexOutOfBoundsException();
+            }
+
+            return new CharSequenceImpl(_offset + start, length);
+        }
+
+        public String toString() {
+            return new String(_characters, _offset, _length);
+        }
+    }
+
+    public final CharSequence getPCDATA() {
+        if (_characters != null) {
+            return new CharSequenceImpl(_textOffset, _textLen);
+        } else if (_charSequence != null) {
+            return _charSequence;
+        } else {
+            throw new IllegalStateException();
+        }
+    }
+
+    public final String getEncoding() {
+        return "UTF-8";
+    }
+
+    public final boolean hasText() {
+        return (_characters != null || _charSequence != null);
+    }
+
+    public final Location getLocation() {
+        return new DummyLocation();
+    }
+
+    public final boolean hasName() {
+        return (_eventType == START_ELEMENT || _eventType == END_ELEMENT);
+    }
+
+    public final QName getName() {
+        return _stackTop.getQName();
+    }
+
+    public final String getLocalName() {
+        return _stackTop.localName;
+    }
+
+    public final String getNamespaceURI() {
+        return _stackTop.uri;
+    }
+
+    public final String getPrefix() {
+        return _stackTop.prefix;
+
+    }
+
+    public final String getVersion() {
+        return "1.0";
+    }
+
+    public final boolean isStandalone() {
+        return false;
+    }
+
+    public final boolean standaloneSet() {
+        return false;
+    }
+
+    public final String getCharacterEncodingScheme() {
+        return "UTF-8";
+    }
+
+    public final String getPITarget() {
+        if (_eventType == PROCESSING_INSTRUCTION) {
+            return _piTarget;
+        }
+        throw new IllegalStateException("");
+    }
+
+    public final String getPIData() {
+        if (_eventType == PROCESSING_INSTRUCTION) {
+            return _piData;
+        }
+        throw new IllegalStateException("");
+    }
+
+    protected void processElement(String prefix, String uri, String localName) {
+        pushElementStack();
+        _stackTop.set(prefix, uri, localName);
+
+        _attributeCache.clear();
+
+        int item = peekStructure();
+        if ((item & TYPE_MASK) == T_NAMESPACE_ATTRIBUTE) {
+            // Skip the namespace declarations on the element
+            // they will have been added already
+            item = processNamespaceAttributes(item);
+        }
+        if ((item & TYPE_MASK) == T_ATTRIBUTE) {
+            processAttributes(item);
+        }
+    }
+
+    private void resizeNamespaceAttributes() {
+        final String[] namespaceAIIsPrefix = new String[_namespaceAIIsEnd * 2];
+        System.arraycopy(_namespaceAIIsPrefix, 0, namespaceAIIsPrefix, 0, _namespaceAIIsEnd);
+        _namespaceAIIsPrefix = namespaceAIIsPrefix;
+
+        final String[] namespaceAIIsNamespaceName = new String[_namespaceAIIsEnd * 2];
+        System.arraycopy(_namespaceAIIsNamespaceName, 0, namespaceAIIsNamespaceName, 0, _namespaceAIIsEnd);
+        _namespaceAIIsNamespaceName = namespaceAIIsNamespaceName;
+    }
+
+    private int processNamespaceAttributes(int item){
+        _stackTop.namespaceAIIsStart = _namespaceAIIsEnd;
+
+        do {
+            if (_namespaceAIIsEnd == _namespaceAIIsPrefix.length) {
+                resizeNamespaceAttributes();
+            }
+
+            switch(_niiStateTable[item]){
+                case STATE_NAMESPACE_ATTRIBUTE:
+                    // Undeclaration of default namespace
+                    _namespaceAIIsPrefix[_namespaceAIIsEnd] =
+                    _namespaceAIIsNamespaceName[_namespaceAIIsEnd++] = "";
+                    break;
+                case STATE_NAMESPACE_ATTRIBUTE_P:
+                    // Undeclaration of namespace
+                    _namespaceAIIsPrefix[_namespaceAIIsEnd] = readStructureString();
+                    _namespaceAIIsNamespaceName[_namespaceAIIsEnd++] = "";
+                    break;
+                case STATE_NAMESPACE_ATTRIBUTE_P_U:
+                    // Declaration with prefix
+                    _namespaceAIIsPrefix[_namespaceAIIsEnd] = readStructureString();
+                    _namespaceAIIsNamespaceName[_namespaceAIIsEnd++] = readStructureString();
+                    break;
+                case STATE_NAMESPACE_ATTRIBUTE_U:
+                    // Default declaration
+                    _namespaceAIIsPrefix[_namespaceAIIsEnd] = "";
+                    _namespaceAIIsNamespaceName[_namespaceAIIsEnd++] = readStructureString();
+                    break;
+            }
+            readStructure();
+
+            item = peekStructure();
+        } while((item & TYPE_MASK) == T_NAMESPACE_ATTRIBUTE);
+
+        _stackTop.namespaceAIIsEnd = _namespaceAIIsEnd;
+
+        return item;
+    }
+
+    private void processAttributes(int item){
+        do {
+            switch(_aiiStateTable[item]){
+                case STATE_ATTRIBUTE_U_LN_QN: {
+                    final String uri = readStructureString();
+                    final String localName = readStructureString();
+                    final String prefix = getPrefixFromQName(readStructureString());
+                    _attributeCache.addAttributeWithPrefix(prefix, uri, localName, readStructureString(), readContentString());
+                    break;
+                }
+                case STATE_ATTRIBUTE_P_U_LN:
+                    _attributeCache.addAttributeWithPrefix(readStructureString(), readStructureString(), readStructureString(), readStructureString(), readContentString());
+                    break;
+                case STATE_ATTRIBUTE_U_LN:
+                    // _attributeCache follows SAX convention
+                    _attributeCache.addAttributeWithPrefix("", readStructureString(), readStructureString(), readStructureString(), readContentString());
+                    break;
+                case STATE_ATTRIBUTE_LN: {
+                    _attributeCache.addAttributeWithPrefix("", "", readStructureString(), readStructureString(), readContentString());
+                    break;
+                }
+            }
+            readStructure();
+
+            item = peekStructure();
+        } while((item & TYPE_MASK) == T_ATTRIBUTE);
+    }
+
+    private void pushElementStack() {
+        if (_depth == _stack.length) {
+            // resize stack
+            ElementStackEntry [] tmp = _stack;
+            _stack = new ElementStackEntry[_stack.length * 3 /2 + 1];
+            System.arraycopy(tmp, 0, _stack, 0, tmp.length);
+            for (int i = tmp.length; i < _stack.length; i++){
+                _stack[i] = new ElementStackEntry();
+            }
+        }
+
+        _stackTop = _stack[_depth++];
+    }
+
+    private void popElementStack(int depth) {
+        // _depth is checked outside this method
+        _stackTop = _stack[depth - 1];
+        // Move back the position of the namespace index
+        _namespaceAIIsEnd = _stack[depth].namespaceAIIsStart;
+    }
+
+    private final class ElementStackEntry {
+        /**
+         * Prefix.
+         * Just like everywhere else in StAX, this can be null but can't be empty.
+         */
+        String prefix;
+        /**
+         * Namespace URI.
+         * Just like everywhere else in StAX, this can be null but can't be empty.
+         */
+        String uri;
+        String localName;
+        QName qname;
+
+        // Start and end of namespace declarations
+        // in namespace declaration arrays
+        int namespaceAIIsStart;
+        int namespaceAIIsEnd;
+
+        public void set(String prefix, String uri, String localName) {
+            this.prefix = prefix;
+            this.uri = uri;
+            this.localName = localName;
+            this.qname = null;
+
+            this.namespaceAIIsStart = this.namespaceAIIsEnd = StreamReaderBufferProcessor.this._namespaceAIIsEnd;
+        }
+
+        public QName getQName() {
+            if (qname == null) {
+                qname = new QName(fixNull(uri), localName, fixNull(prefix));
+            }
+            return qname;
+        }
+
+        private String fixNull(String s) {
+            return (s == null) ? "" : s;
+        }
+    }
+
+    private final class InternalNamespaceContext implements NamespaceContextEx {
+        @SuppressWarnings({"StringEquality"})
+        public String getNamespaceURI(String prefix) {
+            if (prefix == null) {
+                throw new IllegalArgumentException("Prefix cannot be null");
+            }
+
+            /*
+             * If the buffer was created using string interning
+             * intern the prefix and check for reference equality
+             * rather than using String.equals();
+             */
+            if (_stringInterningFeature) {
+                prefix = prefix.intern();
+
+                // Find the most recently declared prefix
+                for (int i = _namespaceAIIsEnd - 1; i >=0; i--) {
+                    if (prefix == _namespaceAIIsPrefix[i]) {
+                        return _namespaceAIIsNamespaceName[i];
+                    }
+                }
+            } else {
+                // Find the most recently declared prefix
+                for (int i = _namespaceAIIsEnd - 1; i >=0; i--) {
+                    if (prefix.equals(_namespaceAIIsPrefix[i])) {
+                        return _namespaceAIIsNamespaceName[i];
+                    }
+                }
+            }
+
+            // Check for XML-based prefixes
+            if (prefix.equals(XMLConstants.XML_NS_PREFIX)) {
+                return XMLConstants.XML_NS_URI;
+            } else if (prefix.equals(XMLConstants.XMLNS_ATTRIBUTE)) {
+                return XMLConstants.XMLNS_ATTRIBUTE_NS_URI;
+            }
+
+            return null;
+        }
+
+        public String getPrefix(String namespaceURI) {
+            final Iterator i = getPrefixes(namespaceURI);
+            if (i.hasNext()) {
+                return (String)i.next();
+            } else {
+                return null;
+            }
+        }
+
+        public Iterator getPrefixes(final String namespaceURI) {
+            if (namespaceURI == null){
+                throw new IllegalArgumentException("NamespaceURI cannot be null");
+            }
+
+            if (namespaceURI.equals(XMLConstants.XML_NS_URI)) {
+                return Collections.singletonList(XMLConstants.XML_NS_PREFIX).iterator();
+            } else if (namespaceURI.equals(XMLConstants.XMLNS_ATTRIBUTE_NS_URI)) {
+                return Collections.singletonList(XMLConstants.XMLNS_ATTRIBUTE).iterator();
+            }
+
+            return new Iterator() {
+                private int i = _namespaceAIIsEnd - 1;
+                private boolean requireFindNext = true;
+                private String p;
+
+                private String findNext() {
+                    while(i >= 0) {
+                        // Find the most recently declared namespace
+                        if (namespaceURI.equals(_namespaceAIIsNamespaceName[i])) {
+                            // Find the most recently declared prefix of the namespace
+                            // and check if the prefix is in scope with that namespace
+                            if (getNamespaceURI(_namespaceAIIsPrefix[i]).equals(
+                                    _namespaceAIIsNamespaceName[i])) {
+                                return p = _namespaceAIIsPrefix[i];
+                            }
+                        }
+                        i--;
+                    }
+                    return p = null;
+                }
+
+                public boolean hasNext() {
+                    if (requireFindNext) {
+                        findNext();
+                        requireFindNext = false;
+                    }
+                    return (p != null);
+                }
+
+                public Object next() {
+                    if (requireFindNext) {
+                        findNext();
+                    }
+                    requireFindNext = true;
+
+                    if (p == null) {
+                        throw new NoSuchElementException();
+                    }
+
+                    return p;
+                }
+
+                public void remove() {
+                    throw new UnsupportedOperationException();
+                }
+            };
+        }
+
+        private class BindingImpl implements NamespaceContextEx.Binding {
+            final String _prefix;
+            final String _namespaceURI;
+
+            BindingImpl(String prefix, String namespaceURI) {
+                _prefix = prefix;
+                _namespaceURI = namespaceURI;
+            }
+
+            public String getPrefix() {
+                return _prefix;
+            }
+
+            public String getNamespaceURI() {
+                return _namespaceURI;
+            }
+        }
+
+        public Iterator iterator() {
+            return new Iterator() {
+                private final int end = _namespaceAIIsEnd - 1;
+                private int current = end;
+                private boolean requireFindNext = true;
+                private NamespaceContextEx.Binding namespace;
+
+                private NamespaceContextEx.Binding findNext() {
+                    while(current >= 0) {
+                        final String prefix = _namespaceAIIsPrefix[current];
+
+                        // Find if the current prefix occurs more recently
+                        // If so then it is not in scope
+                        int i = end;
+                        for (;i > current; i--) {
+                            if (prefix.equals(_namespaceAIIsPrefix[i])) {
+                                break;
+                            }
+                        }
+                        if (i == current--) {
+                            // The current prefix is in-scope
+                            return namespace = new BindingImpl(prefix, _namespaceAIIsNamespaceName[current]);
+                        }
+                    }
+                    return namespace = null;
+                }
+
+                public boolean hasNext() {
+                    if (requireFindNext) {
+                        findNext();
+                        requireFindNext = false;
+                    }
+                    return (namespace != null);
+                }
+
+                public NamespaceContextEx.Binding next() {
+                    if (requireFindNext) {
+                        findNext();
+                    }
+                    requireFindNext = true;
+
+                    if (namespace == null) {
+                        throw new NoSuchElementException();
+                    }
+
+                    return namespace;
+                }
+
+                public void remove() {
+                    throw new UnsupportedOperationException();
+                }
+            };
+        }
+    }
+
+    private class DummyLocation  implements Location {
+        public int getLineNumber() {
+            return -1;
+        }
+
+        public int getColumnNumber() {
+            return -1;
+        }
+
+        public int getCharacterOffset() {
+            return -1;
+        }
+
+        public String getPublicId() {
+            return null;
+        }
+
+        public String getSystemId() {
+            return _buffer.getSystemId();
+        }
+    }
+
+    private static String fixEmptyString(String s) {
+        // s must not be null, so no need to check for that. that would be bug.
+        if(s.length()==0)   return null;
+        else                return s;
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferCreator.java b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferCreator.java
new file mode 100644
index 00000000000..6f165ef7abc
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferCreator.java
@@ -0,0 +1,269 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.stream.buffer.stax;
+
+import com.sun.xml.internal.stream.buffer.MutableXMLStreamBuffer;
+import com.sun.xml.internal.org.jvnet.staxex.Base64Data;
+import com.sun.xml.internal.org.jvnet.staxex.NamespaceContextEx;
+import com.sun.xml.internal.org.jvnet.staxex.XMLStreamWriterEx;
+
+import javax.activation.DataHandler;
+import javax.xml.namespace.NamespaceContext;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+import java.io.OutputStream;
+
+/**
+ * {@link XMLStreamWriter} that fills {@link MutableXMLStreamBuffer}.
+ * 
    
+ * TODO: need to retain all attributes/namespaces and then store all namespaces
+ * before the attributes. Currently it is necessary for the caller to ensure
+ * all namespaces are written before attributes and the caller must not intermix
+ * calls to the writeNamespace and writeAttribute methods.
+ *
+ */
+public class StreamWriterBufferCreator extends StreamBufferCreator implements XMLStreamWriterEx {
+    private final NamespaceContexHelper namespaceContext = new NamespaceContexHelper();
+
+    /**
+     * Nesting depth of the element.
+     * This field is ultimately used to keep track of the # of trees we created in
+     * the buffer.
+     */
+    private int depth=0;
+
+    public StreamWriterBufferCreator() {
+        setXMLStreamBuffer(new MutableXMLStreamBuffer());
+    }
+
+    public StreamWriterBufferCreator(MutableXMLStreamBuffer buffer) {
+        setXMLStreamBuffer(buffer);
+    }
+
+    // XMLStreamWriter
+
+    public Object getProperty(String str) throws IllegalArgumentException {
+        return null; //return  null for all the property names instead of
+                    //throwing unsupported operation exception.
+    }
+
+    public void close() throws XMLStreamException {
+    }
+
+    public void flush() throws XMLStreamException {
+    }
+
+    public NamespaceContextEx getNamespaceContext() {
+        return namespaceContext;
+    }
+
+    public void setNamespaceContext(NamespaceContext namespaceContext) throws XMLStreamException {
+        /*
+         * It is really unclear from the JavaDoc how to implement this method.
+         */
+        throw new UnsupportedOperationException();
+    }
+
+    public void setDefaultNamespace(String namespaceURI) throws XMLStreamException {
+        setPrefix("", namespaceURI);
+    }
+
+    public void setPrefix(String prefix, String namespaceURI) throws XMLStreamException {
+        namespaceContext.declareNamespace(prefix, namespaceURI);
+    }
+
+    public String getPrefix(String namespaceURI) throws XMLStreamException {
+        return namespaceContext.getPrefix(namespaceURI);
+    }
+
+
+    public void writeStartDocument() throws XMLStreamException {
+        writeStartDocument("", "");
+    }
+
+    public void writeStartDocument(String version) throws XMLStreamException {
+        writeStartDocument("", "");
+    }
+
+    public void writeStartDocument(String encoding, String version) throws XMLStreamException {
+        namespaceContext.resetContexts();
+
+        storeStructure(T_DOCUMENT);
+    }
+
+    public void writeEndDocument() throws XMLStreamException {
+        storeStructure(T_END);
+    }
+
+    public void writeStartElement(String localName) throws XMLStreamException {
+        namespaceContext.pushContext();
+        depth++;
+
+        final String defaultNamespaceURI = namespaceContext.getNamespaceURI("");
+
+        if (defaultNamespaceURI == null)
+            storeQualifiedName(T_ELEMENT_LN, null, null, localName);
+        else
+            storeQualifiedName(T_ELEMENT_LN, null, defaultNamespaceURI, localName);
+    }
+
+    public void writeStartElement(String namespaceURI, String localName) throws XMLStreamException {
+        namespaceContext.pushContext();
+        depth++;
+
+        final String prefix = namespaceContext.getPrefix(namespaceURI);
+        if (prefix == null) {
+            throw new XMLStreamException();
+        }
+
+        namespaceContext.pushContext();
+        storeQualifiedName(T_ELEMENT_LN, prefix, namespaceURI, localName);
+    }
+
+    public void writeStartElement(String prefix, String localName, String namespaceURI) throws XMLStreamException {
+        namespaceContext.pushContext();
+        depth++;
+
+        storeQualifiedName(T_ELEMENT_LN, prefix, namespaceURI, localName);
+    }
+
+    public void writeEmptyElement(String localName) throws XMLStreamException {
+        writeStartElement(localName);
+        writeEndElement();
+    }
+
+    public void writeEmptyElement(String namespaceURI, String localName) throws XMLStreamException {
+        writeStartElement(namespaceURI, localName);
+        writeEndElement();
+    }
+
+    public void writeEmptyElement(String prefix, String localName, String namespaceURI) throws XMLStreamException {
+        writeStartElement(prefix, localName, namespaceURI);
+        writeEndElement();
+    }
+
+    public void writeEndElement() throws XMLStreamException {
+        namespaceContext.popContext();
+
+        storeStructure(T_END);
+        if(--depth==0)
+            increaseTreeCount();
+    }
+
+    public void writeDefaultNamespace(String namespaceURI) throws XMLStreamException {
+        storeNamespaceAttribute(null, namespaceURI);
+    }
+
+    public void writeNamespace(String prefix, String namespaceURI) throws XMLStreamException {
+        if ("xmlns".equals(prefix))
+            prefix = null;
+        storeNamespaceAttribute(prefix, namespaceURI);
+    }
+
+
+    public void writeAttribute(String localName, String value) throws XMLStreamException {
+        storeAttribute(null, null, localName, "CDATA", value);
+    }
+
+    public void writeAttribute(String namespaceURI, String localName, String value) throws XMLStreamException {
+        final String prefix = namespaceContext.getPrefix(namespaceURI);
+        if (prefix == null) {
+            // TODO
+            throw new XMLStreamException();
+        }
+
+        writeAttribute(prefix, namespaceURI, localName, value);
+    }
+
+    public void writeAttribute(String prefix, String namespaceURI, String localName, String value) throws XMLStreamException {
+        storeAttribute(prefix, namespaceURI, localName, "CDATA", value);
+    }
+
+    public void writeCData(String data) throws XMLStreamException {
+        storeStructure(T_TEXT_AS_STRING);
+        storeContentString(data);
+    }
+
+    public void writeCharacters(String charData) throws XMLStreamException {
+        storeStructure(T_TEXT_AS_STRING);
+        storeContentString(charData);
+    }
+
+    public void writeCharacters(char[] buf, int start, int len) throws XMLStreamException {
+        storeContentCharacters(T_TEXT_AS_CHAR_ARRAY, buf, start, len);
+    }
+
+    public void writeComment(String str) throws XMLStreamException {
+        storeStructure(T_COMMENT_AS_STRING);
+        storeContentString(str);
+    }
+
+    public void writeDTD(String str) throws XMLStreamException {
+        // not support. just ignore.
+    }
+
+    public void writeEntityRef(String str) throws XMLStreamException {
+        storeStructure(T_UNEXPANDED_ENTITY_REFERENCE);
+        storeContentString(str);
+    }
+
+    public void writeProcessingInstruction(String target) throws XMLStreamException {
+        writeProcessingInstruction(target, "");
+    }
+
+    public void writeProcessingInstruction(String target, String data) throws XMLStreamException {
+        storeProcessingInstruction(target, data);
+    }
+
+    // XMLStreamWriterEx
+
+    public void writePCDATA(CharSequence charSequence) throws XMLStreamException {
+        if (charSequence instanceof Base64Data) {
+            storeStructure(T_TEXT_AS_OBJECT);
+            storeContentObject(((Base64Data)charSequence).clone());
+        } else {
+            writeCharacters(charSequence.toString());
+        }
+    }
+
+    public void writeBinary(byte[] bytes, int offset, int length, String endpointURL) throws XMLStreamException {
+        Base64Data d = new Base64Data();
+        byte b[] = new byte[length];
+        System.arraycopy(bytes, offset, b, 0, length);
+        d.set(b, length, null, true);
+        storeStructure(T_TEXT_AS_OBJECT);
+        storeContentObject(d);
+    }
+
+    public void writeBinary(DataHandler dataHandler) throws XMLStreamException {
+        // TODO
+        throw new UnsupportedOperationException();
+    }
+
+    public OutputStream writeBinary(String endpointURL) throws XMLStreamException {
+        // TODO
+        throw new UnsupportedOperationException();
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferProcessor.java b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferProcessor.java
new file mode 100644
index 00000000000..51676492162
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferProcessor.java
@@ -0,0 +1,464 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.stream.buffer.stax;
+
+import com.sun.xml.internal.stream.buffer.AbstractProcessor;
+import com.sun.xml.internal.stream.buffer.XMLStreamBuffer;
+import com.sun.xml.internal.org.jvnet.staxex.XMLStreamWriterEx;
+
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+
+
+/**
+ * A processor of a {@link XMLStreamBuffer} that writes the XML infoset to a
+ * {@link XMLStreamWriter}.
+ *
+ * @author Paul.Sandoz@Sun.Com
+ * @author K.Venugopal@sun.com
+ */
+public class StreamWriterBufferProcessor extends AbstractProcessor {
+
+
+    public StreamWriterBufferProcessor() {
+    }
+
+    /**
+     * @deprecated
+     *      Use {@link #StreamWriterBufferProcessor(XMLStreamBuffer, boolean)}
+     */
+    public StreamWriterBufferProcessor(XMLStreamBuffer buffer) {
+        setXMLStreamBuffer(buffer,buffer.isFragment());
+    }
+
+    /**
+     * @param produceFragmentEvent
+     *      True to generate fragment SAX events without start/endDocument.
+     *      False to generate a full document SAX events.
+     */
+    public StreamWriterBufferProcessor(XMLStreamBuffer buffer,boolean produceFragmentEvent) {
+        setXMLStreamBuffer(buffer,produceFragmentEvent);
+    }
+
+    public final void process(XMLStreamBuffer buffer, XMLStreamWriter writer) throws XMLStreamException {
+        setXMLStreamBuffer(buffer,buffer.isFragment());
+        process(writer);
+    }
+
+    public void process(XMLStreamWriter writer) throws XMLStreamException {
+        if(_fragmentMode){
+            writeFragment(writer);
+        }else{
+            write(writer);
+        }
+    }
+
+    /**
+     * @deprecated
+     *      Use {@link #setXMLStreamBuffer(XMLStreamBuffer, boolean)}
+     */
+    public void setXMLStreamBuffer(XMLStreamBuffer buffer) {
+        setBuffer(buffer);
+    }
+
+    /**
+     * @param produceFragmentEvent
+     *      True to generate fragment SAX events without start/endDocument.
+     *      False to generate a full document SAX events.
+     */
+    public void setXMLStreamBuffer(XMLStreamBuffer buffer, boolean produceFragmentEvent) {
+        setBuffer(buffer,produceFragmentEvent);
+    }
+
+    /**
+     * Writes a full XML infoset event to the given writer,
+     * including start/end document.
+     */
+    public void write(XMLStreamWriter writer) throws XMLStreamException{
+
+        if(!_fragmentMode) {
+            if(_treeCount>1)
+                throw new IllegalStateException("forest cannot be written as a full infoset");
+            writer.writeStartDocument();
+        }
+
+        // TODO: if we are writing a fragment XMLStreamBuffer as a full document,
+        // we need to put in-scope namespaces as top-level ns decls.
+
+        while(true) {
+            int item = _eiiStateTable[peekStructure()];
+            writer.flush();
+
+            switch(item) {
+                case STATE_DOCUMENT:
+                    readStructure(); //skip
+                    break;
+                case STATE_ELEMENT_U_LN_QN:
+                case STATE_ELEMENT_P_U_LN:
+                case STATE_ELEMENT_U_LN:
+                case STATE_ELEMENT_LN:
+                    writeFragment(writer);
+                    break;
+                case STATE_COMMENT_AS_CHAR_ARRAY_SMALL: {
+                    readStructure();
+                    final int length = readStructure();
+                    final int start = readContentCharactersBuffer(length);
+                    final String comment = new String(_contentCharactersBuffer, start, length);
+                    writer.writeComment(comment);
+                    break;
+                }
+                case STATE_COMMENT_AS_CHAR_ARRAY_MEDIUM: {
+                    readStructure();
+                    final int length = readStructure16();
+                    final int start = readContentCharactersBuffer(length);
+                    final String comment = new String(_contentCharactersBuffer, start, length);
+                    writer.writeComment(comment);
+                    break;
+                }
+                case STATE_COMMENT_AS_CHAR_ARRAY_COPY: {
+                    readStructure();
+                    final char[] ch = readContentCharactersCopy();
+                    writer.writeComment(new String(ch));
+                    break;
+                }
+                case STATE_PROCESSING_INSTRUCTION:
+                    readStructure();
+                    writer.writeProcessingInstruction(readStructureString(), readStructureString());
+                    break;
+                case STATE_END: // done
+                    readStructure();
+                    writer.writeEndDocument();
+                    return;
+                default:
+                    throw new XMLStreamException("Invalid State "+item);
+            }
+        }
+
+    }
+
+    /**
+     * Writes the buffer as a fragment, meaning
+     * the writer will not receive start/endDocument events.
+     *
+     * 
    
+     * If {@link XMLStreamBuffer} has a forest, this method will write all the forests.
+     */
+    public void writeFragment(XMLStreamWriter writer) throws XMLStreamException {
+        if (writer instanceof XMLStreamWriterEx) {
+            writeFragmentEx((XMLStreamWriterEx)writer);
+        } else {
+            writeFragmentNoEx(writer);
+        }
+    }
+
+    public void writeFragmentEx(XMLStreamWriterEx writer) throws XMLStreamException {
+        int depth = 0;  // used to determine when we are done with a tree.
+
+        int item = _eiiStateTable[peekStructure()];
+        if(item==STATE_DOCUMENT)
+            readStructure();    // skip STATE_DOCUMENT
+
+        do {
+
+            item = readEiiState();
+
+            switch(item) {
+                case STATE_DOCUMENT:
+                    throw new AssertionError();
+                case STATE_ELEMENT_U_LN_QN: {
+                    depth ++;
+                    final String uri = readStructureString();
+                    final String localName = readStructureString();
+                    final String prefix = getPrefixFromQName(readStructureString());
+                    writer.writeStartElement(prefix,localName,uri);
+                    writeAttributes(writer);
+                    break;
+                }
+                case STATE_ELEMENT_P_U_LN: {
+                    depth ++;
+                    final String prefix = readStructureString();
+                    final String uri = readStructureString();
+                    final String localName = readStructureString();
+                    writer.writeStartElement(prefix,localName,uri);
+                    writeAttributes(writer);
+                    break;
+                }
+                case STATE_ELEMENT_U_LN: {
+                    depth ++;
+                    final String uri = readStructureString();
+                    final String localName = readStructureString();
+                    writer.writeStartElement("",localName,uri);
+                    writeAttributes(writer);
+                    break;
+                }
+                case STATE_ELEMENT_LN: {
+                    depth ++;
+                    final String localName = readStructureString();
+                    writer.writeStartElement(localName);
+                    writeAttributes(writer);
+                    break;
+                }
+                case STATE_TEXT_AS_CHAR_ARRAY_SMALL: {
+                    final int length = readStructure();
+                    final int start = readContentCharactersBuffer(length);
+                    writer.writeCharacters(_contentCharactersBuffer,start,length);
+                    break;
+                }
+                case STATE_TEXT_AS_CHAR_ARRAY_MEDIUM: {
+                    final int length = readStructure16();
+                    final int start = readContentCharactersBuffer(length);
+                    writer.writeCharacters(_contentCharactersBuffer,start,length);
+                    break;
+                }
+                case STATE_TEXT_AS_CHAR_ARRAY_COPY: {
+                    char[] c = readContentCharactersCopy();
+                    writer.writeCharacters(c,0,c.length);
+                    break;
+                }
+                case STATE_TEXT_AS_STRING: {
+                    final String s = readContentString();
+                    writer.writeCharacters(s);
+                    break;
+                }
+                case STATE_TEXT_AS_OBJECT: {
+                    final CharSequence c = (CharSequence)readContentObject();
+                    writer.writePCDATA(c);
+                    break;
+                }
+                case STATE_COMMENT_AS_CHAR_ARRAY_SMALL: {
+                    final int length = readStructure();
+                    final int start = readContentCharactersBuffer(length);
+                    final String comment = new String(_contentCharactersBuffer, start, length);
+                    writer.writeComment(comment);
+                    break;
+                }
+                case STATE_COMMENT_AS_CHAR_ARRAY_MEDIUM: {
+                    final int length = readStructure16();
+                    final int start = readContentCharactersBuffer(length);
+                    final String comment = new String(_contentCharactersBuffer, start, length);
+                    writer.writeComment(comment);
+                    break;
+                }
+                case STATE_COMMENT_AS_CHAR_ARRAY_COPY: {
+                    final char[] ch = readContentCharactersCopy();
+                    writer.writeComment(new String(ch));
+                    break;
+                }
+                case STATE_PROCESSING_INSTRUCTION:
+                    writer.writeProcessingInstruction(readStructureString(), readStructureString());
+                    break;
+                case STATE_END:
+                    writer.writeEndElement();
+                    depth --;
+                    if(depth==0)
+                        _treeCount--;
+                    break;
+                default:
+                    throw new XMLStreamException("Invalid State "+item);
+            }
+        } while(depth>0 || _treeCount>0);
+
+    }
+
+    public void writeFragmentNoEx(XMLStreamWriter writer) throws XMLStreamException {
+        int depth = 0;
+
+        int item = _eiiStateTable[peekStructure()];
+        if(item==STATE_DOCUMENT)
+            readStructure();    // skip STATE_DOCUMENT
+
+        do {
+            item = readEiiState();
+
+            switch(item) {
+                case STATE_DOCUMENT:
+                    throw new AssertionError();
+                case STATE_ELEMENT_U_LN_QN: {
+                    depth ++;
+                    final String uri = readStructureString();
+                    final String localName = readStructureString();
+                    final String prefix = getPrefixFromQName(readStructureString());
+                    writer.writeStartElement(prefix,localName,uri);
+                    writeAttributes(writer);
+                    break;
+                }
+                case STATE_ELEMENT_P_U_LN: {
+                    depth ++;
+                    final String prefix = readStructureString();
+                    final String uri = readStructureString();
+                    final String localName = readStructureString();
+                    writer.writeStartElement(prefix,localName,uri);
+                    writeAttributes(writer);
+                    break;
+                }
+                case STATE_ELEMENT_U_LN: {
+                    depth ++;
+                    final String uri = readStructureString();
+                    final String localName = readStructureString();
+                    writer.writeStartElement("",localName,uri);
+                    writeAttributes(writer);
+                    break;
+                }
+                case STATE_ELEMENT_LN: {
+                    depth ++;
+                    final String localName = readStructureString();
+                    writer.writeStartElement(localName);
+                    writeAttributes(writer);
+                    break;
+                }
+                case STATE_TEXT_AS_CHAR_ARRAY_SMALL: {
+                    final int length = readStructure();
+                    final int start = readContentCharactersBuffer(length);
+                    writer.writeCharacters(_contentCharactersBuffer,start,length);
+                    break;
+                }
+                case STATE_TEXT_AS_CHAR_ARRAY_MEDIUM: {
+                    final int length = readStructure16();
+                    final int start = readContentCharactersBuffer(length);
+                    writer.writeCharacters(_contentCharactersBuffer,start,length);
+                    break;
+                }
+                case STATE_TEXT_AS_CHAR_ARRAY_COPY: {
+                    char[] c = readContentCharactersCopy();
+                    writer.writeCharacters(c,0,c.length);
+                    break;
+                }
+                case STATE_TEXT_AS_STRING: {
+                    final String s = readContentString();
+                    writer.writeCharacters(s);
+                    break;
+                }
+                case STATE_TEXT_AS_OBJECT: {
+                    final CharSequence c = (CharSequence)readContentObject();
+                    writer.writeCharacters(c.toString());
+                    break;
+                }
+                case STATE_COMMENT_AS_CHAR_ARRAY_SMALL: {
+                    final int length = readStructure();
+                    final int start = readContentCharactersBuffer(length);
+                    final String comment = new String(_contentCharactersBuffer, start, length);
+                    writer.writeComment(comment);
+                    break;
+                }
+                case STATE_COMMENT_AS_CHAR_ARRAY_MEDIUM: {
+                    final int length = readStructure16();
+                    final int start = readContentCharactersBuffer(length);
+                    final String comment = new String(_contentCharactersBuffer, start, length);
+                    writer.writeComment(comment);
+                    break;
+                }
+                case STATE_COMMENT_AS_CHAR_ARRAY_COPY: {
+                    final char[] ch = readContentCharactersCopy();
+                    writer.writeComment(new String(ch));
+                    break;
+                }
+                case STATE_PROCESSING_INSTRUCTION:
+                    writer.writeProcessingInstruction(readStructureString(), readStructureString());
+                    break;
+                case STATE_END:
+                    writer.writeEndElement();
+                    depth --;
+                    if(depth==0)
+                        _treeCount--;
+                    break;
+                default:
+                    throw new XMLStreamException("Invalid State "+item);
+            }
+        } while(depth > 0 && _treeCount>0);
+
+    }
+
+    private void writeAttributes(XMLStreamWriter writer) throws XMLStreamException {
+        int item = peekStructure();
+        if ((item & TYPE_MASK) == T_NAMESPACE_ATTRIBUTE) {
+            // Skip the namespace declarations on the element
+            // they will have been added already
+            item = writeNamespaceAttributes(item, writer);
+        }
+        if ((item & TYPE_MASK) == T_ATTRIBUTE) {
+            writeAttributes(item, writer);
+        }
+    }
+
+    private int writeNamespaceAttributes(int item, XMLStreamWriter writer) throws XMLStreamException {
+        do {
+            switch(_niiStateTable[item]){
+                case STATE_NAMESPACE_ATTRIBUTE:
+                    // Undeclaration of default namespace
+                    writer.writeDefaultNamespace("");
+                    break;
+                case STATE_NAMESPACE_ATTRIBUTE_P:
+                    // Undeclaration of namespace
+                    // Declaration with prefix
+                    writer.writeNamespace(readStructureString(), "");
+                    break;
+                case STATE_NAMESPACE_ATTRIBUTE_P_U:
+                    // Declaration with prefix
+                    writer.writeNamespace(readStructureString(), readStructureString());
+                    break;
+                case STATE_NAMESPACE_ATTRIBUTE_U:
+                    // Default declaration
+                    writer.writeDefaultNamespace(readStructureString());
+                    break;
+            }
+            readStructure();
+
+            item = peekStructure();
+        } while((item & TYPE_MASK) == T_NAMESPACE_ATTRIBUTE);
+
+        return item;
+    }
+
+    private void writeAttributes(int item, XMLStreamWriter writer) throws XMLStreamException {
+        do {
+            switch(_aiiStateTable[item]) {
+                case STATE_ATTRIBUTE_U_LN_QN: {
+                    final String uri = readStructureString();
+                    final String localName = readStructureString();
+                    final String prefix = getPrefixFromQName(readStructureString());
+                    writer.writeAttribute(prefix,uri,localName,readContentString());
+                    break;
+                }
+                case STATE_ATTRIBUTE_P_U_LN:
+                    writer.writeAttribute(readStructureString(), readStructureString(),
+                            readStructureString(), readContentString());
+                    break;
+                case STATE_ATTRIBUTE_U_LN:
+                    writer.writeAttribute(readStructureString(), readStructureString(), readContentString());
+                    break;
+                case STATE_ATTRIBUTE_LN:
+                    writer.writeAttribute(readStructureString(), readContentString());
+                    break;
+            }
+            // Ignore the attribute type
+            readStructureString();
+
+            readStructure();
+
+            item = peekStructure();
+        } while((item & TYPE_MASK) == T_ATTRIBUTE);
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/Attribute.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/Attribute.java
index 40f05dbf91f..23c67f3a923 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/Attribute.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/Attribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.txw2;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/Cdata.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/Cdata.java
index e28fa767110..dab6849569e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/Cdata.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/Cdata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.txw2;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/Comment.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/Comment.java
index 95ae608f5fc..29ceb2d8491 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/Comment.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/Comment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.txw2;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/ContainerElement.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/ContainerElement.java
index d07d3cef903..bc2973034a5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/ContainerElement.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/ContainerElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.txw2;
 
 import com.sun.xml.internal.txw2.annotation.XmlAttribute;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/Content.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/Content.java
index 0be8c32ccf8..7294fbfff6a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/Content.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/Content.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.txw2;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/ContentVisitor.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/ContentVisitor.java
index fc93d60ad4c..60859d72064 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/ContentVisitor.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/ContentVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.txw2;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/DatatypeWriter.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/DatatypeWriter.java
index 3b6c35001bb..c9e4b17d02d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/DatatypeWriter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/DatatypeWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.txw2;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/Document.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/Document.java
index e7bda232374..a69a3d8979f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/Document.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/Document.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.txw2;
 
 import com.sun.xml.internal.txw2.output.XmlSerializer;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/EndDocument.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/EndDocument.java
index 0402c5687b2..3cd2e797a9c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/EndDocument.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/EndDocument.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.txw2;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/EndTag.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/EndTag.java
index 34b396406ab..c60a92092cb 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/EndTag.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/EndTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.txw2;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/IllegalAnnotationException.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/IllegalAnnotationException.java
index 5a0257391f5..89f13ec03c0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/IllegalAnnotationException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/IllegalAnnotationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.txw2;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/IllegalSignatureException.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/IllegalSignatureException.java
index b714779265b..d315e7eb05d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/IllegalSignatureException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/IllegalSignatureException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.txw2;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/NamespaceDecl.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/NamespaceDecl.java
index 48003a96850..5595ce684cd 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/NamespaceDecl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/NamespaceDecl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.txw2;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/NamespaceResolver.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/NamespaceResolver.java
index c182d2ca68f..2a05a458da3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/NamespaceResolver.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/NamespaceResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.txw2;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/NamespaceSupport.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/NamespaceSupport.java
index 8dd4c219bd7..1564b2be438 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/NamespaceSupport.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/NamespaceSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 // NamespaceSupport.java - generic Namespace support for SAX.
 // http://www.saxproject.org
 // Written by David Megginson
@@ -91,6 +92,7 @@ import java.util.Vector;
  *
  * @since SAX 2.0
  * @author David Megginson
+ * @version 2.0.1 (sax2r2)
  */
 final class NamespaceSupport
 {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/Pcdata.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/Pcdata.java
index c32eaa182de..4321fdc0763 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/Pcdata.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/Pcdata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.txw2;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/StartDocument.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/StartDocument.java
index 56e659aaaf4..42a460205d1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/StartDocument.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/StartDocument.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.txw2;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/StartTag.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/StartTag.java
index f1642ca7e80..6b95d603310 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/StartTag.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/StartTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.txw2;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/TXW.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/TXW.java
index ae67641052e..c65acccdeb6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/TXW.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/TXW.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.txw2;
 
 import com.sun.xml.internal.txw2.output.XmlSerializer;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/Text.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/Text.java
index 22558c1d009..49a5f07941f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/Text.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/Text.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.txw2;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/TxwException.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/TxwException.java
index 7179d9939a4..017f86258f0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/TxwException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/TxwException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.txw2;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/TypedXmlWriter.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/TypedXmlWriter.java
index f2c984c1d1d..90aa9540b0f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/TypedXmlWriter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/TypedXmlWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.txw2;
 
 import com.sun.xml.internal.txw2.annotation.XmlElement;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/annotation/XmlAttribute.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/annotation/XmlAttribute.java
index 0a58a21dfbe..e28f1d656ec 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/annotation/XmlAttribute.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/annotation/XmlAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.txw2.annotation;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/annotation/XmlCDATA.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/annotation/XmlCDATA.java
index 9828095ef20..21dfdf4627a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/annotation/XmlCDATA.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/annotation/XmlCDATA.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.txw2.annotation;
 
 import java.lang.annotation.Retention;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/annotation/XmlElement.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/annotation/XmlElement.java
index e7dc725f40c..fea96cd9583 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/annotation/XmlElement.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/annotation/XmlElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.txw2.annotation;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/annotation/XmlNamespace.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/annotation/XmlNamespace.java
index 3602f3c7d22..b33af405173 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/annotation/XmlNamespace.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/annotation/XmlNamespace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.txw2.annotation;
 
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/annotation/XmlValue.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/annotation/XmlValue.java
index 071c4412356..915b6bc47ca 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/annotation/XmlValue.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/annotation/XmlValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.txw2.annotation;
 
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/annotation/package.html b/jaxws/src/share/classes/com/sun/xml/internal/txw2/annotation/package.html
index de8b83295db..c136c29b6f3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/annotation/package.html
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/annotation/package.html
@@ -1,3 +1,27 @@
+
 
 
   
    
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/CharacterEscapeHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/CharacterEscapeHandler.java
index e441cadcb43..f71a44d50b7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/CharacterEscapeHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/CharacterEscapeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.txw2.output;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/DataWriter.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/DataWriter.java
index 27e0eeb292e..dbe80fe36c6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/DataWriter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/DataWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 //@@3RD PARTY CODE@@
 
 // DataWriter.java - XML writer for data-oriented files.
@@ -91,6 +92,7 @@ import java.util.Stack;
  *
  * @since 1.0
  * @author David Megginson, david@megginson.com
+ * @version 0.2
  * @see XMLWriter
  */
 public class DataWriter extends XMLWriter
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/DelegatingXMLStreamWriter.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/DelegatingXMLStreamWriter.java
new file mode 100644
index 00000000000..4b4baa725d9
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/DelegatingXMLStreamWriter.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.txw2.output;
+
+import javax.xml.stream.XMLStreamWriter;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.namespace.NamespaceContext;
+
+/**
+ * Delegating {@link XMLStreamWriter}.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+abstract class DelegatingXMLStreamWriter implements XMLStreamWriter {
+    private final XMLStreamWriter writer;
+
+    public DelegatingXMLStreamWriter(XMLStreamWriter writer) {
+        this.writer = writer;
+    }
+
+    public void writeStartElement(String localName) throws XMLStreamException {
+        writer.writeStartElement(localName);
+    }
+
+    public void writeStartElement(String namespaceURI, String localName) throws XMLStreamException {
+        writer.writeStartElement(namespaceURI, localName);
+    }
+
+    public void writeStartElement(String prefix, String localName, String namespaceURI) throws XMLStreamException {
+        writer.writeStartElement(prefix, localName, namespaceURI);
+    }
+
+    public void writeEmptyElement(String namespaceURI, String localName) throws XMLStreamException {
+        writer.writeEmptyElement(namespaceURI, localName);
+    }
+
+    public void writeEmptyElement(String prefix, String localName, String namespaceURI) throws XMLStreamException {
+        writer.writeEmptyElement(prefix, localName, namespaceURI);
+    }
+
+    public void writeEmptyElement(String localName) throws XMLStreamException {
+        writer.writeEmptyElement(localName);
+    }
+
+    public void writeEndElement() throws XMLStreamException {
+        writer.writeEndElement();
+    }
+
+    public void writeEndDocument() throws XMLStreamException {
+        writer.writeEndDocument();
+    }
+
+    public void close() throws XMLStreamException {
+        writer.close();
+    }
+
+    public void flush() throws XMLStreamException {
+        writer.flush();
+    }
+
+    public void writeAttribute(String localName, String value) throws XMLStreamException {
+        writer.writeAttribute(localName, value);
+    }
+
+    public void writeAttribute(String prefix, String namespaceURI, String localName, String value) throws XMLStreamException {
+        writer.writeAttribute(prefix, namespaceURI, localName, value);
+    }
+
+    public void writeAttribute(String namespaceURI, String localName, String value) throws XMLStreamException {
+        writer.writeAttribute(namespaceURI, localName, value);
+    }
+
+    public void writeNamespace(String prefix, String namespaceURI) throws XMLStreamException {
+        writer.writeNamespace(prefix, namespaceURI);
+    }
+
+    public void writeDefaultNamespace(String namespaceURI) throws XMLStreamException {
+        writer.writeDefaultNamespace(namespaceURI);
+    }
+
+    public void writeComment(String data) throws XMLStreamException {
+        writer.writeComment(data);
+    }
+
+    public void writeProcessingInstruction(String target) throws XMLStreamException {
+        writer.writeProcessingInstruction(target);
+    }
+
+    public void writeProcessingInstruction(String target, String data) throws XMLStreamException {
+        writer.writeProcessingInstruction(target, data);
+    }
+
+    public void writeCData(String data) throws XMLStreamException {
+        writer.writeCData(data);
+    }
+
+    public void writeDTD(String dtd) throws XMLStreamException {
+        writer.writeDTD(dtd);
+    }
+
+    public void writeEntityRef(String name) throws XMLStreamException {
+        writer.writeEntityRef(name);
+    }
+
+    public void writeStartDocument() throws XMLStreamException {
+        writer.writeStartDocument();
+    }
+
+    public void writeStartDocument(String version) throws XMLStreamException {
+        writer.writeStartDocument(version);
+    }
+
+    public void writeStartDocument(String encoding, String version) throws XMLStreamException {
+        writer.writeStartDocument(encoding, version);
+    }
+
+    public void writeCharacters(String text) throws XMLStreamException {
+        writer.writeCharacters(text);
+    }
+
+    public void writeCharacters(char[] text, int start, int len) throws XMLStreamException {
+        writer.writeCharacters(text, start, len);
+    }
+
+    public String getPrefix(String uri) throws XMLStreamException {
+        return writer.getPrefix(uri);
+    }
+
+    public void setPrefix(String prefix, String uri) throws XMLStreamException {
+        writer.setPrefix(prefix, uri);
+    }
+
+    public void setDefaultNamespace(String uri) throws XMLStreamException {
+        writer.setDefaultNamespace(uri);
+    }
+
+    public void setNamespaceContext(NamespaceContext context) throws XMLStreamException {
+        writer.setNamespaceContext(context);
+    }
+
+    public NamespaceContext getNamespaceContext() {
+        return writer.getNamespaceContext();
+    }
+
+    public Object getProperty(String name) throws IllegalArgumentException {
+        return writer.getProperty(name);
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/DomSerializer.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/DomSerializer.java
index 8de932f3a91..34e3c40bb45 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/DomSerializer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/DomSerializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.txw2.output;
 
 import org.w3c.dom.Document;
@@ -55,7 +56,7 @@ public class DomSerializer implements XmlSerializer {
 
     public DomSerializer(Node node) {
         Dom2SaxAdapter adapter = new Dom2SaxAdapter(node);
-        serializer = new SaxSerializer(adapter,adapter);
+        serializer = new SaxSerializer(adapter,adapter,false);
     }
 
     public DomSerializer(DOMResult domResult) {
@@ -68,12 +69,12 @@ public class DomSerializer implements XmlSerializer {
                 DocumentBuilder db = dbf.newDocumentBuilder();
                 Document doc = db.newDocument();
                 domResult.setNode(doc);
-                serializer = new SaxSerializer(new Dom2SaxAdapter(doc));
+                serializer = new SaxSerializer(new Dom2SaxAdapter(doc),null,false);
             } catch (ParserConfigurationException pce) {
                 throw new TxwException(pce);
             }
         } else {
-            serializer = new SaxSerializer(new Dom2SaxAdapter(node));
+            serializer = new SaxSerializer(new Dom2SaxAdapter(node),null,false);
         }
     }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/DumbEscapeHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/DumbEscapeHandler.java
index b887f7e7ad5..0ee526b49f5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/DumbEscapeHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/DumbEscapeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.txw2.output;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/DumpSerializer.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/DumpSerializer.java
index 67bce07b5ce..1460613170e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/DumpSerializer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/DumpSerializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.txw2.output;
 
 import java.io.PrintStream;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/IndentingXMLFilter.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/IndentingXMLFilter.java
new file mode 100644
index 00000000000..b4e26405025
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/IndentingXMLFilter.java
@@ -0,0 +1,311 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.txw2.output;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
+import org.xml.sax.ext.LexicalHandler;
+import org.xml.sax.helpers.XMLFilterImpl;
+
+import java.util.Stack;
+
+/**
+ * {@link XMLFilterImpl} that does indentation to SAX events.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public class IndentingXMLFilter extends XMLFilterImpl implements LexicalHandler {
+    private LexicalHandler lexical;
+
+    public IndentingXMLFilter() {
+    }
+
+    public IndentingXMLFilter(ContentHandler handler) {
+        setContentHandler(handler);
+    }
+
+    public IndentingXMLFilter(ContentHandler handler, LexicalHandler lexical) {
+        setContentHandler(handler);
+        setLexicalHandler(lexical);
+    }
+
+    public LexicalHandler getLexicalHandler() {
+        return lexical;
+    }
+
+    public void setLexicalHandler(LexicalHandler lexical) {
+        this.lexical = lexical;
+    }
+
+
+    /**
+     * Return the current indent step.
+     *
+     * 
    Return the current indent step: each start tag will be
+     * indented by this number of spaces times the number of
+     * ancestors that the element has.
    
+     *
+     * @return The number of spaces in each indentation step,
+     *         or 0 or less for no indentation.
+     * @see #setIndentStep(int)
+     *
+     * @deprecated
+     *      Only return the length of the indent string.
+     */
+    public int getIndentStep ()
+    {
+        return indentStep.length();
+    }
+
+
+    /**
+     * Set the current indent step.
+     *
+     * @param indentStep The new indent step (0 or less for no
+     *        indentation).
+     * @see #getIndentStep()
+     *
+     * @deprecated
+     *      Should use the version that takes string.
+     */
+    public void setIndentStep (int indentStep)
+    {
+        StringBuilder s = new StringBuilder();
+        for( ; indentStep>0; indentStep-- )   s.append(' ');
+        setIndentStep(s.toString());
+    }
+
+    public void setIndentStep(String s) {
+        this.indentStep = s;
+    }
+
+
+
+    ////////////////////////////////////////////////////////////////////
+    // Override methods from XMLWriter.
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Write a start tag.
+     *
+     * 
    Each tag will begin on a new line, and will be
+     * indented by the current indent step times the number
+     * of ancestors that the element has.
    
+     *
+     * 
    The newline and indentation will be passed on down
+     * the filter chain through regular characters events.
    
+     *
+     * @param uri The element's Namespace URI.
+     * @param localName The element's local name.
+     * @param qName The element's qualified (prefixed) name.
+     * @param atts The element's attribute list.
+     * @exception org.xml.sax.SAXException If there is an error
+     *            writing the start tag, or if a filter further
+     *            down the chain raises an exception.
+     * @see XMLWriter#startElement(String, String, String,Attributes)
+     */
+    public void startElement (String uri, String localName,
+                              String qName, Attributes atts)
+        throws SAXException {
+        stateStack.push(SEEN_ELEMENT);
+        state = SEEN_NOTHING;
+        if (depth > 0) {
+            writeNewLine();
+        }
+        doIndent();
+        super.startElement(uri, localName, qName, atts);
+        depth++;
+    }
+
+    private void writeNewLine() throws SAXException {
+        super.characters(NEWLINE,0,NEWLINE.length);
+    }
+
+    private static final char[] NEWLINE = {'\n'};
+
+
+    /**
+     * Write an end tag.
+     *
+     * 
    If the element has contained other elements, the tag
+     * will appear indented on a new line; otherwise, it will
+     * appear immediately following whatever came before.
    
+     *
+     * 
    The newline and indentation will be passed on down
+     * the filter chain through regular characters events.
    
+     *
+     * @param uri The element's Namespace URI.
+     * @param localName The element's local name.
+     * @param qName The element's qualified (prefixed) name.
+     * @exception org.xml.sax.SAXException If there is an error
+     *            writing the end tag, or if a filter further
+     *            down the chain raises an exception.
+     * @see XMLWriter#endElement(String, String, String)
+     */
+    public void endElement (String uri, String localName, String qName)
+        throws SAXException
+    {
+        depth--;
+        if (state == SEEN_ELEMENT) {
+            writeNewLine();
+            doIndent();
+        }
+        super.endElement(uri, localName, qName);
+        state = stateStack.pop();
+    }
+
+
+//    /**
+//     * Write a empty element tag.
+//     *
+//     * 
    Each tag will appear on a new line, and will be
+//     * indented by the current indent step times the number
+//     * of ancestors that the element has.
    
+//     *
+//     * 
    The newline and indentation will be passed on down
+//     * the filter chain through regular characters events.
    
+//     *
+//     * @param uri The element's Namespace URI.
+//     * @param localName The element's local name.
+//     * @param qName The element's qualified (prefixed) name.
+//     * @param atts The element's attribute list.
+//     * @exception org.xml.sax.SAXException If there is an error
+//     *            writing the empty tag, or if a filter further
+//     *            down the chain raises an exception.
+//     * @see XMLWriter#emptyElement(String, String, String, Attributes)
+//     */
+//    public void emptyElement (String uri, String localName,
+//                              String qName, Attributes atts)
+//        throws SAXException
+//    {
+//        state = SEEN_ELEMENT;
+//        if (depth > 0) {
+//            super.characters("\n");
+//        }
+//        doIndent();
+//        super.emptyElement(uri, localName, qName, atts);
+//    }
+
+
+    /**
+     * Write a sequence of characters.
+     *
+     * @param ch The characters to write.
+     * @param start The starting position in the array.
+     * @param length The number of characters to use.
+     * @exception org.xml.sax.SAXException If there is an error
+     *            writing the characters, or if a filter further
+     *            down the chain raises an exception.
+     * @see XMLWriter#characters(char[], int, int)
+     */
+    public void characters (char ch[], int start, int length)
+        throws SAXException
+    {
+        state = SEEN_DATA;
+        super.characters(ch, start, length);
+    }
+
+    public void comment(char ch[], int start, int length) throws SAXException {
+        if (depth > 0) {
+            writeNewLine();
+        }
+        doIndent();
+        if(lexical!=null)
+            lexical.comment(ch,start,length);
+    }
+
+    public void startDTD(String name, String publicId, String systemId) throws SAXException {
+        if(lexical!=null)
+            lexical.startDTD(name, publicId, systemId);
+    }
+
+    public void endDTD() throws SAXException {
+        if(lexical!=null)
+            lexical.endDTD();
+    }
+
+    public void startEntity(String name) throws SAXException {
+        if(lexical!=null)
+            lexical.startEntity(name);
+    }
+
+    public void endEntity(String name) throws SAXException {
+        if(lexical!=null)
+            lexical.endEntity(name);
+    }
+
+    public void startCDATA() throws SAXException {
+        if(lexical!=null)
+            lexical.startCDATA();
+    }
+
+    public void endCDATA() throws SAXException {
+        if(lexical!=null)
+            lexical.endCDATA();
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    // Internal methods.
+    ////////////////////////////////////////////////////////////////////
+
+
+    /**
+     * Print indentation for the current level.
+     *
+     * @exception org.xml.sax.SAXException If there is an error
+     *            writing the indentation characters, or if a filter
+     *            further down the chain raises an exception.
+     */
+    private void doIndent ()
+        throws SAXException
+    {
+        if (depth > 0) {
+            char[] ch = indentStep.toCharArray();
+            for( int i=0; i stateStack = new Stack();
+
+    private String indentStep = "";
+    private int depth = 0;
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/IndentingXMLStreamWriter.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/IndentingXMLStreamWriter.java
new file mode 100644
index 00000000000..51144102bc9
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/IndentingXMLStreamWriter.java
@@ -0,0 +1,194 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.txw2.output;
+
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+import java.util.Stack;
+
+/**
+ * @author Kohsuke Kawaguchi
+ */
+public class IndentingXMLStreamWriter extends DelegatingXMLStreamWriter {
+    private final static Object SEEN_NOTHING = new Object();
+    private final static Object SEEN_ELEMENT = new Object();
+    private final static Object SEEN_DATA = new Object();
+
+    private Object state = SEEN_NOTHING;
+    private Stack stateStack = new Stack();
+
+    private String indentStep = "  ";
+    private int depth = 0;
+
+    public IndentingXMLStreamWriter(XMLStreamWriter writer) {
+        super(writer);
+    }
+
+    /**
+     * Return the current indent step.
+     *
+     * 
    Return the current indent step: each start tag will be
+     * indented by this number of spaces times the number of
+     * ancestors that the element has.
    
+     *
+     * @return The number of spaces in each indentation step,
+     *         or 0 or less for no indentation.
+     * @see #setIndentStep(int)
+     *
+     * @deprecated
+     *      Only return the length of the indent string.
+     */
+    public int getIndentStep() {
+        return indentStep.length();
+    }
+
+
+    /**
+     * Set the current indent step.
+     *
+     * @param indentStep The new indent step (0 or less for no
+     *        indentation).
+     * @see #getIndentStep()
+     *
+     * @deprecated
+     *      Should use the version that takes string.
+     */
+    public void setIndentStep(int indentStep) {
+        StringBuilder s = new StringBuilder();
+        for (; indentStep > 0; indentStep--) s.append(' ');
+        setIndentStep(s.toString());
+    }
+
+    public void setIndentStep(String s) {
+        this.indentStep = s;
+    }
+
+    private void onStartElement() throws XMLStreamException {
+        stateStack.push(SEEN_ELEMENT);
+        state = SEEN_NOTHING;
+        if (depth > 0) {
+            super.writeCharacters("\n");
+        }
+        doIndent();
+        depth++;
+    }
+
+    private void onEndElement() throws XMLStreamException {
+        depth--;
+        if (state == SEEN_ELEMENT) {
+            super.writeCharacters("\n");
+            doIndent();
+        }
+        state = stateStack.pop();
+    }
+
+    private void onEmptyElement() throws XMLStreamException {
+        state = SEEN_ELEMENT;
+        if (depth > 0) {
+            super.writeCharacters("\n");
+        }
+        doIndent();
+    }
+
+    /**
+     * Print indentation for the current level.
+     *
+     * @exception org.xml.sax.SAXException If there is an error
+     *            writing the indentation characters, or if a filter
+     *            further down the chain raises an exception.
+     */
+    private void doIndent() throws XMLStreamException {
+        if (depth > 0) {
+            for (int i = 0; i < depth; i++)
+                super.writeCharacters(indentStep);
+        }
+    }
+
+
+    public void writeStartDocument() throws XMLStreamException {
+        super.writeStartDocument();
+        super.writeCharacters("\n");
+    }
+
+    public void writeStartDocument(String version) throws XMLStreamException {
+        super.writeStartDocument(version);
+        super.writeCharacters("\n");
+    }
+
+    public void writeStartDocument(String encoding, String version) throws XMLStreamException {
+        super.writeStartDocument(encoding, version);
+        super.writeCharacters("\n");
+    }
+
+    public void writeStartElement(String localName) throws XMLStreamException {
+        onStartElement();
+        super.writeStartElement(localName);
+    }
+
+    public void writeStartElement(String namespaceURI, String localName) throws XMLStreamException {
+        onStartElement();
+        super.writeStartElement(namespaceURI, localName);
+    }
+
+    public void writeStartElement(String prefix, String localName, String namespaceURI) throws XMLStreamException {
+        onStartElement();
+        super.writeStartElement(prefix, localName, namespaceURI);
+    }
+
+    public void writeEmptyElement(String namespaceURI, String localName) throws XMLStreamException {
+        onEmptyElement();
+        super.writeEmptyElement(namespaceURI, localName);
+    }
+
+    public void writeEmptyElement(String prefix, String localName, String namespaceURI) throws XMLStreamException {
+        onEmptyElement();
+        super.writeEmptyElement(prefix, localName, namespaceURI);
+    }
+
+    public void writeEmptyElement(String localName) throws XMLStreamException {
+        onEmptyElement();
+        super.writeEmptyElement(localName);
+    }
+
+    public void writeEndElement() throws XMLStreamException {
+        onEndElement();
+        super.writeEndElement();
+    }
+
+    public void writeCharacters(String text) throws XMLStreamException {
+        state = SEEN_DATA;
+        super.writeCharacters(text);
+    }
+
+    public void writeCharacters(char[] text, int start, int len) throws XMLStreamException {
+        state = SEEN_DATA;
+        super.writeCharacters(text, start, len);
+    }
+
+    public void writeCData(String data) throws XMLStreamException {
+        state = SEEN_DATA;
+        super.writeCData(data);
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/ResultFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/ResultFactory.java
index 9b2bb48c0b3..0dd788948ef 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/ResultFactory.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/ResultFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.txw2.output;
 
 import javax.xml.transform.Result;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/SaxSerializer.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/SaxSerializer.java
index 570cd0dd34b..106d1c39459 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/SaxSerializer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/SaxSerializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.txw2.output;
 
 import com.sun.xml.internal.txw2.TxwException;
@@ -44,7 +45,7 @@ public class SaxSerializer implements XmlSerializer {
     private final LexicalHandler lexical;
 
     public SaxSerializer(ContentHandler handler) {
-        this(handler,null);
+        this(handler,null,true);
     }
 
     /**
@@ -55,8 +56,18 @@ public class SaxSerializer implements XmlSerializer {
      * to write comments and CDATA sections.
      */
     public SaxSerializer(ContentHandler handler,LexicalHandler lex) {
-        writer = handler;
-        lexical = lex;
+        this(handler, lex, true);
+    }
+
+    public SaxSerializer(ContentHandler handler,LexicalHandler lex, boolean indenting) {
+        if(!indenting) {
+            writer = handler;
+            lexical = lex;
+        } else {
+            IndentingXMLFilter indenter = new IndentingXMLFilter(handler, lex);
+            writer = indenter;
+            lexical = indenter;
+        }
     }
 
     public SaxSerializer(SAXResult result) {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/StaxSerializer.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/StaxSerializer.java
index 4b6c8218287..d8d34a5df98 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/StaxSerializer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/StaxSerializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.txw2.output;
 
 import com.sun.xml.internal.txw2.TxwException;
@@ -41,6 +42,12 @@ public class StaxSerializer implements XmlSerializer {
     private final XMLStreamWriter out;
 
     public StaxSerializer(XMLStreamWriter writer) {
+        this(writer,true);
+    }
+
+    public StaxSerializer(XMLStreamWriter writer, boolean indenting) {
+        if(indenting)
+            writer = new IndentingXMLStreamWriter(writer);
         this.out = writer;
     }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/StreamSerializer.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/StreamSerializer.java
index 601fafb8cd7..0370870cfcf 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/StreamSerializer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/StreamSerializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.txw2.output;
 
 import com.sun.xml.internal.txw2.TxwException;
@@ -83,7 +84,7 @@ public class StreamSerializer implements XmlSerializer {
             throw new IllegalArgumentException();
 
         // now delegate to the SaxSerializer
-        serializer = new SaxSerializer(writer,writer) {
+        serializer = new SaxSerializer(writer,writer,false) {
             public void endDocument() {
                 super.endDocument();
                 if(autoClose[0]!=null) {
@@ -101,7 +102,7 @@ public class StreamSerializer implements XmlSerializer {
     private StreamSerializer(XMLWriter writer) {
         this.writer = writer;
         // now delegate to the SaxSerializer
-        serializer = new SaxSerializer(writer,writer);
+        serializer = new SaxSerializer(writer,writer,false);
     }
 
     private String convertURL(String url) {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/XMLWriter.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/XMLWriter.java
index bdbf0ec214b..f1315122846 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/XMLWriter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/XMLWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 // @@3RD PARTY CODE@@
 
 // XMLWriter.java - serialize an XML document.
@@ -260,6 +261,7 @@ import java.util.Map;
  * character data.
    
  *
  * @author David Megginson, david@megginson.com
+ * @version 0.2
  * @since JAXB1.0
  * @see org.xml.sax.XMLFilter
  * @see org.xml.sax.ContentHandler
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/XmlSerializer.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/XmlSerializer.java
index 644d4435fa4..f1de6ab2b98 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/XmlSerializer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/XmlSerializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/package.html b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/package.html
index f6c3b6cee67..7008cef9b0e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/package.html
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/package.html
@@ -1,3 +1,27 @@
+
 
 
   
    
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/package.html b/jaxws/src/share/classes/com/sun/xml/internal/txw2/package.html
index 9340078640f..2c5587186ed 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/package.html
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/package.html
@@ -1,3 +1,27 @@
+
 
 
   
    
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/Closeable.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/Closeable.java
new file mode 100644
index 00000000000..3a003c79b71
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/Closeable.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws;
+
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.Dispatch;
+import java.io.IOException;
+
+/**
+ * Closeable JAX-WS proxy object.
+ *
+ * @author Kohsuke Kawaguchi
+ * @since JAX-WS 2.0.2
+ */
+// this interface is exposed to applications.
+public interface Closeable extends java.io.Closeable {
+    /**
+     * Closes this object and cleans up any resources
+     * it holds, such as network connections.
+     *
+     * 
    
+     * This interface is implemented by a port proxy
+     * or {@link Dispatch}. In particular, this signals
+     * the implementation of certain specs (like WS-ReliableMessaging
+     * and WS-SecureConversation) to terminate sessions that they
+     * create during the life time of a proxy object.
+     *
+     * 
    
+     * This is not a mandatory operation, so the application
+     * does not have to call this method.
+     *
+     *
+     * @throws WebServiceException
+     *      If clean up fails unexpectedly, this exception
+     *      will be thrown (instead of {@link IOException}.
+     */
+    public void close() throws WebServiceException;
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/EndpointReferenceUtil.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/EndpointReferenceUtil.java
new file mode 100644
index 00000000000..7f042f0ee24
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/EndpointReferenceUtil.java
@@ -0,0 +1,368 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+
+package com.sun.xml.internal.ws.addressing;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.stream.buffer.XMLStreamBufferSource;
+import com.sun.xml.internal.stream.buffer.stax.StreamWriterBufferCreator;
+import com.sun.xml.internal.ws.api.addressing.AddressingVersion;
+import com.sun.xml.internal.ws.developer.MemberSubmissionEndpointReference;
+import com.sun.xml.internal.ws.util.DOMUtil;
+import com.sun.xml.internal.ws.util.xml.XmlUtil;
+import com.sun.xml.internal.ws.wsdl.parser.WSDLConstants;
+import com.sun.xml.internal.ws.addressing.v200408.MemberSubmissionAddressingConstants;
+import org.w3c.dom.*;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.ws.EndpointReference;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.wsaddressing.W3CEndpointReference;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Rama Pulavarthi
+ */
+
+public class EndpointReferenceUtil {
+    /**
+     * Gives the EPR based on the clazz. It may need to perform tranformation from
+     * W3C EPR to MS EPR or vise-versa.
+     */
+    public static  T transform(Class clazz, @NotNull EndpointReference epr) {
+        assert epr != null;
+        if (clazz.isAssignableFrom(W3CEndpointReference.class)) {
+            if (epr instanceof W3CEndpointReference) {
+                return (T) epr;
+            } else if (epr instanceof MemberSubmissionEndpointReference) {
+                return (T) toW3CEpr((MemberSubmissionEndpointReference) epr);
+            }
+        } else if (clazz.isAssignableFrom(MemberSubmissionEndpointReference.class)) {
+            if (epr instanceof W3CEndpointReference) {
+                return (T) toMSEpr((W3CEndpointReference) epr);
+            } else if (epr instanceof MemberSubmissionEndpointReference) {
+                return (T) epr;
+            }
+        }
+
+        //This must be an EPR that we dont know
+        throw new WebServiceException("Unknwon EndpointReference: " + epr.getClass());
+    }
+
+    //TODO: bit of redundency on writes of w3c epr, should modularize it
+    private static W3CEndpointReference toW3CEpr(MemberSubmissionEndpointReference msEpr) {
+        StreamWriterBufferCreator writer = new StreamWriterBufferCreator();
+        w3cMetadataWritten = false;
+        try {
+            writer.writeStartDocument();
+            writer.writeStartElement(AddressingVersion.W3C.getPrefix(),
+                    "EndpointReference", AddressingVersion.W3C.nsUri);
+            writer.writeNamespace(AddressingVersion.W3C.getPrefix(),
+                    AddressingVersion.W3C.nsUri);
+            //write wsa:Address
+            writer.writeStartElement(AddressingVersion.W3C.getPrefix(),
+                    W3CAddressingConstants.WSA_ADDRESS_NAME, AddressingVersion.W3C.nsUri);
+            writer.writeCharacters(msEpr.addr.uri);
+            writer.writeEndElement();
+            //TODO: write extension attributes on wsa:Address
+            if ((msEpr.referenceProperties != null && msEpr.referenceProperties.elements.size() > 0) ||
+                    (msEpr.referenceParameters != null && msEpr.referenceParameters.elements.size() > 0)) {
+
+                writer.writeStartElement(AddressingVersion.W3C.getPrefix(), "ReferenceParameters", AddressingVersion.W3C.nsUri);
+
+                //write ReferenceProperties
+                if (msEpr.referenceProperties != null) {
+                    for (Element e : msEpr.referenceProperties.elements) {
+                        DOMUtil.serializeNode(e, writer);
+                    }
+                }
+                //write referenceParameters
+                if (msEpr.referenceParameters != null) {
+                    for (Element e : msEpr.referenceParameters.elements) {
+                        DOMUtil.serializeNode(e, writer);
+                    }
+                }
+                writer.writeEndElement();
+            }
+            // Supress writing ServiceName and EndpointName in W3CEPR,
+            // Until the ns for those metadata elements is resolved.
+            /*
+            //Write Interface info
+            if (msEpr.portTypeName != null) {
+                writeW3CMetadata(writer);
+                writer.writeStartElement(AddressingVersion.W3C.getWsdlPrefix(),
+                        W3CAddressingConstants.WSAW_INTERFACENAME_NAME,
+                        AddressingVersion.W3C.wsdlNsUri);
+                writer.writeNamespace(AddressingVersion.W3C.getWsdlPrefix(),
+                        AddressingVersion.W3C.wsdlNsUri);
+                String portTypePrefix = fixNull(msEpr.portTypeName.name.getPrefix());
+                writer.writeNamespace(portTypePrefix, msEpr.portTypeName.name.getNamespaceURI());
+                if (portTypePrefix.equals(""))
+                    writer.writeCharacters(msEpr.portTypeName.name.getLocalPart());
+                else
+                    writer.writeCharacters(portTypePrefix + ":" + msEpr.portTypeName.name.getLocalPart());
+                writer.writeEndElement();
+            }
+            if (msEpr.serviceName != null) {
+                writeW3CMetadata(writer);
+                //Write service and Port info
+                writer.writeStartElement(AddressingVersion.W3C.getWsdlPrefix(),
+                        W3CAddressingConstants.WSAW_SERVICENAME_NAME,
+                        AddressingVersion.W3C.wsdlNsUri);
+                writer.writeNamespace(AddressingVersion.W3C.getWsdlPrefix(),
+                        AddressingVersion.W3C.wsdlNsUri);
+
+                String servicePrefix = fixNull(msEpr.serviceName.name.getPrefix());
+                if (msEpr.serviceName.portName != null)
+                    writer.writeAttribute(W3CAddressingConstants.WSAW_ENDPOINTNAME_NAME,
+                            msEpr.serviceName.portName);
+
+                writer.writeNamespace(servicePrefix, msEpr.serviceName.name.getNamespaceURI());
+                if (servicePrefix.length() > 0)
+                    writer.writeCharacters(servicePrefix + ":" + msEpr.serviceName.name.getLocalPart());
+                else
+                    writer.writeCharacters(msEpr.serviceName.name.getLocalPart());
+                writer.writeEndElement();
+            }
+            */
+            //TODO: revisit this
+            Element wsdlElement = null;
+            //Check for wsdl in extension elements
+            if ((msEpr.elements != null) && (msEpr.elements.size() > 0)) {
+                for (Element e : msEpr.elements) {
+                    if(e.getNamespaceURI().equals(MemberSubmissionAddressingConstants.MEX_METADATA.getNamespaceURI()) &&
+                            e.getLocalName().equals(MemberSubmissionAddressingConstants.MEX_METADATA.getLocalPart())) {
+                        NodeList nl = e.getElementsByTagNameNS(WSDLConstants.NS_WSDL,
+                                WSDLConstants.QNAME_DEFINITIONS.getLocalPart());
+                        if(nl != null)
+                            wsdlElement = (Element) nl.item(0);
+                    }
+                }
+            }
+            //write WSDL
+            if (wsdlElement != null) {
+                DOMUtil.serializeNode(wsdlElement, writer);
+            }
+
+            if (w3cMetadataWritten)
+                writer.writeEndElement();
+            //TODO revisit this
+            //write extension elements
+            if ((msEpr.elements != null) && (msEpr.elements.size() > 0)) {
+                for (Element e : msEpr.elements) {
+                    if (e.getNamespaceURI().equals(WSDLConstants.NS_WSDL) &&
+                            e.getLocalName().equals(WSDLConstants.QNAME_DEFINITIONS.getLocalPart())) {
+                        // Don't write it as this is written already in Metadata
+                    }
+                    DOMUtil.serializeNode(e, writer);
+                }
+            }
+
+            //TODO:write extension attributes
+
+            //
+            writer.writeEndElement();
+            writer.writeEndDocument();
+            writer.flush();
+        } catch (XMLStreamException e) {
+            throw new WebServiceException(e);
+        }
+        return new W3CEndpointReference(new XMLStreamBufferSource(writer.getXMLStreamBuffer()));
+    }
+
+    private static boolean w3cMetadataWritten = false;
+
+    private static void writeW3CMetadata(StreamWriterBufferCreator writer) throws XMLStreamException {
+        if (!w3cMetadataWritten) {
+            writer.writeStartElement(AddressingVersion.W3C.getPrefix(), W3CAddressingConstants.WSA_METADATA_NAME, AddressingVersion.W3C.nsUri);
+            w3cMetadataWritten = true;
+        }
+    }
+
+    private static MemberSubmissionEndpointReference toMSEpr(W3CEndpointReference w3cEpr) {
+        DOMResult result = new DOMResult();
+        w3cEpr.writeTo(result);
+        Node eprNode = result.getNode();
+        Element e = DOMUtil.getFirstElementChild(eprNode);
+        if (e == null)
+            return null;
+
+        MemberSubmissionEndpointReference msEpr = new MemberSubmissionEndpointReference();
+
+        NodeList nodes = e.getChildNodes();
+        for (int i = 0; i < nodes.getLength(); i++) {
+            if (nodes.item(i).getNodeType() == Node.ELEMENT_NODE) {
+                Element child = (Element) nodes.item(i);
+                if (child.getNamespaceURI().equals(AddressingVersion.W3C.nsUri) &&
+                        child.getLocalName().equals(W3CAddressingConstants.WSA_ADDRESS_NAME)) {
+                    if (msEpr.addr == null)
+                        msEpr.addr = new MemberSubmissionEndpointReference.Address();
+                    msEpr.addr.uri = XmlUtil.getTextForNode(child);
+
+                    //now add the attribute extensions
+                    msEpr.addr.attributes = getAttributes(child);
+                } else if (child.getNamespaceURI().equals(AddressingVersion.W3C.nsUri) &&
+                        child.getLocalName().equals("ReferenceParameters")) {
+                    NodeList refParams = child.getChildNodes();
+                    for (int j = 0; j < refParams.getLength(); j++) {
+                        if (refParams.item(j).getNodeType() == Node.ELEMENT_NODE) {
+                            if (msEpr.referenceParameters == null) {
+                                msEpr.referenceParameters = new MemberSubmissionEndpointReference.Elements();
+                                msEpr.referenceParameters.elements = new ArrayList();
+                            }
+                            msEpr.referenceParameters.elements.add((Element) refParams.item(i));
+                        }
+                    }
+                } else if (child.getNamespaceURI().equals(AddressingVersion.W3C.nsUri) &&
+                        child.getLocalName().equals(W3CAddressingConstants.WSA_METADATA_NAME)) {
+                    NodeList metadata = child.getChildNodes();
+                    for (int j = 0; j < metadata.getLength(); j++) {
+                        Node node = metadata.item(j);
+                        if (node.getNodeType() != Node.ELEMENT_NODE)
+                            continue;
+
+                        Element elm = (Element) node;
+                        if (elm.getNamespaceURI().equals(AddressingVersion.W3C.wsdlNsUri) &&
+                                elm.getLocalName().equals(W3CAddressingConstants.WSAW_SERVICENAME_NAME)) {
+                            msEpr.serviceName = new MemberSubmissionEndpointReference.ServiceNameType();
+                            msEpr.serviceName.portName = elm.getAttribute(W3CAddressingConstants.WSAW_ENDPOINTNAME_NAME);
+
+                            String service = elm.getTextContent();
+                            String prefix = XmlUtil.getPrefix(service);
+                            String name = XmlUtil.getLocalPart(service);
+
+                            //if there is no service name then its not a valid EPR but lets continue as its optional anyway
+                            if (name == null)
+                                continue;
+
+                            if (prefix != null) {
+                                String ns = elm.lookupNamespaceURI(prefix);
+                                if (ns != null)
+                                    msEpr.serviceName.name = new QName(ns, name, prefix);
+                            } else {
+                                msEpr.serviceName.name = new QName(null, name);
+                            }
+                            msEpr.serviceName.attributes = getAttributes(elm);
+                        } else if (elm.getNamespaceURI().equals(AddressingVersion.W3C.wsdlNsUri) &&
+                                elm.getLocalName().equals(W3CAddressingConstants.WSAW_INTERFACENAME_NAME)) {
+                            msEpr.portTypeName = new MemberSubmissionEndpointReference.AttributedQName();
+
+                            String portType = elm.getTextContent();
+                            String prefix = XmlUtil.getPrefix(portType);
+                            String name = XmlUtil.getLocalPart(portType);
+
+                            //if there is no portType name then its not a valid EPR but lets continue as its optional anyway
+                            if (name == null)
+                                continue;
+
+                            if (prefix != null) {
+                                String ns = elm.lookupNamespaceURI(prefix);
+                                if (ns != null)
+                                    msEpr.portTypeName.name = new QName(ns, name, prefix);
+                            } else {
+                                msEpr.portTypeName.name = new QName(null, name);
+                            }
+                            msEpr.portTypeName.attributes = getAttributes(elm);
+                        } else if(elm.getNamespaceURI().equals(WSDLConstants.NS_WSDL) &&
+                                elm.getLocalName().equals(WSDLConstants.QNAME_DEFINITIONS.getLocalPart())) {
+                            Document doc = DOMUtil.createDom();
+                            Element mexEl = doc.createElementNS(MemberSubmissionAddressingConstants.MEX_METADATA.getNamespaceURI(),
+                                    MemberSubmissionAddressingConstants.MEX_METADATA.getPrefix()+":"
+                                            +MemberSubmissionAddressingConstants.MEX_METADATA.getLocalPart());
+                            Element metadataEl = doc.createElementNS(MemberSubmissionAddressingConstants.MEX_METADATA_SECTION.getNamespaceURI(),
+                                    MemberSubmissionAddressingConstants.MEX_METADATA_SECTION.getPrefix()+":"
+                                            +MemberSubmissionAddressingConstants.MEX_METADATA_SECTION.getLocalPart());
+                            metadataEl.setAttribute(MemberSubmissionAddressingConstants.MEX_METADATA_DIALECT_ATTRIBUTE,
+                                    MemberSubmissionAddressingConstants.MEX_METADATA_DIALECT_VALUE);
+                            metadataEl.appendChild(elm);
+                            mexEl.appendChild(metadataEl);
+
+                        } else {
+                            //TODO : Revisit this
+                            //its extensions in META-DATA and should be copied to extensions in MS EPR
+                            if (msEpr.elements == null) {
+                                msEpr.elements = new ArrayList();
+                            }
+                            msEpr.elements.add(elm);
+                        }
+                    }
+                } else {
+                    //its extensions
+                    if (msEpr.elements == null) {
+                        msEpr.elements = new ArrayList();
+                    }
+                    msEpr.elements.add((Element) child);
+
+                }
+            } else if (nodes.item(i).getNodeType() == Node.ATTRIBUTE_NODE) {
+                Node n = nodes.item(i);
+                if (msEpr.attributes == null) {
+                    msEpr.attributes = new HashMap();
+                    String prefix = fixNull(n.getPrefix());
+                    String ns = fixNull(n.getNamespaceURI());
+                    String localName = n.getLocalName();
+                    msEpr.attributes.put(new QName(ns, localName, prefix), n.getNodeValue());
+                }
+            }
+        }
+
+        return msEpr;
+    }
+
+    private static Map getAttributes(Node node) {
+        Map attribs = null;
+
+        NamedNodeMap nm = node.getAttributes();
+        for (int i = 0; i < nm.getLength(); i++) {
+            if (attribs == null)
+                attribs = new HashMap();
+            Node n = nm.item(i);
+            String prefix = fixNull(n.getPrefix());
+            String ns = fixNull(n.getNamespaceURI());
+            String localName = n.getLocalName();
+            if (prefix.equals("xmlns") || prefix.length() == 0 && localName.equals("xmlns"))
+                continue;
+
+            //exclude some attributes
+            if (!localName.equals(W3CAddressingConstants.WSAW_ENDPOINTNAME_NAME))
+                attribs.put(new QName(ns, localName, prefix), n.getNodeValue());
+        }
+        return attribs;
+    }
+
+    private static
+    @NotNull
+    String fixNull(@Nullable String s) {
+        if (s == null) return "";
+        else return s;
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/ProblemAction.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/ProblemAction.java
new file mode 100644
index 00000000000..dc155561f56
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/ProblemAction.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.addressing;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlElement;
+
+import com.sun.xml.internal.ws.addressing.W3CAddressingConstants;
+
+/**
+ * @author Arun Gupta
+ */
+@XmlRootElement(name="ProblemAction", namespace= W3CAddressingConstants.WSA_NAMESPACE_NAME)
+public class ProblemAction {
+
+    @XmlElement(name="Action", namespace=W3CAddressingConstants.WSA_NAMESPACE_NAME)
+    private String action;
+
+    @XmlElement(name="SoapAction", namespace=W3CAddressingConstants.WSA_NAMESPACE_NAME)
+    private String soapAction;
+
+    /** Creates a new instance of ProblemAction */
+    public ProblemAction() {
+    }
+
+    public ProblemAction(String action) {
+        this.action = action;
+    }
+
+    public ProblemAction(String action, String soapAction) {
+        this.action = action;
+        this.soapAction = soapAction;
+    }
+
+    public String getAction() {
+        return action;
+    }
+
+    public String getSoapAction() {
+        return soapAction;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/ProblemHeaderQName.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/ProblemHeaderQName.java
new file mode 100644
index 00000000000..17a81284d35
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/ProblemHeaderQName.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.addressing;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlValue;
+import javax.xml.namespace.QName;
+
+import static com.sun.xml.internal.ws.addressing.W3CAddressingConstants.WSA_NAMESPACE_NAME;
+
+/**
+ * @author Arun Gupta
+ */
+@XmlRootElement(name="ProblemHeaderQName", namespace= WSA_NAMESPACE_NAME)
+public class ProblemHeaderQName {
+    @XmlValue
+    private QName value;
+
+    /** Creates a new instance of ProblemHeaderQName */
+    public ProblemHeaderQName() {
+    }
+
+    public ProblemHeaderQName(QName name) {
+        this.value = name;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/W3CAddressingConstants.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/W3CAddressingConstants.java
new file mode 100644
index 00000000000..44b09819a50
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/W3CAddressingConstants.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.addressing;
+
+import javax.xml.namespace.QName;
+
+import com.sun.xml.internal.ws.api.addressing.AddressingVersion;
+
+/**
+ * Constants for W3C WS-Addressing version
+ *
+ * @author Arun Gupta
+ */
+public interface W3CAddressingConstants {
+    public static final String WSA_NAMESPACE_NAME = "http://www.w3.org/2005/08/addressing";
+    public static final String WSA_NAMESPACE_WSDL_NAME = "http://www.w3.org/2006/05/addressing/wsdl";
+
+    public static final String WSAW_SERVICENAME_NAME = "ServiceName";
+    public static final String WSAW_INTERFACENAME_NAME = "InterfaceName";
+    public static final String WSAW_ENDPOINTNAME_NAME = "EndpointName";
+
+    public static final String WSA_REFERENCEPROPERTIES_NAME = "ReferenceParameters";
+    public static final QName WSA_REFERENCEPROPERTIES_QNAME = new QName(WSA_NAMESPACE_NAME, WSA_REFERENCEPROPERTIES_NAME);
+
+    public static final String WSA_REFERENCEPARAMETERS_NAME = "ReferenceParameters";
+    public static final QName WSA_REFERENCEPARAMETERS_QNAME = new QName(WSA_NAMESPACE_NAME, WSA_REFERENCEPARAMETERS_NAME);
+
+    public static final String WSA_METADATA_NAME = "Metadata";
+    public static final QName WSA_METADATA_QNAME = new QName(WSA_NAMESPACE_NAME, WSA_METADATA_NAME);
+
+    public static final String WSA_ADDRESS_NAME = "Address";
+    public static final QName WSA_ADDRESS_QNAME = new QName(WSA_NAMESPACE_NAME, WSA_ADDRESS_NAME);
+
+    public static final String WSA_ANONYMOUS_ADDRESS = WSA_NAMESPACE_NAME + "/anonymous";
+    public static final String WSA_NONE_ADDRESS = WSA_NAMESPACE_NAME + "/none";
+
+    public static final String WSA_DEFAULT_FAULT_ACTION = WSA_NAMESPACE_NAME + "/fault";
+
+    public static final String WSAW_USING_ADDRESSING_NAME = "UsingAddressing";
+    public static final QName WSAW_USING_ADDRESSING_QNAME = new QName(WSA_NAMESPACE_WSDL_NAME, WSAW_USING_ADDRESSING_NAME);
+
+    public static final QName INVALID_MAP_QNAME = new QName(WSA_NAMESPACE_NAME, "InvalidAddressingHeader");
+    public static final QName MAP_REQUIRED_QNAME = new QName(WSA_NAMESPACE_NAME, "MessageAddressingHeaderRequired");
+    public static final QName DESTINATION_UNREACHABLE_QNAME = new QName(WSA_NAMESPACE_NAME, "DestinationUnreachable");
+    public static final QName ACTION_NOT_SUPPORTED_QNAME = new QName(WSA_NAMESPACE_NAME, "ActionNotSupported");
+    public static final QName ENDPOINT_UNAVAILABLE_QNAME = new QName(WSA_NAMESPACE_NAME, "EndpointUnavailable");
+
+    public static final String ACTION_NOT_SUPPORTED_TEXT = "The \"%s\" cannot be processed at the receiver";
+    public static final String DESTINATION_UNREACHABLE_TEXT = "No route can be determined to reach %s";
+    public static final String ENDPOINT_UNAVAILABLE_TEXT = "The endpoint is unable to process the message at this time";
+    public static final String INVALID_MAP_TEXT = "A header representing a Message Addressing Property is not valid and the message cannot be processed";
+    public static final String MAP_REQUIRED_TEXT = "A required header representing a Message Addressing Property is not present";
+
+    public static final QName PROBLEM_ACTION_QNAME = new QName(WSA_NAMESPACE_NAME, "ProblemAction");
+    public static final QName PROBLEM_HEADER_QNAME_QNAME = new QName(WSA_NAMESPACE_NAME, "ProblemHeaderQName");
+    public static final QName FAULT_DETAIL_QNAME = new QName(WSA_NAMESPACE_NAME, "FaultDetail");
+
+    // Fault subsubcode when an invalid address is specified.
+    public static final QName INVALID_ADDRESS_SUBCODE = new QName(WSA_NAMESPACE_NAME, "InvalidAddress",
+                                                                  AddressingVersion.W3C.getPrefix());
+
+    // Fault subsubcode when an invalid header was expected to be EndpointReference but was not valid.
+    public static final QName INVALID_EPR = new QName(WSA_NAMESPACE_NAME, "InvalidEPR", AddressingVersion.W3C.getPrefix());
+
+    // Fault subsubcode when greater than expected number of the specified header is received.
+    public static final QName INVALID_CARDINALITY = new QName(WSA_NAMESPACE_NAME, "InvalidCardinality",
+                                                              AddressingVersion.W3C.getPrefix());
+
+    // Fault subsubcode when an invalid header was expected to be EndpointReference but did not contain address.
+    public static final QName MISSING_ADDRESS_IN_EPR = new QName(WSA_NAMESPACE_NAME, "MissingAddressInEPR",
+                                                                 AddressingVersion.W3C.getPrefix());
+
+    // Fault subsubcode when a header contains a message id that was a duplicate of one already received.
+    public static final QName DUPLICATE_MESSAGEID = new QName(WSA_NAMESPACE_NAME, "DuplicateMessageID",
+                                                              AddressingVersion.W3C.getPrefix());
+
+    // Fault subsubcode when Action and SOAPAction for the mesage did not match.
+    public static final QName ACTION_MISMATCH = new QName(WSA_NAMESPACE_NAME, "ActionMismatch",
+                                                          AddressingVersion.W3C.getPrefix());
+
+    // Fault subsubcode when the only address supported is the anonymous address.
+    public static final QName ONLY_ANONYMOUS_ADDRESS_SUPPORTED = new QName(WSA_NAMESPACE_NAME, "OnlyAnonymousAddressSupported",
+                                                                           AddressingVersion.W3C.getPrefix());
+
+    //Fault subsubcode when anonymous address is not supported.
+    public static final QName ONLY_NON_ANONYMOUS_ADDRESS_SUPPORTED = new QName(WSA_NAMESPACE_NAME, "OnlyNonAnonymousAddressSupported",
+                                                                               AddressingVersion.W3C.getPrefix());
+
+    public static final String ANONYMOUS_EPR = "\n" +
+            "    
    http://www.w3.org/2005/08/addressing/anonymous
    \n" +
+            "";
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaClientTube.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaClientTube.java
new file mode 100644
index 00000000000..11714a506df
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaClientTube.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.addressing;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.ws.addressing.model.ActionNotSupportedException;
+import com.sun.xml.internal.ws.addressing.model.MapRequiredException;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.message.HeaderList;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLBoundOperation;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
+import com.sun.xml.internal.ws.api.pipe.NextAction;
+import com.sun.xml.internal.ws.api.pipe.Tube;
+import com.sun.xml.internal.ws.api.pipe.TubeCloner;
+import com.sun.xml.internal.ws.resources.AddressingMessages;
+
+import javax.xml.ws.WebServiceException;
+
+/**
+ * WsaClientTube appears in the Tubeline only if addressing is enabled.
+ * This tube checks the validity of addressing headers in the incoming messages
+ * based on the WSDL model.
+ *
+ * @author Arun Gupta
+ */
+public final class WsaClientTube extends WsaTube {
+    public WsaClientTube(WSDLPort wsdlPort, WSBinding binding, Tube next) {
+        super(wsdlPort, binding, next);
+    }
+
+    public WsaClientTube(WsaClientTube that, TubeCloner cloner) {
+        super(that, cloner);
+    }
+
+    public WsaClientTube copy(TubeCloner cloner) {
+        return new WsaClientTube(this, cloner);
+    }
+
+    public @NotNull NextAction processRequest(Packet request) {
+        return doInvoke(next,request);
+   }
+
+    public @NotNull NextAction processResponse(Packet response) {
+        // if one-way then, no validation
+        if (response.getMessage() != null)
+            response = validateInboundHeaders(response);
+
+        return doReturnWith(response);
+    }
+
+
+    @Override
+    public void validateAction(Packet packet) {
+        //There may not be a WSDL operation.  There may not even be a WSDL.
+        //For instance this may be a RM CreateSequence message.
+        WSDLBoundOperation wbo = getWSDLBoundOperation(packet);
+
+        if (wbo == null)    return;
+
+        String gotA = packet.getMessage().getHeaders().getAction(addressingVersion, soapVersion);
+        if (gotA == null)
+            throw new WebServiceException(AddressingMessages.VALIDATION_CLIENT_NULL_ACTION());
+
+        String expected = helper.getOutputAction(packet);
+
+        if (expected != null && !gotA.equals(expected))
+            throw new ActionNotSupportedException(gotA);
+    }
+
+    @Override
+    protected void checkMandatoryHeaders(Packet packet, boolean foundAction, boolean foundTo, boolean foundMessageID, boolean foundRelatesTo) {
+        super.checkMandatoryHeaders(packet, foundAction, foundTo, foundMessageID, foundRelatesTo);
+
+//        if(!foundRelatesTo)
+//            // RelatesTo required as per
+//            // Table 5-3 of http://www.w3.org/TR/2006/WD-ws-addr-wsdl-20060216/#wsdl11requestresponse
+//            throw new MapRequiredException(addressingVersion.relatesToTag);
+
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaServerTube.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaServerTube.java
new file mode 100644
index 00000000000..901ce3fee98
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaServerTube.java
@@ -0,0 +1,353 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.addressing;
+
+import com.sun.istack.internal.NotNull;
+import static com.sun.xml.internal.ws.addressing.W3CAddressingConstants.ONLY_ANONYMOUS_ADDRESS_SUPPORTED;
+import static com.sun.xml.internal.ws.addressing.W3CAddressingConstants.ONLY_NON_ANONYMOUS_ADDRESS_SUPPORTED;
+import com.sun.xml.internal.ws.addressing.model.ActionNotSupportedException;
+import com.sun.xml.internal.ws.addressing.model.InvalidMapException;
+import com.sun.xml.internal.ws.addressing.model.MapRequiredException;
+import com.sun.xml.internal.ws.api.EndpointAddress;
+import com.sun.xml.internal.ws.api.SOAPVersion;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.addressing.AddressingVersion;
+import com.sun.xml.internal.ws.api.addressing.WSEndpointReference;
+import com.sun.xml.internal.ws.api.message.HeaderList;
+import com.sun.xml.internal.ws.api.message.Message;
+import com.sun.xml.internal.ws.api.message.Messages;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLBoundOperation;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
+import com.sun.xml.internal.ws.api.pipe.ClientTubeAssemblerContext;
+import com.sun.xml.internal.ws.api.pipe.Fiber;
+import com.sun.xml.internal.ws.api.pipe.NextAction;
+import com.sun.xml.internal.ws.api.pipe.TransportTubeFactory;
+import com.sun.xml.internal.ws.api.pipe.Tube;
+import com.sun.xml.internal.ws.api.pipe.TubeCloner;
+import com.sun.xml.internal.ws.message.FaultDetailHeader;
+import com.sun.xml.internal.ws.resources.AddressingMessages;
+
+import javax.xml.soap.SOAPFault;
+import javax.xml.ws.WebServiceException;
+import java.net.URI;
+import java.util.logging.Logger;
+
+/**
+ * Handles WS-Addressing for the server.
+ *
+ * @author Kohsuke Kawaguchi
+ * @author Arun Gupta
+ */
+public final class WsaServerTube extends WsaTube {
+
+    // store the replyTo/faultTo of the message currently being processed.
+    // both will be set to non-null in processRequest
+    private WSEndpointReference replyTo;
+    private WSEndpointReference faultTo;
+    private boolean isAnonymousRequired = false;
+    /**
+     * WSDLBoundOperation calculated on the Request payload.
+     * Used for determining ReplyTo or Fault Action for non-anonymous responses     *
+     */
+    private WSDLBoundOperation wbo;
+    public WsaServerTube(@NotNull WSDLPort wsdlPort, WSBinding binding, Tube next) {
+        super(wsdlPort, binding, next);
+    }
+
+    public WsaServerTube(WsaServerTube that, TubeCloner cloner) {
+        super(that, cloner);
+    }
+
+    public WsaServerTube copy(TubeCloner cloner) {
+        return new WsaServerTube(this, cloner);
+    }
+
+    public @NotNull NextAction processRequest(Packet request) {
+        Message msg = request.getMessage();
+        if(msg==null)   return doInvoke(next,request); // hmm?
+
+
+        // Store request ReplyTo and FaultTo in requestPacket.invocationProperties
+        // so that they can be used after responsePacket is received.
+        // These properties are used if a fault is thrown from the subsequent Pipe/Tubes.
+
+        HeaderList hl = request.getMessage().getHeaders();
+        try {
+        replyTo = hl.getReplyTo(addressingVersion, soapVersion);
+        faultTo = hl.getFaultTo(addressingVersion, soapVersion);
+        } catch (InvalidMapException e) {
+            SOAPFault soapFault = helper.newInvalidMapFault(e, addressingVersion);
+            // WS-A fault processing for one-way methods
+            if (request.getMessage().isOneWay(wsdlPort)) {
+                request.createServerResponse(null, wsdlPort, null, binding);
+                return doInvoke(next, request);
+            }
+
+            Message m = Messages.create(soapFault);
+            if (soapVersion == SOAPVersion.SOAP_11) {
+                FaultDetailHeader s11FaultDetailHeader = new FaultDetailHeader(addressingVersion, addressingVersion.problemHeaderQNameTag.getLocalPart(), e.getMapQName());
+                m.getHeaders().add(s11FaultDetailHeader);
+            }
+
+            Packet response = request.createServerResponse(m, wsdlPort, null, binding);
+            return doReturnWith(response);
+        }
+        String messageId = hl.getMessageID(addressingVersion, soapVersion);
+
+        // TODO: This is probably not a very good idea.
+        // if someone wants to get this data, let them get from HeaderList.
+        // we can even provide a convenience method
+        //  -- KK.
+        request.invocationProperties.put(REQUEST_MESSAGE_ID, messageId);
+
+
+        // defaulting
+        if (replyTo == null)    replyTo = addressingVersion.anonymousEpr;
+        if (faultTo == null)    faultTo = replyTo;
+
+        wbo = getWSDLBoundOperation(request);
+        if(wbo != null && wbo.getAnonymous()== WSDLBoundOperation.ANONYMOUS.required)
+            isAnonymousRequired = true;
+        Packet p = validateInboundHeaders(request);
+        // if one-way message and WS-A header processing fault has occurred,
+        // then do no further processing
+        if (p.getMessage() == null)
+            // TODO: record the problem that we are dropping this problem on the floor.
+            return doReturnWith(p);
+
+        // if we find an error in addressing header, just turn around the direction here
+        if (p.getMessage().isFault()) {
+            // close the transportBackChannel if we know that
+            // we'll never use them
+            if (!(isAnonymousRequired) &&
+                    !faultTo.isAnonymous() && request.transportBackChannel != null)
+                request.transportBackChannel.close();
+            return processResponse(p);
+        }
+        // close the transportBackChannel if we know that
+        // we'll never use them
+        if (!(isAnonymousRequired) &&
+                !replyTo.isAnonymous() && !faultTo.isAnonymous() &&
+                request.transportBackChannel != null)
+            request.transportBackChannel.close();
+        return doInvoke(next,p);
+    }
+
+    @Override
+    public @NotNull NextAction processResponse(Packet response) {
+        Message msg = response.getMessage();
+        if (msg ==null)
+            return doReturnWith(response);  // one way message. Nothing to see here. Move on.
+
+        WSEndpointReference target = msg.isFault()?faultTo:replyTo;
+
+        if(target.isAnonymous() || isAnonymousRequired )
+            // the response will go back the back channel. most common case
+            return doReturnWith(response);
+
+        if(target.isNone()) {
+            // the caller doesn't want to hear about it, so proceed like one-way
+            response.setMessage(null);
+            return doReturnWith(response);
+        }
+
+        // send the response to this EPR.
+        processNonAnonymousReply(response,target);
+
+        // then we'll proceed the rest like one-way.
+        response.setMessage(null);
+        return doReturnWith(response);
+    }
+
+    /**
+     * Send a response to a non-anonymous address. Also closes the transport back channel
+     * of {@link Packet} if it's not closed already.
+     *
+     * 
    
+     * TODO: ideally we should be doing this by creating a new fiber.
+     *
+     * @param packet
+     *      The response from our server, which will be delivered to the destination.
+     * @param target
+     *      Where do we send the packet to?
+     */
+    private void processNonAnonymousReply(final Packet packet, WSEndpointReference target) {
+        // at this point we know we won't be sending anything back through the back channel,
+        // so close it first to let the client go.
+        if (packet.transportBackChannel != null)
+            packet.transportBackChannel.close();
+
+        if (packet.getMessage().isOneWay(wsdlPort)) {
+            // one way message but with replyTo. I believe this is a hack for WS-TX - KK.
+            LOGGER.fine(AddressingMessages.NON_ANONYMOUS_RESPONSE_ONEWAY());
+            return;
+        }
+
+        EndpointAddress adrs;
+        try {
+             adrs = new EndpointAddress(URI.create(target.getAddress()));
+        } catch (NullPointerException e) {
+            throw new WebServiceException(e);
+        } catch (IllegalArgumentException e) {
+            throw new WebServiceException(e);
+        }
+
+        // we need to assemble a pipeline to talk to this endpoint.
+        // TODO: what to pass as WSService?
+        Tube transport = TransportTubeFactory.create(Thread.currentThread().getContextClassLoader(),
+            new ClientTubeAssemblerContext(adrs, wsdlPort, null, binding));
+
+        packet.endpointAddress = adrs;
+        String action = packet.getMessage().isFault() ?
+                helper.getFaultAction(wbo, packet) :
+                helper.getOutputAction(wbo);
+        //set the SOAPAction, as its got to be same as wsa:Action
+        packet.soapAction = action;
+        Fiber.current().runSync(transport, packet);
+    }
+
+    @Override
+    public void validateAction(Packet packet) {
+        //There may not be a WSDL operation.  There may not even be a WSDL.
+        //For instance this may be a RM CreateSequence message.
+        WSDLBoundOperation wbo = getWSDLBoundOperation(packet);
+
+        if (wbo == null)
+            return;
+
+        String gotA = packet.getMessage().getHeaders().getAction(addressingVersion, soapVersion);
+
+        if (gotA == null)
+            throw new WebServiceException(AddressingMessages.VALIDATION_SERVER_NULL_ACTION());
+
+        String expected = helper.getInputAction(packet);
+        String soapAction = helper.getSOAPAction(packet);
+        if (helper.isInputActionDefault(packet) && (soapAction != null && !soapAction.equals("")))
+            expected = soapAction;
+
+        if (expected != null && !gotA.equals(expected)) {
+            throw new ActionNotSupportedException(gotA);
+        }
+    }
+
+    @Override
+    public void checkCardinality(Packet packet) {
+        super.checkCardinality(packet);
+
+        // wsaw:Anonymous validation
+        WSDLBoundOperation wbo = getWSDLBoundOperation(packet);
+        checkAnonymousSemantics(wbo, replyTo, faultTo);
+         // check if addresses are valid
+        checkNonAnonymousAddresses(replyTo,faultTo);
+    }
+
+    private void checkNonAnonymousAddresses(WSEndpointReference replyTo, WSEndpointReference faultTo) {
+        if (!replyTo.isAnonymous()) {
+            try {
+                new EndpointAddress(URI.create(replyTo.getAddress()));
+            } catch (Exception e) {
+                throw new InvalidMapException(addressingVersion.replyToTag, addressingVersion.invalidAddressTag);
+            }
+        }
+        //for now only validate ReplyTo
+        /*
+        if (!faultTo.isAnonymous()) {
+            try {
+                new EndpointAddress(URI.create(faultTo.getAddress()));
+            } catch (IllegalArgumentException e) {
+                throw new InvalidMapException(addressingVersion.faultToTag, addressingVersion.invalidAddressTag);
+            }
+        }
+        */
+
+    }
+
+    protected void checkMandatoryHeaders(
+        Packet packet, boolean foundAction, boolean foundTo, boolean foundMessageId, boolean foundRelatesTo) {
+        super.checkMandatoryHeaders(packet, foundAction, foundTo, foundMessageId, foundRelatesTo);
+        WSDLBoundOperation wbo = getWSDLBoundOperation(packet);
+        // no need to check for for non-application messages
+        if (wbo == null)
+            return;
+
+        // if no wsa:To header is found
+        if (!foundTo)
+            throw new MapRequiredException(addressingVersion.toTag);
+
+        // if two-way and no wsa:MessageID is found
+        if (!wbo.getOperation().isOneWay() && !foundMessageId)
+            throw new MapRequiredException(addressingVersion.messageIDTag);
+    }
+
+
+    final void checkAnonymousSemantics(WSDLBoundOperation wbo, WSEndpointReference replyTo, WSEndpointReference faultTo) {
+        // no check if Addressing is not enabled or is Member Submission
+        if (addressingVersion == null || addressingVersion == AddressingVersion.MEMBER)
+            return;
+
+        if (wbo == null)
+            return;
+
+        WSDLBoundOperation.ANONYMOUS anon = wbo.getAnonymous();
+
+        String replyToValue = null;
+        String faultToValue = null;
+
+        if (replyTo != null)
+            replyToValue = replyTo.getAddress();
+
+        if (faultTo != null)
+            faultToValue = faultTo.getAddress();
+
+        switch (anon) {
+        case optional:
+            // no check is required
+            break;
+        case prohibited:
+            if (replyToValue != null && replyToValue.equals(addressingVersion.anonymousUri))
+                throw new InvalidMapException(addressingVersion.replyToTag, ONLY_NON_ANONYMOUS_ADDRESS_SUPPORTED);
+
+            if (faultToValue != null && faultToValue.equals(addressingVersion.anonymousUri))
+                throw new InvalidMapException(addressingVersion.faultToTag, ONLY_NON_ANONYMOUS_ADDRESS_SUPPORTED);
+            break;
+        case required:
+            if (replyToValue != null && !replyToValue.equals(addressingVersion.anonymousUri))
+                throw new InvalidMapException(addressingVersion.replyToTag, ONLY_ANONYMOUS_ADDRESS_SUPPORTED);
+
+            if (faultToValue != null && !faultToValue.equals(addressingVersion.anonymousUri))
+                throw new InvalidMapException(addressingVersion.faultToTag, ONLY_ANONYMOUS_ADDRESS_SUPPORTED);
+            break;
+        default:
+            // cannot reach here
+            throw new WebServiceException(AddressingMessages.INVALID_WSAW_ANONYMOUS(anon.toString()));
+        }
+    }
+
+    public static final String REQUEST_MESSAGE_ID = "com.sun.xml.internal.ws.addressing.request.messageID";
+
+    private static final Logger LOGGER = Logger.getLogger(WsaServerTube.class.getName());
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaTube.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaTube.java
new file mode 100644
index 00000000000..1baa69ba169
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaTube.java
@@ -0,0 +1,346 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.addressing;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.ws.addressing.model.InvalidMapException;
+import com.sun.xml.internal.ws.addressing.model.MapRequiredException;
+import com.sun.xml.internal.ws.api.SOAPVersion;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.addressing.AddressingVersion;
+import com.sun.xml.internal.ws.api.message.Header;
+import com.sun.xml.internal.ws.api.message.Message;
+import com.sun.xml.internal.ws.api.message.Messages;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLBoundOperation;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
+import com.sun.xml.internal.ws.api.pipe.NextAction;
+import com.sun.xml.internal.ws.api.pipe.Tube;
+import com.sun.xml.internal.ws.api.pipe.TubeCloner;
+import com.sun.xml.internal.ws.api.pipe.helper.AbstractFilterTubeImpl;
+import com.sun.xml.internal.ws.developer.MemberSubmissionAddressingFeature;
+import com.sun.xml.internal.ws.message.FaultDetailHeader;
+import com.sun.xml.internal.ws.resources.AddressingMessages;
+
+import javax.xml.namespace.QName;
+import javax.xml.soap.SOAPFault;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.soap.AddressingFeature;
+import java.util.Iterator;
+
+/**
+ * WS-Addressing processing code shared between client and server.
+ *
+ * 
    
+ * This tube is used only when WS-Addressing is enabled.
+ *
+ * @author Arun Gupta
+ */
+abstract class WsaTube extends AbstractFilterTubeImpl {
+    /**
+     * Port that we are processing.
+     */
+    protected final @NotNull WSDLPort wsdlPort;
+    protected final WSBinding binding;
+    final WsaTubeHelper helper;
+    protected final @NotNull AddressingVersion addressingVersion;
+    protected final SOAPVersion soapVersion;
+
+    /**
+     * True if the addressing headers are mandatory.
+     */
+    private final boolean addressingRequired;
+
+    public WsaTube(WSDLPort wsdlPort, WSBinding binding, Tube next) {
+        super(next);
+        this.wsdlPort = wsdlPort;
+        this.binding = binding;
+        addressingVersion = binding.getAddressingVersion();
+        soapVersion = binding.getSOAPVersion();
+        helper = getTubeHelper();
+        addressingRequired = AddressingVersion.isRequired(binding);
+    }
+
+    public WsaTube(WsaTube that, TubeCloner cloner) {
+        super(that, cloner);
+        this.wsdlPort = that.wsdlPort;
+        this.binding = that.binding;
+        this.helper = that.helper;
+        addressingVersion = that.addressingVersion;
+        soapVersion = that.soapVersion;
+        addressingRequired = that.addressingRequired;
+    }
+
+    @Override
+    public
+    @NotNull
+    NextAction processException(Throwable t) {
+        return super.processException(t);
+    }
+
+    protected WsaTubeHelper getTubeHelper() {
+        if(binding.isFeatureEnabled(AddressingFeature.class)) {
+            return new WsaTubeHelperImpl(wsdlPort, null, binding);
+        } else if(binding.isFeatureEnabled(MemberSubmissionAddressingFeature.class)) {
+            //seiModel is null as it is not needed.
+            return new com.sun.xml.internal.ws.addressing.v200408.WsaTubeHelperImpl(wsdlPort, null, binding);
+        } else {
+            // Addressing is not enabled, WsaTube should not be included in the pipeline
+            throw new WebServiceException(AddressingMessages.ADDRESSING_NOT_ENABLED(this.getClass().getSimpleName()));
+        }
+    }
+
+    /**
+     * Validates the inbound message. If an error is found, create
+     * a fault message and returns that. Otherwise
+     * it will pass through the parameter 'packet' object to the return value.
+     */
+    protected final Packet validateInboundHeaders(Packet packet) {
+        SOAPFault soapFault;
+        FaultDetailHeader s11FaultDetailHeader;
+
+        try {
+            checkCardinality(packet);
+
+            return packet;
+        } catch (InvalidMapException e) {
+            soapFault = helper.newInvalidMapFault(e, addressingVersion);
+            s11FaultDetailHeader = new FaultDetailHeader(addressingVersion, addressingVersion.problemHeaderQNameTag.getLocalPart(), e.getMapQName());
+        } catch (MapRequiredException e) {
+            soapFault = helper.newMapRequiredFault(e, addressingVersion);
+            s11FaultDetailHeader = new FaultDetailHeader(addressingVersion, addressingVersion.problemHeaderQNameTag.getLocalPart(), e.getMapQName());
+        }
+
+        if (soapFault != null) {
+            // WS-A fault processing for one-way methods
+            if (packet.getMessage().isOneWay(wsdlPort)) {
+                return packet.createServerResponse(null, wsdlPort, null, binding);
+            }
+
+            Message m = Messages.create(soapFault);
+            if (soapVersion == SOAPVersion.SOAP_11) {
+                m.getHeaders().add(s11FaultDetailHeader);
+            }
+
+            Packet response = packet.createServerResponse(m, wsdlPort, null,  binding);
+            return response;
+        }
+
+        return packet;
+    }
+
+    final boolean isAddressingEngagedOrRequired(Packet packet, WSBinding binding) {
+        if (AddressingVersion.isRequired(binding))
+            return true;
+
+        if (packet == null)
+            return false;
+
+        if (packet.getMessage() == null)
+            return false;
+
+        if (packet.getMessage().getHeaders() != null)
+            return false;
+
+        String action = packet.getMessage().getHeaders().getAction(addressingVersion, soapVersion);
+        if (action == null)
+            return true;
+
+        return true;
+    }
+
+    /**
+     * Checks the cardinality of WS-Addressing headers on an inbound {@link Packet}. This method
+     * checks for the cardinality if WS-Addressing is engaged (detected by the presence of wsa:Action
+     * header) or wsdl:required=true.
+     *
+     * @param packet The inbound packet.
+     * @throws WebServiceException if:
+     * 
      
+     * 
    • there is an error reading ReplyTo or FaultTo
      • 
+     * 
    • WS-Addressing is required and {@link Message} within packet is null
      • 
+     * 
    • WS-Addressing is required and no headers are found in the {@link Message}
      • 
+     * 
    • an uknown WS-Addressing header is present
      • 
+     * 
    
+     */
+    public void checkCardinality(Packet packet) {
+        Message message = packet.getMessage();
+        if (message == null) {
+            if (addressingRequired)
+                throw new WebServiceException(AddressingMessages.NULL_MESSAGE());
+            else
+                return;
+        }
+
+        Iterator
     hIter = message.getHeaders().getHeaders(addressingVersion.nsUri, true);
+
+        if (!hIter.hasNext()) {
+            // no WS-A headers are found
+            if (addressingRequired)
+                // if WS-A is required, then throw an exception looking for wsa:Action header
+                throw new MapRequiredException(addressingVersion.actionTag);
+            else
+                // else no need to process
+                return;
+        }
+
+        boolean foundFrom = false;
+        boolean foundTo = false;
+        boolean foundReplyTo = false;
+        boolean foundFaultTo = false;
+        boolean foundAction = false;
+        boolean foundMessageId = false;
+        boolean foundRelatesTo = false;
+        QName duplicateHeader = null;
+
+        while (hIter.hasNext()) {
+            Header h = hIter.next();
+
+            // check if the Header is in current role
+            if (!isInCurrentRole(h, binding)) {
+                continue;
+            }
+
+            String local = h.getLocalPart();
+            if (local.equals(addressingVersion.fromTag.getLocalPart())) {
+                if (foundFrom) {
+                    duplicateHeader = addressingVersion.fromTag;
+                    break;
+                }
+                foundFrom = true;
+            } else if (local.equals(addressingVersion.toTag.getLocalPart())) {
+                if (foundTo) {
+                    duplicateHeader = addressingVersion.toTag;
+                    break;
+                }
+                foundTo = true;
+            } else if (local.equals(addressingVersion.replyToTag.getLocalPart())) {
+                if (foundReplyTo) {
+                    duplicateHeader = addressingVersion.replyToTag;
+                    break;
+                }
+                foundReplyTo = true;
+                try { // verify that the header is in a good shape
+                    h.readAsEPR(addressingVersion);
+                } catch (XMLStreamException e) {
+                    throw new WebServiceException(AddressingMessages.REPLY_TO_CANNOT_PARSE(), e);
+                }
+            } else if (local.equals(addressingVersion.faultToTag.getLocalPart())) {
+                if (foundFaultTo) {
+                    duplicateHeader = addressingVersion.faultToTag;
+                    break;
+                }
+                foundFaultTo = true;
+                try { // verify that the header is in a good shape
+                    h.readAsEPR(addressingVersion);
+                } catch (XMLStreamException e) {
+                    throw new WebServiceException(AddressingMessages.FAULT_TO_CANNOT_PARSE(), e);
+                }
+            } else if (local.equals(addressingVersion.actionTag.getLocalPart())) {
+                if (foundAction) {
+                    duplicateHeader = addressingVersion.actionTag;
+                    break;
+                }
+                foundAction = true;
+            } else if (local.equals(addressingVersion.messageIDTag.getLocalPart())) {
+                if (foundMessageId) {
+                    duplicateHeader = addressingVersion.messageIDTag;
+                    break;
+                }
+                foundMessageId = true;
+            } else if (local.equals(addressingVersion.relatesToTag.getLocalPart())) {
+                foundRelatesTo = true;
+            } else if (local.equals(addressingVersion.faultDetailTag.getLocalPart())) {
+                // TODO: should anything be done here ?
+                // TODO: fault detail element - only for SOAP 1.1
+            } else {
+                System.err.println(AddressingMessages.UNKNOWN_WSA_HEADER());
+            }
+        }
+
+        // check for invalid cardinality first before checking for mandatory headers
+        if (duplicateHeader != null) {
+            throw new InvalidMapException(duplicateHeader, addressingVersion.invalidCardinalityTag);
+        }
+
+        // WS-A is engaged if wsa:Action header is found
+        boolean engaged = foundAction;
+
+        // check for mandatory set of headers only if:
+        // 1. WS-A is engaged or
+        // 2. wsdl:required=true
+        // Both wsa:Action and wsa:To MUST be present on request (for oneway MEP) and
+        // response messages (for oneway and request/response MEP only)
+        if (engaged || addressingRequired) {
+            checkMandatoryHeaders(packet, foundAction, foundTo, foundMessageId, foundRelatesTo);
+        }
+    }
+
+    final boolean isInCurrentRole(Header header, WSBinding binding) {
+        // TODO: binding will be null for protocol messages
+        // TODO: returning true assumes that protocol messages are
+        // TODO: always in current role, this may not to be fixed.
+        if (binding == null)
+            return true;
+
+
+        if (soapVersion == SOAPVersion.SOAP_11) {
+            // Rama: Why not checking for SOAP 1.1?
+            return true;
+        } else {
+            String role = header.getRole(soapVersion);
+            return (role.equals(SOAPVersion.SOAP_12.implicitRole));
+        }
+    }
+
+    protected final WSDLBoundOperation getWSDLBoundOperation(Packet packet) {
+        return packet.getMessage().getOperation(wsdlPort);
+    }
+
+    protected void validateSOAPAction(Packet packet) {
+        String gotA = packet.getMessage().getHeaders().getAction(addressingVersion, soapVersion);
+        if (gotA == null)
+            throw new WebServiceException(AddressingMessages.VALIDATION_SERVER_NULL_ACTION());
+        if(packet.soapAction != null && !packet.soapAction.equals("\"\"") && !packet.soapAction.equals("\""+gotA+"\"")) {
+            throw new InvalidMapException(addressingVersion.actionTag, addressingVersion.actionMismatchTag);
+        }
+    }
+
+    protected abstract void validateAction(Packet packet);
+    protected void checkMandatoryHeaders(
+        Packet packet, boolean foundAction, boolean foundTo, boolean foundMessageId, boolean foundRelatesTo) {
+        WSDLBoundOperation wbo = getWSDLBoundOperation(packet);
+        // no need to check for for non-application messages
+        if (wbo == null)
+            return;
+
+        // if no wsa:Action header is found
+        if (!foundAction)
+            throw new MapRequiredException(addressingVersion.actionTag);
+        validateSOAPAction(packet);
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelper.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelper.java
new file mode 100644
index 00000000000..7fd6d7c96d2
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelper.java
@@ -0,0 +1,330 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.addressing;
+
+import com.sun.xml.internal.ws.addressing.model.InvalidMapException;
+import com.sun.xml.internal.ws.addressing.model.MapRequiredException;
+import com.sun.xml.internal.ws.api.SOAPVersion;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.addressing.AddressingVersion;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLBoundOperation;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLFault;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLOperation;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLOutput;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
+import com.sun.xml.internal.ws.api.model.SEIModel;
+import com.sun.xml.internal.ws.model.wsdl.WSDLOperationImpl;
+import com.sun.xml.internal.ws.model.JavaMethodImpl;
+import com.sun.xml.internal.ws.model.CheckedExceptionImpl;
+import com.sun.istack.internal.Nullable;
+import com.sun.istack.internal.NotNull;
+import org.w3c.dom.Element;
+
+import javax.xml.bind.Marshaller;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.namespace.QName;
+import javax.xml.soap.Detail;
+import javax.xml.soap.SOAPConstants;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPFactory;
+import javax.xml.soap.SOAPFault;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.WebServiceException;
+import java.util.Map;
+
+/**
+ * @author Arun Gupta
+ */
+public abstract class WsaTubeHelper {
+
+    public WsaTubeHelper(WSBinding binding, SEIModel seiModel, WSDLPort wsdlPort) {
+        this.binding = binding;
+        this.wsdlPort = wsdlPort;
+        this.seiModel = seiModel;
+        this.soapVer = binding.getSOAPVersion();
+        this.addVer = binding.getAddressingVersion();
+
+    }
+
+    public String getFaultAction(Packet requestPacket, Packet responsePacket) {
+        String action = null;
+        if(seiModel != null) {
+            action = getFaultActionFromSEIModel(requestPacket,responsePacket);
+        }
+        if(action != null)
+            return action;
+        else
+            action = addVer.getDefaultFaultAction();
+        if (wsdlPort == null)
+            return action;
+        WSDLBoundOperation wbo = requestPacket.getMessage().getOperation(wsdlPort);
+        return getFaultAction(wbo,responsePacket);
+    }
+
+    String getFaultActionFromSEIModel(Packet requestPacket, Packet responsePacket) {
+        String action = null;
+        if (seiModel == null || wsdlPort == null)
+            return action;
+
+        try {
+            SOAPMessage sm = responsePacket.getMessage().copy().readAsSOAPMessage();
+            if (sm == null)
+                return action;
+
+            if (sm.getSOAPBody() == null)
+                return action;
+
+            if (sm.getSOAPBody().getFault() == null)
+                return action;
+
+            Detail detail = sm.getSOAPBody().getFault().getDetail();
+            if (detail == null)
+                return action;
+
+            String ns = detail.getFirstChild().getNamespaceURI();
+            String name = detail.getFirstChild().getLocalName();
+            JavaMethodImpl jm = (JavaMethodImpl) requestPacket.getMessage().getMethod(seiModel);
+            for (CheckedExceptionImpl ce : jm.getCheckedExceptions()) {
+                if (ce.getDetailType().tagName.getLocalPart().equals(name) &&
+                        ce.getDetailType().tagName.getNamespaceURI().equals(ns)) {
+                    return ce.getFaultAction();
+                }
+            }
+            return action;
+        } catch (SOAPException e) {
+            throw new WebServiceException(e);
+        }
+    }
+
+    String getFaultAction(@Nullable WSDLBoundOperation wbo, Packet responsePacket) {
+        String action = addVer.getDefaultFaultAction();
+        if (wbo == null)
+            return action;
+
+        try {
+            SOAPMessage sm = responsePacket.getMessage().copy().readAsSOAPMessage();
+            if (sm == null)
+                return action;
+
+            if (sm.getSOAPBody() == null)
+                return action;
+
+            if (sm.getSOAPBody().getFault() == null)
+                return action;
+
+            Detail detail = sm.getSOAPBody().getFault().getDetail();
+            if (detail == null)
+                return action;
+
+            String ns = detail.getFirstChild().getNamespaceURI();
+            String name = detail.getFirstChild().getLocalName();
+
+            WSDLOperation o = wbo.getOperation();
+
+            WSDLFault fault = o.getFault(new QName(ns, name));
+            if (fault == null)
+                return action;
+
+            WSDLOperationImpl impl = (WSDLOperationImpl)o;
+            Map map = impl.getFaultActionMap();
+            if (map == null)
+                return action;
+
+            action = map.get(fault.getName());
+
+            return action;
+        } catch (SOAPException e) {
+            throw new WebServiceException(e);
+        }
+    }
+
+    public String getInputAction(Packet packet) {
+        String action = null;
+
+        if (wsdlPort != null) {
+            WSDLBoundOperation wbo = wsdlPort.getBinding().getOperation(packet.getMessage().getPayloadNamespaceURI(), packet.getMessage().getPayloadLocalPart());
+            if (wbo != null) {
+                WSDLOperation op = wbo.getOperation();
+                action = op.getInput().getAction();
+            }
+        }
+
+        return action;
+    }
+
+    /**
+     * This method gives the Input addressing Action for a message.
+     * It gives the Action set in the wsdl operation for the corresponding payload.
+     * If it is not explicitly set, it gives the soapAction
+     * @param packet
+     * @return input Action
+     */
+    public String getEffectiveInputAction(Packet packet) {
+        //non-default SOAPAction beomes wsa:action
+        if(packet.soapAction != null && !packet.soapAction.equals(""))
+                return packet.soapAction;
+        String action = null;
+
+        if (wsdlPort != null) {
+            WSDLBoundOperation wbo = wsdlPort.getBinding().getOperation(packet.getMessage().getPayloadNamespaceURI(), packet.getMessage().getPayloadLocalPart());
+            if (wbo != null) {
+                WSDLOperation op = wbo.getOperation();
+                action = op.getInput().getAction();
+            } else
+                action = packet.soapAction;
+        } else {
+            action = packet.soapAction;
+        }
+        return action;
+    }
+
+    public boolean isInputActionDefault(Packet packet) {
+        if (wsdlPort == null)
+            return false;
+
+        WSDLBoundOperation wbo = wsdlPort.getBinding().getOperation(packet.getMessage().getPayloadNamespaceURI(), packet.getMessage().getPayloadLocalPart());
+        if (wbo == null)
+            return false;
+
+        WSDLOperation op = wbo.getOperation();
+        return ((WSDLOperationImpl) op).getInput().isDefaultAction();
+
+    }
+
+    public String getSOAPAction(Packet packet) {
+        String action = "";
+
+        if (packet == null)
+            return action;
+
+        if (packet.getMessage() == null)
+            return action;
+
+        WSDLBoundOperation op = packet.getMessage().getOperation(wsdlPort);
+        if (op == null)
+            return action;
+
+        action = op.getSOAPAction();
+
+        return action;
+    }
+
+    public String getOutputAction(Packet packet) {
+        String action = AddressingVersion.UNSET_OUTPUT_ACTION;
+        if(seiModel!= null) {
+            JavaMethodImpl jm = (JavaMethodImpl) packet.getMessage().getMethod(seiModel);
+            if(jm.getOutputAction() != null && !jm.getOutputAction().equals("")) {
+                return jm.getOutputAction();
+            }
+        }
+        if (wsdlPort != null) {
+            WSDLBoundOperation wbo = wsdlPort.getBinding().getOperation(packet.getMessage().getPayloadNamespaceURI(), packet.getMessage().getPayloadLocalPart());
+            return getOutputAction(wbo);
+        }
+        return action;
+    }
+
+    String getOutputAction(@Nullable WSDLBoundOperation wbo) {
+        String action = AddressingVersion.UNSET_OUTPUT_ACTION;
+        if (wbo != null) {
+            WSDLOutput op = wbo.getOperation().getOutput();
+            if (op != null)
+                action = op.getAction();
+        }
+        return action;
+    }
+    public SOAPFault newInvalidMapFault(InvalidMapException e, AddressingVersion av) {
+        QName name = e.getMapQName();
+        QName subsubcode = e.getSubsubcode();
+        QName subcode = av.invalidMapTag;
+        String faultstring = String.format(av.getInvalidMapText(), name, subsubcode);
+
+        try {
+            SOAPFactory factory;
+            SOAPFault fault;
+            if (soapVer == SOAPVersion.SOAP_12) {
+                factory = SOAPVersion.SOAP_12.saajSoapFactory;
+                fault = factory.createFault();
+                fault.setFaultCode(SOAPConstants.SOAP_SENDER_FAULT);
+                fault.appendFaultSubcode(subcode);
+                fault.appendFaultSubcode(subsubcode);
+                getInvalidMapDetail(name, fault.addDetail());
+            } else {
+                factory = SOAPVersion.SOAP_11.saajSoapFactory;
+                fault = factory.createFault();
+                fault.setFaultCode(subsubcode);
+            }
+
+            fault.setFaultString(faultstring);
+
+            return fault;
+        } catch (SOAPException se) {
+            throw new WebServiceException(se);
+        }
+    }
+
+    public SOAPFault newMapRequiredFault(MapRequiredException e, AddressingVersion av) {
+        QName subcode = av.mapRequiredTag;
+        QName subsubcode = av.mapRequiredTag;
+        String faultstring = av.getMapRequiredText();
+
+        try {
+            SOAPFactory factory;
+            SOAPFault fault;
+            if (soapVer == SOAPVersion.SOAP_12) {
+                factory = SOAPVersion.SOAP_12.saajSoapFactory;
+                fault = factory.createFault();
+                fault.setFaultCode(SOAPConstants.SOAP_SENDER_FAULT);
+                fault.appendFaultSubcode(subcode);
+                fault.appendFaultSubcode(subsubcode);
+                getMapRequiredDetail(e.getMapQName(), fault.addDetail());
+            } else {
+                factory = SOAPVersion.SOAP_11.saajSoapFactory;
+                fault = factory.createFault();
+                fault.setFaultCode(subsubcode);
+            }
+
+            fault.setFaultString(faultstring);
+
+            return fault;
+        } catch (SOAPException se) {
+            throw new WebServiceException(se);
+        }
+    }
+
+    public abstract void getProblemActionDetail(String action, Element element);
+    public abstract void getInvalidMapDetail(QName name, Element element);
+    public abstract void getMapRequiredDetail(QName name, Element element);
+
+    protected Unmarshaller unmarshaller;
+    protected Marshaller marshaller;
+    protected SEIModel seiModel;
+    protected WSDLPort wsdlPort;
+    protected WSBinding binding;
+    protected final SOAPVersion soapVer;
+    protected final AddressingVersion addVer;
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelperImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelperImpl.java
new file mode 100644
index 00000000000..8a24292eacc
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelperImpl.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.addressing;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Marshaller;
+import javax.xml.namespace.QName;
+import javax.xml.ws.WebServiceException;
+
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
+import com.sun.xml.internal.ws.api.model.SEIModel;
+import org.w3c.dom.Element;
+
+/**
+ * @author Arun Gupta
+ */
+public class WsaTubeHelperImpl extends WsaTubeHelper {
+    static final JAXBContext jc;
+
+    static {
+        try {
+            jc = JAXBContext.newInstance(ProblemAction.class,
+                                         ProblemHeaderQName.class);
+        } catch (JAXBException e) {
+            throw new WebServiceException(e);
+        }
+    }
+
+    public WsaTubeHelperImpl(WSDLPort wsdlPort, SEIModel seiModel, WSBinding binding) {
+        super(binding,seiModel,wsdlPort);
+        try {
+            unmarshaller = jc.createUnmarshaller();
+            marshaller = jc.createMarshaller();
+            marshaller.setProperty(Marshaller.JAXB_FRAGMENT, Boolean.TRUE);
+        } catch (JAXBException e) {
+            throw new WebServiceException(e);
+        }
+    }
+
+    @Override
+    public final void getProblemActionDetail(String action, Element element) {
+        ProblemAction pa = new ProblemAction(action);
+        try {
+            marshaller.marshal(pa, element);
+        } catch (JAXBException e) {
+            throw new WebServiceException(e);
+        }
+    }
+
+    @Override
+    public final void getInvalidMapDetail(QName name, Element element) {
+        ProblemHeaderQName phq = new ProblemHeaderQName(name);
+        try {
+            marshaller.marshal(phq, element);
+        } catch (JAXBException e) {
+            throw new WebServiceException(e);
+        }
+    }
+
+    @Override
+    public final void getMapRequiredDetail(QName name, Element element) {
+        getInvalidMapDetail(name, element);
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/Service.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/ActionNotSupportedException.java
similarity index 71%
rename from jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/Service.java
rename to jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/ActionNotSupportedException.java
index ba557be25a1..6718544f745 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/Service.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/ActionNotSupportedException.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,22 +22,26 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-package com.sun.xml.internal.ws.wsdl.parser;
 
-import javax.xml.namespace.QName;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
+package com.sun.xml.internal.ws.addressing.model;
 
-public class Service extends LinkedHashMap {
-    private QName name;
+import javax.xml.ws.WebServiceException;
 
-    public Service(QName name) {
+/**
+ * @author Arun Gupta
+ */
+public class ActionNotSupportedException extends WebServiceException {
+    String action;
+
+    protected ActionNotSupportedException() {
         super();
-        this.name = name;
     }
 
-    public QName getName() {
-        return name;
+    public ActionNotSupportedException(String action) {
+        this.action = action;
+    }
+
+    public String getAction() {
+        return action;
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/Message.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/InvalidMapException.java
similarity index 71%
rename from jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/Message.java
rename to jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/InvalidMapException.java
index cd1fb346777..5e84bd5b01c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/Message.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/InvalidMapException.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,24 +22,29 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-package com.sun.xml.internal.ws.wsdl.parser;
 
+package com.sun.xml.internal.ws.addressing.model;
+
+import javax.xml.ws.WebServiceException;
 import javax.xml.namespace.QName;
-import java.util.HashMap;
-import java.util.TreeMap;
-import java.util.LinkedHashSet;
 
-public class Message extends LinkedHashSet{
-    private QName name;
+/**
+ * @author Arun Gupta
+ */
+public class InvalidMapException extends WebServiceException {
+    QName name;
+    QName subsubcode;
 
-    /**
-     * @param name wsdl:message name attribute qualified name
-     */
-    public Message(QName name) {
+    public InvalidMapException(QName name, QName subsubcode) {
         this.name = name;
+        this.subsubcode = subsubcode;
     }
 
-    public QName getName() {
+    public QName getMapQName() {
         return name;
     }
+
+    public QName getSubsubcode() {
+        return subsubcode;
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/PortType.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/MapRequiredException.java
similarity index 77%
rename from jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/PortType.java
rename to jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/MapRequiredException.java
index 5f74557108c..d1161ee0ed4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/PortType.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/MapRequiredException.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,20 +22,23 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-package com.sun.xml.internal.ws.wsdl.parser;
 
+package com.sun.xml.internal.ws.addressing.model;
+
+import javax.xml.ws.WebServiceException;
 import javax.xml.namespace.QName;
-import java.util.HashMap;
 
-public class PortType extends HashMap{
-    private QName name;
+/**
+ * @author Arun Gupta
+ */
+public class MapRequiredException extends WebServiceException {
+    QName name;
 
-    public PortType(QName name) {
-        super();
+    public MapRequiredException(QName name) {
         this.name = name;
     }
 
-    public QName getName() {
+    public QName getMapQName() {
         return name;
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionAddressingConstants.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionAddressingConstants.java
new file mode 100644
index 00000000000..e94d63d4249
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionAddressingConstants.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.addressing.v200408;
+
+import javax.xml.namespace.QName;
+
+/**
+ * Constants for Member Submission WS-Addressing version
+ *
+ * @author Arun Gupta
+ */
+public interface MemberSubmissionAddressingConstants {
+    public static final String WSA_NAMESPACE_NAME = "http://schemas.xmlsoap.org/ws/2004/08/addressing";
+    public static final String WSA_NAMESPACE_WSDL_NAME = WSA_NAMESPACE_NAME;
+    public static final String WSA_NAMESPACE_POLICY_NAME = "http://schemas.xmlsoap.org/ws/2004/08/addressing/policy";
+
+    public static final String WSA_SERVICENAME_NAME = "ServiceName";
+    public static final String WSA_PORTTYPE_NAME = "PortType";
+    public static final String WSA_PORTNAME_NAME = "PortName";
+
+    public static final String WSA_ADDRESS_NAME = "Address";
+    public static final QName WSA_ADDRESS_QNAME = new QName(WSA_NAMESPACE_NAME, WSA_ADDRESS_NAME);
+
+    public static final String WSA_ANONYMOUS_ADDRESS = WSA_NAMESPACE_NAME + "/role/anonymous";
+    public static final String WSA_NONE_ADDRESS = "";
+
+    public static final String WSA_DEFAULT_FAULT_ACTION = WSA_NAMESPACE_NAME + "/fault";
+
+    public static final QName INVALID_MAP_QNAME = new QName(WSA_NAMESPACE_NAME, "InvalidMessageInformationHeader");
+    public static final QName MAP_REQUIRED_QNAME = new QName(WSA_NAMESPACE_NAME, "MessageInformationHeaderRequired");
+    public static final QName DESTINATION_UNREACHABLE_QNAME = new QName(WSA_NAMESPACE_NAME, "DestinationUnreachable");
+    public static final QName ACTION_NOT_SUPPORTED_QNAME = new QName(WSA_NAMESPACE_NAME, "ActionNotSupported");
+    public static final QName ENDPOINT_UNAVAILABLE_QNAME = new QName(WSA_NAMESPACE_NAME, "EndpointUnavailable");
+
+    public static final String ACTION_NOT_SUPPORTED_TEXT = "The \"%s\" cannot be processed at the receiver.";
+    public static final String DESTINATION_UNREACHABLE_TEXT = "No route can be determined to reach the destination role defined by the WS-Addressing To.";
+    public static final String ENDPOINT_UNAVAILABLE_TEXT = "The endpoint is unable to process the message at this time.";
+    public static final String INVALID_MAP_TEXT = "A message information header is not valid and the message cannot be processed.";
+    public static final String MAP_REQUIRED_TEXT = "A required message information header, To, MessageID, or Action, is not present.";
+
+    public static final QName PROBLEM_ACTION_QNAME = new QName(WSA_NAMESPACE_NAME, "ProblemAction");
+    public static final QName PROBLEM_HEADER_QNAME_QNAME = new QName(WSA_NAMESPACE_NAME, "ProblemHeaderQName");
+    public static final QName FAULT_DETAIL_QNAME = new QName(WSA_NAMESPACE_NAME, "FaultDetail");
+
+    public
+    static final String ANONYMOUS_EPR = "\n"+
+        "    
    http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous
    \n"+
+        "    ";
+
+    public static final QName MEX_METADATA = new QName("http://schemas.xmlsoap.org/ws/2004/09/mex", "Metadata","mex");
+    public static final QName MEX_METADATA_SECTION = new QName("http://schemas.xmlsoap.org/ws/2004/09/mex", "MetadataSection","mex");
+    public static final String MEX_METADATA_DIALECT_ATTRIBUTE = "Dialect";
+    public static final String MEX_METADATA_DIALECT_VALUE = "http://schemas.xmlsoap.org/wsdl/";
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/ExtensionHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/ProblemAction.java
similarity index 53%
rename from jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/ExtensionHandler.java
rename to jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/ProblemAction.java
index 971940e628a..f39eba0d25d 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/ExtensionHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/ProblemAction.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,44 +23,42 @@
  * have any questions.
  */
 
-package com.sun.tools.internal.ws.wsdl.parser;
+package com.sun.xml.internal.ws.addressing.v200408;
 
-import java.io.IOException;
-import java.util.Map;
-
-import org.w3c.dom.Element;
-
-import com.sun.tools.internal.ws.wsdl.framework.Extensible;
-import com.sun.tools.internal.ws.wsdl.framework.Extension;
-import com.sun.tools.internal.ws.wsdl.framework.ParserContext;
-import com.sun.tools.internal.ws.wsdl.framework.WriterContext;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
 
+import static com.sun.xml.internal.ws.addressing.v200408.MemberSubmissionAddressingConstants.WSA_NAMESPACE_NAME;
 /**
- * A handler for extensions elements definined in one namespace.
- *
- * @author WS Development Team
+ * @author Arun Gupta
  */
-public abstract class ExtensionHandler {
+@XmlRootElement(name="ProblemAction", namespace= WSA_NAMESPACE_NAME)
+public class ProblemAction {
 
-    protected ExtensionHandler() {
+    @XmlElement(name="Action", namespace= WSA_NAMESPACE_NAME)
+    private String action;
+
+    @XmlElement(name="SoapAction", namespace=WSA_NAMESPACE_NAME)
+    private String soapAction;
+
+    /** Creates a new instance of ProblemAction */
+    public ProblemAction() {
     }
 
-    public abstract String getNamespaceURI();
-
-    public void setExtensionHandlers(Map m) {
-        _extensionHandlers = m;
+    public ProblemAction(String action) {
+        this.action = action;
     }
 
-    public boolean doHandleExtension(
-        ParserContext context,
-        Extensible parent,
-        Element e) {
-        return false;
+    public ProblemAction(String action, String soapAction) {
+        this.action = action;
+        this.soapAction = soapAction;
     }
 
-    public void doHandleExtension(WriterContext context, Extension extension)
-        throws IOException {
+    public String getAction() {
+        return action;
     }
 
-    protected Map _extensionHandlers;
+    public String getSoapAction() {
+        return soapAction;
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/ProblemHeaderQName.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/ProblemHeaderQName.java
new file mode 100644
index 00000000000..5cfda4961a8
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/ProblemHeaderQName.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.addressing.v200408;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlValue;
+import javax.xml.namespace.QName;
+
+import static com.sun.xml.internal.ws.addressing.v200408.MemberSubmissionAddressingConstants.WSA_NAMESPACE_NAME;
+
+/**
+ * @author Arun Gupta
+ */
+@XmlRootElement(name="ProblemHeaderQName", namespace= WSA_NAMESPACE_NAME)
+public class ProblemHeaderQName {
+    @XmlValue
+    private QName value;
+
+    /** Creates a new instance of ProblemHeaderQName */
+    public ProblemHeaderQName() {
+    }
+
+    public ProblemHeaderQName(QName name) {
+        this.value = name;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/WsaTubeHelperImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/WsaTubeHelperImpl.java
new file mode 100644
index 00000000000..27ff72ebfa2
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/WsaTubeHelperImpl.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.addressing.v200408;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Marshaller;
+import javax.xml.namespace.QName;
+import javax.xml.ws.WebServiceException;
+
+import com.sun.xml.internal.ws.addressing.WsaTubeHelper;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
+import com.sun.xml.internal.ws.api.model.SEIModel;
+import org.w3c.dom.Element;
+
+/**
+ * @author Arun Gupta
+ */
+public class WsaTubeHelperImpl extends WsaTubeHelper {
+    static final JAXBContext jc;
+
+    static {
+        try {
+            jc = JAXBContext.newInstance(ProblemAction.class,
+                                         ProblemHeaderQName.class);
+        } catch (JAXBException e) {
+            throw new WebServiceException(e);
+        }
+    }
+
+    public WsaTubeHelperImpl(WSDLPort wsdlPort, SEIModel seiModel, WSBinding binding) {
+        super(binding,seiModel,wsdlPort);
+        try {
+            unmarshaller = jc.createUnmarshaller();
+            marshaller = jc.createMarshaller();
+            marshaller.setProperty(Marshaller.JAXB_FRAGMENT, Boolean.TRUE);
+        } catch (JAXBException e) {
+            throw new WebServiceException(e);
+        }
+    }
+
+    @Override
+    public final void getProblemActionDetail(String action, Element element) {
+        ProblemAction pa = new ProblemAction(action);
+        try {
+            marshaller.marshal(pa, element);
+        } catch (JAXBException e) {
+            throw new WebServiceException(e);
+        }
+    }
+
+    @Override
+    public final void getInvalidMapDetail(QName name, Element element) {
+        ProblemHeaderQName phq = new ProblemHeaderQName(name);
+        try {
+            marshaller.marshal(phq, element);
+        } catch (JAXBException e) {
+            throw new WebServiceException(e);
+        }
+    }
+
+    @Override
+    public final void getMapRequiredDetail(QName name, Element element) {
+        getInvalidMapDetail(name, element);
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/BindingID.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/BindingID.java
new file mode 100644
index 00000000000..f466f24e6af
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/BindingID.java
@@ -0,0 +1,411 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.ws.api.message.Message;
+import com.sun.xml.internal.ws.api.pipe.Codec;
+import com.sun.xml.internal.ws.api.pipe.Tube;
+import com.sun.xml.internal.ws.binding.BindingImpl;
+import com.sun.xml.internal.ws.binding.SOAPBindingImpl;
+import com.sun.xml.internal.ws.binding.WebServiceFeatureList;
+import com.sun.xml.internal.ws.encoding.SOAPBindingCodec;
+import com.sun.xml.internal.ws.encoding.XMLHTTPBindingCodec;
+import com.sun.xml.internal.ws.util.ServiceFinder;
+
+import javax.xml.ws.BindingType;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.WebServiceFeature;
+import javax.xml.ws.handler.Handler;
+import javax.xml.ws.http.HTTPBinding;
+import javax.xml.ws.soap.MTOMFeature;
+import javax.xml.ws.soap.SOAPBinding;
+import java.io.UnsupportedEncodingException;
+import java.net.URL;
+import java.net.URLDecoder;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Parsed binding ID string.
+ *
+ * 
    
+ * {@link BindingID} is an immutable object that represents a binding ID,
+ * much like how {@link URL} is a representation of an URL.
+ * Like {@link URL}, this class offers a bunch of methods that let you
+ * query various traits/properties of a binding ID.
+ *
+ * 
    
+ * {@link BindingID} is extensible; one can plug in a parser from
+ * {@link String} to {@link BindingID} to interpret binding IDs that
+ * the JAX-WS RI does no a-priori knowledge of.
+ * Technologies such as Tango uses this to make the JAX-WS RI understand
+ * binding IDs defined in their world.
+ *
+ * Such technologies are free to extend this class and expose more characterstics.
+ *
+ * 
    
+ * Even though this class defines a few well known constants, {@link BindingID}
+ * instances do not necessarily have singleton semantics. Use {@link #equals(Object)}
+ * for the comparison.
+ *
+ * 
    {@link BindingID} and {@link WSBinding}
    
+ * 
    
+ * {@link WSBinding} is mutable and represents a particular "use" of a {@link BindingID}.
+ * As such, it has state like a list of {@link Handler}s, which are inherently local
+ * to a particular usage. For example, if you have two proxies, you need two instances.
+ *
+ * {@link BindingID}, OTOH, is immutable and thus the single instance
+ * that represents "SOAP1.2/HTTP" can be shared and reused by all proxies in the same VM.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public abstract class BindingID {
+
+    /**
+     * Creates an instance of {@link WSBinding} (which is conceptually an "use"
+     * of {@link BindingID}) from a {@link BindingID}.
+     *
+     * @return
+     *      Always a new instance.
+     */
+    public final @NotNull WSBinding createBinding() {
+        return BindingImpl.create(this);
+    }
+
+    public final @NotNull WSBinding createBinding(WebServiceFeature... features) {
+        return BindingImpl.create(this, features);
+    }
+
+    public final @NotNull WSBinding createBinding(WSFeatureList features) {
+        return createBinding(features.toArray());
+    }
+
+    /**
+     * Gets the SOAP version of this binding.
+     *
+     * TODO: clarify what to do with XML/HTTP binding
+     *
+     * @return
+     *      If the binding is using SOAP, this method returns
+     *      a {@link SOAPVersion} constant.
+     *
+     *      If the binding is not based on SOAP, this method
+     *      returns null. See {@link Message} for how a non-SOAP
+     *      binding shall be handled by {@link Tube}s.
+     */
+    public abstract SOAPVersion getSOAPVersion();
+
+    /**
+     * Creates a new {@link Codec} for this binding.
+     *
+     * @param binding
+     *      Ocassionally some aspects of binding can be overridden by
+     *      {@link WSBinding} at runtime by users, so some {@link Codec}s
+     *      need to have access to {@link WSBinding} that it's working for.
+     */
+    public abstract @NotNull Codec createEncoder(@NotNull WSBinding binding);
+
+    /**
+     * Gets the binding ID, which uniquely identifies the binding.
+     *
+     * 
    
+     * The relevant specs define the binding IDs and what they mean.
+     * The ID is used in many places to identify the kind of binding
+     * (such as SOAP1.1, SOAP1.2, REST, ...)
+     *
+     * @return
+     *      Always non-null same value.
+     */
+    public abstract String toString();
+
+    /**
+     * Returna a new {@link WebServiceFeatureList} instance
+     * that represents the features that are built into this binding ID.
+     *
+     * 
    
+     * For example, {@link BindingID} for
+     * "{@value SOAPBinding#SOAP11HTTP_MTOM_BINDING}"
+     * would always return a list that has {@link MTOMFeature} enabled.
+     */
+    public WebServiceFeatureList createBuiltinFeatureList() {
+        return new WebServiceFeatureList();
+    }
+
+    /**
+     * Returns true if this binding can generate WSDL.
+     *
+     * 
    
+     * For e.g.: SOAP 1.1 and "XSOAP 1.2" is supposed to return true
+     * from this method. For SOAP1.2, there is no standard WSDL, so the
+     * runtime is not generating one and it expects the WSDL is packaged.
+     *
+     */
+    public boolean canGenerateWSDL() {
+        return false;
+    }
+
+    /**
+     * Returns a parameter of this binding ID.
+     *
+     * 
    
+     * Some binding ID, such as those for SOAP/HTTP, uses the URL
+     * query syntax (like ?mtom=true) to control
+     * the optional part of the binding. This method obtains
+     * the value for such optional parts.
+     *
+     * 
    
+     * For implementors of the derived classes, if your binding ID
+     * does not define such optional parts (such as the XML/HTTP binding ID),
+     * then you should simply return the specified default value
+     * (which is what this implementation does.)
+     *
+     * @param parameterName
+     *      The parameter name, such as "mtom" in the above example.
+     * @param defaultValue
+     *      If this binding ID doesn't have the specified parameter explicitly,
+     *      this value will be returned.
+     *
+     * @return
+     *      the value of the parameter, if it's present (such as "true"
+     *      in the above example.) If not present, this method returns
+     *      the {@code defaultValue}.
+     */
+    public String getParameter(String parameterName, String defaultValue) {
+        return defaultValue;
+    }
+
+    /**
+     * Compares the equality based on {@link #toString()}.
+     */
+    public boolean equals(Object obj) {
+        if(!(obj instanceof BindingID))
+            return false;
+        return toString().equals(obj.toString());
+    }
+
+    public int hashCode() {
+        return toString().hashCode();
+    }
+
+    /**
+     * Parses a binding ID string into a {@link BindingID} object.
+     *
+     * 
    
+     * This method first checks for a few known values and then delegate
+     * the parsing to {@link BindingIDFactory}.
+     *
+     * 
    
+     * If parsing succeeds this method returns a value. Otherwise
+     * throws {@link WebServiceException}.
+     *
+     * @throws WebServiceException
+     *      If the binding ID is not understood.
+     */
+    public static @NotNull BindingID parse(String lexical) {
+        if(lexical.equals(XML_HTTP.toString()))
+            return XML_HTTP;
+        if(belongsTo(lexical,SOAP11_HTTP.toString()))
+            return customize(lexical,SOAP11_HTTP);
+        if(belongsTo(lexical,SOAP12_HTTP.toString()))
+            return customize(lexical,SOAP12_HTTP);
+        if(belongsTo(lexical,SOAPBindingImpl.X_SOAP12HTTP_BINDING))
+            return customize(lexical,X_SOAP12_HTTP);
+
+        // OK, it's none of the values JAX-WS understands.
+        for( BindingIDFactory f : ServiceFinder.find(BindingIDFactory.class) ) {
+            BindingID r = f.parse(lexical);
+            if(r!=null)
+                return r;
+        }
+
+        // nobody understood this value
+        throw new WebServiceException("Wrong binding ID: "+lexical);
+    }
+
+    private static boolean belongsTo(String lexical, String id) {
+        return lexical.equals(id) || lexical.startsWith(id+'?');
+    }
+
+    /**
+     * Parses parameter portion and returns appropriately populated {@link SOAPHTTPImpl}
+     */
+    private static SOAPHTTPImpl customize(String lexical, SOAPHTTPImpl base) {
+        if(lexical.equals(base.toString()))
+            return base;
+
+        // otherwise we must have query parameter
+        // we assume the spec won't define any tricky parameters that require
+        // complicated handling (such as %HH or non-ASCII char), so this parser
+        // is quite simple-minded.
+        SOAPHTTPImpl r = new SOAPHTTPImpl(base.getSOAPVersion(), lexical, base.canGenerateWSDL());
+        try {
+            // With X_SOAP12_HTTP, base != lexical and lexical does n't have any query string
+            if(lexical.indexOf('?') == -1) {
+                return r;
+            }
+            String query = URLDecoder.decode(lexical.substring(lexical.indexOf('?')+1),"UTF-8");
+            for( String token : query.split("&") ) {
+                int idx = token.indexOf('=');
+                if(idx<0)
+                    throw new WebServiceException("Malformed binding ID (no '=' in "+token+")");
+                r.parameters.put(token.substring(0,idx),token.substring(idx+1));
+            }
+        } catch (UnsupportedEncodingException e) {
+            throw new AssertionError(e);    // UTF-8 is supported everywhere
+        }
+
+        return r;
+    }
+
+
+    /**
+     * Figures out the binding from {@link BindingType} annotation.
+     *
+     * @return
+     *      default to {@link BindingID#SOAP11_HTTP}, if no such annotation is present.
+     * @see #parse(String)
+     */
+    public static @NotNull BindingID parse(Class implClass) {
+        BindingType bindingType = implClass.getAnnotation(BindingType.class);
+        if (bindingType != null) {
+            String bindingId = bindingType.value();
+            if (bindingId.length() > 0) {
+                return BindingID.parse(bindingId);
+            }
+        }
+        return SOAP11_HTTP;
+    }
+
+    /**
+     * Constant that represents implementation specific SOAP1.2/HTTP which is
+     * used to generate non-standard WSDLs
+     */
+    public static final SOAPHTTPImpl X_SOAP12_HTTP = new SOAPHTTPImpl(
+        SOAPVersion.SOAP_12, SOAPBindingImpl.X_SOAP12HTTP_BINDING, true);
+
+    /**
+     * Constant that represents SOAP1.2/HTTP.
+     */
+    public static final SOAPHTTPImpl SOAP12_HTTP = new SOAPHTTPImpl(
+        SOAPVersion.SOAP_12, SOAPBinding.SOAP12HTTP_BINDING, false);
+    /**
+     * Constant that represents SOAP1.1/HTTP.
+     */
+    public static final SOAPHTTPImpl SOAP11_HTTP = new SOAPHTTPImpl(
+        SOAPVersion.SOAP_11, SOAPBinding.SOAP11HTTP_BINDING, true);
+
+    /**
+     * Constant that represents SOAP1.2/HTTP.
+     */
+    public static final SOAPHTTPImpl SOAP12_HTTP_MTOM = new SOAPHTTPImpl(
+        SOAPVersion.SOAP_12, SOAPBinding.SOAP12HTTP_MTOM_BINDING, false, true);
+    /**
+     * Constant that represents SOAP1.1/HTTP.
+     */
+    public static final SOAPHTTPImpl SOAP11_HTTP_MTOM = new SOAPHTTPImpl(
+        SOAPVersion.SOAP_11, SOAPBinding.SOAP11HTTP_MTOM_BINDING, true, true);
+
+
+    /**
+     * Constant that represents REST.
+     */
+    public static final BindingID XML_HTTP = new Impl(SOAPVersion.SOAP_11, HTTPBinding.HTTP_BINDING,false) {
+        public Codec createEncoder(WSBinding binding) {
+            return new XMLHTTPBindingCodec();
+        }
+    };
+
+    private static abstract class Impl extends BindingID {
+        final SOAPVersion version;
+        private final String lexical;
+        private final boolean canGenerateWSDL;
+
+        public Impl(SOAPVersion version, String lexical, boolean canGenerateWSDL) {
+            this.version = version;
+            this.lexical = lexical;
+            this.canGenerateWSDL = canGenerateWSDL;
+        }
+
+        public SOAPVersion getSOAPVersion() {
+            return version;
+        }
+
+        public String toString() {
+            return lexical;
+        }
+
+        @Deprecated
+        public boolean canGenerateWSDL() {
+            return canGenerateWSDL;
+        }
+    }
+
+    /**
+     * Internal implementation for SOAP/HTTP.
+     */
+    private static final class SOAPHTTPImpl extends Impl implements Cloneable {
+        /*final*/ Map parameters = new HashMap();
+
+        static final String MTOM_PARAM = "mtom";
+        Boolean mtomSetting = null;
+
+        public SOAPHTTPImpl(SOAPVersion version, String lexical, boolean canGenerateWSDL) {
+            super(version, lexical, canGenerateWSDL);
+        }
+
+        public SOAPHTTPImpl(SOAPVersion version, String lexical, boolean canGenerateWSDL,
+                           boolean mtomEnabled) {
+            this(version, lexical, canGenerateWSDL);
+            String mtomStr = mtomEnabled ? "true" : "false";
+            parameters.put(MTOM_PARAM, mtomStr);
+            mtomSetting = mtomEnabled;
+        }
+
+        public @NotNull Codec createEncoder(WSBinding binding) {
+            return new SOAPBindingCodec(binding);
+        }
+
+        private Boolean isMTOMEnabled() {
+            String mtom = parameters.get(MTOM_PARAM);
+            return mtom==null?null:Boolean.valueOf(mtom);
+        }
+
+        public WebServiceFeatureList createBuiltinFeatureList() {
+            WebServiceFeatureList r=super.createBuiltinFeatureList();
+            Boolean mtom = isMTOMEnabled();
+            if(mtom != null)
+                r.add(new MTOMFeature(mtom));
+            return r;
+        }
+
+        public String getParameter(String parameterName, String defaultValue) {
+            if (parameters.get(parameterName) == null)
+                return super.getParameter(parameterName, defaultValue);
+            return parameters.get(parameterName);
+        }
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/BindingIDFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/BindingIDFactory.java
new file mode 100644
index 00000000000..cb2c02e7133
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/BindingIDFactory.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api;
+
+import com.sun.istack.internal.Nullable;
+import com.sun.istack.internal.NotNull;
+
+import javax.xml.ws.WebServiceException;
+
+/**
+ * Extension point to plug in additional {@link BindingID} parsing logic.
+ *
+ * 
    
+ * When the JAX-WS RI is asked to parse a binding ID string into a {@link BindingID}
+ * object, it uses service idiom to look for the implementations of this class
+ * in the META-INF/services/....
+ *
+ * @since JAX-WS 2.0.next
+ * @author Kohsuke Kawaguchi
+ * @see BindingID#parse(String)
+ */
+public abstract class BindingIDFactory {
+    /**
+     * Parses a binding ID string into {@link BindingID} if possible.
+     *
+     * @return
+     *      a non-null return value would cause the JAX-WS RI to consider
+     *      the parsing to be successful. No furhter {@link BindingIDFactory}
+     *      will be consulted.
+     *
+     *      
    
+     *      Retruning a null value indicates that this factory doesn't understand
+     *      this string, in which case the JAX-WS RI will keep asking next
+     *      {@link BindingIDFactory}.
+     *
+     * @throws WebServiceException
+     *      if the implementation understood the lexical value but it is not correct,
+     *      this exception can be thrown to abort the parsing with error.
+     *      No further {@link BindingIDFactory} will be consulted, and
+     *      {@link BindingID#parse(String)} will throw the exception.
+     */
+    public abstract @Nullable BindingID parse(@NotNull String lexical) throws WebServiceException;
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/DistributedPropertySet.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/DistributedPropertySet.java
new file mode 100644
index 00000000000..85a394b126b
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/DistributedPropertySet.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api;
+
+import com.sun.istack.internal.FinalArrayList;
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.client.RequestContext;
+import com.sun.xml.internal.ws.client.ResponseContext;
+
+import javax.xml.ws.WebServiceContext;
+import java.util.Map.Entry;
+import java.util.Set;
+
+/**
+ * {@link PropertySet} that combines properties exposed from multiple
+ * {@link PropertySet}s into one.
+ *
+ * 
    
+ * This implementation allows one {@link PropertySet} to assemble
+ * all properties exposed from other "satellite" {@link PropertySet}s.
+ * (A satellite may itself be a {@link DistributedPropertySet}, so
+ * in general this can form a tree.)
+ *
+ * 
    
+ * This is useful for JAX-WS because the properties we expose to the application
+ * are contributed by different pieces, and therefore we'd like each of them
+ * to have a separate {@link PropertySet} implementation that backs up
+ * the properties. For example, this allows FastInfoset to expose its
+ * set of properties to {@link RequestContext} by using a strongly-typed fields.
+ *
+ * 
    
+ * This is also useful for a client-side transport to expose a bunch of properties
+ * into {@link ResponseContext}. It simply needs to create a {@link PropertySet}
+ * object with methods for each property it wants to expose, and then add that
+ * {@link PropertySet} to {@link Packet}. This allows property values to be
+ * lazily computed (when actually asked by users), thus improving the performance
+ * of the typical case where property values are not asked.
+ *
+ * 
    
+ * A similar benefit applies on the server-side, for a transport to expose
+ * a bunch of properties to {@link WebServiceContext}.
+ *
+ * 
    
+ * To achieve these benefits, access to {@link DistributedPropertySet} is slower
+ * compared to {@link PropertySet} (such as get/set), while adding a satellite
+ * object is relatively fast.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public abstract class DistributedPropertySet extends PropertySet {
+    /**
+     * All {@link PropertySet}s that are bundled into this {@link PropertySet}.
+     */
+    private final FinalArrayList satellites = new FinalArrayList();
+
+    public void addSatellite(@NotNull PropertySet satellite) {
+        satellites.add(satellite);
+    }
+
+    public void removeSatellite(@NotNull PropertySet satellite) {
+        satellites.remove(satellite);
+    }
+
+    public void copySatelliteInto(@NotNull DistributedPropertySet r) {
+        r.satellites.addAll(this.satellites);
+    }
+
+    @Override
+    public Object get(Object key) {
+        // check satellites
+        for (PropertySet child : satellites) {
+            if(child.supports(key))
+                return child.get(key);
+        }
+
+        // otherwise it must be the master
+        return super.get(key);
+    }
+
+    @Override
+    public Object put(String key, Object value) {
+        // check satellites
+        for (PropertySet child : satellites) {
+            if(child.supports(key))
+                return child.put(key,value);
+        }
+
+        // otherwise it must be the master
+        return super.put(key,value);
+    }
+
+    @Override
+    public boolean supports(Object key) {
+        // check satellites
+        for (PropertySet child : satellites) {
+            if(child.supports(key))
+                return true;
+        }
+
+        return super.supports(key);
+    }
+
+    @Override
+    public Object remove(Object key) {
+        // check satellites
+        for (PropertySet child : satellites) {
+            if(child.supports(key))
+                return child.remove(key);
+        }
+
+        return super.remove(key);
+    }
+
+    @Override
+    /*package*/ void createEntrySet(Set> core) {
+        super.createEntrySet(core);
+        for (PropertySet child : satellites) {
+            child.createEntrySet(core);
+        }
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/EndpointAddress.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/EndpointAddress.java
new file mode 100644
index 00000000000..14bdf40a43d
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/EndpointAddress.java
@@ -0,0 +1,205 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api;
+
+
+import com.sun.istack.internal.Nullable;
+
+import javax.xml.ws.WebServiceException;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.Proxy;
+import java.net.ProxySelector;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLStreamHandler;
+import java.util.Iterator;
+
+/**
+ * Represents the endpoint address URI.
+ *
+ * 
    
+ * Conceptually this can be really thought of as an {@link URI},
+ * but it hides some of the details that improve the performance.
+ *
+ * 
    
+ * Being an {@link URI} allows this class to represent custom made-up URIs
+ * (like "jms" for example.) Whenever possible, this object
+ * also creates an {@link URL} (this is only possible when the address
+ * has a registered {@link URLStreamHandler}), so that if the clients
+ * of this code wants to use it, it can do so.
+ *
+ *
+ * 
    How it improves the performance
    
+ * 
      
+ *  
    1. 
+ *  Endpoint address is often eventually turned into an {@link URLConnection},
+ *  and given that generally this value is read more often than being set,
+ *  it makes sense to eagerly turn it into an {@link URL},
+ *  thereby avoiding a repeated conversion.
+ *
+ *  
    2. 
+ *  JDK spends a lot of time choosing a list of {@link Proxy}
+ *  to connect to an {@link URL}. Since the default proxy selector
+ *  implementation always return the same proxy for the same URL,
+ *  we can determine the proxy by ourselves to let JDK skip its
+ *  proxy-discovery step.
+ *
+ *  (That said, user-defined proxy selector can do a lot of interesting things
+ *  --- like doing a round-robin, or pick one from a proxy farm randomly,
+ *  and so it's dangerous to stick to one proxy. For this case,
+ *  we still let JDK decide the proxy. This shouldn't be that much of an
+ *  disappointment, since most people only mess with system properties,
+ *  and never with {@link ProxySelector}. Also, avoiding optimization
+ *  with non-standard proxy selector allows people to effectively disable
+ *  this optimization, which may come in handy for a trouble-shooting.)
+ * 
    
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public final class EndpointAddress {
+    @Nullable
+    private URL url;
+    private final URI uri;
+    private final String stringForm;
+    /**
+     * Pre-selected proxy.
+     *
+     * If {@link #url} is null, this field is null.
+     * Otherwise, this field could still be null if the proxy couldn't be chosen
+     * upfront.
+     */
+    private Proxy proxy;
+
+    public EndpointAddress(URI uri) {
+        this.uri = uri;
+        this.stringForm = uri.toString();
+        try {
+            this.url = uri.toURL();
+            proxy = chooseProxy();
+        } catch (MalformedURLException e) {
+            // ignore
+        }
+    }
+
+    /**
+     *
+     * @see #create(String)
+     */
+    public EndpointAddress(String url) throws URISyntaxException {
+        this.uri = new URI(url);
+        this.stringForm = url;
+        try {
+            this.url = new URL(url);
+            proxy = chooseProxy();
+        } catch (MalformedURLException e) {
+            // ignore
+        }
+    }
+
+    /**
+     * Creates a new {@link EndpointAddress} with a reasonably
+     * generic error handling.
+     */
+    public static EndpointAddress create(String url) {
+        try {
+            return new EndpointAddress(url);
+        } catch(URISyntaxException e) {
+            throw new WebServiceException("Illegal endpoint address: "+url,e);
+        }
+    }
+
+    private Proxy chooseProxy() {
+        ProxySelector sel =
+            java.security.AccessController.doPrivileged(
+                new java.security.PrivilegedAction() {
+                    public ProxySelector run() {
+                        return ProxySelector.getDefault();
+                    }
+                });
+
+        if(sel==null)
+            return Proxy.NO_PROXY;
+
+
+        if(!sel.getClass().getName().equals("sun.net.spi.DefaultProxySelector"))
+            // user-defined proxy. may return a different proxy for each invocation
+            return null;
+
+        Iterator it = sel.select(uri).iterator();
+        if(it.hasNext())
+            return it.next();
+
+        return Proxy.NO_PROXY;
+    }
+
+    /**
+     * Returns an URL of this endpoint adress.
+     *
+     * @return
+     *      null if this endpoint address doesn't have a registered {@link URLStreamHandler}.
+     */
+    public URL getURL() {
+        return url;
+    }
+
+    /**
+     * Returns an URI of the endpoint address.
+     *
+     * @return
+     *      always non-null.
+     */
+    public URI getURI() {
+        return uri;
+    }
+
+    /**
+     * Tries to open {@link URLConnection} for this endpoint.
+     *
+     * 
    
+     * This is possible only when an endpoint address has
+     * the corresponding {@link URLStreamHandler}.
+     *
+     * @throws IOException
+     *      if {@link URL#openConnection()} reports an error.
+     * @throws AssertionError
+     *      if this endpoint doesn't have an associated URL.
+     *      if the code is written correctly this shall never happen.
+     */
+    public URLConnection openConnection() throws IOException {
+        assert url!=null : uri+" doesn't have the corresponding URL";
+        if(proxy!=null)
+            return url.openConnection(proxy);
+        else
+            return url.openConnection();
+    }
+
+    public String toString() {
+        return stringForm;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/FeatureConstructor.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/FeatureConstructor.java
new file mode 100644
index 00000000000..6fba74b6152
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/FeatureConstructor.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api;
+
+import com.sun.xml.internal.ws.developer.MemberSubmissionAddressing;
+import com.sun.xml.internal.ws.developer.MemberSubmissionAddressingFeature;
+import com.sun.xml.internal.ws.developer.Stateful;
+import com.sun.xml.internal.ws.developer.StatefulFeature;
+
+import javax.xml.ws.WebServiceFeature;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Target;
+
+/**
+ * 
    
+ * This annotation should be used on a constructor of classes extending {@link WebServiceFeature} other than
+ * Spec defined features, to help JAX-WS runtime recognize feature extensions.
+ * 
    
+ * 
    
+ * For WebServiceFeature annotations to be recognizable by JAX-WS runtime, the feature annotation should point
+ * to a corresponding bean (class extending WebServiceFeature). Only one of the constructors in the bean MUST be marked
+ * with @FeatureConstructor whose value captures the annotaion attribute names for the corresponding parameters.
+ * 
    
+ * For example,
+ * @see MemberSubmissionAddressingFeature
+ * @see MemberSubmissionAddressing
+ *
+ * @see Stateful
+ * @see StatefulFeature
+ *
+ * @author Rama Pulavarthi
+ */
+@Retention(RUNTIME)
+@Target(ElementType.CONSTRUCTOR)
+
+public @interface FeatureConstructor {
+    /**
+     * The name of the parameter.
+     */
+    String[] value() default {};
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/PropertySet.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/PropertySet.java
new file mode 100644
index 00000000000..8b8ae22a833
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/PropertySet.java
@@ -0,0 +1,422 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.util.ReadOnlyPropertyException;
+
+import javax.xml.ws.handler.MessageContext;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.AbstractMap;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+/**
+ * A set of "properties" that can be accessed via strongly-typed fields
+ * as well as reflexibly through the property name.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+@SuppressWarnings("SuspiciousMethodCalls")
+public abstract class PropertySet {
+
+    /**
+     * Creates a new instance of TypedMap.
+     */
+    protected PropertySet() {}
+
+    /**
+     * Marks a field on {@link PropertySet} as a
+     * property of {@link MessageContext}.
+     *
+     * 
    
+     * To make the runtime processing easy, this annotation
+     * must be on a public field (since the property name
+     * can be set through {@link Map} anyway, you won't be
+     * losing abstraction by doing so.)
+     *
+     * 
    
+     * For similar reason, this annotation can be only placed
+     * on a reference type, not primitive type.
+     *
+     * @see Packet
+     * @author Kohsuke Kawaguchi
+     */
+    @Inherited
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target({ElementType.FIELD,ElementType.METHOD})
+    public @interface Property {
+        /**
+         * Name of the property.
+         */
+        String[] value();
+    }
+
+    /**
+     * Represents the list of strongly-typed known propertyies
+     * (keyed by property names.)
+     *
+     * 
    
+     * Just giving it an alias to make the use of this class more fool-proof.
+     */
+    protected static final class PropertyMap extends HashMap {}
+
+    /**
+     * Map representing the Fields and Methods annotated with {@link Property}.
+     * Model of {@link PropertySet} class.
+     *
+     * 
    
+     * At the end of the derivation chain this method just needs to be implemented
+     * as:
+     *
+     * 
    +     * private static final PropertyMap model;
+     * static {
+     *   model = parse(MyDerivedClass.class);
+     * }
+     * protected PropertyMap getPropertyMap() {
+     *   return model;
+     * }
+     * 
    
+     */
+    protected abstract PropertyMap getPropertyMap();
+
+    // maybe we can use this some time
+    ///**
+    // * If all the properties defined on this {@link PropertySet} has a certain prefix
+    // * (such as, say, "javax.xml.ws.http."), then return it.
+    // *
+    // * 
    
+    // * Returning a non-null name from this method allows methods like
+    // * {@link #get(Object)} and {@link #put(String, Object)} to work faster.
+    // * This is especially so with {@link DistributedPropertySet}, so implementations
+    // * are encouraged to set a common prefix, as much as possible.
+    // *
+    // * 
    
+    // * Currently, this is used only by {@link DistributedPropertySet}.
+    // *
+    // * @return
+    // *      Null if no such common prefix exists. Otherwise string like
+    // *      "javax.xml.ws.http." (the dot at the last is usually preferrable,
+    // *      so that properties like "javax.xml.ws.https.something" won't match.
+    // */
+    //protected abstract String getPropertyPrefix();
+
+    /**
+     * This method parses a class for fields and methods with {@link Property}.
+     */
+    protected static PropertyMap parse(final Class clazz) {
+        // make all relevant fields and methods accessible.
+        // this allows runtime to skip the security check, so they runs faster.
+        return AccessController.doPrivileged(new PrivilegedAction() {
+            public PropertyMap run() {
+                PropertyMap props = new PropertyMap();
+                for( Class c=clazz; c!=null; c=c.getSuperclass()) {
+                    for (Field f : c.getDeclaredFields()) {
+                        Property cp = f.getAnnotation(Property.class);
+                        if(cp!=null) {
+                            for(String value : cp.value()) {
+                                props.put(value, new FieldAccessor(f, value));
+                            }
+                        }
+                    }
+                    for (Method m : c.getDeclaredMethods()) {
+                        Property cp = m.getAnnotation(Property.class);
+                        if(cp!=null) {
+                            String name = m.getName();
+                            assert name.startsWith("get");
+
+                            String setName = 's'+name.substring(1);   // getFoo -> setFoo
+                            Method setter;
+                            try {
+                                setter = clazz.getMethod(setName,m.getReturnType());
+                            } catch (NoSuchMethodException e) {
+                                setter = null; // no setter
+                            }
+                            for(String value : cp.value()) {
+                                props.put(value, new MethodAccessor(m, setter, value));
+                            }
+                        }
+                    }
+                }
+
+                return props;
+            }
+        });
+    }
+
+    /**
+     * Represents a typed property defined on a {@link PropertySet}.
+     */
+    protected interface Accessor {
+        String getName();
+        boolean hasValue(PropertySet props);
+        Object get(PropertySet props);
+        void set(PropertySet props, Object value);
+    }
+
+    static final class FieldAccessor implements Accessor {
+        /**
+         * Field with the annotation.
+         */
+        private final Field f;
+
+        /**
+         * One of the values in {@link Property} annotation on {@link #f}.
+         */
+        private final String name;
+
+        protected FieldAccessor(Field f, String name) {
+            this.f = f;
+            f.setAccessible(true);
+            this.name = name;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public boolean hasValue(PropertySet props) {
+            return get(props)!=null;
+        }
+
+        public Object get(PropertySet props) {
+            try {
+                return f.get(props);
+            } catch (IllegalAccessException e) {
+                throw new AssertionError();
+            }
+        }
+
+        public void set(PropertySet props, Object value) {
+            try {
+                f.set(props,value);
+            } catch (IllegalAccessException e) {
+                throw new AssertionError();
+            }
+        }
+    }
+
+    static final class MethodAccessor implements Accessor {
+        /**
+         * Getter method.
+         */
+        private final @NotNull Method getter;
+        /**
+         * Setter method.
+         * Some property is read-only.
+         */
+        private final @Nullable Method setter;
+
+        /**
+         * One of the values in {@link Property} annotation on {@link #getter}.
+         */
+        private final String name;
+
+        protected MethodAccessor(Method getter, Method setter, String value) {
+            this.getter = getter;
+            this.setter = setter;
+            this.name = value;
+            getter.setAccessible(true);
+            if(setter!=null)
+                setter.setAccessible(true);
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public boolean hasValue(PropertySet props) {
+            return get(props)!=null;
+        }
+
+        public Object get(PropertySet props) {
+            try {
+                return getter.invoke(props);
+            } catch (IllegalAccessException e) {
+                throw new AssertionError();
+            } catch (InvocationTargetException e) {
+                handle(e);
+                return 0;   // never reach here
+            }
+        }
+
+        public void set(PropertySet props, Object value) {
+            if(setter==null)
+                throw new ReadOnlyPropertyException(getName());
+            try {
+                setter.invoke(props,value);
+            } catch (IllegalAccessException e) {
+                throw new AssertionError();
+            } catch (InvocationTargetException e) {
+                handle(e);
+            }
+        }
+
+        /**
+         * Since we don't expect the getter/setter to throw a checked exception,
+         * it should be possible to make the exception propagation transparent.
+         * That's what we are trying to do here.
+         */
+        private Exception handle(InvocationTargetException e) {
+            Throwable t = e.getTargetException();
+            if(t instanceof Error)
+                throw (Error)t;
+            if(t instanceof RuntimeException)
+                throw (RuntimeException)t;
+            throw new Error(e);
+        }
+    }
+
+
+    public final boolean containsKey(Object key) {
+        return get(key)!=null;
+    }
+
+    /**
+     * Gets the name of the property.
+     *
+     * @param key
+     *      This field is typed as {@link Object} to follow the {@link Map#get(Object)}
+     *      convention, but if anything but {@link String} is passed, this method
+     *      just returns null.
+     */
+    public Object get(Object key) {
+        Accessor sp = getPropertyMap().get(key);
+        if(sp!=null)
+            return sp.get(this);
+        throw new IllegalArgumentException("Undefined property "+key);
+    }
+
+    /**
+     * Sets a property.
+     *
+     * 
    Implementation Note
    
+     * This method is slow. Code inside JAX-WS should define strongly-typed
+     * fields in this class and access them directly, instead of using this.
+     *
+     * @throws ReadOnlyPropertyException
+     *      if the given key is an alias of a strongly-typed field,
+     *      and if the name object given is not assignable to the field.
+     *
+     * @see Property
+     */
+    public Object put(String key, Object value) {
+        Accessor sp = getPropertyMap().get(key);
+        if(sp!=null) {
+            Object old = sp.get(this);
+            sp.set(this,value);
+            return old;
+        } else {
+            throw new IllegalArgumentException("Undefined property "+key);
+        }
+    }
+
+    /**
+     * Checks if this {@link PropertySet} supports a property of the given name.
+     */
+    public boolean supports(Object key) {
+        return getPropertyMap().containsKey(key);
+    }
+
+    public Object remove(Object key) {
+        Accessor sp = getPropertyMap().get(key);
+        if(sp!=null) {
+            Object old = sp.get(this);
+            sp.set(this,null);
+            return old;
+        } else {
+            throw new IllegalArgumentException("Undefined property "+key);
+        }
+    }
+
+
+    /**
+     * Lazily created view of {@link Property}s that
+     * forms the core of {@link #createMapView()}.
+     */
+    /*package*/ Set> mapViewCore;
+
+    /**
+     * Creates a {@link Map} view of this {@link PropertySet}.
+     *
+     * 
    
+     * This map is partially live, in the sense that values you set to it
+     * will be reflected to {@link PropertySet}.
+     *
+     * 
    
+     * However, this map may not pick up changes made
+     * to {@link PropertySet} after the view is created.
+     *
+     * @return
+     *      always non-null valid instance.
+     */
+    public final Map createMapView() {
+        final Set> core = new HashSet>();
+        createEntrySet(core);
+
+        return new AbstractMap() {
+            public Set> entrySet() {
+                return core;
+            }
+        };
+    }
+
+    /*package*/ void createEntrySet(Set> core) {
+        for (final Entry e : getPropertyMap().entrySet()) {
+            core.add(new Entry() {
+                public String getKey() {
+                    return e.getKey();
+                }
+
+                public Object getValue() {
+                    return e.getValue().get(PropertySet.this);
+                }
+
+                public Object setValue(Object value) {
+                    Accessor acc = e.getValue();
+                    Object old = acc.get(PropertySet.this);
+                    acc.set(PropertySet.this,value);
+                    return old;
+                }
+            });
+        }
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/SOAPVersion.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/SOAPVersion.java
new file mode 100644
index 00000000000..4642d6c8ff4
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/SOAPVersion.java
@@ -0,0 +1,219 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api;
+
+import com.sun.xml.internal.ws.encoding.soap.SOAP12Constants;
+
+import javax.xml.namespace.QName;
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPConstants;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPFactory;
+import javax.xml.ws.soap.SOAPBinding;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+
+/**
+ * Version of SOAP (1.1 and 1.2).
+ *
+ * 
    
+ * This class defines various constants for SOAP 1.1 and SOAP 1.2,
+ * and also defines convenience methods to simplify the processing
+ * of multiple SOAP versions.
+ *
+ * 
    
+ * This constant alows you to do:
+ *
+ * 
    + * SOAPVersion version = ...;
+ * version.someOp(...);
+ * 
    
+ *
+ * As opposed to:
+ *
+ * 
    + * if(binding is SOAP11) {
+ *   doSomeOp11(...);
+ * } else {
+ *   doSomeOp12(...);
+ * }
+ * 
    
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public enum SOAPVersion {
+    SOAP_11(SOAPBinding.SOAP11HTTP_BINDING,
+            com.sun.xml.internal.ws.encoding.soap.SOAPConstants.URI_ENVELOPE,
+            "text/xml",
+            SOAPConstants.URI_SOAP_ACTOR_NEXT, "actor",
+            javax.xml.soap.SOAPConstants.SOAP_1_1_PROTOCOL,
+            new QName(com.sun.xml.internal.ws.encoding.soap.SOAPConstants.URI_ENVELOPE, "MustUnderstand"),
+            "Client",
+            "Server",
+            Collections.singleton(SOAPConstants.URI_SOAP_ACTOR_NEXT)),
+
+    SOAP_12(SOAPBinding.SOAP12HTTP_BINDING,
+            SOAP12Constants.URI_ENVELOPE,
+            "application/soap+xml",
+            SOAPConstants.URI_SOAP_1_2_ROLE_ULTIMATE_RECEIVER, "role",
+            javax.xml.soap.SOAPConstants.SOAP_1_2_PROTOCOL,
+            new QName(com.sun.xml.internal.ws.encoding.soap.SOAP12Constants.URI_ENVELOPE, "MustUnderstand"),
+            "Sender",
+            "Receiver",
+            new HashSet(Arrays.asList(SOAPConstants.URI_SOAP_1_2_ROLE_NEXT,SOAPConstants.URI_SOAP_1_2_ROLE_ULTIMATE_RECEIVER)));
+
+    /**
+     * Binding ID for SOAP/HTTP binding of this SOAP version.
+     *
+     * 
    
+     * Either {@link SOAPBinding#SOAP11HTTP_BINDING} or
+     *  {@link SOAPBinding#SOAP12HTTP_BINDING}
+     */
+    public final String httpBindingId;
+
+    /**
+     * SOAP envelope namespace URI.
+     */
+    public final String nsUri;
+
+    /**
+     * Content-type. Either "text/xml" or "application/soap+xml".
+     */
+    public final String contentType;
+
+    /**
+     * SOAP MustUnderstand FaultCode for this SOAP version
+     */
+    public final QName faultCodeMustUnderstand;
+
+    /**
+     * SAAJ {@link MessageFactory} for this SOAP version.
+     */
+    public final MessageFactory saajMessageFactory;
+
+    /**
+     * SAAJ {@link SOAPFactory} for this SOAP version.
+     */
+    public final SOAPFactory saajSoapFactory;
+
+    /**
+     * If the actor/role attribute is absent, this SOAP version assumes this value.
+     */
+    public final String implicitRole;
+
+    /**
+     * Singleton set that contains {@link #implicitRole}.
+     */
+    public final Set implicitRoleSet;
+
+    /**
+     * This represents the roles required to be assumed by SOAP binding implementation.
+     */
+    public final Set requiredRoles;
+
+    /**
+     * "role" (SOAP 1.2) or "actor" (SOAP 1.1)
+     */
+    public final String roleAttributeName;
+
+    /**
+     * "{nsUri}Client" or "{nsUri}Sender"
+     */
+    public final QName faultCodeClient;
+
+    /**
+     * "{nsUri}Server" or "{nsUri}Receiver"
+     */
+    public final QName faultCodeServer;
+
+
+    private SOAPVersion(String httpBindingId, String nsUri, String contentType, String implicitRole, String roleAttributeName,
+                        String saajFactoryString, QName faultCodeMustUnderstand, String faultCodeClientLocalName,
+                        String faultCodeServerLocalName,Set requiredRoles) {
+        this.httpBindingId = httpBindingId;
+        this.nsUri = nsUri;
+        this.contentType = contentType;
+        this.implicitRole = implicitRole;
+        this.implicitRoleSet = Collections.singleton(implicitRole);
+        this.roleAttributeName = roleAttributeName;
+        try {
+            saajMessageFactory = MessageFactory.newInstance(saajFactoryString);
+            saajSoapFactory = SOAPFactory.newInstance(saajFactoryString);
+        } catch (SOAPException e) {
+            throw new Error(e);
+        }
+        this.faultCodeMustUnderstand = faultCodeMustUnderstand;
+        this.requiredRoles = requiredRoles;
+        this.faultCodeClient = new QName(nsUri,faultCodeClientLocalName);
+        this.faultCodeServer = new QName(nsUri,faultCodeServerLocalName);
+    }
+
+
+    public String toString() {
+        return httpBindingId;
+    }
+
+    /**
+     * Returns {@link SOAPVersion} whose {@link #httpBindingId} equals to
+     * the given string.
+     *
+     * This method does not perform input string validation.
+     *
+     * @param binding
+     *      for historical reason, we treat null as {@link #SOAP_11},
+     *      but you really shouldn't be passing null.
+     * @return always non-null.
+     */
+    public static SOAPVersion fromHttpBinding(String binding) {
+        if(binding==null)
+            return SOAP_11;
+
+        if(binding.equals(SOAP_12.httpBindingId))
+            return SOAP_12;
+        else
+            return SOAP_11;
+    }
+
+    /**
+     * Returns {@link SOAPVersion} whose {@link #nsUri} equals to
+     * the given string.
+     *
+     * This method does not perform input string validation.
+     *
+     * @param nsUri
+     *      must not be null.
+     * @return always non-null.
+     */
+    public static SOAPVersion fromNsUri(String nsUri) {
+        if(nsUri.equals(SOAP_12.nsUri))
+            return SOAP_12;
+        else
+            return SOAP_11;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/WSBinding.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/WSBinding.java
new file mode 100644
index 00000000000..c1a4381e84d
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/WSBinding.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.api.addressing.AddressingVersion;
+import com.sun.xml.internal.ws.api.message.Message;
+import com.sun.xml.internal.ws.api.pipe.Codec;
+import com.sun.xml.internal.ws.api.pipe.Tube;
+
+import javax.xml.ws.Binding;
+import javax.xml.ws.WebServiceFeature;
+import javax.xml.ws.handler.Handler;
+import java.util.List;
+
+/**
+ * JAX-WS implementation of {@link Binding}.
+ *
+ * 
    
+ * This object can be created by {@link BindingID#createBinding()}.
+ *
+ * 
    
+ * Binding conceptually includes the on-the-wire format of the message,
+ * this this object owns {@link Codec}.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public interface WSBinding extends Binding {
+    /**
+     * Gets the SOAP version of this binding.
+     *
+     * TODO: clarify what to do with XML/HTTP binding
+     *
+     * 
    
+     * This is just a shor-cut for  {@code getBindingID().getSOAPVersion()}
+     *
+     * @return
+     *      If the binding is using SOAP, this method returns
+     *      a {@link SOAPVersion} constant.
+     *
+     *      If the binding is not based on SOAP, this method
+     *      returns null. See {@link Message} for how a non-SOAP
+     *      binding shall be handled by {@link Tube}s.
+     */
+    SOAPVersion getSOAPVersion();
+    /**
+     * Gets the WS-Addressing version of this binding.
+     * 
    
+     * TODO: clarify what to do with XML/HTTP binding
+     *
+     * @return If the binding is using SOAP and WS-Addressing is enabled,
+     *         this method returns a {@link AddressingVersion} constant.
+     *         If binding is not using SOAP or WS-Addressing is not enabled,
+     *         this method returns null.
+     *
+     *          This might be little slow as it has to go over all the features on binding.
+     *          Its advisable to cache the addressingVersion wherever possible and reuse it.
+     */
+    AddressingVersion getAddressingVersion();
+
+    /**
+     * Gets the binding ID, which uniquely identifies the binding.
+     *
+     * 
    
+     * The relevant specs define the binding IDs and what they mean.
+     * The ID is used in many places to identify the kind of binding
+     * (such as SOAP1.1, SOAP1.2, REST, ...)
+     *
+     * @return
+     *      Always non-null same value.
+     */
+    @NotNull BindingID getBindingId();
+
+    @NotNull List getHandlerChain();
+
+    /**
+     * Checks if a particular {@link WebServiceFeature} is enabled.
+     *
+     * @return
+     *      true if enabled.
+     */
+    boolean isFeatureEnabled(@NotNull Class feature);
+
+    /**
+     * Gets a {@link WebServiceFeature} of the specific type.
+     *
+     * @param featureType
+     *      The type of the feature to retrieve.
+     * @return
+     *      If the feature is present and enabled, return a non-null instance.
+     *      Otherwise null.
+     */
+    @Nullable  F getFeature(@NotNull Class featureType);
+
+    /**
+     * Returns a list of features associated with {@link WSBinding}.
+     */
+    @NotNull WSFeatureList getFeatures();
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/Node.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/WSFeatureList.java
similarity index 54%
rename from jaxws/src/share/classes/com/sun/tools/internal/txw2/model/Node.java
rename to jaxws/src/share/classes/com/sun/xml/internal/ws/api/WSFeatureList.java
index 7f90e838feb..6fe13df3feb 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/Node.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/WSFeatureList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,53 +23,38 @@
  * have any questions.
  */
 
-package com.sun.tools.internal.txw2.model;
+package com.sun.xml.internal.ws.api;import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
 
-import org.xml.sax.Locator;
-
-import java.util.Iterator;
+import javax.xml.ws.WebServiceFeature;
 
 /**
- * {@link Node} is a {@link Leaf} that has children.
- *
- * Children are orderless.
+ * Read-only list of {@link WebServiceFeature}s.
  *
  * @author Kohsuke Kawaguchi
  */
-public abstract class Node extends Leaf implements Iterable {
+public interface WSFeatureList extends Iterable {
+    /**
+     * Checks if a particular {@link WebServiceFeature} is enabled.
+     *
+     * @return
+     *      true if enabled.
+     */
+    boolean isEnabled(@NotNull Class feature);
 
     /**
-     * Children of this node.
+     * Gets a {@link WebServiceFeature} of the specific type.
+     *
+     * @param featureType
+     *      The type of the feature to retrieve.
+     * @return
+     *      If the feature is present and enabled, return a non-null instance.
+     *      Otherwise null.
      */
-    public Leaf leaf;
-
-    protected Node(Locator location, Leaf leaf) {
-        super(location);
-        this.leaf = leaf;
-    }
+    @Nullable  F get(@NotNull Class featureType);
 
     /**
-     * Iterates all the children.
-     */
-    public final Iterator iterator() {
-        return new CycleIterator(leaf);
-    }
-
-    /**
-     * Returns true if this node has only one child node.
-     */
-    public final boolean hasOneChild() {
-        return leaf==leaf.getNext();
-    }
-
-    /**
-     * Adds the given {@link Leaf} and their sibling as children of this {@link Node}.
-     */
-    public final void addChild(Leaf child) {
-        if(this.leaf==null)
-            leaf = child;
-        else
-            leaf.merge(child);
-    }
-
+     * Obtains all the features in the array.
+      */
+    @NotNull WebServiceFeature[] toArray();
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/WSService.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/WSService.java
new file mode 100644
index 00000000000..42cdd66762f
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/WSService.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api;
+
+import com.sun.xml.internal.ws.api.addressing.WSEndpointReference;
+import com.sun.xml.internal.ws.client.WSServiceDelegate;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Dispatch;
+import javax.xml.ws.EndpointReference;
+import javax.xml.ws.Service;
+import javax.xml.ws.Service.Mode;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.WebServiceFeature;
+import javax.xml.ws.spi.ServiceDelegate;
+import java.lang.reflect.Field;
+import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+/**
+ * JAX-WS implementation of {@link ServiceDelegate}.
+ *
+ * 
    
+ * This abstract class is used only to improve the static type safety
+ * of the JAX-WS internal API.
+ *
+ * 
    
+ * The class name intentionally doesn't include "Delegate",
+ * because the fact that it's a delegate is a detail of
+ * the JSR-224 API, and for the layers above us this object
+ * nevertheless represents {@link Service}. We want them
+ * to think of this as an internal representation of a service.
+ *
+ * 
    
+ * Only JAX-WS internal code may downcast this to {@link WSServiceDelegate}.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public abstract class WSService extends ServiceDelegate {
+    protected WSService() {
+    }
+
+    /**
+     * Works like {@link #getPort(EndpointReference, Class, WebServiceFeature...)}
+     * but takes {@link WSEndpointReference}.
+     */
+    public abstract  T getPort(WSEndpointReference epr, Class portInterface, WebServiceFeature... features);
+
+    /**
+     * Works like {@link #createDispatch(EndpointReference, Class, Mode, WebServiceFeature[])}
+     * but it takes the port name separately, so that EPR without embedded metadata can be used.
+     */
+    public abstract  Dispatch createDispatch(QName portName, WSEndpointReference wsepr, Class aClass, Service.Mode mode, WebServiceFeature... features);
+
+    /**
+     * Works like {@link #createDispatch(EndpointReference, JAXBContext, Mode, WebServiceFeature[])}
+     * but it takes the port name separately, so that EPR without embedded metadata can be used.
+     */
+    public abstract Dispatch createDispatch(QName portName, WSEndpointReference wsepr, JAXBContext jaxbContext, Service.Mode mode, WebServiceFeature... features);
+
+    /**
+     * Create a Service instance.
+     *
+     * The specified WSDL document location and service qualified name MUST
+     * uniquely identify a wsdl:service element.
+     *
+     * @param wsdlDocumentLocation URL for the WSDL document location
+     *                             for the service
+     * @param serviceName QName for the service
+     * @throws WebServiceException If any error in creation of the
+     *                    specified service.
+     **/
+    public static WSService create( URL wsdlDocumentLocation, QName serviceName) {
+        return new WSServiceDelegate(wsdlDocumentLocation,serviceName,Service.class);
+    }
+
+    /**
+     * Create a Service instance.
+     *
+     * @param serviceName QName for the service
+     * @throws WebServiceException If any error in creation of the
+     *                    specified service
+     */
+    public static WSService create(QName serviceName) {
+        return create(null,serviceName);
+    }
+
+    /**
+     * Creates a service with a dummy service name.
+     */
+    public static WSService create() {
+        return create(null,new QName(WSService.class.getName(),"dummy"));
+    }
+
+    /**
+     * Obtains the {@link WSService} that's encapsulated inside a {@link Service}.
+     *
+     * @throws IllegalArgumentException
+     *      if the given service object is not from the JAX-WS RI.
+     */
+    public static WSService unwrap(final Service svc) {
+        return AccessController.doPrivileged(new PrivilegedAction() {
+            public WSService run() {
+                try {
+                    Field f = svc.getClass().getField("delegate");
+                    f.setAccessible(true);
+                    Object delegate = f.get(svc);
+                    if(!(delegate instanceof WSService))
+                        throw new IllegalArgumentException();
+                    return (WSService) delegate;
+                } catch (NoSuchFieldException e) {
+                    AssertionError x = new AssertionError("Unexpected service API implementation");
+                    x.initCause(e);
+                    throw x;
+                } catch (IllegalAccessException e) {
+                    IllegalAccessError x = new IllegalAccessError(e.getMessage());
+                    x.initCause(e);
+                    throw x;
+                }
+            }
+        });
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/AddressingVersion.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/AddressingVersion.java
new file mode 100644
index 00000000000..9a28f7170aa
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/AddressingVersion.java
@@ -0,0 +1,744 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.addressing;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.stream.buffer.XMLStreamBuffer;
+import com.sun.xml.internal.ws.addressing.W3CAddressingConstants;
+import com.sun.xml.internal.ws.addressing.WsaTubeHelper;
+import com.sun.xml.internal.ws.addressing.v200408.MemberSubmissionAddressingConstants;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.message.Header;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
+import com.sun.xml.internal.ws.api.model.SEIModel;
+import com.sun.xml.internal.ws.developer.MemberSubmissionAddressingFeature;
+import com.sun.xml.internal.ws.developer.MemberSubmissionEndpointReference;
+import com.sun.xml.internal.ws.message.stream.OutboundStreamHeader;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.ws.EndpointReference;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.WebServiceFeature;
+import javax.xml.ws.soap.AddressingFeature;
+import javax.xml.ws.wsaddressing.W3CEndpointReference;
+import java.io.ByteArrayInputStream;
+
+/**
+ * 'Traits' object that absorbs differences of WS-Addressing versions.
+ *
+ * @author Arun Gupta
+ */
+public enum AddressingVersion {
+
+    W3C("http://www.w3.org/2005/08/addressing",
+        W3CAddressingConstants.ANONYMOUS_EPR,
+        "http://www.w3.org/2006/05/addressing/wsdl",
+        "http://www.w3.org/2006/05/addressing/wsdl",
+        "http://www.w3.org/2005/08/addressing/anonymous",
+        "http://www.w3.org/2005/08/addressing/none",
+        new EPR(W3CEndpointReference.class,
+                    "Address",
+                    "ServiceName",
+                    "EndpointName",
+                    "InterfaceName",
+                    new QName("http://www.w3.org/2005/08/addressing","Metadata"),
+                    "ReferenceParameters",
+                    null )) {
+
+        /* package */  String getActionMismatchLocalName() {
+            return "ActionMismatch";
+        }
+        @Override
+        public boolean isReferenceParameter(String localName) {
+            return localName.equals("ReferenceParameters");
+        }
+
+        @Override
+        public WsaTubeHelper getWsaHelper(WSDLPort wsdlPort, SEIModel seiModel, WSBinding binding) {
+            return new com.sun.xml.internal.ws.addressing.WsaTubeHelperImpl(wsdlPort, seiModel, binding);
+        }
+
+        @Override
+        /* package */ String getMapRequiredLocalName() {
+            return "MessageAddressingHeaderRequired";
+        }
+
+        @Override
+        public String getMapRequiredText() {
+            return "A required header representing a Message Addressing Property is not present";
+        }
+
+        /* package */ String getInvalidAddressLocalName() {
+            return "InvalidAddress";
+        }
+
+        @Override
+        /* package */ String getInvalidMapLocalName() {
+            return "InvalidAddressingHeader";
+        }
+
+        @Override
+        public String getInvalidMapText() {
+            return "A header representing a Message Addressing Property is not valid and the message cannot be processed";
+        }
+
+        @Override
+        /* package */ String getInvalidCardinalityLocalName() {
+            return "InvalidCardinality";
+        }
+
+        /*package*/ Header createReferenceParameterHeader(XMLStreamBuffer mark, String nsUri, String localName) {
+            return new OutboundReferenceParameterHeader(mark,nsUri,localName);
+        }
+
+        /*package*/ String getIsReferenceParameterLocalName() {
+            return "IsReferenceParameter";
+        }
+
+        /* package */ String getWsdlAnonymousLocalName() {
+            return "Anonymous";
+        }
+
+        public String getPrefix() {
+            return "wsa";
+        }
+
+        public String getWsdlPrefix() {
+            return "wsaw";
+        }
+
+        public Class getFeatureClass() {
+            return AddressingFeature.class;
+        }
+    },
+    MEMBER("http://schemas.xmlsoap.org/ws/2004/08/addressing",
+           MemberSubmissionAddressingConstants.ANONYMOUS_EPR,
+           "http://schemas.xmlsoap.org/ws/2004/08/addressing",
+           "http://schemas.xmlsoap.org/ws/2004/08/addressing/policy",
+           "http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous",
+            "",
+           new EPR(MemberSubmissionEndpointReference.class,
+                    "Address",
+                    "ServiceName",
+                    "PortName",
+                    "PortType",
+                    MemberSubmissionAddressingConstants.MEX_METADATA,
+                    "ReferenceParameters",
+                    "ReferenceProperties")) {
+        /* package */  String getActionMismatchLocalName() {
+            return "InvalidMessageInformationHeader";
+        }
+        @Override
+        public boolean isReferenceParameter(String localName) {
+            return localName.equals("ReferenceParameters") || localName.equals("ReferenceProperties");
+        }
+
+        @Override
+        public WsaTubeHelper getWsaHelper(WSDLPort wsdlPort, SEIModel seiModel, WSBinding binding) {
+            return new com.sun.xml.internal.ws.addressing.v200408.WsaTubeHelperImpl(wsdlPort, seiModel, binding);
+        }
+
+        @Override
+        /* package */ String getMapRequiredLocalName() {
+            return "MessageInformationHeaderRequired";
+        }
+
+        @Override
+        public String getMapRequiredText() {
+            return "A required message information header, To, MessageID, or Action, is not present.";
+        }
+
+        /* package */ String getInvalidAddressLocalName() {
+            return getInvalidMapLocalName();
+        }
+
+        @Override
+        /* package */ String getInvalidMapLocalName() {
+            return "InvalidMessageInformationHeader";
+        }
+
+        @Override
+        public String getInvalidMapText() {
+            return "A message information header is not valid and the message cannot be processed.";
+        }
+
+        @Override
+        /* package */ String getInvalidCardinalityLocalName() {
+            return getInvalidMapLocalName();
+        }
+
+        /*package*/ Header createReferenceParameterHeader(XMLStreamBuffer mark, String nsUri, String localName) {
+            return new OutboundStreamHeader(mark,nsUri,localName);
+        }
+
+        /*package*/ String getIsReferenceParameterLocalName() {
+            return "";
+        }
+
+        /* package */ String getWsdlAnonymousLocalName() {
+            return "";
+        }
+
+        public String getPrefix() {
+            return "wsa";
+        }
+
+        public String getWsdlPrefix() {
+            return "wsaw";
+        }
+
+        public Class getFeatureClass() {
+            return MemberSubmissionAddressingFeature.class;
+        }
+    };
+
+    /**
+     * Namespace URI
+     */
+    public final String nsUri;
+
+    /**
+     * Namespace URI for the WSDL Binding
+     */
+    public final String wsdlNsUri;
+
+    /**
+     * Representing either {@link W3CEndpointReference} or
+     * {@link MemberSubmissionEndpointReference}.
+     */
+    public final EPR eprType;
+
+    /**
+     * Namespace URI for the WSDL Binding
+     */
+    public final String policyNsUri;
+
+    /**
+     * Gets the anonymous URI value associated with this WS-Addressing version.
+     */
+    public final @NotNull String anonymousUri;
+
+    /**
+     * Gets the none URI value associated with this WS-Addressing version.
+     */
+    public final @NotNull String noneUri;
+
+    /**
+     * Represents the anonymous EPR.
+     */
+    public final WSEndpointReference anonymousEpr;
+
+    /**
+     * Represents the To QName in the SOAP message for a specific WS-Addressing Version.
+     */
+    public final QName toTag;
+
+    /**
+     * Represents the From QName in the SOAP message for a specific WS-Addressing Version.
+     */
+    public final QName fromTag;
+
+    /**
+     * Represents the ReplyTo QName in the SOAP message for a specific WS-Addressing Version.
+     */
+    public final QName replyToTag;
+
+    /**
+     * Represents the FaultTo QName for a specific WS-Addressing Version.
+     */
+    public final QName faultToTag;
+
+    /**
+     * Represents the Action QName in the SOAP message for a specific WS-Addressing Version.
+     */
+    public final QName actionTag;
+
+    /**
+     * Represents the MessageID QName in the SOAP message for a specific WS-Addressing Version.
+     */
+    public final QName messageIDTag;
+
+    /**
+     * Represents the RelatesTo QName in the SOAP message for a specific WS-Addressing Version.
+     */
+    public final QName relatesToTag;
+
+    /**
+     * Represents the QName of the fault code when a required header representing a
+     * WS-Addressing Message Addressing Property is not present.
+     */
+    public final QName mapRequiredTag;
+
+    /**
+     * Represents the QName of the fault code when Action is not supported at this endpoint.
+     */
+    public final QName actionMismatchTag;
+
+    /**
+     * Represents the QName of the fault code when Action is not supported at this endpoint.
+     */
+    public final QName actionNotSupportedTag;
+
+    /**
+     * Represents the text of the fault when Action is not supported at this endpoint.
+     */
+    public final String actionNotSupportedText;
+
+    /**
+     * Represents the QName of the fault code when a header representing a
+     * WS-Addressing Message Addressing Property is invalid and cannot be processed.
+     */
+    public final QName invalidMapTag;
+
+    /**
+     * Represents the QName of the fault code when a header representing a
+     * WS-Addressing Message Addressing Property occurs greater than expected number.
+     */
+    public final QName invalidCardinalityTag;
+
+    /**
+     * Represents the QName of the fault code when a header representing an
+     * address is not valid.
+     */
+    public final QName invalidAddressTag;
+
+    /**
+     * Represents the QName of the element that conveys additional information
+     * on the pre-defined WS-Addressing faults.
+     */
+    public final QName problemHeaderQNameTag;
+
+    /**
+     * Represents the QName of the element that conveys additional information
+     * if Action is not matching with that expected.
+     */
+    public final QName problemActionTag;
+
+    /**
+     * Represents the QName of the header element that is used to capture the fault detail
+     * if there is a fault processing WS-Addressing Message Addressing Property. This is
+     * only used for SOAP 1.1.
+     */
+    public final QName faultDetailTag;
+
+    /**
+     * Fault sub-sub-code that represents
+     * "Specifies that the invalid header was expected to be an EPR but did not contain an [address]."
+     */
+    public final QName fault_missingAddressInEpr;
+
+    /**
+     * Represents the Action QName in the WSDL for a specific WS-Addressing Version.
+     */
+    public final QName wsdlActionTag;
+
+    /**
+     * Represents the WSDL extension QName for a specific WS-Addressing Version.
+     */
+    public final QName wsdlExtensionTag;
+
+    /**
+     * Represents the WSDL anonymous QName for a specific WS-Addressing Version.
+     */
+    public final QName wsdlAnonymousTag;
+
+    /**
+     * Represents the QName of the reference parameter in a SOAP message. This is
+     * only valid for W3C WS-Addressing.
+     */
+    public final QName isReferenceParameterTag;
+
+    private static final String EXTENDED_FAULT_NAMESPACE = "http://jax-ws.dev.java.net/addressing/fault";
+    public static final String UNSET_OUTPUT_ACTION = "http://jax-ws.dev.java.net/addressing/output-action-not-set";
+    public static final String UNSET_INPUT_ACTION = "http://jax-ws.dev.java.net/addressing/input-action-not-set";
+
+    /**
+     * Fault sub-sub-code that represents duplicate <Address> element in EPR.
+     * This is a fault code not defined in the spec.
+     */
+    public static final QName fault_duplicateAddressInEpr = new QName(
+        EXTENDED_FAULT_NAMESPACE, "DuplicateAddressInEpr"
+    );
+
+    private AddressingVersion(String nsUri, String anonymousEprString, String wsdlNsUri, String policyNsUri,
+                              String anonymousUri, String noneUri,
+                              EPR eprType ) {
+        this.nsUri = nsUri;
+        this.wsdlNsUri = wsdlNsUri;
+        this.policyNsUri = policyNsUri;
+        this.anonymousUri = anonymousUri;
+        this.noneUri = noneUri;
+        toTag = new QName(nsUri,"To");
+        fromTag = new QName(nsUri,"From");
+        replyToTag = new QName(nsUri,"ReplyTo");
+        faultToTag = new QName(nsUri,"FaultTo");
+        actionTag = new QName(nsUri,"Action");
+        messageIDTag = new QName(nsUri,"MessageID");
+        relatesToTag = new QName(nsUri,"RelatesTo");
+
+        mapRequiredTag = new QName(nsUri,getMapRequiredLocalName());
+        actionMismatchTag = new QName(nsUri,getActionMismatchLocalName());
+        actionNotSupportedTag = new QName(nsUri,"ActionNotSupported");
+        actionNotSupportedText = "The \"%s\" cannot be processed at the receiver";
+        invalidMapTag = new QName(nsUri,getInvalidMapLocalName());
+        invalidAddressTag = new QName(nsUri,getInvalidAddressLocalName());
+        invalidCardinalityTag = new QName(nsUri,getInvalidCardinalityLocalName());
+        faultDetailTag = new QName(nsUri,"FaultDetail");
+
+        problemHeaderQNameTag = new QName(nsUri,"ProblemHeaderQName");
+        problemActionTag = new QName(nsUri, "ProblemAction");
+
+        fault_missingAddressInEpr = new QName(nsUri,"MissingAddressInEPR","wsa");
+        isReferenceParameterTag = new QName(nsUri,getIsReferenceParameterLocalName());
+
+        wsdlActionTag = new QName(wsdlNsUri,"Action");
+        wsdlExtensionTag = new QName(wsdlNsUri, "UsingAddressing");
+        wsdlAnonymousTag = new QName(wsdlNsUri, getWsdlAnonymousLocalName());
+
+        // create stock anonymous EPR
+        try {
+            this.anonymousEpr = new WSEndpointReference(new ByteArrayInputStream(anonymousEprString.getBytes()),this);
+        } catch (XMLStreamException e) {
+            throw new Error(e); // bug in our code as EPR should parse.
+        }
+        this.eprType = eprType;
+    }
+
+    /**
+     * Gets the local name of the fault when a header representing a WS-Addressing Action is not same as SOAPAction
+     *
+     * @return local name
+     */
+    /* package */ abstract String getActionMismatchLocalName();
+
+    /**
+     * Returns {@link AddressingVersion} whose {@link #nsUri} equals to
+     * the given string.
+     *
+     * This method does not perform input string validation.
+     *
+     * @param nsUri
+     *      must not be null.
+     * @return always non-null.
+     */
+    public static AddressingVersion fromNsUri(String nsUri) {
+        if (nsUri.equals(W3C.nsUri))
+            return W3C;
+
+        if (nsUri.equals(MEMBER.nsUri))
+            return MEMBER;
+
+        return null;
+    }
+
+    /**
+     * Gets the {@link AddressingVersion} from a {@link WSBinding}
+     *
+     * @param binding WSDL binding
+     * @return
+     *     addresing version enabled, or null if none is enabled.
+     */
+    public static @Nullable
+    AddressingVersion fromBinding(WSBinding binding) {
+        // TODO: who is responsible for reporting an error if both versions
+        // are on?
+        if (binding.isFeatureEnabled(AddressingFeature.class))
+            return W3C;
+
+        if (binding.isFeatureEnabled(MemberSubmissionAddressingFeature.class))
+            return MEMBER;
+
+        return null;
+    }
+
+    /**
+     * Gets the {@link AddressingVersion} from a {@link WSDLPort}
+     *
+     * @param port WSDL port
+     * @return addresing version
+     */
+    public static AddressingVersion fromPort(WSDLPort port) {
+        if (port == null)
+            return null;
+
+        WebServiceFeature wsf = port.getFeature(AddressingFeature.class);
+        if (wsf == null) {
+            wsf = port.getFeature(MemberSubmissionAddressingFeature.class);
+        }
+        if (wsf == null)
+            return null;
+
+        return fromFeature(wsf);
+    }
+
+    /**
+     * Returns {@link #nsUri} associated with this {@link AddressingVersion}
+     *
+     * @return namespace URI
+     * @deprecated
+     *      Use {@link #nsUri}.
+     */
+    public String getNsUri() {
+        return nsUri;
+    }
+
+    /**
+     * Returns true if the given local name is considered as
+     * a reference parameter in EPR.
+     *
+     * For W3C, this means "ReferenceParameters",
+     * and for the member submission version, this means
+     * either "ReferenceParameters" or "ReferenceProperties".
+     */
+    public abstract boolean isReferenceParameter(String localName);
+
+    /**
+     * Returns WsaTubeHelper for the WS-Addressing version identified by binding
+     * {@link WSBinding} and for the {@link WSDLPort} port.
+     *
+     * @return WS-A version specific helper
+     */
+    public abstract WsaTubeHelper getWsaHelper(WSDLPort wsdlPort, SEIModel seiModel, WSBinding binding);
+
+    /**
+     * Gets the none URI value associated with this WS-Addressing version.
+     *
+     * @return none URI value
+     * @deprecated
+     *      Use {@link #noneUri}.
+     */
+    public final String getNoneUri() {
+        return noneUri;
+    }
+
+    /**
+     * Gets the anonymous URI value associated with this WS-Addressing version.
+     *
+     * @deprecated
+     *      Use {@link #anonymousUri}
+     */
+    public final String getAnonymousUri() {
+        return anonymousUri;
+    }
+
+    /**
+     * Gets the default fault Action value associated with this WS-Addressing version.
+     *
+     * @return default fault Action value
+     */
+    public String getDefaultFaultAction() {
+        return nsUri + "/fault";
+    }
+
+    /**
+     * Gets the local name of the fault when a header representing a WS-Addressing Message
+     * Addresing Property is absent.
+     *
+     * @return local name
+     */
+    /* package */ abstract String getMapRequiredLocalName();
+
+    /**
+     * Gets the description text when a required WS-Addressing header representing a
+     * Message Addressing Property is absent.
+     *
+     * @return description text
+     */
+    public abstract String getMapRequiredText();
+
+    /**
+         * Gets the local name of the fault when a header representing anaddress is invalid.
+         * @return local name
+         */
+    /* package */ abstract String getInvalidAddressLocalName();
+
+
+    /**
+     * Gets the local name of the fault when a header representing a WS-Addressing Message
+     * Addresing Property is invalid and cannot be processed.
+     *
+     * @return local name
+     */
+    /* package */ abstract String getInvalidMapLocalName();
+
+    /**
+     * Gets the description text when a header representing a WS-Addressing
+     * Message Addressing Property is invalid and cannot be processed.
+     *
+     * @return description text
+     */
+    public abstract String getInvalidMapText();
+
+    /**
+     * Gets the local name of the fault when a header representing a WS-Addressing Message
+     * Addresing Property occurs greater than expected number.
+     *
+     * @return local name
+     */
+    /* package */ abstract String getInvalidCardinalityLocalName();
+
+    /* package */ abstract String getWsdlAnonymousLocalName();
+
+    public abstract String getPrefix();
+
+    public abstract String getWsdlPrefix();
+
+    public abstract Class getFeatureClass();
+    /**
+     * Creates an outbound {@link Header} from a reference parameter.
+     */
+    /*package*/ abstract Header createReferenceParameterHeader(XMLStreamBuffer mark, String nsUri, String localName);
+
+    /**
+     * Gets the local name for wsa:IsReferenceParameter. This method will return a valid
+     * value only valid for W3C WS-Addressing. For Member Submission WS-Addressing, this method
+     * returns null.
+     */
+    /*package*/ abstract String getIsReferenceParameterLocalName();
+
+    public static AddressingVersion fromFeature(WebServiceFeature af) {
+        if (af.getID().equals(AddressingFeature.ID))
+            return W3C;
+        else if (af.getID().equals(MemberSubmissionAddressingFeature.ID))
+            return MEMBER;
+        else
+            return null;
+    }
+
+    /**
+     * Gets the {@link WebServiceFeature} corresponding to the namespace URI of
+     * WS-Addressing policy assertion in the WSDL. enabled and
+     * required are used to initialize the value of the feature.
+     *
+     * @param nsUri namespace URI of the WS-Addressing policy assertion in the WSDL
+     * @param enabled true if feature is to be enabled, false otherwise
+     * @param required true if feature is required, false otherwise. Corresponds
+     *          to wsdl:required on the extension/assertion.
+     * @return WebServiceFeature corresponding to the assertion namespace URI
+     * @throws WebServiceException if an unsupported namespace URI is passed
+     */
+    public static @NotNull WebServiceFeature getFeature(String nsUri, boolean enabled, boolean required) {
+        if (nsUri.equals(W3C.policyNsUri))
+            return new AddressingFeature(enabled, required);
+        else if (nsUri.equals(MEMBER.policyNsUri))
+            return new MemberSubmissionAddressingFeature(enabled, required);
+        else
+            throw new WebServiceException("Unsupported namespace URI: " + nsUri);
+    }
+
+    /**
+     * Gets the corresponding {@link AddressingVersion} instance from the
+     * EPR class.
+     */
+    public static @NotNull AddressingVersion fromSpecClass(Class eprClass) {
+        if(eprClass==W3CEndpointReference.class)
+            return W3C;
+        if(eprClass==MemberSubmissionEndpointReference.class)
+            return MEMBER;
+        throw new WebServiceException("Unsupported EPR type: "+eprClass);
+    }
+
+    /**
+     * Returns true if the WebServiceFeature is either a {@link AddressingFeature} or
+     * {@link MemberSubmissionAddressingFeature} and is required.
+     *
+     * @param wsf The WebServiceFeature encaps
+     * @throws WebServiceException if wsf does not contain either {@link AddressingFeature} or
+     * {@link MemberSubmissionAddressingFeature}
+     * @return true if wsf requires WS-Addressing
+     */
+    public static boolean isRequired(WebServiceFeature wsf) {
+        if (wsf.getID().equals(AddressingFeature.ID)) {
+            return ((AddressingFeature)wsf).isRequired();
+        } else if (wsf.getID().equals(MemberSubmissionAddressingFeature.ID)) {
+            return ((MemberSubmissionAddressingFeature)wsf).isRequired();
+        } else
+            throw new WebServiceException("WebServiceFeature not an Addressing feature: "+ wsf.getID());
+    }
+
+    /**
+     * Returns true if binding contains either a {@link AddressingFeature} or
+     * {@link MemberSubmissionAddressingFeature} and is required.
+     *
+     * @param binding The binding
+     * @return true if binding requires WS-Addressing
+     */
+    public static boolean isRequired(WSBinding binding) {
+        AddressingFeature af = binding.getFeature(AddressingFeature.class);
+        if (af != null)
+            return af.isRequired();
+        MemberSubmissionAddressingFeature msaf = binding.getFeature(MemberSubmissionAddressingFeature.class);
+        if(msaf != null)
+            return msaf.isRequired();
+
+        return false;
+    }
+
+    /**
+     * Returns true if binding contains either a {@link AddressingFeature} or
+     * {@link MemberSubmissionAddressingFeature} and is enabled.
+     *
+     * @param binding The binding
+     * @return true if WS-Addressing is enabled for binding.
+     */
+    public static boolean isEnabled(WSBinding binding) {
+        return binding.isFeatureEnabled(MemberSubmissionAddressingFeature.class) ||
+                binding.isFeatureEnabled(AddressingFeature.class);
+    }
+
+    public final static class EPR {
+        public final Class eprClass;
+        public final String address;
+        public final String serviceName;
+        public final String portName;
+        public final String portTypeName;
+        public final String referenceParameters;
+        /**
+         * Element under which metadata is specified.
+         * In W3C, it is wsa:Metadata
+         * In Member, it is directly under mex:MetadataSection
+         */
+        public final QName wsdlMetadata;
+        public final String referenceProperties;
+
+        public EPR(Class eprClass, String address, String serviceName, String portName,
+                    String portTypeName, QName wsdlMetadata,
+                    String referenceParameters, String referenceProperties) {
+            this.eprClass = eprClass;
+            this.address = address;
+            this.serviceName = serviceName;
+            this.portName = portName;
+            this.portTypeName = portTypeName;
+            this.referenceParameters = referenceParameters;
+            this.referenceProperties = referenceProperties;
+            this.wsdlMetadata = wsdlMetadata;
+
+        }
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/EPRHeader.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/EPRHeader.java
new file mode 100644
index 00000000000..977bab8a153
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/EPRHeader.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.addressing;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.message.AbstractHeaderImpl;
+import com.sun.xml.internal.ws.util.xml.XmlUtil;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.SAXException;
+
+import javax.xml.namespace.QName;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.dom.DOMResult;
+
+/**
+ * Used to represent outbound endpoint reference header,
+ * such as <ReplyTo> and <FaultTo>.
+ * Used from {@link WSEndpointReference}.
+ *
+ * @author Kohsuke Kawaguchi
+ * @see WSEndpointReference
+ */
+final class EPRHeader extends AbstractHeaderImpl {
+
+    private final String nsUri,localName;
+    private final WSEndpointReference epr;
+
+    EPRHeader(QName tagName, WSEndpointReference epr) {
+        this.nsUri = tagName.getNamespaceURI();
+        this.localName = tagName.getLocalPart();
+        this.epr = epr;
+    }
+
+    public @NotNull String getNamespaceURI() {
+        return nsUri;
+    }
+
+    public @NotNull String getLocalPart() {
+        return localName;
+    }
+
+    @Nullable
+    public String getAttribute(@NotNull String nsUri, @NotNull String localName) {
+        try {
+            XMLStreamReader sr = epr.read("EndpointReference"/*doesn't matter*/);
+            while(sr.getEventType()!= XMLStreamConstants.START_ELEMENT)
+                sr.next();
+
+            return sr.getAttributeValue(nsUri,localName);
+        } catch (XMLStreamException e) {
+            // since we are reading from buffer, this can't happen.
+            throw new AssertionError(e);
+        }
+    }
+
+    public XMLStreamReader readHeader() throws XMLStreamException {
+        return epr.read(localName);
+    }
+
+    public void writeTo(XMLStreamWriter w) throws XMLStreamException {
+        epr.writeTo(localName, w);
+    }
+
+    public void writeTo(SOAPMessage saaj) throws SOAPException {
+        try {
+            // TODO what about in-scope namespaces
+            // Not very efficient consider implementing a stream buffer
+            // processor that produces a DOM node from the buffer.
+            Transformer t = XmlUtil.newTransformer();
+            t.transform(epr.asSource(localName), new DOMResult(saaj.getSOAPHeader()));
+        } catch (Exception e) {
+            throw new SOAPException(e);
+        }
+    }
+
+    public void writeTo(ContentHandler contentHandler, ErrorHandler errorHandler) throws SAXException {
+        epr.writeTo(localName,contentHandler,errorHandler,true);
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/OneWayFeature.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/OneWayFeature.java
new file mode 100644
index 00000000000..cbcecb701fa
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/OneWayFeature.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.addressing;
+
+import com.sun.xml.internal.ws.api.FeatureConstructor;
+
+import javax.xml.ws.WebServiceFeature;
+
+/**
+ * Unsupported RI extension to work around an issue in WSIT.
+ *
+ * 
    
+ * This feature is not meant to be used by a common Web service developer as there
+ * is no need to send the above mentioned header for a one-way operation. But these
+ * properties may need to be sent in certain middleware Web services.
+ *
+ * 
    
+ * This feature allows ReplyTo, From and RelatesTo Message Addressing Properties
+ * to be added for all messages that are sent from the port configured with
+ * this annotation. All operations are assumed to be one-way, and
+ * this feature should be used for one-way
+ * operations only.
+ *
+ * If a non-null ReplyTo is specified, then MessageID property is also added.
+ *
+ * @author Arun Gupta
+ */
+public class OneWayFeature extends WebServiceFeature {
+    /**
+     * Constant value identifying the {@link OneWayFeature}
+     */
+    public static final String ID = "http://java.sun.com/xml/ns/jaxws/addressing/oneway";
+
+    private WSEndpointReference replyTo;
+    private WSEndpointReference from;
+    private String relatesToID;
+
+    /**
+     * Create an {@link OneWayFeature}. The instance created will be enabled.
+     */
+    public OneWayFeature() {
+        this.enabled = true;
+    }
+
+    /**
+     * Create an {@link OneWayFeature}
+     *
+     * @param enabled specifies whether this feature should
+     *                be enabled or not.
+     */
+    public OneWayFeature(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    /**
+     * Create an {@link OneWayFeature}
+     *
+     * @param enabled specifies whether this feature should be enabled or not.
+     * @param replyTo specifies the {@link WSEndpointReference} of wsa:ReplyTo header.
+     */
+    public OneWayFeature(boolean enabled, WSEndpointReference replyTo) {
+        this.enabled = enabled;
+        this.replyTo = replyTo;
+    }
+
+    /**
+     * Create an {@link OneWayFeature}
+     *
+     * @param enabled specifies whether this feature should be enabled or not.
+     * @param replyTo specifies the {@link WSEndpointReference} of wsa:ReplyTo header.
+     * @param from specifies the {@link WSEndpointReference} of wsa:From header.
+     * @param relatesTo specifies the MessageID to be used for wsa:RelatesTo header.
+     */
+    @FeatureConstructor({"enabled","replyTo","from","relatesTo"})
+    public OneWayFeature(boolean enabled, WSEndpointReference replyTo, WSEndpointReference from, String relatesTo) {
+        this.enabled = enabled;
+        this.replyTo = replyTo;
+        this.from = from;
+        this.relatesToID = relatesTo;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public String getID() {
+        return ID;
+    }
+
+    /**
+     * Getter for wsa:ReplyTo header {@link WSEndpointReference} .
+     *
+     * @return address of the wsa:ReplyTo header
+     */
+    public WSEndpointReference getReplyTo() {
+        return replyTo;
+    }
+
+    /**
+     * Setter for wsa:ReplyTo header {@link WSEndpointReference}.
+     *
+     * @param address
+     */
+    public void setReplyTo(WSEndpointReference address) {
+        this.replyTo = address;
+    }
+
+    /**
+     * Getter for wsa:From header {@link WSEndpointReference}.
+     *
+     * @return address of the wsa:From header
+     */
+    public WSEndpointReference getFrom() {
+        return from;
+    }
+
+    /**
+     * Setter for wsa:From header {@link WSEndpointReference}.
+     *
+     * @param address of the wsa:From header
+     */
+    public void setFrom(WSEndpointReference address) {
+        this.from = address;
+    }
+
+    /**
+     * Getter for MessageID for wsa:RelatesTo header.
+     *
+     * @return address of the wsa:FaultTo header
+     */
+    public String getRelatesToID() {
+        return relatesToID;
+    }
+
+    /**
+     * Setter for MessageID for wsa:RelatesTo header.
+     *
+     * @param id
+     */
+    public void setRelatesToID(String id) {
+        this.relatesToID = id;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/OutboundReferenceParameterHeader.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/OutboundReferenceParameterHeader.java
new file mode 100644
index 00000000000..f0de7f5a5ce
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/OutboundReferenceParameterHeader.java
@@ -0,0 +1,330 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.addressing;
+
+import com.sun.istack.internal.FinalArrayList;
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.stream.buffer.XMLStreamBuffer;
+import com.sun.xml.internal.stream.buffer.XMLStreamBufferException;
+import com.sun.xml.internal.ws.api.message.Header;
+import com.sun.xml.internal.ws.message.AbstractHeaderImpl;
+import com.sun.xml.internal.ws.util.xml.XMLStreamWriterFilter;
+import org.w3c.dom.Element;
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
+import org.xml.sax.helpers.XMLFilterImpl;
+
+import javax.xml.namespace.QName;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+import javax.xml.stream.util.StreamReaderDelegate;
+import javax.xml.ws.WebServiceException;
+
+/**
+ * Used to represent outbound header created from {@link WSEndpointReference}'s
+ * referenec parameters.
+ *
+ * 
    
+ * This is optimized for outbound use, so it implements some of the methods lazily,
+ * in a slow way.
+ *
+ * 
    
+ * This header adds "wsa:IsReferenceParameter" and thus only used for the W3C version.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+final class OutboundReferenceParameterHeader extends AbstractHeaderImpl {
+    private final XMLStreamBuffer infoset;
+    private final String nsUri,localName;
+
+    /**
+     * The attributes on the header element.
+     * Lazily parsed.
+     * Null if not parsed yet.
+     */
+    private FinalArrayList attributes;
+
+    OutboundReferenceParameterHeader(XMLStreamBuffer infoset, String nsUri, String localName) {
+        this.infoset = infoset;
+        this.nsUri = nsUri;
+        this.localName = localName;
+    }
+
+    public @NotNull String getNamespaceURI() {
+        return nsUri;
+    }
+
+    public @NotNull String getLocalPart() {
+        return localName;
+    }
+
+    public String getAttribute(String nsUri, String localName) {
+        if(attributes==null)
+            parseAttributes();
+        for(int i=attributes.size()-1; i>=0; i-- ) {
+            Attribute a = attributes.get(i);
+            if(a.localName.equals(localName) && a.nsUri.equals(nsUri))
+                return a.value;
+        }
+        return null;
+    }
+
+    /**
+     * We don't really expect this to be used, but just to satisfy
+     * the {@link Header} contract.
+     *
+     * So this is rather slow.
+     */
+    private void parseAttributes() {
+        try {
+            XMLStreamReader reader = readHeader();
+            reader.nextTag();   // move to the first element, which is the header element
+
+            attributes = new FinalArrayList();
+
+            for (int i = 0; i < reader.getAttributeCount(); i++) {
+                final String localName = reader.getAttributeLocalName(i);
+                final String namespaceURI = reader.getAttributeNamespace(i);
+                final String value = reader.getAttributeValue(i);
+
+                attributes.add(new Attribute(namespaceURI,localName,value));
+            }
+
+            // we are adding one more attribute "wsa:IsReferenceParameter"
+            attributes.add(new Attribute(AddressingVersion.W3C.nsUri,IS_REFERENCE_PARAMETER,TRUE_VALUE));
+        } catch (XMLStreamException e) {
+            throw new WebServiceException("Unable to read the attributes for {"+nsUri+"}"+localName+" header",e);
+        }
+    }
+
+    public XMLStreamReader readHeader() throws XMLStreamException {
+        return new StreamReaderDelegate(infoset.readAsXMLStreamReader()) {
+            int state=0; /* 0:expecting root, 1:in root, 2:past root */
+            public int next() throws XMLStreamException {
+                return check(super.next());
+            }
+
+            public int nextTag() throws XMLStreamException {
+                return check(super.nextTag());
+            }
+
+            private int check(int type) {
+                switch(state) {
+                case 0:
+                    if(type==START_ELEMENT)
+                        state=1;
+                    break;
+                case 1:
+                    state=2;
+                }
+
+                return type;
+            }
+
+            public int getAttributeCount() {
+                if(state==1)    return super.getAttributeCount()+1;
+                else            return super.getAttributeCount();
+            }
+
+            public String getAttributeLocalName(int index) {
+                if(state==1 && index==super.getAttributeCount())
+                    return IS_REFERENCE_PARAMETER;
+                else
+                    return super.getAttributeLocalName(index);
+            }
+
+            public String getAttributeNamespace(int index) {
+                if(state==1 && index==super.getAttributeCount())
+                    return AddressingVersion.W3C.nsUri;
+                else
+                    return super.getAttributeNamespace(index);
+            }
+
+            public String getAttributePrefix(int index) {
+                if(state==1 && index==super.getAttributeCount())
+                    return "wsa";
+                else
+                    return super.getAttributePrefix(index);
+            }
+
+            public String getAttributeType(int index) {
+                if(state==1 && index==super.getAttributeCount())
+                    return "CDATA";
+                else
+                    return super.getAttributeType(index);
+            }
+
+            public String getAttributeValue(int index) {
+                if(state==1 && index==super.getAttributeCount())
+                    return TRUE_VALUE;
+                else
+                    return super.getAttributeValue(index);
+            }
+
+            public QName getAttributeName(int index) {
+                if(state==1 && index==super.getAttributeCount())
+                    return new QName(AddressingVersion.W3C.nsUri, IS_REFERENCE_PARAMETER, "wsa");
+                else
+                    return super.getAttributeName(index);
+            }
+
+            public String getAttributeValue(String namespaceUri, String localName) {
+                if(state==1 && localName.equals(IS_REFERENCE_PARAMETER) && namespaceUri.equals(AddressingVersion.W3C.nsUri))
+                    return TRUE_VALUE;
+                else
+                    return super.getAttributeValue(namespaceUri, localName);
+            }
+        };
+    }
+
+    public void writeTo(XMLStreamWriter w) throws XMLStreamException {
+        infoset.writeToXMLStreamWriter(new XMLStreamWriterFilter(w) {
+            private boolean root=true;
+
+            public void writeStartElement(String localName) throws XMLStreamException {
+                super.writeStartElement(localName);
+                writeAddedAttribute();
+            }
+
+            private void writeAddedAttribute() throws XMLStreamException {
+                if(!root)   return;
+                root=false;
+                writeNamespace("wsa",AddressingVersion.W3C.nsUri);
+                super.writeAttribute("wsa",AddressingVersion.W3C.nsUri,IS_REFERENCE_PARAMETER,TRUE_VALUE);
+            }
+
+            public void writeStartElement(String namespaceURI, String localName) throws XMLStreamException {
+                super.writeStartElement(namespaceURI, localName);
+                writeAddedAttribute();
+            }
+
+            public void writeStartElement(String prefix, String localName, String namespaceURI) throws XMLStreamException {
+                //TODO: Verify with KK later
+                //check if prefix is declared before writing start element.
+                boolean prefixDeclared = isPrefixDeclared(prefix,namespaceURI);
+                super.writeStartElement(prefix, localName, namespaceURI);
+                if(!prefixDeclared && !prefix.equals(""))
+                    super.writeNamespace(prefix,namespaceURI);
+                writeAddedAttribute();
+            }
+            public void writeNamespace(String prefix, String namespaceURI) throws XMLStreamException{
+                //TODO: Verify with KK later
+                if(isPrefixDeclared(prefix, namespaceURI)) {
+                    //Dont write it again , as its already in NamespaceContext
+                    return;
+                } else
+                    super.writeNamespace(prefix,namespaceURI);
+            }
+
+            private boolean isPrefixDeclared(String prefix, String namespaceURI ) {
+                return namespaceURI.equals(getNamespaceContext().getNamespaceURI(prefix));
+            }
+        },true);
+    }
+
+    public void writeTo(SOAPMessage saaj) throws SOAPException {
+        //TODO: SAAJ returns null instead of throwing SOAPException,
+        // when there is no SOAPHeader in the message,
+        // which leads to NPE.
+        try {
+            Element node = (Element)infoset.writeTo(saaj.getSOAPHeader());
+            node.setAttributeNS(AddressingVersion.W3C.nsUri,AddressingVersion.W3C.getPrefix()+":"+IS_REFERENCE_PARAMETER,TRUE_VALUE);
+        } catch (XMLStreamBufferException e) {
+            throw new SOAPException(e);
+        }
+    }
+
+    public void writeTo(ContentHandler contentHandler, ErrorHandler errorHandler) throws SAXException {
+        class Filter extends XMLFilterImpl {
+            Filter(ContentHandler ch) { setContentHandler(ch); }
+            private int depth=0;
+            public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
+                if(depth++==0) {
+                    // add one more attribute
+                    super.startPrefixMapping("wsa",AddressingVersion.W3C.nsUri);
+                    AttributesImpl atts2 = new AttributesImpl(atts);
+                    atts2.addAttribute(
+                        AddressingVersion.W3C.nsUri,
+                        IS_REFERENCE_PARAMETER,
+                        "wsa:IsReferenceParameter",
+                        "CDATA",
+                        TRUE_VALUE);
+                    atts = atts2;
+                }
+
+                super.startElement(uri, localName, qName, atts);
+            }
+
+            public void endElement(String uri, String localName, String qName) throws SAXException {
+                super.endElement(uri, localName, qName);
+                if(--depth==0)
+                    super.endPrefixMapping("wsa");
+            }
+        }
+
+        infoset.writeTo(new Filter(contentHandler),errorHandler);
+    }
+
+
+    /**
+     * Keep the information about an attribute on the header element.
+     */
+    static final class Attribute {
+        /**
+         * Can be empty but never null.
+         */
+        final String nsUri;
+        final String localName;
+        final String value;
+
+        public Attribute(String nsUri, String localName, String value) {
+            this.nsUri = fixNull(nsUri);
+            this.localName = localName;
+            this.value = value;
+        }
+
+        /**
+         * Convert null to "".
+         */
+        private static String fixNull(String s) {
+            if(s==null) return "";
+            else        return s;
+        }
+    }
+
+    /**
+     * We the performance paranoid people in the JAX-WS RI thinks
+     * saving three bytes is worth while...
+     */
+    private static final String TRUE_VALUE = "1";
+    private static final String IS_REFERENCE_PARAMETER = "IsReferenceParameter";
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/WSEndpointReference.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/WSEndpointReference.java
new file mode 100644
index 00000000000..6014672f895
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/WSEndpointReference.java
@@ -0,0 +1,954 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.addressing;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.stream.buffer.MutableXMLStreamBuffer;
+import com.sun.xml.internal.stream.buffer.XMLStreamBuffer;
+import com.sun.xml.internal.stream.buffer.XMLStreamBufferResult;
+import com.sun.xml.internal.stream.buffer.XMLStreamBufferSource;
+import com.sun.xml.internal.stream.buffer.sax.SAXBufferProcessor;
+import com.sun.xml.internal.stream.buffer.stax.StreamReaderBufferProcessor;
+import com.sun.xml.internal.stream.buffer.stax.StreamWriterBufferCreator;
+import com.sun.xml.internal.ws.addressing.EndpointReferenceUtil;
+import com.sun.xml.internal.ws.addressing.W3CAddressingConstants;
+import com.sun.xml.internal.ws.addressing.model.InvalidMapException;
+import com.sun.xml.internal.ws.addressing.v200408.MemberSubmissionAddressingConstants;
+import com.sun.xml.internal.ws.api.message.Header;
+import com.sun.xml.internal.ws.api.message.HeaderList;
+import com.sun.xml.internal.ws.api.message.Message;
+import com.sun.xml.internal.ws.api.streaming.XMLStreamReaderFactory;
+import com.sun.xml.internal.ws.resources.AddressingMessages;
+import com.sun.xml.internal.ws.resources.ClientMessages;
+import com.sun.xml.internal.ws.spi.ProviderImpl;
+import com.sun.xml.internal.ws.streaming.XMLStreamReaderUtil;
+import com.sun.xml.internal.ws.util.DOMUtil;
+import com.sun.xml.internal.ws.util.xml.XMLStreamWriterFilter;
+import com.sun.xml.internal.ws.util.xml.XmlUtil;
+import com.sun.xml.internal.ws.wsdl.parser.WSDLConstants;
+import org.w3c.dom.Element;
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.XMLFilterImpl;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+import javax.xml.transform.Source;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.ws.Dispatch;
+import javax.xml.ws.EndpointReference;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.WebServiceFeature;
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.net.URI;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Internal representation of the EPR.
+ *
+ * 
    
+ * Instances of this class are immutable and thread-safe.
+ *
+ * @author Kohsuke Kawaguchi
+ * @see AddressingVersion#anonymousEpr
+ */
+public final class WSEndpointReference {
+    private final XMLStreamBuffer infoset;
+    /**
+     * Version of the addressing spec.
+     */
+    private final AddressingVersion version;
+
+    /**
+     * Marked Reference parameters inside this EPR.
+     *
+     * Parsed when the object is created. can be empty but never null.
+     * @see #parse()
+     */
+    private @NotNull Header[] referenceParameters;
+    private @NotNull String address;
+
+    /**
+     * Creates from the spec version of {@link EndpointReference}.
+     *
+     * 
    
+     * This method performs the data conversion, so it's slow.
+     * Do not use this method in a performance critical path.
+     */
+    public WSEndpointReference(EndpointReference epr, AddressingVersion version) {
+        try {
+            MutableXMLStreamBuffer xsb = new MutableXMLStreamBuffer();
+            epr.writeTo(new XMLStreamBufferResult(xsb));
+            this.infoset = xsb;
+            this.version = version;
+            parse();
+        } catch (XMLStreamException e) {
+            throw new WebServiceException(ClientMessages.FAILED_TO_PARSE_EPR(epr),e);
+        }
+    }
+
+    /**
+     * Creates from the spec version of {@link EndpointReference}.
+     *
+     * 
    
+     * This method performs the data conversion, so it's slow.
+     * Do not use this method in a performance critical path.
+     */
+    public WSEndpointReference(EndpointReference epr) {
+        this(epr,AddressingVersion.fromSpecClass(epr.getClass()));
+    }
+
+    /**
+     * Creates a {@link WSEndpointReference} that wraps a given infoset.
+     */
+    public WSEndpointReference(XMLStreamBuffer infoset, AddressingVersion version) {
+        try {
+            this.infoset = infoset;
+            this.version = version;
+            parse();
+        } catch (XMLStreamException e) {
+            // this can never happen because XMLStreamBuffer never has underlying I/O error.
+            throw new AssertionError(e);
+        }
+    }
+
+    /**
+     * Creates a {@link WSEndpointReference} by parsing an infoset.
+     */
+    public WSEndpointReference(InputStream infoset, AddressingVersion version) throws XMLStreamException {
+        this(XMLStreamReaderFactory.create(null,infoset,false),version);
+    }
+
+    /**
+     * Creates a {@link WSEndpointReference} from the given infoset.
+     * The {@link XMLStreamReader} must point to either a document or an element.
+     */
+    public WSEndpointReference(XMLStreamReader in, AddressingVersion version) throws XMLStreamException {
+        this(XMLStreamBuffer.createNewBufferFromXMLStreamReader(in), version);
+    }
+
+    /**
+     * @see #WSEndpointReference(String, AddressingVersion)
+     */
+    public WSEndpointReference(URL address, AddressingVersion version) {
+        this(address.toExternalForm(), version);
+    }
+
+    /**
+     * @see #WSEndpointReference(String, AddressingVersion)
+     */
+    public WSEndpointReference(URI address, AddressingVersion version) {
+        this(address.toString(), version);
+    }
+
+    /**
+     * Creates a {@link WSEndpointReference} that only has an address.
+     */
+    public WSEndpointReference(String address, AddressingVersion version) {
+        this.infoset = createBufferFromAddress(address,version);
+        this.version = version;
+        this.address = address;
+        this.referenceParameters = EMPTY_ARRAY;
+    }
+
+    private static XMLStreamBuffer createBufferFromAddress(String address, AddressingVersion version) {
+        try {
+            MutableXMLStreamBuffer xsb = new MutableXMLStreamBuffer();
+            StreamWriterBufferCreator w = new StreamWriterBufferCreator(xsb);
+            w.writeStartDocument();
+            w.writeStartElement(version.getPrefix(),
+                "EndpointReference", version.nsUri);
+            w.writeNamespace(version.getPrefix(),
+                version.nsUri);
+            w.writeStartElement(version.getPrefix(),
+                W3CAddressingConstants.WSA_ADDRESS_NAME, version.nsUri);
+            w.writeCharacters(address);
+            w.writeEndElement();
+            w.writeEndElement();
+            w.writeEndDocument();
+            w.close();
+            return xsb;
+        } catch (XMLStreamException e) {
+            // can never happen because we are writing to XSB
+            throw new AssertionError(e);
+        }
+    }
+
+    /**
+     * Creates an EPR from individual components.
+     *
+     * 
    
+     * This version takes various information about metadata, and creates an EPR that has
+     * the necessary embedded WSDL.
+     */
+    public WSEndpointReference(@NotNull AddressingVersion version,
+                               @NotNull String address,
+                               @Nullable QName service,
+                               @Nullable QName port,
+                               @Nullable QName portType,
+                               @Nullable List metadata,
+                               @Nullable String wsdlAddress,
+                               @Nullable List referenceParameters) {
+       this(
+            createBufferFromData(version, address, referenceParameters, service, port, portType, metadata, wsdlAddress),
+            version );
+    }
+
+    private static XMLStreamBuffer createBufferFromData(AddressingVersion version, String address, List referenceParameters, QName service, QName port, QName portType, List metadata, String wsdlAddress) {
+
+        StreamWriterBufferCreator writer = new StreamWriterBufferCreator();
+
+        try {
+            writer.writeStartDocument();
+            writer.writeStartElement(version.getPrefix(),"EndpointReference", version.nsUri);
+            writer.writeNamespace(version.getPrefix(),version.nsUri);
+            writer.writeStartElement(version.getPrefix(),"Address", version.nsUri);
+            writer.writeCharacters(address);
+            writer.writeEndElement();
+            if(referenceParameters != null) {
+                writer.writeStartElement(version.getPrefix(),"ReferenceParameters", version.nsUri);
+                for (Element e : referenceParameters)
+                    DOMUtil.serializeNode(e, writer);
+                writer.writeEndElement();
+            }
+
+            switch(version) {
+            case W3C:
+                writeW3CMetaData(writer, service, port, portType, metadata, wsdlAddress);
+                break;
+
+            case MEMBER:
+                writeMSMetaData(writer, service, port, portType, metadata);
+                if (wsdlAddress != null) {
+                    //Inline the wsdl as extensibility element
+                    //Write mex:Metadata wrapper
+                    writer.writeStartElement(MemberSubmissionAddressingConstants.MEX_METADATA.getPrefix(),
+                            MemberSubmissionAddressingConstants.MEX_METADATA.getLocalPart(),
+                            MemberSubmissionAddressingConstants.MEX_METADATA.getNamespaceURI());
+                    writer.writeStartElement(MemberSubmissionAddressingConstants.MEX_METADATA_SECTION.getPrefix(),
+                            MemberSubmissionAddressingConstants.MEX_METADATA_SECTION.getLocalPart(),
+                            MemberSubmissionAddressingConstants.MEX_METADATA_SECTION.getNamespaceURI());
+                    writer.writeAttribute(MemberSubmissionAddressingConstants.MEX_METADATA_DIALECT_ATTRIBUTE,
+                            MemberSubmissionAddressingConstants.MEX_METADATA_DIALECT_VALUE);
+
+                    writeWsdl(writer, service, wsdlAddress);
+
+                    writer.writeEndElement();
+                    writer.writeEndElement();
+                }
+
+                break;
+            }
+            writer.writeEndElement();
+            writer.writeEndDocument();
+            writer.flush();
+
+            return writer.getXMLStreamBuffer();
+        } catch (XMLStreamException e) {
+            throw new WebServiceException(e);
+        }
+    }
+
+    private static void writeW3CMetaData(StreamWriterBufferCreator writer,
+                                         QName service,
+                                         QName port,
+                                         QName portType, List metadata,
+                                         String wsdlAddress) throws XMLStreamException {
+
+        writer.writeStartElement(AddressingVersion.W3C.getPrefix(),
+                W3CAddressingConstants.WSA_METADATA_NAME, AddressingVersion.W3C.nsUri);
+        writer.writeNamespace(AddressingVersion.W3C.getWsdlPrefix(),
+                AddressingVersion.W3C.wsdlNsUri);
+
+        //Write Interface info
+        if (portType != null) {
+            writer.writeStartElement(AddressingVersion.W3C.getWsdlPrefix(),
+                    W3CAddressingConstants.WSAW_INTERFACENAME_NAME,
+                    AddressingVersion.W3C.wsdlNsUri);
+            String portTypePrefix = portType.getPrefix();
+            if (portTypePrefix == null || portTypePrefix.equals("")) {
+                //TODO check prefix again
+                portTypePrefix = "wsns";
+            }
+            writer.writeNamespace(portTypePrefix, portType.getNamespaceURI());
+            writer.writeCharacters(portTypePrefix + ":" + portType.getLocalPart());
+            writer.writeEndElement();
+        }
+        if (service != null) {
+            //Write service and Port info
+            if (!(service.getNamespaceURI().equals("") || service.getLocalPart().equals(""))) {
+                writer.writeStartElement(AddressingVersion.W3C.getWsdlPrefix(),
+                        W3CAddressingConstants.WSAW_SERVICENAME_NAME,
+                        AddressingVersion.W3C.wsdlNsUri);
+                String servicePrefix = service.getPrefix();
+                if (servicePrefix == null || servicePrefix.equals("")) {
+                    //TODO check prefix again
+                    servicePrefix = "wsns";
+                }
+                writer.writeNamespace(servicePrefix, service.getNamespaceURI());
+                if (port != null) {
+                    writer.writeAttribute(W3CAddressingConstants.WSAW_ENDPOINTNAME_NAME, port.getLocalPart());
+                }
+                writer.writeCharacters(servicePrefix + ":" + service.getLocalPart());
+                writer.writeEndElement();
+            }
+        }
+        //Inline the wsdl
+        if (wsdlAddress != null) {
+            writeWsdl(writer, service, wsdlAddress);
+        }
+        //Add the extra metadata Elements
+        if (metadata != null)
+            for (Element e : metadata) {
+                DOMUtil.serializeNode(e, writer);
+            }
+        writer.writeEndElement();
+
+    }
+
+    private static void writeMSMetaData(StreamWriterBufferCreator writer,
+                                        QName service,
+                                        QName port,
+                                        QName portType, List metadata) throws XMLStreamException {
+        // TODO: write ReferenceProperties
+        //TODO: write ReferenceParameters
+        if (portType != null) {
+            //Write Interface info
+            writer.writeStartElement(AddressingVersion.MEMBER.getPrefix(),
+                    MemberSubmissionAddressingConstants.WSA_PORTTYPE_NAME,
+                    AddressingVersion.MEMBER.nsUri);
+
+
+            String portTypePrefix = portType.getPrefix();
+            if (portTypePrefix == null || portTypePrefix.equals("")) {
+                //TODO check prefix again
+                portTypePrefix = "wsns";
+            }
+            writer.writeNamespace(portTypePrefix, portType.getNamespaceURI());
+            writer.writeCharacters(portTypePrefix + ":" + portType.getLocalPart());
+            writer.writeEndElement();
+        }
+        //Write service and Port info
+        if (service != null) {
+            if (!(service.getNamespaceURI().equals("") || service.getLocalPart().equals(""))) {
+                writer.writeStartElement(AddressingVersion.MEMBER.getPrefix(),
+                        MemberSubmissionAddressingConstants.WSA_SERVICENAME_NAME,
+                        AddressingVersion.MEMBER.nsUri);
+                String servicePrefix = service.getPrefix();
+                if (servicePrefix == null || servicePrefix.equals("")) {
+                    //TODO check prefix again
+                    servicePrefix = "wsns";
+                }
+                writer.writeNamespace(servicePrefix, service.getNamespaceURI());
+                if (port != null) {
+                    writer.writeAttribute(MemberSubmissionAddressingConstants.WSA_PORTNAME_NAME,
+                            port.getLocalPart());
+                }
+                writer.writeCharacters(servicePrefix + ":" + service.getLocalPart());
+                writer.writeEndElement();
+            }
+        }
+    }
+
+    private static void writeWsdl(StreamWriterBufferCreator writer, QName service, String wsdlAddress) throws XMLStreamException {
+       // Inline-wsdl
+       writer.writeStartElement(WSDLConstants.PREFIX_NS_WSDL,
+               WSDLConstants.QNAME_DEFINITIONS.getLocalPart(),
+               WSDLConstants.NS_WSDL);
+       writer.writeNamespace(WSDLConstants.PREFIX_NS_WSDL, WSDLConstants.NS_WSDL);
+       writer.writeStartElement(WSDLConstants.PREFIX_NS_WSDL,
+               WSDLConstants.QNAME_IMPORT.getLocalPart(),
+               WSDLConstants.NS_WSDL);
+       writer.writeAttribute("namespace", service.getNamespaceURI());
+       writer.writeAttribute("location", wsdlAddress);
+       writer.writeEndElement();
+       writer.writeEndElement();
+   }
+
+
+
+    /**
+     * Converts from {@link EndpointReference}.
+     *
+     * This handles null {@link EndpointReference} correctly.
+     * Call {@link #WSEndpointReference(EndpointReference)} directly
+     * if you know it's not null.
+     */
+    public static @Nullable
+    WSEndpointReference create(@Nullable EndpointReference epr) {
+        if (epr != null)
+            return new WSEndpointReference(epr);
+        else
+            return null;
+    }
+
+    /**
+     * @see #createWithAddress(String)
+     */
+    public @NotNull WSEndpointReference createWithAddress(@NotNull URI newAddress) {
+        return createWithAddress(newAddress.toString());
+    }
+
+    /**
+     * @see #createWithAddress(String)
+     */
+    public @NotNull WSEndpointReference createWithAddress(@NotNull URL newAddress) {
+        return createWithAddress(newAddress.toString());
+    }
+
+    /**
+     * Creates a new {@link WSEndpointReference} by replacing the address of this EPR
+     * to the new one.
+     *
+     * 
    
+     * The following example shows how you can use this to force an HTTPS EPR,
+     * when the endpoint can serve both HTTP and HTTPS requests.
+     * 
    +     * if(epr.getAddress().startsWith("http:"))
+     *   epr = epr.createWithAddress("https:"+epr.getAddress().substring(5));
+     * 
    
+     *
+     * @param newAddress
+     *      This is a complete URL to be written inside <Adress> element of the EPR,
+     *      such as "http://foo.bar/abc/def"
+     */
+    public @NotNull WSEndpointReference createWithAddress(@NotNull final String newAddress) {
+        MutableXMLStreamBuffer xsb = new MutableXMLStreamBuffer();
+        XMLFilterImpl filter = new XMLFilterImpl() {
+            private boolean inAddress = false;
+            public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
+                if(localName.equals("Address") && uri.equals(version.nsUri))
+                    inAddress = true;
+                super.startElement(uri,localName,qName,atts);
+            }
+
+            public void characters(char ch[], int start, int length) throws SAXException {
+                if(!inAddress)
+                    super.characters(ch, start, length);
+            }
+
+
+            public void endElement(String uri, String localName, String qName) throws SAXException {
+                if(inAddress)
+                    super.characters(newAddress.toCharArray(),0,newAddress.length());
+                inAddress = false;
+                super.endElement(uri, localName, qName);
+            }
+        };
+        filter.setContentHandler(xsb.createFromSAXBufferCreator());
+        try {
+            infoset.writeTo(filter,false);
+        } catch (SAXException e) {
+            throw new AssertionError(e); // impossible since we are writing from XSB to XSB.
+        }
+
+        return new WSEndpointReference(xsb,version);
+    }
+
+    /**
+     * Convert the EPR to the spec version. The actual type of
+     * {@link EndpointReference} to be returned depends on which version
+     * of the addressing spec this EPR conforms to.
+     *
+     * @throws WebServiceException
+     *      if the conversion fails, which can happen if the EPR contains
+     *      invalid infoset (wrong namespace URI, etc.)
+     */
+    public @NotNull EndpointReference toSpec() {
+        return ProviderImpl.INSTANCE.readEndpointReference(asSource("EndpointReference"));
+    }
+
+    /**
+     * Converts the EPR to the specified spec version.
+     *
+     * If the {@link #getVersion() the addressing version in use} and
+     * the given class is different, then this may involve version conversion.
+     */
+    public @NotNull  T toSpec(Class clazz) {
+        return EndpointReferenceUtil.transform(clazz,toSpec());
+    }
+
+    /**
+     * Creates a proxy that can be used to talk to this EPR.
+     *
+     * 
    
+     * All the normal WS-Addressing processing happens automatically,
+     * such as setting the endpoint address to {@link #getAddress() the address},
+     * and sending the reference parameters associated with this EPR as
+     * headers, etc.
+     */
+    public @NotNull  T getPort(@NotNull Service jaxwsService,
+                     @NotNull Class serviceEndpointInterface,
+                     WebServiceFeature... features)     {
+        // TODO: implement it in a better way
+        return jaxwsService.getPort(toSpec(),serviceEndpointInterface,features);
+    }
+
+    /**
+     * Creates a {@link Dispatch} that can be used to talk to this EPR.
+     *
+     * 
    
+     * All the normal WS-Addressing processing happens automatically,
+     * such as setting the endpoint address to {@link #getAddress() the address},
+     * and sending the reference parameters associated with this EPR as
+     * headers, etc.
+     */
+    public @NotNull  Dispatch createDispatch(
+        @NotNull Service jaxwsService,
+        @NotNull Class type,
+        @NotNull Service.Mode mode,
+        WebServiceFeature... features) {
+
+        // TODO: implement it in a better way
+        return jaxwsService.createDispatch(toSpec(),type,mode,features);
+    }
+
+    /**
+     * Creates a {@link Dispatch} that can be used to talk to this EPR.
+     *
+     * 
    
+     * All the normal WS-Addressing processing happens automatically,
+     * such as setting the endpoint address to {@link #getAddress() the address},
+     * and sending the reference parameters associated with this EPR as
+     * headers, etc.
+     */
+    public @NotNull Dispatch createDispatch(
+        @NotNull Service jaxwsService,
+        @NotNull JAXBContext context,
+        @NotNull Service.Mode mode,
+        WebServiceFeature... features) {
+
+        // TODO: implement it in a better way
+        return jaxwsService.createDispatch(toSpec(),context,mode,features);
+    }
+
+    /**
+     * Gets the addressing version of this EPR.
+     */
+    public @NotNull AddressingVersion getVersion() {
+        return version;
+    }
+
+    /**
+     * The value of the <wsa:address> header.
+     */
+    public @NotNull String getAddress() {
+        return address;
+    }
+
+    /**
+     * Returns true if this has anonymous URI as the {@link #getAddress() address}.
+     */
+    public boolean isAnonymous() {
+        return address.equals(version.anonymousUri);
+    }
+
+    /**
+     * Returns true if this has {@link AddressingVersion#noneUri none URI}
+     * as the {@link #getAddress() address}.
+     */
+    public boolean isNone() {
+        return address.equals(version.noneUri);
+    }
+
+    /**
+     * Parses inside EPR and mark all reference parameters.
+     */
+    private void parse() throws XMLStreamException {
+        // TODO: validate the EPR structure.
+        // check for non-existent Address, that sort of things.
+
+        StreamReaderBufferProcessor xsr = infoset.readAsXMLStreamReader();
+
+        // parser should be either at the start element or the start document
+        if(xsr.getEventType()==XMLStreamReader.START_DOCUMENT)
+            xsr.nextTag();
+        assert xsr.getEventType()==XMLStreamReader.START_ELEMENT;
+
+        String rootLocalName = xsr.getLocalName();
+        if(!xsr.getNamespaceURI().equals(version.nsUri))
+            throw new WebServiceException(AddressingMessages.WRONG_ADDRESSING_VERSION(
+                version.nsUri, xsr.getNamespaceURI()));
+
+        // since often EPR doesn't have a reference parameter, create array lazily
+        List
     marks=null;
+
+        while(xsr.nextTag()==XMLStreamReader.START_ELEMENT) {
+            String localName = xsr.getLocalName();
+            if(version.isReferenceParameter(localName)) {
+                XMLStreamBuffer mark;
+                while((mark = xsr.nextTagAndMark())!=null) {
+                    if(marks==null)
+                        marks = new ArrayList
    ();
+
+                    // TODO: need a different header for member submission version
+                    marks.add(version.createReferenceParameterHeader(
+                        mark, xsr.getNamespaceURI(), xsr.getLocalName()));
+                    XMLStreamReaderUtil.skipElement(xsr);
+                }
+            } else
+            if(localName.equals("Address")) {
+                if(address!=null) // double 
    . That's an error.
+                    throw new InvalidMapException(new QName(version.nsUri,rootLocalName),AddressingVersion.fault_duplicateAddressInEpr);
+                address = xsr.getElementText();
+            } else {
+                XMLStreamReaderUtil.skipElement(xsr);
+            }
+        }
+
+        // hit to  by now
+
+        if(marks==null) {
+            this.referenceParameters = EMPTY_ARRAY;
+        } else {
+            this.referenceParameters = marks.toArray(new Header[marks.size()]);
+        }
+
+        if(address==null)
+            throw new InvalidMapException(new QName(version.nsUri,rootLocalName),version.fault_missingAddressInEpr);
+    }
+
+
+    /**
+     * Reads this EPR as {@link XMLStreamReader}.
+     *
+     * @param localName
+     *      EPR uses a different root tag name depending on the context.
+     *      The returned {@link XMLStreamReader} will use the given local name
+     *      for the root element name.
+     */
+    public XMLStreamReader read(final @NotNull String localName) throws XMLStreamException {
+        return new StreamReaderBufferProcessor(infoset) {
+            protected void processElement(String prefix, String uri, String _localName) {
+                if(_depth==0)
+                        _localName = localName;
+                super.processElement(prefix, uri, _localName);
+            }
+        };
+    }
+
+    /**
+     * Returns a {@link Source} that represents this EPR.
+     *
+     * @param localName
+     *      EPR uses a different root tag name depending on the context.
+     *      The returned {@link Source} will use the given local name
+     *      for the root element name.
+     */
+    public Source asSource(@NotNull String localName) {
+        return new SAXSource(new SAXBufferProcessorImpl(localName),new InputSource());
+    }
+
+    /**
+     * Writes this EPR to the given {@link ContentHandler}.
+     *
+     * @param localName
+     *      EPR uses a different root tag name depending on the context.
+     *      The returned {@link Source} will use the given local name
+     *      for the root element name.
+     * @param fragment
+     *      If true, generate a fragment SAX events without start/endDocument callbacks.
+     *      If false, generate a full XML document event.
+     */
+    public void writeTo(@NotNull String localName, ContentHandler contentHandler, ErrorHandler errorHandler, boolean fragment) throws SAXException {
+        SAXBufferProcessorImpl p = new SAXBufferProcessorImpl(localName);
+        p.setContentHandler(contentHandler);
+        p.setErrorHandler(errorHandler);
+        p.process(infoset,fragment);
+    }
+
+    /**
+     * Writes this EPR into the given writer.
+     *
+     * @param localName
+     *      EPR uses a different root tag name depending on the context.
+     *      The returned {@link Source} will use the given local name
+     */
+    public void writeTo(final @NotNull String localName, @NotNull XMLStreamWriter w) throws XMLStreamException {
+        infoset.writeToXMLStreamWriter(new XMLStreamWriterFilter(w) {
+            private boolean root=true;
+
+            @Override
+            public void writeStartDocument() throws XMLStreamException {
+            }
+
+            @Override
+            public void writeStartDocument(String encoding, String version) throws XMLStreamException {
+            }
+
+            @Override
+            public void writeStartDocument(String version) throws XMLStreamException {
+            }
+
+            @Override
+            public void writeEndDocument() throws XMLStreamException {
+            }
+
+            private String override(String ln) {
+                if(root) {
+                    root = false;
+                    return localName;
+                }
+                return ln;
+            }
+
+            public void writeStartElement(String localName) throws XMLStreamException {
+                super.writeStartElement(override(localName));
+            }
+
+            public void writeStartElement(String namespaceURI, String localName) throws XMLStreamException {
+                super.writeStartElement(namespaceURI, override(localName));
+            }
+
+            public void writeStartElement(String prefix, String localName, String namespaceURI) throws XMLStreamException {
+                super.writeStartElement(prefix, override(localName), namespaceURI);
+            }
+        },true/*write as fragment*/);
+    }
+
+    /**
+     * Returns a {@link Header} that wraps this {@link WSEndpointReference}.
+     *
+     * 
    
+     * The returned header is immutable too, and can be reused with
+     * many {@link Message}s.
+     *
+     * @param rootTagName
+     *      The header tag name to be used, such as <ReplyTo> or <FaultTo>.
+     *      (It's bit ugly that this method takes {@link QName} and not just local name,
+     *      unlike other methods. If it's making the caller's life miserable, then
+     *      we can talk.)
+     */
+    public Header createHeader(QName rootTagName) {
+        return new EPRHeader(rootTagName,this);
+    }
+
+    /**
+     * Copies all the reference parameters in this EPR as headers
+     * to the given {@link HeaderList}.
+     */
+    public void addReferenceParameters(HeaderList outbound) {
+        for (Header header : referenceParameters) {
+            outbound.add(header);
+        }
+    }
+
+    /**
+     * Dumps the EPR infoset in a human-readable string.
+     */
+    @Override
+    public String toString() {
+        try {
+            // debug convenience
+            StringWriter sw = new StringWriter();
+            XmlUtil.newTransformer().transform(asSource("EndpointReference"),new StreamResult(sw));
+            return sw.toString();
+        } catch (TransformerException e) {
+            return e.toString();
+        }
+    }
+
+    /**
+     * Filtering {@link SAXBufferProcessor} that replaces the root tag name.
+     */
+    class SAXBufferProcessorImpl extends SAXBufferProcessor {
+        private final String rootLocalName;
+        private boolean root=true;
+
+        public SAXBufferProcessorImpl(String rootLocalName) {
+            super(infoset,false);
+            this.rootLocalName = rootLocalName;
+        }
+
+        protected void processElement(String uri, String localName, String qName) throws SAXException {
+            if(root) {
+                root = false;
+
+                if(qName.equals(localName)) {
+                    qName = localName = rootLocalName;
+                } else {
+                    localName = rootLocalName;
+                    int idx = qName.indexOf(':');
+                    qName = qName.substring(0,idx+1)+rootLocalName;
+                }
+            }
+            super.processElement(uri, localName, qName);
+        }
+    }
+
+    private static final OutboundReferenceParameterHeader[] EMPTY_ARRAY = new OutboundReferenceParameterHeader[0];
+
+    /**
+     * Parses the metadata inside this EPR and obtains it in a easy-to-process form.
+     *
+     * 
    
+     * See {@link Metadata} class for what's avaliable as "metadata".
+     */
+    public @NotNull Metadata getMetaData() {
+        return new Metadata();
+    }
+
+    /**
+     * Parses the Metadata in an EPR and provides convenience methods to access
+     * the metadata.
+     *
+     */
+   public class Metadata {
+        private @Nullable QName serviceName;
+        private @Nullable QName portName;
+        private @Nullable QName portTypeName; //interfaceName
+        private @Nullable Source wsdlSource;
+        public @Nullable QName getServiceName(){
+            return serviceName;
+        }
+        public @Nullable QName getPortName(){
+            return portName;
+        }
+        public @Nullable QName getPortTypeName(){
+            return portTypeName;
+        }
+        public @Nullable Source getWsdlSource(){
+            return wsdlSource;
+        }
+
+        private Metadata() {
+            try {
+                parseMetaData();
+            } catch (XMLStreamException e) {
+                throw new WebServiceException(e);
+            }
+        }
+
+       /**
+         * Parses the Metadata section of the EPR.
+         */
+       private void parseMetaData() throws XMLStreamException {
+           StreamReaderBufferProcessor xsr = infoset.readAsXMLStreamReader();
+
+            // parser should be either at the start element or the start document
+            if (xsr.getEventType() == XMLStreamReader.START_DOCUMENT)
+                xsr.nextTag();
+            assert xsr.getEventType() == XMLStreamReader.START_ELEMENT;
+            String rootElement = xsr.getLocalName();
+            if (!xsr.getNamespaceURI().equals(version.nsUri))
+                throw new WebServiceException(AddressingMessages.WRONG_ADDRESSING_VERSION(
+                        version.nsUri, xsr.getNamespaceURI()));
+            String localName;
+            String ns;
+            if (version == AddressingVersion.W3C) {
+                do {
+                    //If the current element is metadata enclosure, look inside
+                    if (xsr.getLocalName().equals(version.eprType.wsdlMetadata.getLocalPart())) {
+                        XMLStreamBuffer mark;
+                        while ((mark = xsr.nextTagAndMark()) != null) {
+                            localName = xsr.getLocalName();
+                            ns = xsr.getNamespaceURI();
+                            if (localName.equals(version.eprType.serviceName)) {
+                                String portStr = xsr.getAttributeValue(null, version.eprType.portName);
+                                serviceName = getElementTextAsQName(xsr);
+                                if (serviceName != null)
+                                    portName = new QName(serviceName.getNamespaceURI(), portStr);
+                            } else if (localName.equals(version.eprType.portTypeName)) {
+                                portTypeName = getElementTextAsQName(xsr);
+                            } else if (ns.equals(WSDLConstants.NS_WSDL)
+                                    && localName.equals(WSDLConstants.QNAME_DEFINITIONS.getLocalPart())) {
+                                wsdlSource = new XMLStreamBufferSource(mark);
+                            } else {
+                                XMLStreamReaderUtil.skipElement(xsr);
+                            }
+                        }
+                    } else {
+                        //Skip is it is not root element
+                        if (!xsr.getLocalName().equals(rootElement))
+                            XMLStreamReaderUtil.skipElement(xsr);
+                    }
+                } while (XMLStreamReaderUtil.nextElementContent(xsr) == XMLStreamReader.START_ELEMENT);
+            } else if (version == AddressingVersion.MEMBER) {
+                do {
+                    localName = xsr.getLocalName();
+                    ns = xsr.getNamespaceURI();
+                    //If the current element is metadata enclosure, look inside
+                    if (localName.equals(version.eprType.wsdlMetadata.getLocalPart()) &&
+                            ns.equals(version.eprType.wsdlMetadata.getNamespaceURI())) {
+                        while (xsr.nextTag() == XMLStreamReader.START_ELEMENT) {
+                            XMLStreamBuffer mark;
+                            while ((mark = xsr.nextTagAndMark()) != null) {
+                                localName = xsr.getLocalName();
+                                ns = xsr.getNamespaceURI();
+                                if (ns.equals(WSDLConstants.NS_WSDL)
+                                        && localName.equals(WSDLConstants.QNAME_DEFINITIONS.getLocalPart())) {
+                                    wsdlSource = new XMLStreamBufferSource(mark);
+                                } else {
+                                    XMLStreamReaderUtil.skipElement(xsr);
+                                }
+                            }
+                        }
+                    } else if (localName.equals(version.eprType.serviceName)) {
+                        String portStr = xsr.getAttributeValue(null, version.eprType.portName);
+                        serviceName = getElementTextAsQName(xsr);
+                        if (serviceName != null)
+                            portName = new QName(serviceName.getNamespaceURI(), portStr);
+                    } else if (localName.equals(version.eprType.portTypeName)) {
+                        portTypeName = getElementTextAsQName(xsr);
+                    } else {
+                        //Skip is it is not root element
+                        if (!xsr.getLocalName().equals(rootElement))
+                            XMLStreamReaderUtil.skipElement(xsr);
+                    }
+                } while (XMLStreamReaderUtil.nextElementContent(xsr) == XMLStreamReader.START_ELEMENT);
+            }
+        }
+
+        private QName getElementTextAsQName(StreamReaderBufferProcessor xsr) throws XMLStreamException {
+            String text = xsr.getElementText();
+            String prefix = XmlUtil.getPrefix(text);
+            String name = XmlUtil.getLocalPart(text);
+            if (name != null) {
+                if (prefix != null) {
+                    String ns = xsr.getNamespaceURI(prefix);
+                    if (ns != null)
+                        return new QName(ns, name, prefix);
+                } else {
+                    return new QName(null, name);
+                }
+            }
+            return null;
+        }
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/package-info.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/package-info.java
new file mode 100644
index 00000000000..4669ef9cb45
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/package-info.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+@javax.xml.bind.annotation.XmlSchema(namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing",
+        location = "http://schemas.xmlsoap.org/ws/2004/08/addressing")
+package com.sun.xml.internal.ws.api.addressing;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/client/ClientPipelineHook.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/client/ClientPipelineHook.java
new file mode 100644
index 00000000000..7a55e352df8
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/client/ClientPipelineHook.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.client;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.ws.api.pipe.Pipe;
+import com.sun.xml.internal.ws.api.pipe.ClientPipeAssemblerContext;
+
+/**
+ * Allow the container (primarily Glassfish) to inject
+ * their own pipes into the client pipeline.
+ *
+ * 
    
+ * This interface has a rather ad-hoc set of methods, because
+ * we didn't want to define an autonomous pipe-assembly process.
+ * (We thought this is a smaller evil compared to that.)
+ *
+ * 
    
+ * JAX-WS obtains this through {@link com.sun.xml.internal.ws.api.server.Container#getSPI(Class)}.
+ *
+ * @author Jitendra Kotamraju
+ */
+public abstract class ClientPipelineHook {
+
+    /**
+     * Called during the pipeline construction process once to allow a container
+     * to register a pipe for security.
+     *
+     * This pipe will be injected to a point very close to the transport, allowing
+     * it to do some security operations.
+     *
+     * @param ctxt
+     *      Represents abstraction of SEI, WSDL abstraction etc. Context can be used
+     *      whether add a new pipe to the head or not.
+     *
+     * @param tail
+     *      Head of the partially constructed pipeline. If the implementation
+     *      wishes to add new pipes, it should do so by extending
+     *      {@link com.sun.xml.internal.ws.api.pipe.helper.AbstractFilterPipeImpl} and making sure that this {@link com.sun.xml.internal.ws.api.pipe.Pipe}
+     *      eventually processes messages.
+     *
+     * @return
+     *      The default implementation just returns tail, which means
+     *      no additional pipe is inserted. If the implementation adds
+     *      new pipes, return the new head pipe.
+     */
+    public @NotNull Pipe createSecurityPipe(ClientPipeAssemblerContext ctxt, @NotNull Pipe tail) {
+        return tail;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/client/SelectOptimalEncodingFeature.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/client/SelectOptimalEncodingFeature.java
new file mode 100644
index 00000000000..c105b3e8f08
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/client/SelectOptimalEncodingFeature.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.client;
+
+import com.sun.xml.internal.ws.api.FeatureConstructor;
+
+import javax.xml.ws.WebServiceFeature;
+
+/**
+ * Client side feature to enable or disable the selection of the optimal
+ * encoding by the client when sending outbound messages.
+ * 
    
+ * The following describes the affects of this feature with respect
+ * to being enabled or disabled:
+ * 
      
+ *  
    •  ENABLED: In this Mode, the most optimal encoding will be selected
+ *       depending on the configuration and capabilities of the client
+ *       the capabilities of the Web service.
+ *  
    •  DISABLED: In this Mode, the default encoding will be selected.
+ * 
    
+ * 
    
+ * If this feature is not present on a Web service then the default behaviour
+ * is equivalent to this feature being present and disabled.
+ * 
    
+ * If this feature is enabled by the client and the Service supports the
+ * Fast Infoset encoding, as specified by the {@link FastInfosetFeature},
+ * and Fast Infoset is determined to be the most optimal encoding, then the
+ * Fast Infoset encoding will be automatically selected by the client.
+ * 
    
+ * TODO: Still not sure if a feature is a server side only thing or can
+ * also be a client side thing. If the former then this class should be
+ * removed.
+ * @author Paul.Sandoz@Sun.Com
+ */
+public class SelectOptimalEncodingFeature extends WebServiceFeature {
+    /**
+     * Constant value identifying the {@link SelectOptimalEncodingFeature}
+     */
+    public static final String ID = "http://java.sun.com/xml/ns/jaxws/client/selectOptimalEncoding";
+
+    /**
+     * Create a {@link SelectOptimalEncodingFeature}.
+     * The instance created will be enabled.
+     */
+    public SelectOptimalEncodingFeature() {
+        this.enabled = true;
+    }
+
+    /**
+     * Create a {@link SelectOptimalEncodingFeature}
+     *
+     * @param enabled specifies whether this feature should
+     *                be enabled or not.
+     */
+    @FeatureConstructor({"enabled"})
+    public SelectOptimalEncodingFeature(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public String getID() {
+        return ID;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/client/ServiceInterceptor.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/client/ServiceInterceptor.java
new file mode 100644
index 00000000000..0755684128e
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/client/ServiceInterceptor.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.client;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.api.BindingID;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.WSFeatureList;
+import com.sun.xml.internal.ws.api.WSService;
+import com.sun.xml.internal.ws.developer.WSBindingProvider;
+
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Dispatch;
+import javax.xml.ws.WebServiceFeature;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Interception point for inner working of {@link WSService}.
+ *
+ * 
    
+ * System-level code could hook an implementation of this to
+ * {@link WSService} to augument its behavior.
+ *
+ * @author Kohsuke Kawaguchi
+ * @since 2.1 EA3
+ * @see ServiceInterceptorFactory
+ */
+public abstract class ServiceInterceptor {
+    /**
+     * Called before {@link WSBinding} is created, to allow interceptors
+     * to add {@link WebServiceFeature}s to the created {@link WSBinding}.
+     *
+     * @param port
+     *      Information about the port for which dispatch/proxy will be created.
+     * @param serviceEndpointInterface
+     *      Null if the created binding is for {@link Dispatch}. Otheriwse
+     *      it represents the port interface of the proxy to be created.
+     * @param defaultFeatures
+     *      The list of features that are currently scheduled to be set for
+     *      the newly created {@link WSBinding}.
+     *
+     * @return
+     *      A set of features to be added to the newly created {@link WSBinding}.
+     *      Can be empty but never null.
+     *      defaultFeatures will take precedence over what this method
+     *      would return (because it includes user-specified ones which will
+     *      take the at-most priority), but features you return from this method
+     *      will take precedence over {@link BindingID}'s
+     *      {@link BindingID#createBuiltinFeatureList() implicit features}.
+     */
+    public List preCreateBinding(@NotNull WSPortInfo port, @Nullable Class serviceEndpointInterface, @NotNull WSFeatureList defaultFeatures) {
+        return Collections.emptyList();
+    }
+
+
+    /**
+     * A callback to notify the event of creation of proxy object for SEI endpoint. The
+     * callback could set some properties on the {@link BindingProvider}.
+     *
+     * @param bp created proxy instance
+     * @param serviceEndpointInterface SEI of the endpoint
+     */
+    public void postCreateProxy(@NotNull WSBindingProvider bp,@NotNull Class serviceEndpointInterface) {
+    }
+
+
+    /**
+     * A callback to notify that a {@link Dispatch} object is created. The callback
+     * could set some properties on the {@link BindingProvider}.
+     *
+     * @param bp BindingProvider of dispatch object
+     */
+    public void postCreateDispatch(@NotNull WSBindingProvider bp) {
+    }
+
+    /**
+     * Aggregates multiple interceptors into one facade.
+     */
+    public static ServiceInterceptor aggregate(final ServiceInterceptor... interceptors) {
+        if(interceptors.length==1)
+            return interceptors[0];
+        return new ServiceInterceptor() {
+            public List preCreateBinding(@NotNull WSPortInfo port, @Nullable Class portInterface, @NotNull WSFeatureList defaultFeatures) {
+                List r = new ArrayList();
+                for (ServiceInterceptor si : interceptors)
+                    r.addAll(si.preCreateBinding(port,portInterface,defaultFeatures));
+                return r;
+            }
+
+            public void postCreateProxy(@NotNull WSBindingProvider bp, @NotNull Class serviceEndpointInterface) {
+                for (ServiceInterceptor si : interceptors)
+                    si.postCreateProxy(bp,serviceEndpointInterface);
+            }
+
+            public void postCreateDispatch(@NotNull WSBindingProvider bp) {
+                for (ServiceInterceptor si : interceptors)
+                    si.postCreateDispatch(bp);
+            }
+        };
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/client/ServiceInterceptorFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/client/ServiceInterceptorFactory.java
new file mode 100644
index 00000000000..32eb3953d98
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/client/ServiceInterceptorFactory.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.client;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.api.WSService;
+import com.sun.xml.internal.ws.util.ServiceFinder;
+
+import javax.xml.ws.Service;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Creates {@link ServiceInterceptor}.
+ *
+ * 
    
+ * Code that wishes to inject {@link ServiceInterceptor} into {@link WSService}
+ * must implement this class. There are two ways to have the JAX-WS RI
+ * recognize your {@link ServiceInterceptor}s.
+ *
+ * 
    Use {@link ServiceFinder}
    
+ * 
    
+ * {@link ServiceInterceptorFactory}s discovered via {@link ServiceFinder}
+ * will be incorporated to all {@link WSService} instances.
+ *
+ * 
    Register per-thread
    
+ *
+ *
+ * @author Kohsuke Kawaguchi
+ * @see ServiceInterceptor
+ * @see 2.1 EA3
+ */
+public abstract class ServiceInterceptorFactory {
+    public abstract ServiceInterceptor create(@NotNull WSService service);
+
+    /**
+     * Loads all {@link ServiceInterceptor}s and return aggregated one.
+     */
+    public static @NotNull ServiceInterceptor load(@NotNull WSService service, @Nullable ClassLoader cl) {
+        List l = new ArrayList();
+
+        // first service look-up
+        for( ServiceInterceptorFactory f : ServiceFinder.find(ServiceInterceptorFactory.class))
+            l.add(f.create(service));
+
+        // then thread-local
+        for( ServiceInterceptorFactory f : threadLocalFactories.get())
+            l.add(f.create(service));
+
+        return ServiceInterceptor.aggregate(l.toArray(new ServiceInterceptor[l.size()]));
+    }
+
+    private static ThreadLocal> threadLocalFactories = new ThreadLocal>() {
+        protected Set initialValue() {
+            return new HashSet();
+        }
+    };
+
+    /**
+     * Registers {@link ServiceInterceptorFactory} for this thread.
+     *
+     * 
    
+     * Once registered, {@link ServiceInterceptorFactory}s are consulted for every
+     * {@link Service} created in this thread, until it gets unregistered.
+     */
+    public static boolean registerForThread(ServiceInterceptorFactory factory) {
+        return threadLocalFactories.get().add(factory);
+    }
+
+    /**
+     * Removes previously registered {@link ServiceInterceptorFactory} for this thread.
+     */
+    public static boolean unregisterForThread(ServiceInterceptorFactory factory) {
+        return threadLocalFactories.get().remove(factory);
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/client/WSPortInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/client/WSPortInfo.java
new file mode 100644
index 00000000000..845bdd36687
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/client/WSPortInfo.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.client;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.api.BindingID;
+import com.sun.xml.internal.ws.api.EndpointAddress;
+import com.sun.xml.internal.ws.api.WSService;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
+
+import javax.xml.ws.handler.PortInfo;
+
+/**
+ * JAX-WS RI's extension to {@link PortInfo}.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public interface WSPortInfo extends PortInfo {
+    /**
+     * Returns {@link WSService} object that owns this port.
+     */
+    @NotNull WSService getOwner();
+
+    /**
+     * Returns the same information as {@link #getBindingID()}
+     * but in a strongly-typed fashion
+     */
+    @NotNull BindingID getBindingId();
+
+    /**
+     * Gets the endpoint address of this port.
+     */
+    @NotNull EndpointAddress getEndpointAddress();
+
+    /**
+     * Gets the {@link WSDLPort} object that represents this port,
+     * if {@link WSService} is configured with WSDL. Otherwise null.
+     */
+    @Nullable WSDLPort getPort();
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/fastinfoset/FastInfosetFeature.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/fastinfoset/FastInfosetFeature.java
new file mode 100644
index 00000000000..cc75babc9c0
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/fastinfoset/FastInfosetFeature.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.fastinfoset;
+
+import com.sun.xml.internal.ws.api.FeatureConstructor;
+
+import javax.xml.ws.WebServiceFeature;
+
+/**
+ * Enable or disable Fast Infoset on a Web service.
+ * 
    
+ * The following describes the affects of this feature with respect
+ * to being enabled or disabled:
+ * 
      
+ *  
    •  ENABLED: In this Mode, Fast Infoset will be enabled.
+ *  
    •  DISABLED: In this Mode, Fast Infoset will be disabled and the
+ *       Web service will not process incoming messages or produce outgoing
+ *       messages encoded using Fast Infoset.
+ * 
    
+ * 
    
+ * If this feature is not present on a Web service then the default behaviour
+ * is equivalent to this feature being present and enabled.
+ * @author Paul.Sandoz@Sun.Com
+ */
+public class FastInfosetFeature extends WebServiceFeature {
+    /**
+     * Constant value identifying the {@link FastInfosetFeature}
+     */
+    public static final String ID = "http://java.sun.com/xml/ns/jaxws/fastinfoset";
+
+    /**
+     * Create a {@link FastInfosetFeature}. The instance created will be enabled.
+     */
+    public FastInfosetFeature() {
+        this.enabled = true;
+    }
+
+    /**
+     * Create a {@link FastInfosetFeature}
+     *
+     * @param enabled specifies whether this feature should
+     *                be enabled or not.
+     */
+    @FeatureConstructor({"enabled"})
+    public FastInfosetFeature(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public String getID() {
+        return ID;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Attachment.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Attachment.java
new file mode 100644
index 00000000000..276d95bbb52
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Attachment.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.api.message;
+
+import com.sun.istack.internal.NotNull;
+
+import javax.activation.DataHandler;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.soap.SOAPException;
+import javax.xml.transform.Source;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+/**
+ * Attachment.
+ */
+public interface Attachment {
+
+    /**
+     * Content ID of the attachment. Uniquely identifies an attachment.
+     *
+     * @return
+     *      The content ID like "foo-bar-zot@abc.com", without
+     *      surrounding '<' and '>' used as the transfer syntax.
+     */
+    @NotNull String getContentId();
+
+    /**
+     * Gets the MIME content-type of this attachment.
+     */
+    String getContentType();
+
+    /**
+     * Gets the attachment as an exact-length byte array.
+     */
+    byte[] asByteArray();
+
+    /**
+     * Gets the attachment as a {@link DataHandler}.
+     */
+    DataHandler asDataHandler();
+
+    /**
+     * Gets the attachment as a {@link Source}.
+     * Note that there's no guarantee that the attachment is actually an XML.
+     */
+    Source asSource();
+
+    /**
+     * Obtains this attachment as an {@link InputStream}.
+     */
+    InputStream asInputStream();
+
+    /**
+     * Writes the contents of the attachment into the given stream.
+     */
+    void writeTo(OutputStream os) throws IOException;
+
+    /**
+     * Writes this attachment to the given {@link SOAPMessage}.
+     */
+    void writeTo(SOAPMessage saaj) throws SOAPException;
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/AttachmentSet.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/AttachmentSet.java
new file mode 100644
index 00000000000..651abf6cdbf
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/AttachmentSet.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.api.message;
+
+import com.sun.istack.internal.Nullable;
+
+/**
+ * A set of {@link Attachment} on a {@link Message}.
+ *
+ * 
    
+ * A particular attention is made to ensure that attachments
+ * can be read and parsed lazily as requested.
+ *
+ * @see Message#getAttachments()
+ */
+public interface AttachmentSet extends Iterable {
+    /**
+     * Gets the attachment by the content ID.
+     *
+     * @param contentId
+     *      The content ID like "foo-bar-zot@abc.com", without
+     *      surrounding '<' and '>' used as the transfer syntax.
+     *
+     * @return null
+     *      if no such attachment exist.
+     */
+    @Nullable
+    Attachment get(String contentId);
+
+    /**
+     * Returns true if there's no attachment.
+     */
+    boolean isEmpty();
+
+    /**
+     * Adds an attachment to this set.
+     *
+     * 
    
+     * Note that it's OK for an {@link Attachment} to belong to
+     * more than one {@link AttachmentSet} (which is in fact
+     * necessary when you wrap a {@link Message} into another.
+     *
+     * @param att
+     *      must not be null.
+     */
+    public void add(Attachment att);
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/message/SOAPMsgFactoryCreateException.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/ExceptionHasMessage.java
similarity index 57%
rename from jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/message/SOAPMsgFactoryCreateException.java
rename to jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/ExceptionHasMessage.java
index 63c77c3a80e..eea45436617 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/message/SOAPMsgFactoryCreateException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/ExceptionHasMessage.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,20 +23,31 @@
  * have any questions.
  */
 
-package com.sun.xml.internal.ws.encoding.soap.message;
+package com.sun.xml.internal.ws.api.message;
 
 import com.sun.xml.internal.ws.util.exception.JAXWSExceptionBase;
+import com.sun.xml.internal.ws.protocol.soap.VersionMismatchException;
 
 /**
- * @author WS Development Team
+ * This class represents an Exception that needs to be marshalled
+ * with a specific protocol wire format. For example, the SOAP's
+ * VersionMismatchFault needs to be written with a correct fault code.
+ * In that case, decoder could throw {@link VersionMismatchException},
+ * and the correspoinding fault {@link Message} from {@link ExceptionHasMessage::getFaultMessage}
+ * is sent on the wire.
+ *
+ * @author Jitendra Kotamraju
  */
-public class SOAPMsgFactoryCreateException extends JAXWSExceptionBase {
+public abstract class ExceptionHasMessage extends JAXWSExceptionBase {
 
-    public SOAPMsgFactoryCreateException(String key, Object... args) {
+    public ExceptionHasMessage(String key, Object... args) {
         super(key, args);
     }
 
-    public String getResourceBundleName() {
-        return "com.sun.xml.internal.ws.resources.soap";
-    }
+    /**
+     * Returns the exception into a fault Message
+     *
+     * @return Message for this exception
+     */
+    public abstract Message getFaultMessage();
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Header.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Header.java
new file mode 100644
index 00000000000..edef2ad619e
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Header.java
@@ -0,0 +1,325 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.api.message;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.bind.api.Bridge;
+import com.sun.xml.internal.ws.api.SOAPVersion;
+import com.sun.xml.internal.ws.api.addressing.AddressingVersion;
+import com.sun.xml.internal.ws.api.addressing.WSEndpointReference;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.namespace.QName;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+import javax.xml.ws.WebServiceException;
+import java.util.Set;
+
+
+/**
+ * A SOAP header.
+ *
+ * 
    
+ * A header is immutable, but unlike body it can be read
+ * multiple times.
+ * The {@link Header} abstraction hides how the header
+ * data is represented in memory; instead, it commits to
+ * the ability to write itself to XML infoset.
+ *
+ * 
    
+ * When a message is received from the transport and
+ * being processed, the processor needs to "peek"
+ * some information of a header, such as the tag name,
+ * the mustUnderstand attribute, and so on. Therefore,
+ * the {@link Header} interface exposes those information
+ * as properties, so that they can be checked without
+ * replaying the infoset, which is efficiently but still
+ * costly.
+ *
+ * 
    
+ * A {@link Header} may belong to more than one {@link HeaderList}
+ * due to wrapping of {@link Message}.
+ *
+ * @see HeaderList
+ * @see Headers
+ */
+public interface Header {
+    // TODO: Vivek pointed out that the only time we are looking at
+    // mustUnderstand and role are when we do the mustUnderstand error check
+    // (that is, to find out if there's any header with @mustUnderstand that
+    // has appropriate role for us.)
+    // if that's the case, it might be better if we define this whole operation
+    // as one method, instead of exposing two properties.
+
+    /**
+     * Checks if this header is ignorable for us (IOW, make sure
+     * that this header has a problematic "mustUnderstand" header value
+     * that we have to reject.)
+     *
+     * 
    
+     * This method is used as a part of the
+     * mustUnderstanx processing.
+     * At the end of the processing, the JAX-WS identifies a list of {@link Header}s
+     * that were not understood. This method is invoked on those {@link Header}s,
+     * to verify that we don't need to report an error for it.
+     *
+     * 
    
+     * specifically, this method has to perform the following tasks:
+     *
+     * 
      
+     *  
    • If this header does not have mustUnderstand as "1" nor "true",
+     *      then this method must return true.
+     *  
    • Otherwise, check the role attribute (for SOAP 1.2) or the actor attribute (for SOAP 1.1).
+     *      When those attributes are absent, the default values have to be assumed.
+     *      See {@link #getRole(SOAPVersion)} for how the values are defaulted.
+     *      Now, see if the {@code roles} set contains the value.
+     *      If so, this method must return false (indicating that an error is in order.)
+     *  
    • Otherwise return true (since we don't play the role this header is intended for.)
+     * 
    
+     *
+     * @param soapVersion
+     *      The caller specifies the SOAP version that the pipeline is working against.
+     *      Often each {@link Header} implementation already knows the SOAP version
+     *      anyway, but this allows some {@link Header}s to avoid keeping it.
+     *      That's why this redundant parameter is passed in.
+     * @param roles
+     *      The set of role values that the current JAX-WS pipeline is assuming.
+     *      Note that SOAP 1.1 and SOAP 1.2 use different strings for the same role,
+     *      and the caller is responsible for supplying a proper value depending on the
+     *      active SOAP version in use.
+     *
+     * @return
+     *      true if no error needs to be reported. False if an error needs to be raised.
+     *      See the method javadoc for more discussion.
+     */
+    public boolean isIgnorable(@NotNull SOAPVersion soapVersion, @NotNull Set roles);
+
+    /**
+     * Gets the value of the soap:role attribute (or soap:actor for SOAP 1.1).
+     *
+     * 
    
+     * If the attribute is omitted, the value defaults to {@link SOAPVersion#implicitRole}.
+     *
+     * @param soapVersion
+     *      The caller specifies the SOAP version that the pipeline is working against.
+     *      Often each {@link Header} implementation already knows the SOAP version
+     *      anyway, but this allows some {@link Header}s to avoid keeping it.
+     *      That's why this redundant parameter is passed in.
+     * @return
+     *      never null. This string need not be interned.
+     */
+    public @NotNull String getRole(@NotNull SOAPVersion soapVersion);
+
+    /**
+     * True if this header is to be relayed if not processed.
+     * For SOAP 1.1 messages, this method always return false.
+     *
+     * 
    
+     * IOW, this method returns true if there's @soap:relay='true'
+     * is present.
+     *
+     * 
    Implementation Note
    
+     * 
    
+     * The implementation needs to check for both "true" and "1",
+     * but because attribute values are normalized, it doesn't have
+     * to consider " true", " 1 ", and so on.
+     *
+     * @return
+     *      false.
+     */
+    public boolean isRelay();
+
+    /**
+     * Gets the namespace URI of this header element.
+     *
+     * @return
+     *      this string must be interned.
+     */
+    public @NotNull String getNamespaceURI();
+
+    /**
+     * Gets the local name of this header element.
+     *
+     * @return
+     *      this string must be interned.
+     */
+    public @NotNull String getLocalPart();
+
+    /**
+     * Gets the attribute value on the header element.
+     *
+     * @param nsUri
+     *      The namespace URI of the attribute. Can be empty.
+     * @param localName
+     *      The local name of the attribute.
+     *
+     * @return
+     *      if the attribute is found, return the whitespace normalized value.
+     *      (meaning no leading/trailing space, no consequtive whitespaces in-between.)
+     *      Otherwise null. Note that the XML parsers are responsible for
+     *      whitespace-normalizing attributes, so {@link Header} implementation
+     *      doesn't have to do anything.
+     */
+    @Nullable String getAttribute(@NotNull String nsUri, @NotNull String localName);
+
+    /**
+     * Gets the attribute value on the header element.
+     *
+     * 
    
+     * This is a convenience method that calls into {@link #getAttribute(String, String)}
+     *
+     * @param name
+     *      Never null.
+     *
+     * @see #getAttribute(String, String)
+     */
+    @Nullable String getAttribute(@NotNull QName name);
+
+    /**
+     * Reads the header as a {@link XMLStreamReader}.
+     *
+     * 
    
+     * The returned parser points at the start element of this header.
+     * (IOW, {@link XMLStreamReader#getEventType()} would return
+     * {@link XMLStreamReader#START_ELEMENT}.
+     *
+     * 
    Performance Expectation
    
+     * 
    
+     * For some {@link Header} implementations, this operation
+     * is a non-trivial operation. Therefore, use of this method
+     * is discouraged unless the caller is interested in reading
+     * the whole header.
+     *
+     * 
    
+     * Similarly, if the caller wants to use this method only to do
+     * the API conversion (such as simply firing SAX events from
+     * {@link XMLStreamReader}), then the JAX-WS team requests
+     * that you talk to us.
+     *
+     * 
    
+     * {@link Message}s that come from tranport usually provides
+     * a reasonably efficient implementation of this method.
+     *
+     * @return
+     *      must not null.
+     */
+    public XMLStreamReader readHeader() throws XMLStreamException;
+
+    /**
+     * Reads the header as a JAXB object by using the given unmarshaller.
+     */
+    public  T readAsJAXB(Unmarshaller unmarshaller) throws JAXBException;
+
+    /**
+     * Reads the header as a JAXB object by using the given unmarshaller.
+     */
+    public  T readAsJAXB(Bridge bridge) throws JAXBException;
+
+    /**
+     * Reads this header as an {@link WSEndpointReference}.
+     *
+     * @param expected
+     *      The version of the addressing used to parse the EPR.
+     *      If the actual infoset and this doesn't agree, then
+     *      you'll get an {@link WebServiceException} stating that fact.
+     *
+     * @return
+     *      On a successful return, this method never returns null.
+     */
+    public @NotNull WSEndpointReference readAsEPR(AddressingVersion expected) throws XMLStreamException;
+
+    /**
+     * Writes out the header as a fragment.
+     *
+     * @throws XMLStreamException
+     *      if the operation fails for some reason. This leaves the
+     *      writer to an undefined state.
+     */
+    public void writeTo(XMLStreamWriter w) throws XMLStreamException;
+
+    /**
+     * Writes out the header to the given SOAPMessage.
+     *
+     * 
    
+     * Sometimes a {@link Message} needs to produce itself
+     * as {@link SOAPMessage}, in which case each header needs
+     * to turn itself into a header.
+     *
+     * @throws SOAPException
+     *      if the operation fails for some reason. This leaves the
+     *      writer to an undefined state.
+     */
+    public void writeTo(SOAPMessage saaj) throws SOAPException;
+
+    /**
+     * Writes out the header as SAX events.
+     *
+     * 
    
+     * Sometimes a {@link Message} needs to produce SAX events,
+     * and this method is necessary for headers to participate to it.
+     *
+     * 
    
+     * A header is responsible for producing the SAX events for its part,
+     * including startPrefixMapping and endPrefixMapping,
+     * but not startDocument/endDocument.
+     *
+     * 
    
+     * Note that SAX contract requires that any error that does NOT originate
+     * from {@link ContentHandler} (meaning any parsing error and etc) must
+     * be first reported to {@link ErrorHandler}. If the SAX event production
+     * cannot be continued and the processing needs to abort, the code may
+     * then throw the same {@link SAXParseException} reported to {@link ErrorHandler}.
+     *
+     * @param contentHandler
+     *      The {@link ContentHandler} that receives SAX events.
+     *
+     * @param errorHandler
+     *      The {@link ErrorHandler} that receives parsing errors.
+     */
+    public void writeTo(ContentHandler contentHandler, ErrorHandler errorHandler) throws SAXException;
+
+    /**
+     * Used to obtain value XYZ from a header that looks like
+     * "<header>XYZ</header>". The primary use of this header
+     * for now is to access certain Addressing headers quickly.
+     *
+     * @throws WebServiceException
+     *      If the structure of the header is more complicated than
+     *      a simple string header.
+     *
+     * @return
+     *      Can be empty but always non-null.
+     */
+    public @NotNull String getStringContent();
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/HeaderList.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/HeaderList.java
new file mode 100644
index 00000000000..6da2c3deba8
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/HeaderList.java
@@ -0,0 +1,794 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.api.message;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.addressing.WsaTubeHelper;
+import com.sun.xml.internal.ws.api.SOAPVersion;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.addressing.AddressingVersion;
+import com.sun.xml.internal.ws.api.addressing.OneWayFeature;
+import com.sun.xml.internal.ws.api.addressing.WSEndpointReference;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLBoundOperation;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
+import com.sun.xml.internal.ws.api.pipe.Pipe;
+import com.sun.xml.internal.ws.api.pipe.Codec;
+import com.sun.xml.internal.ws.message.RelatesToHeader;
+import com.sun.xml.internal.ws.message.StringHeader;
+import com.sun.xml.internal.ws.protocol.soap.ClientMUTube;
+import com.sun.xml.internal.ws.protocol.soap.ServerMUTube;
+import com.sun.xml.internal.ws.resources.AddressingMessages;
+import com.sun.xml.internal.ws.resources.ClientMessages;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.ws.WebServiceException;
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+/**
+ * A list of {@link Header}s on a {@link Message}.
+ *
+ * 
    
+ * This list can be modified to add headers
+ * from outside a {@link Message}, this is necessary
+ * since intermediate processing layers often need to
+ * put additional headers.
+ *
+ * 
    
+ * Following the SOAP convention, the order among headers
+ * are not significant. However, {@link Codec}s are
+ * expected to preserve the order of headers in the input
+ * message as much as possible.
+ *
+ *
+ * 
+ * 
    MustUnderstand Processing
    
+ * 
    
+ * To perform SOAP mustUnderstang processing correctly, we need to keep
+ * track of headers that are understood and headers that are not.
+ * This is a collaborative process among {@link Pipe}s, thus it's something
+ * a {@link Pipe} author needs to keep in mind.
+ *
+ * 
    
+ * Specifically, when a {@link Pipe} sees a header and processes it
+ * (that is, if it did enough computing with the header to claim that
+ * the header is understood), then it should mark the corresponding
+ * header as "understood". For example, when a pipe that handles JAX-WSA
+ * examins the <wsa:To> header, it can claim that it understood the header.
+ * But for example, if a pipe that does the signature verification checks
+ * <wsa:To> for a signature, that would not be considered as "understood".
+ *
+ * 
    
+ * There are two ways to mark a header as understood:
+ *
+ * 
      
+ *  
    1. Use one of the getXXX methods that take a
+ *      boolean markAsUnderstood parameter.
+ *      Most often, a {@link Pipe} knows it's going to understand a header
+ *      as long as it's present, so this is the easiest and thus the preferred way.
+ *
+ *      For example, if JAX-WSA looks for <wsa:To>, then it can set
+ *      markAsUnderstand to true, to do the obtaining of a header
+ *      and marking at the same time.
+ *
+ *  
    2. Call {@link #understood(int)}.
+ *      If under a rare circumstance, a pipe cannot determine whether
+ *      it can understand it or not when you are fetching a header, then
+ *      you can use this method afterward to mark it as understood.
+ * 
    
+ *
+ * 
    
+ * Intuitively speaking, at the end of the day, if a header is not
+ * understood but {@link Header#isIgnorable(SOAPVersion, Set)} is false, a bad thing
+ * will happen. The actual implementation of the checking is more complicated,
+ * for that see {@link ClientMUTube}/{@link ServerMUTube}.
+ *
+ * @see Message#getHeaders()
+ */
+public final class HeaderList extends ArrayList
     {
+
+    /**
+     * Bit set to keep track of which headers are understood.
+     * 
    
+     * The first 32 headers use this field, and the rest will use
+     * {@link #moreUnderstoodBits}. The expectation is that
+     * most of the time a SOAP message will only have up to 32 headers,
+     * so we can avoid allocating separate objects for {@link BitSet}.
+     */
+    private int understoodBits;
+    /**
+     * If there are more than 32 headers, we use this {@link BitSet}
+     * to keep track of whether those headers are understood.
+     * Lazily allocated.
+     */
+    private BitSet moreUnderstoodBits = null;
+
+    private String to = null;
+    private String action = null;
+    private WSEndpointReference replyTo = null;
+    private WSEndpointReference faultTo = null;
+    private String messageId;
+
+
+    /**
+     * Creates an empty {@link HeaderList}.
+     */
+    public HeaderList() {
+    }
+
+    /**
+     * Copy constructor.
+     */
+    public HeaderList(HeaderList that) {
+        super(that);
+        this.understoodBits = that.understoodBits;
+        if(that.moreUnderstoodBits!=null)
+            this.moreUnderstoodBits = (BitSet)that.moreUnderstoodBits.clone();
+        this.to = that.to;
+        this.action = that.action;
+        this.replyTo = that.replyTo;
+        this.faultTo = that.faultTo;
+        this.messageId = that.messageId;
+    }
+
+    /**
+     * The number of total headers.
+     */
+    public int size() {
+        return super.size();
+    }
+
+    /**
+     * Adds all the headers.
+     */
+    public void addAll(Header... headers) {
+        for (Header header : headers)
+            add(header);
+    }
+
+    /**
+     * Gets the {@link Header} at the specified index.
+     *
+     * 
    
+     * This method does not mark the returned {@link Header} as understood.
+     *
+     * @see #understood(int)
+     */
+    public Header get(int index) {
+        return super.get(index);
+    }
+
+    /**
+     * Marks the {@link Header} at the specified index as
+     * "understood".
+     */
+    public void understood(int index) {
+        assert index"understood".
+     */
+    public boolean isUnderstood(int index) {
+        assert index"understood".
+     *
+     * @deprecated
+     * By the deifnition of {@link ArrayList}, this operation requires
+     * O(n) search of the array, and thus inherently inefficient.
+     *
+     * Because of this, if you are developing a {@link Pipe} for
+     * a performance sensitive environment, do not use this method.
+     *
+     * @throws IllegalArgumentException
+     *      if the given header is not {@link #contains(Object) contained}
+     *      in this header.
+     */
+    public void understood(@NotNull Header header) {
+        int sz = size();
+        for( int i=0; i"understood".
+     * @return null if not found.
+     */
+    public @Nullable Header get(@NotNull String nsUri, @NotNull String localName, boolean markAsUnderstood) {
+        int len = size();
+        for( int i=0; i"understood".
+     * @return null
+     *      if not found.
+     */
+    public @Nullable Header get(@NotNull QName name, boolean markAsUnderstood) {
+        return get(name.getNamespaceURI(),name.getLocalPart(),markAsUnderstood);
+    }
+
+    /**
+     * @deprecated
+     *      Use {@link #get(QName)}
+     */
+    public @Nullable Header get(@NotNull QName name) {
+        return get(name,true);
+    }
+
+    /**
+     * @deprecated
+     *      Use {@link #getHeaders(String, String, boolean)}
+     */
+    public Iterator
     getHeaders(final String nsUri, final String localName) {
+        return getHeaders(nsUri,localName,true);
+    }
+
+    /**
+     * Gets all the {@link Header}s of the specified name,
+     * including duplicates (if any.)
+     *
+     * @param markAsUnderstood
+     *      If this parameter is true, the returned headers will
+     *      be marked as "understood" when they are returned
+     *      from {@link Iterator#next()}.
+     * @return empty iterator if not found.
+     */
+    public @NotNull Iterator
     getHeaders(@NotNull final String nsUri, @NotNull final String localName, final boolean markAsUnderstood) {
+        return new Iterator
    () {
+            int idx = 0;
+            Header next;
+            public boolean hasNext() {
+                if(next==null)
+                    fetch();
+                return next!=null;
+            }
+
+            public Header next() {
+                if(next==null) {
+                    fetch();
+                    if(next==null)
+                        throw new NoSuchElementException();
+                }
+
+                if(markAsUnderstood) {
+                    assert get(idx-1)==next;
+                    understood(idx-1);
+                }
+
+                Header r = next;
+                next = null;
+                return r;
+            }
+
+            private void fetch() {
+                while(idx getHeaders(@NotNull QName headerName, final boolean markAsUnderstood) {
+        return getHeaders(headerName.getNamespaceURI(),headerName.getLocalPart(),markAsUnderstood);
+    }
+
+    /**
+     * @deprecated
+     *      use {@link #getHeaders(String, boolean)}.
+     */
+    public @NotNull Iterator
     getHeaders(@NotNull final String nsUri) {
+        return getHeaders(nsUri,true);
+    }
+
+    /**
+     * Gets an iteration of headers {@link Header} in the specified namespace,
+     * including duplicates (if any.)
+     *
+     * @param markAsUnderstood
+     *      If this parameter is true, the returned headers will
+     *      be marked as "understood" when they are returned
+     *      from {@link Iterator#next()}.
+     * @return
+     *      empty iterator if not found.
+     */
+    public @NotNull Iterator
     getHeaders(@NotNull final String nsUri, final boolean markAsUnderstood) {
+        return new Iterator
    () {
+            int idx = 0;
+            Header next;
+            public boolean hasNext() {
+                if(next==null)
+                    fetch();
+                return next!=null;
+            }
+
+            public Header next() {
+                if(next==null) {
+                    fetch();
+                    if(next==null)
+                        throw new NoSuchElementException();
+                }
+
+                if(markAsUnderstood) {
+                    assert get(idx-1)==next;
+                    understood(idx-1);
+                }
+
+                Header r = next;
+                next = null;
+                return r;
+            }
+
+            private void fetch() {
+                while(idx"understood" when they are returned
+     *      from {@link Iterator#next()}.
+     * @return null if header not found
+     */
+    private Header getFirstHeader(QName name, boolean markUnderstood, SOAPVersion sv) {
+        if (sv == null)
+            throw new IllegalArgumentException(AddressingMessages.NULL_SOAP_VERSION());
+
+        Iterator
     iter = getHeaders(name.getNamespaceURI(), name.getLocalPart(), markUnderstood);
+        while (iter.hasNext()) {
+            Header h = iter.next();
+            if (h.getRole(sv).equals(sv.implicitRole))
+                return h;
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns the value of WS-Addressing To header. The version
+     * identifies the WS-Addressing version and the header returned is targeted at
+     * the current implicit role. Caches the value for subsequent invocation.
+     * Duplicate To headers are detected earlier.
+     *
+     * @param av WS-Addressing version
+     * @param sv SOAP version
+     * @throws IllegalArgumentException if either av or sv is null.
+     * @return Value of WS-Addressing To header, anonymous URI if no header is present
+     */
+    public String getTo(AddressingVersion av, SOAPVersion sv) {
+        if (to != null)
+            return to;
+        if (av == null)
+            throw new IllegalArgumentException(AddressingMessages.NULL_ADDRESSING_VERSION());
+
+        Header h = getFirstHeader(av.toTag, true, sv);
+        if (h != null) {
+            to = h.getStringContent();
+        } else {
+            to = av.anonymousUri;
+        }
+
+        return to;
+    }
+
+    /**
+     * Returns the value of WS-Addressing Action header. The version
+     * identifies the WS-Addressing version and the header returned is targeted at
+     * the current implicit role. Caches the value for subsequent invocation.
+     * Duplicate Action headers are detected earlier.
+     *
+     * @param av WS-Addressing version
+     * @param sv SOAP version
+     * @throws IllegalArgumentException if either av or sv is null.
+     * @return Value of WS-Addressing Action header, null if no header is present
+     */
+    public String getAction(@NotNull AddressingVersion av, @NotNull SOAPVersion sv) {
+        if (action!= null)
+            return action;
+        if (av == null)
+            throw new IllegalArgumentException(AddressingMessages.NULL_ADDRESSING_VERSION());
+
+        Header h = getFirstHeader(av.actionTag, true, sv);
+        if (h != null) {
+            action = h.getStringContent();
+        }
+
+        return action;
+    }
+
+    /**
+     * Returns the value of WS-Addressing ReplyTo header. The version
+     * identifies the WS-Addressing version and the header returned is targeted at
+     * the current implicit role. Caches the value for subsequent invocation.
+     * Duplicate ReplyTo headers are detected earlier.
+     *
+     * @param av WS-Addressing version
+     * @param sv SOAP version
+     * @throws IllegalArgumentException if either av or sv is null.
+     * @return Value of WS-Addressing ReplyTo header, null if no header is present
+     */
+    public WSEndpointReference getReplyTo(@NotNull AddressingVersion av, @NotNull SOAPVersion sv) {
+        if (replyTo!=null)
+            return replyTo;
+        if (av == null)
+            throw new IllegalArgumentException(AddressingMessages.NULL_ADDRESSING_VERSION());
+
+        Header h = getFirstHeader(av.replyToTag, true, sv);
+        if (h != null) {
+            try {
+                replyTo = h.readAsEPR(av);
+            } catch (XMLStreamException e) {
+                throw new WebServiceException(AddressingMessages.REPLY_TO_CANNOT_PARSE(), e);
+            }
+        } else {
+            replyTo = av.anonymousEpr;
+        }
+
+        return replyTo;
+    }
+
+    /**
+     * Returns the value of WS-Addressing FaultTo header. The version
+     * identifies the WS-Addressing version and the header returned is targeted at
+     * the current implicit role. Caches the value for subsequent invocation.
+     * Duplicate FaultTo headers are detected earlier.
+     *
+     * @param av WS-Addressing version
+     * @param sv SOAP version
+     * @throws IllegalArgumentException if either av or sv is null.
+     * @return Value of WS-Addressing FaultTo header, null if no header is present
+     */
+    public WSEndpointReference getFaultTo(@NotNull AddressingVersion av, @NotNull SOAPVersion sv) {
+        if (faultTo != null)
+            return faultTo;
+
+        if (av == null)
+            throw new IllegalArgumentException(AddressingMessages.NULL_ADDRESSING_VERSION());
+
+        Header h = getFirstHeader(av.faultToTag, true, sv);
+        if (h != null) {
+            try {
+                faultTo = h.readAsEPR(av);
+            } catch (XMLStreamException e) {
+                throw new WebServiceException(AddressingMessages.FAULT_TO_CANNOT_PARSE(), e);
+            }
+        }
+
+        return faultTo;
+    }
+
+    /**
+     * Returns the value of WS-Addressing MessageID header. The version
+     * identifies the WS-Addressing version and the header returned is targeted at
+     * the current implicit role. Caches the value for subsequent invocation.
+     * Duplicate MessageID headers are detected earlier.
+     *
+     * @param av WS-Addressing version
+     * @param sv SOAP version
+     * @throws WebServiceException if either av or sv is null.
+     * @return Value of WS-Addressing MessageID header, null if no header is present
+     */
+    public String getMessageID(@NotNull AddressingVersion av, @NotNull SOAPVersion sv) {
+        if (messageId != null)
+            return messageId;
+
+        if (av == null)
+            throw new IllegalArgumentException(AddressingMessages.NULL_ADDRESSING_VERSION());
+
+        Header h = getFirstHeader(av.messageIDTag, true, sv);
+        if (h != null) {
+            messageId = h.getStringContent();
+        }
+
+        return messageId;
+    }
+
+    /**
+     * Creates a set of outbound WS-Addressing headers on the client with the
+     * specified Action Message Addressing Property value.
+     * 
    
+     * This method needs to be invoked right after such a Message is
+     * created which is error prone but so far only MEX, RM and JAX-WS
+     * creates a request so this ugliness is acceptable. This method is also used
+     * to create protocol messages that are not associated with any {@link WSBinding}
+     * and {@link WSDLPort}.
+     *
+     * @param packet request packet
+     * @param av WS-Addressing version
+     * @param sv SOAP version
+     * @param oneway Indicates if the message exchange pattern is oneway
+     * @param action Action Message Addressing Property value
+     */
+    public void fillRequestAddressingHeaders(Packet packet, AddressingVersion av, SOAPVersion sv, boolean oneway, String action) {
+        fillCommonAddressingHeaders(packet, av, sv, action);
+
+        // wsa:ReplyTo
+        // null or "true" is equivalent to request/response MEP
+        if (!oneway) {
+            WSEndpointReference epr = av.anonymousEpr;
+            add(epr.createHeader(av.replyToTag));
+
+            // wsa:MessageID
+            Header h = new StringHeader(av.messageIDTag, packet.getMessage().getID(av, sv));
+            add(h);
+        }
+    }
+
+    /**
+     * Creates a set of outbound WS-Addressing headers on the client with the
+     * default Action Message Addressing Property value.
+     * 
    
+     * This method needs to be invoked right after such a Message is
+     * created which is error prone but so far only MEX, RM and JAX-WS
+     * creates a request so this ugliness is acceptable. If more components
+     * are identified using this, then we may revisit this.
+     * 
    
+     * This method is used if default Action Message Addressing Property is to
+     * be used. See
+     * {@link #fillRequestAddressingHeaders(Packet, com.sun.xml.internal.ws.api.addressing.AddressingVersion, com.sun.xml.internal.ws.api.SOAPVersion, boolean, String)}
+     * if non-default Action is to be used, for example when creating a protocol message not
+     * associated with {@link WSBinding} and {@link WSDLPort}.
+     * This method uses SOAPAction as the Action unless set expplicitly in the wsdl.
+     * @param wsdlPort request WSDL port
+     * @param binding request WSBinding
+     * @param packet request packet
+     */
+    public void fillRequestAddressingHeaders(WSDLPort wsdlPort, @NotNull WSBinding binding, Packet packet) {
+        if (binding == null)
+            throw new IllegalArgumentException(AddressingMessages.NULL_BINDING());
+
+        AddressingVersion addressingVersion = binding.getAddressingVersion();
+        //seiModel is passed as null as it is not needed.
+        WsaTubeHelper wsaHelper = addressingVersion.getWsaHelper(wsdlPort, null, binding);
+
+        // wsa:Action
+        String action = wsaHelper.getEffectiveInputAction(packet);
+        if (action == null || action.equals("")) {
+            throw new WebServiceException(ClientMessages.INVALID_SOAP_ACTION());
+        }
+        boolean oneway = !packet.expectReply;
+        if (wsdlPort != null) {
+            // if WSDL has prohibited, then throw an error
+            // as anonymous ReplyTo MUST NOT be added in that case. BindingProvider need to
+            // disable AddressingFeature and MemberSubmissionAddressingFeature and hand-craft
+            // the SOAP message with non-anonymous ReplyTo/FaultTo.
+            if (!oneway && packet.getMessage() != null && packet.getMessage().getOperation(wsdlPort) != null && packet.getMessage().getOperation(wsdlPort).getAnonymous() == WSDLBoundOperation.ANONYMOUS.prohibited)
+            {
+                throw new WebServiceException(AddressingMessages.WSAW_ANONYMOUS_PROHIBITED());
+            }
+        }
+        if (!binding.isFeatureEnabled(OneWayFeature.class)) {
+            // standard oneway
+            fillRequestAddressingHeaders(packet, addressingVersion, binding.getSOAPVersion(), oneway, action);
+        } else {
+            // custom oneway
+            fillRequestAddressingHeaders(packet, addressingVersion, binding.getSOAPVersion(), binding.getFeature(OneWayFeature.class), action);
+        }
+    }
+
+    private void fillRequestAddressingHeaders(@NotNull Packet packet, @NotNull AddressingVersion av, @NotNull SOAPVersion sv, @NotNull OneWayFeature of, @NotNull String action) {
+        fillCommonAddressingHeaders(packet, av, sv, action);
+
+        // wsa:ReplyTo
+        if (of.getReplyTo() != null) {
+            add(of.getReplyTo().createHeader(av.replyToTag));
+
+            // add wsa:MessageID only for non-null ReplyTo
+            Header h = new StringHeader(av.messageIDTag, packet.getMessage().getID(av, sv));
+            add(h);
+        }
+
+        // wsa:From
+        if (of.getFrom() != null) {
+            add(of.getFrom().createHeader(av.fromTag));
+        }
+
+        // wsa:RelatesTo
+        if (of.getRelatesToID() != null) {
+            add(new RelatesToHeader(av.relatesToTag, of.getRelatesToID()));
+        }
+    }
+
+    /**
+     * Creates wsa:To, wsa:Action and wsa:MessageID header on the client
+     *
+     * @param packet request packet
+     * @param av WS-Addressing version
+     * @param sv SOAP version
+     * @param action Action Message Addressing Property value
+     * @throws IllegalArgumentException if any of the parameters is null.
+     */
+    private void fillCommonAddressingHeaders(Packet packet, @NotNull AddressingVersion av, @NotNull SOAPVersion sv, @NotNull String action) {
+        if (packet == null)
+            throw new IllegalArgumentException(AddressingMessages.NULL_PACKET());
+
+        if (av == null)
+            throw new IllegalArgumentException(AddressingMessages.NULL_ADDRESSING_VERSION());
+
+        if (sv == null)
+            throw new IllegalArgumentException(AddressingMessages.NULL_SOAP_VERSION());
+
+        if (action == null)
+            throw new IllegalArgumentException(AddressingMessages.NULL_ACTION());
+
+        // wsa:To
+        StringHeader h = new StringHeader(av.toTag, packet.endpointAddress.toString());
+        add(h);
+
+        // wsa:Action
+        packet.soapAction = action;
+        h = new StringHeader(av.actionTag, action);
+        add(h);
+    }
+
+    /**
+     * Adds a new {@link Header}.
+     *
+     * 
    
+     * Order doesn't matter in headers, so this method
+     * does not make any guarantee as to where the new header
+     * is inserted.
+     *
+     * @return
+     *      always true. Don't use the return value.
+     */
+    public boolean add(Header header) {
+        return super.add(header);
+    }
+
+    /**
+     * @deprecated
+     *      {@link HeaderList} is monotonic and you can't remove anything.
+     */
+    // to allow this, we need to implement the resizing of understoodBits
+    public Header remove(int index) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * @deprecated
+     *      {@link HeaderList} is monotonic and you can't remove anything.
+     */
+    public boolean remove(Object o) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * @deprecated
+     *      {@link HeaderList} is monotonic and you can't remove anything.
+     */
+    public boolean removeAll(Collection c) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * @deprecated
+     *      {@link HeaderList} is monotonic and you can't remove anything.
+     */
+    public boolean retainAll(Collection c) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Creates a copy.
+     *
+     * This handles null {@link HeaderList} correctly.
+     *
+     * @param original
+     *      Can be null, in which case null will be returned.
+     */
+    public static HeaderList copy(HeaderList original) {
+        if(original==null)
+            return null;
+        else
+            return new HeaderList(original);
+    }
+
+    public void readResponseAddressingHeaders(WSDLPort wsdlPort, WSBinding binding) {
+        // read Action
+        String action = getAction(binding.getAddressingVersion(), binding.getSOAPVersion());
+        // TODO: validate client-inbound Action
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Headers.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Headers.java
new file mode 100644
index 00000000000..3c695fecefa
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Headers.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.message;
+
+import com.sun.xml.internal.bind.api.Bridge;
+import com.sun.xml.internal.bind.api.JAXBRIContext;
+import com.sun.xml.internal.bind.v2.runtime.MarshallerImpl;
+import com.sun.xml.internal.ws.api.SOAPVersion;
+import com.sun.xml.internal.ws.api.pipe.Pipe;
+import com.sun.xml.internal.ws.message.DOMHeader;
+import com.sun.xml.internal.ws.message.StringHeader;
+import com.sun.xml.internal.ws.message.jaxb.JAXBHeader;
+import com.sun.xml.internal.ws.message.saaj.SAAJHeader;
+import com.sun.xml.internal.ws.message.stream.StreamHeader11;
+import com.sun.xml.internal.ws.message.stream.StreamHeader12;
+import org.w3c.dom.Element;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.Marshaller;
+import javax.xml.namespace.QName;
+import javax.xml.soap.SOAPHeaderElement;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+/**
+ * Factory methods for various {@link Header} implementations.
+ *
+ * 
    
+ * This class provides various methods to create different
+ * flavors of {@link Header} classes that store data
+ * in different formats.
+ *
+ * 
    
+ * This is a part of the JAX-WS RI internal API so that
+ * {@link Pipe} implementations can reuse the implementations
+ * done inside the JAX-WS without having a strong dependency
+ * to the actual class.
+ *
+ * 
    
+ * If you find some of the useful convenience methods missing
+ * from this class, please talk to us.
+ *
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public abstract class Headers {
+    private Headers() {}
+
+    /**
+     * @deprecated
+     *      Use {@link #create(JAXBRIContext, Object)} instead.
+     */
+    public static Header create(SOAPVersion soapVersion, Marshaller m, Object o) {
+        return new JAXBHeader(((MarshallerImpl)m).getContext(),o);
+    }
+
+    /**
+     * Creates a {@link Header} backed a by a JAXB bean.
+     */
+    public static Header create(JAXBRIContext context, Object o) {
+        return new JAXBHeader(context,o);
+    }
+
+    /**
+     * Creates a {@link Header} backed a by a JAXB bean, with the given tag name.
+     *
+     * See {@link #create(SOAPVersion, Marshaller, Object)} for the meaning
+     * of other parameters.
+     *
+     * @param tagName
+     *      The name of the newly created header. Must not be null.
+     * @param o
+     *      The JAXB bean that represents the contents of the header. Must not be null.
+     */
+    public static Header create(SOAPVersion soapVersion, Marshaller m, QName tagName, Object o) {
+        return create(soapVersion,m,new JAXBElement(tagName,o.getClass(),o));
+    }
+
+    /**
+     * Creates a {@link Header} backed a by a JAXB bean.
+     */
+    public static Header create(Bridge bridge, Object jaxbObject) {
+        return new JAXBHeader(bridge, jaxbObject);
+    }
+
+    /**
+     * Creates a new {@link Header} backed by a SAAJ object.
+     */
+    public static Header create(SOAPHeaderElement header) {
+        return new SAAJHeader(header);
+    }
+
+    /**
+     * Creates a new {@link Header} backed by an {@link Element}.
+     */
+    public static Header create( Element node ) {
+        return new DOMHeader(node);
+    }
+
+    /**
+     * @deprecated
+     *      Use {@link #create(Element)}
+     */
+    public static Header create( SOAPVersion soapVersion, Element node ) {
+        return create(node);
+    }
+
+    /**
+     * Creates a new {@link Header} that reads from {@link XMLStreamReader}.
+     *
+     * 
    
+     * Note that the header implementation will read the entire data
+     * into memory anyway, so this might not be as efficient as you might hope.
+     */
+    public static Header create( SOAPVersion soapVersion, XMLStreamReader reader ) throws XMLStreamException {
+        switch(soapVersion) {
+        case SOAP_11:
+            return new StreamHeader11(reader);
+        case SOAP_12:
+            return new StreamHeader12(reader);
+        default:
+            throw new AssertionError();
+        }
+    }
+
+    /**
+     * Creates a new {@link Header} that that has a single text value in it
+     * (IOW, of the form <foo>text</foo>.)
+     *
+     * @param name QName of the header element
+     * @param value text value of the header
+     */
+    public static Header create(QName name, String value) {
+        return new StringHeader(name, value);
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Message.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Message.java
new file mode 100644
index 00000000000..8a313d63856
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Message.java
@@ -0,0 +1,672 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.api.message;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.bind.api.Bridge;
+import com.sun.xml.internal.ws.api.BindingID;
+import com.sun.xml.internal.ws.api.SOAPVersion;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.addressing.AddressingVersion;
+import com.sun.xml.internal.ws.api.model.JavaMethod;
+import com.sun.xml.internal.ws.api.model.SEIModel;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLBoundOperation;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLBoundPortType;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
+import com.sun.xml.internal.ws.api.pipe.Codec;
+import com.sun.xml.internal.ws.api.pipe.Pipe;
+import com.sun.xml.internal.ws.api.streaming.XMLStreamReaderFactory;
+import com.sun.xml.internal.ws.client.dispatch.DispatchImpl;
+import com.sun.xml.internal.ws.message.AttachmentSetImpl;
+import com.sun.xml.internal.ws.message.jaxb.JAXBMessage;
+import com.sun.xml.internal.org.jvnet.staxex.XMLStreamReaderEx;
+import com.sun.xml.internal.org.jvnet.staxex.XMLStreamWriterEx;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.namespace.QName;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+import javax.xml.transform.Source;
+import javax.xml.ws.Dispatch;
+import java.io.InputStream;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.UUID;
+
+/**
+ * Represents a SOAP message.
+ *
+ *
+ * 
    What is a message?
    
+ * 
    
+ * A {@link Message} consists of the following:
+ *
+ * 
      
+ * 
    1. 
+ *    Random-accessible list of headers.
+ *    a header is a representation of an element inside
+ *    <soap:Header>.
+ *    It can be read multiple times,
+ *    can be added or removed, but it is not modifiable.
+ *    See {@link HeaderList} for more about headers.
+ *
+ * 
    2. 
+ *    The payload of the message, which is a representation
+ *    of an element inside <soap:Body>.
+ *    the payload is streamed, and therefore it can be
+ *    only read once (or can be only written to something once.)
+ *    once a payload is used, a message is said to be consumed.
+ *    A message {@link #hasPayload() may not have any payload.}
+ *
+ * 
    3. 
+ *    Attachments.
+ *    TODO: can attachments be streamed? I suspect so.
+ *    does anyone need to read attachment twice?
+ *
+ * 
    
+ *
+ *
+ * 
    How does this abstraction work?
    
+ * 
    
+ * The basic idea behind the {@link Message} is to hide the actual
+ * data representation. For example, a {@link Message} might be
+ * constructed on top of an {@link InputStream} from the accepted HTTP connection,
+ * or it might be constructed on top of a JAXB object as a result
+ * of the method invocation through {@link Proxy}. There will be
+ * a {@link Message} implementation for each of those cases.
+ *
+ * 
    
+ * This interface provides a lot of methods that access the payload
+ * in many different forms, and implementations can implement those
+ * methods in the best possible way.
+ *
+ * 
    
+ * A particular attention is paid to make sure that a {@link Message}
+ * object can be constructed on a stream that is not fully read yet.
+ * We believe this improves the turn-around time on the server side.
+ *
+ * 
    
+ * It is often useful to wrap a {@link Message} into another {@link Message},
+ * for example to encrypt the body, or to verify the signature as the body
+ * is read.
+ *
+ * 
    
+ * This representation is also used for a REST-ful XML message.
+ * In such case we'll construct a {@link Message} with empty
+ * attachments and headers, and when serializing all headers
+ * and attachments will be ignored.
+ *
+ *
+ *
+ * 
    Message and XOP
    
+ * 
    
+ * XOP is considered as an {@link Codec}, and therefore when you are looking at
+ * {@link Message}, you'll never see <xop:Include> or any such elements
+ * (instead you'll see the base64 data inlined.) If a consumer of infoset isn't
+ * interested in handling XOP by himself, this allows him to work with XOP
+ * correctly even without noticing it.
+ *
+ * 
    
+ * For producers and consumers that are interested in accessing the binary data
+ * more efficiently, they can use {@link XMLStreamReaderEx} and
+ * {@link XMLStreamWriterEx}.
+ *
+ *
+ *
+ * 
    Message lifespan
    
+ * 
    
+ * Often {@link Packet} include information local to a particular
+ * invocaion (such as {@code HttpServletRequest}, from this angle, it makes sense
+ * to tie a lifespan of a message to one pipeline invocation.
+ * 
    
+ * On the other hand, if you think about WS-RM, it often needs to hold on to
+ * a message longer than a pipeline invocation (you might get an HTTP request,
+ * get a message X, get a second HTTP request, get another message Y, and
+ * only then you might want to process X.)
+ * 
    
+ * TODO: what do we do about this?
+ *
+ *
+ * 
    + * TODO: can body element have foreign attributes? maybe ID for security?
+ *       Yes, when the SOAP body is signed there will be an ID attribute present
+ *       But in this case any security based impl may need access
+ *       to the concrete representation.
+ * TODO: HTTP headers?
+ *       Yes. Abstracted as transport-based properties.
+ * TODO: who handles SOAP 1.1 and SOAP 1.2 difference?
+ *       As separate channel implementations responsible for the creation of the
+ *       message?
+ * TODO: session?
+ * TODO: Do we need to expose SOAPMessage explicitly?
+ *       SOAPMessage could be the concrete representation but is it necessary to
+ *       transform between different concrete representations?
+ *       Perhaps this comes down to how use channels for creation and processing.
+ * TODO: Do we need to distinguish better between creation and processing?
+ *       Do we really need the requirement that a created message can be resused
+ *       for processing. Shall we bifurcate?
+ *
+ * TODO: SOAP version issue
+ *       SOAP version is determined by the context, so message itself doesn't carry it around (?)
+ *
+ * TODO: wrapping message needs easier. in particular properties and attachments.
+ * 
    
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public abstract class Message {
+
+    /**
+     * Returns true if headers are present in the message.
+     *
+     * @return
+     *      true if headers are present.
+     */
+    public abstract boolean hasHeaders();
+
+    /**
+     * Gets all the headers of this message.
+     *
+     * 
    Implementation Note
    
+     * 
    
+     * {@link Message} implementation is allowed to defer
+     * the construction of {@link HeaderList} object. So
+     * if you only want to check for the existence of any header
+     * element, use {@link #hasHeaders()}.
+     *
+     * @return
+     *      always return the same non-null object.
+     */
+    public abstract @NotNull HeaderList getHeaders();
+
+    /**
+     * Gets the attachments of this message
+     * (attachments live outside a message.)
+     */
+    public @NotNull AttachmentSet getAttachments() {
+        if (attachmentSet == null) {
+            attachmentSet = new AttachmentSetImpl();
+        }
+        return attachmentSet;
+    }
+
+    /**
+     * Optimization hint for the derived class to check
+     * if we may have some attachments.
+     */
+    protected boolean hasAttachments() {
+        return attachmentSet!=null;
+    }
+
+    protected AttachmentSet attachmentSet;
+
+    private WSDLBoundOperation operation = null;
+
+    /**
+     * Returns the operation of which this message is an instance of.
+     *
+     * 
    
+     * This method relies on {@link WSDLBoundPortType#getOperation(String, String)} but
+     * it does so in an efficient way.
+     *
+     * 
    
+     * This method works only for a request. A pipe can determine an operation for a request,
+     * and then keep it in a local variable to use it with a response, so there should be
+     * no need to find out operation from a response (besides, there might not be any response!).
+     *
+     * @param boundPortType
+     *      This represents the port for which this message is used.
+     *      Most {@link Pipe}s should get this information when they are created,
+     *      since a pippeline always work against a particular type of {@link WSDLPort}.
+     *
+     * @return
+     *      Null if the operation was not found. This is possible, for example when a protocol
+     *      message is sent through a pipeline, or when we receive an invalid request on the server,
+     *      or when we are on the client and the user appliation sends a random DOM through
+     *      {@link Dispatch}, so this error needs to be handled gracefully.
+     */
+    public final @Nullable WSDLBoundOperation getOperation(@NotNull WSDLBoundPortType boundPortType) {
+        if(operation==null)
+            operation = boundPortType.getOperation(getPayloadNamespaceURI(),getPayloadLocalPart());
+        return operation;
+    }
+
+    /**
+     * The same as {@link #getOperation(WSDLBoundPortType)} but
+     * takes {@link WSDLPort} for convenience.
+     */
+    public final @Nullable WSDLBoundOperation getOperation(@NotNull WSDLPort port) {
+        return getOperation(port.getBinding());
+    }
+
+    /**
+     * Returns the java Method of which this message is an instance of.
+     *
+     *
+     * 
    
+     * This method works only for a request. A pipe can determine a {@link Method}
+     * for a request, and then keep it in a local variable to use it with a response,
+     * so there should be no need to find out operation from a response (besides,
+     * there might not be any response!).
+     *
+     * @param seiModel
+     *      This represents the java model for the endpoint
+     *      Some server {@link Pipe}s would get this information when they are created.
+     *
+     * @return
+     *      Null if there is no corresponding Method for this message. This is
+     *      possible, for example when a protocol message is sent through a
+     *      pipeline, or when we receive an invalid request on the server,
+     *      or when we are on the client and the user appliation sends a random
+     *      DOM through {@link Dispatch}, so this error needs to be handled
+     *      gracefully.
+     */
+    public final @Nullable JavaMethod getMethod(@NotNull SEIModel seiModel) {
+        String localPart = getPayloadLocalPart();
+        String nsUri;
+        if (localPart == null) {
+            localPart = "";
+            nsUri = "";
+        } else {
+            nsUri = getPayloadNamespaceURI();
+        }
+        QName name = new QName(nsUri, localPart);
+        return seiModel.getJavaMethod(name);
+    }
+
+    private Boolean isOneWay;
+
+    /**
+     * Returns true if this message is a request message for a
+     * one way operation according to the given WSDL. False otherwise.
+     *
+     * 
    
+     * This method is functionally equivalent as doing
+     * {@code getOperation(port).getOperation().isOneWay()}
+     * (with proper null check and all.) But this method
+     * can sometimes work faster than that (for example,
+     * on the client side when used with SEI.)
+     *
+     * @param port
+     *      {@link Message}s are always created under the context of
+     *      one {@link WSDLPort} and they never go outside that context.
+     *      Pass in that "governing" {@link WSDLPort} object here.
+     *      We chose to receive this as a parameter instead of
+     *      keeping {@link WSDLPort} in a message, just to save the storage.
+     *
+     *      
    
+     *      The implementation of this method involves caching the return
+     *      value, so the behavior is undefined if multiple callers provide
+     *      different {@link WSDLPort} objects, which is a bug of the caller.
+     */
+    public boolean isOneWay(@NotNull WSDLPort port) {
+        if(isOneWay==null) {
+            // we don't know, so compute.
+            WSDLBoundOperation op = getOperation(port);
+            if(op!=null)
+                isOneWay = op.getOperation().isOneWay();
+            else
+                // the contract is to return true only when it's known to be one way.
+                isOneWay = false;
+        }
+        return isOneWay;
+    }
+
+    /**
+     * Makes an assertion that this {@link Message} is
+     * a request message for an one-way operation according
+     * to the context WSDL.
+     *
+     * 
    
+     * This method is really only intended to be invoked from within
+     * the JAX-WS runtime, and not by any code building on top of it.
+     *
+     * 
    
+     * This method can be invoked only when the caller "knows" what
+     * WSDL says. Also, there's no point in invoking this method if the caller
+     * is doing  {@code getOperation(port).getOperation().isOneWay()},
+     * or sniffing the payload tag name.
+     * In particular, this includes {@link DispatchImpl}.
+     *
+     * 
    
+     * Once called, this allows {@link #isOneWay(WSDLPort)} method
+     * to return a value quickly.
+     *
+     * @see #isOneWay(WSDLPort)
+     */
+    public final void assertOneWay(boolean value) {
+        // if two callers make different assertions, that's a bug.
+        // this is an assertion, not a runtime check because
+        // nobody outside JAX-WS should be using this.
+        assert isOneWay==null || isOneWay==value;
+
+        isOneWay = value;
+    }
+
+
+    /**
+     * Gets the local name of the payload element.
+     *
+     * @return
+     *      null if a {@link Message} doesn't have any payload.
+     */
+    public abstract @Nullable String getPayloadLocalPart();
+
+    /**
+     * Gets the namespace URI of the payload element.
+     *
+     * @return
+     *      null if a {@link Message} doesn't have any payload.
+     */
+    public abstract String getPayloadNamespaceURI();
+    // I'm not putting @Nullable on it because doing null check on getPayloadLocalPart() should be suffice
+
+    /**
+     * Returns true if a {@link Message} has a payload.
+     *
+     * 
    
+     * A message without a payload is a SOAP message that looks like:
+     * 
    
+     * <S:Envelope>
+     *   <S:Header>
+     *     ...
+     *   </S:Header>
+     *   <S:Body />
+     * </S:Envelope>
+     * 
    
+     */
+    public abstract boolean hasPayload();
+
+    /**
+     * Returns true if this message is a fault.
+     *
+     * 
    
+     * Just a convenience method built on {@link #getPayloadNamespaceURI()}
+     * and {@link #getPayloadLocalPart()}.
+     */
+    public boolean isFault() {
+        // TODO: is SOAP version a property of a Message?
+        // or is it defined by external factors?
+        // how do I compare?
+        String localPart = getPayloadLocalPart();
+        if(localPart==null || !localPart.equals("Fault"))
+            return false;
+
+        String nsUri = getPayloadNamespaceURI();
+        return nsUri.equals(SOAPVersion.SOAP_11.nsUri) || nsUri.equals(SOAPVersion.SOAP_12.nsUri);
+    }
+
+    /**
+     * Consumes this message including the envelope.
+     * returns it as a {@link Source} object.
+     */
+    public abstract Source readEnvelopeAsSource();
+
+
+    /**
+     * Returns the payload as a {@link Source} object.
+     *
+     * This consumes the message.
+     *
+     * @return
+     *      if there's no payload, this method returns null.
+     */
+    public abstract Source readPayloadAsSource();
+
+    /**
+     * Creates the equivalent {@link SOAPMessage} from this message.
+     *
+     * This consumes the message.
+     *
+     * @throws SOAPException
+     *      if there's any error while creating a {@link SOAPMessage}.
+     */
+    public abstract SOAPMessage readAsSOAPMessage() throws SOAPException ;
+
+    /**
+     * Creates the equivalent {@link SOAPMessage} from this message. It also uses
+     * transport specific headers from Packet during the SOAPMessage construction
+     * so that {@link SOAPMessage#getMimeHeaders()} gives meaningful transport
+     * headers.
+     *
+     * This consumes the message.
+     *
+     * @throws SOAPException
+     *      if there's any error while creating a {@link SOAPMessage}.
+     */
+    public SOAPMessage readAsSOAPMessage(Packet packet, boolean inbound) throws SOAPException {
+        return readAsSOAPMessage();
+    }
+
+    /**
+     * Reads the payload as a JAXB object by using the given unmarshaller.
+     *
+     * This consumes the message.
+     *
+     * @throws JAXBException
+     *      If JAXB reports an error during the processing.
+     */
+    public abstract  T readPayloadAsJAXB(Unmarshaller unmarshaller) throws JAXBException;
+
+    /**
+     * Reads the payload as a JAXB object according to the given {@link Bridge}.
+     *
+     * This consumes the message.
+     *
+     * @throws JAXBException
+     *      If JAXB reports an error during the processing.
+     */
+    public abstract  T readPayloadAsJAXB(Bridge bridge) throws JAXBException;
+
+    /**
+     * Reads the payload as a {@link XMLStreamReader}
+     *
+     * This consumes the message. The caller is encouraged to call
+     * {@link XMLStreamReaderFactory#recycle(XMLStreamReader)} when finished using
+     * the instance.
+     *
+     * @return
+     *      If there's no payload, this method returns null.
+     *      Otherwise always non-null valid {@link XMLStreamReader} that points to
+     *      the payload tag name.
+     */
+    public abstract XMLStreamReader readPayload() throws XMLStreamException;
+
+    /**
+     * Marks the message as consumed, without actually reading the contents.
+     *
+     * 
    
+     * This method provides an opportunity for implementations to reuse
+     * any reusable resources needed for representing the payload.
+     */
+    public void consume() {}
+
+    /**
+     * Writes the payload to StAX.
+     *
+     * This method writes just the payload of the message to the writer.
+     * This consumes the message.
+     * The implementation will not write
+     * {@link XMLStreamWriter#writeStartDocument()}
+     * nor
+     * {@link XMLStreamWriter#writeEndDocument()}
+     *
+     * 
    
+     * If there's no payload, this method is no-op.
+     *
+     * @throws XMLStreamException
+     *      If the {@link XMLStreamWriter} reports an error,
+     *      or some other errors happen during the processing.
+     */
+    public abstract void writePayloadTo(XMLStreamWriter sw) throws XMLStreamException;
+
+    /**
+     * Writes the whole SOAP message (but not attachments)
+     * to the given writer.
+     *
+     * This consumes the message.
+     *
+     * @throws XMLStreamException
+     *      If the {@link XMLStreamWriter} reports an error,
+     *      or some other errors happen during the processing.
+     */
+    public abstract void writeTo(XMLStreamWriter sw) throws XMLStreamException;
+
+    /**
+     * Writes the whole SOAP envelope as SAX events.
+     *
+     * 
    
+     * This consumes the message.
+     *
+     * @param contentHandler
+     *      must not be nulll.
+     * @param errorHandler
+     *      must not be null.
+     *      any error encountered during the SAX event production must be
+     *      first reported to this error handler. Fatal errors can be then
+     *      thrown as {@link SAXParseException}. {@link SAXException}s thrown
+     *      from {@link ErrorHandler} should propagate directly through this method.
+     */
+    public abstract void writeTo( ContentHandler contentHandler, ErrorHandler errorHandler ) throws SAXException;
+
+    // TODO: do we need a method that reads payload as a fault?
+    // do we want a separte streaming representation of fault?
+    // or would SOAPFault in SAAJ do?
+
+
+
+    /**
+     * Creates a copy of a {@link Message}.
+     *
+     * 
    
+     * This method creates a new {@link Message} whose header/payload/attachments/properties
+     * are identical to this {@link Message}. Once created, the created {@link Message}
+     * and the original {@link Message} behaves independently --- adding header/
+     * attachment to one {@link Message} doesn't affect another {@link Message}
+     * at all.
+     *
+     * 
    
+     * This method does NOT consume a message.
+     *
+     * 
    
+     * To enable efficient copy operations, there's a few restrictions on
+     * how copied message can be used.
+     *
+     * 
      
+     *  
    1. The original and the copy may not be
+     *      used concurrently by two threads (this allows two {@link Message}s
+     *      to share some internal resources, such as JAXB marshallers.)
+     *      Note that it's OK for the original and the copy to be processed
+     *      by two threads, as long as they are not concurrent.
+     *
+     *  
    2. The copy has the same 'life scope'
+     *      as the original (this allows shallower copy, such as
+     *      JAXB beans wrapped in {@link JAXBMessage}.)
+     * 
    
+     *
+     * 
    
+     * A 'life scope' of a message created during a message processing
+     * in a pipeline is until a pipeline processes the next message.
+     * A message cannot be kept beyond its life scope.
+     *
+     * (This experimental design is to allow message objects to be reused
+     * --- feedback appreciated.)
+     *
+     *
+     *
+     * 
    Design Rationale
    
+     * 
    
+     * Since a {@link Message} body is read-once, sometimes
+     * (such as when you do fail-over, or WS-RM) you need to
+     * create an idential copy of a {@link Message}.
+     *
+     * 
    
+     * The actual copy operation depends on the layout
+     * of the data in memory, hence it's best to be done by
+     * the {@link Message} implementation itself.
+     *
+     * 
    
+     * The restrictions placed on the use of copied {@link Message} can be
+     * relaxed if necessary, but it will make the copy method more expensive.
+     */
+    // TODO: update the class javadoc with 'lifescope'
+    // and move the discussion about life scope there.
+    public abstract Message copy();
+
+    private String uuid;
+
+    /**
+     * Retuns a unique id for the message. The id can be used for various things,
+     * like debug assistance, logging, and MIME encoding(say for boundary).
+     *
+     * 
    
+     * This method will check the existence of the addressing  header,
+     * and if present uses that value. Otherwise it generates one from UUID.random(),
+     * and return it without adding a new header. But it doesn't add a 
+     * to the header list since we expect them to be added before calling this
+     * method.
+     *
+     * 
    
+     * Addressing tube will go do a separate verification on inbound
+     * headers to make sure that  header is present when it's
+     * supposed to be.
+     *
+     * @param binding object created by {@link BindingID#createBinding()}
+     *
+     * @return unique id for the message
+     */
+    public @NotNull String getID(@NotNull WSBinding binding) {
+        return getID(binding.getAddressingVersion(), binding.getSOAPVersion());
+    }
+
+    /**
+     * Retuns a unique id for the message.
+     * 
    
+     * @see {@link #getID(com.sun.xml.internal.ws.api.WSBinding)} for detailed description.
+     * @param av WS-Addressing version
+     * @param sv SOAP version
+     * @return unique id for the message
+     */
+    public @NotNull String getID(AddressingVersion av, SOAPVersion sv) {
+        if (uuid == null) {
+            if (av != null) {
+                uuid = getHeaders().getMessageID(av, sv);
+            }
+            if (uuid == null) {
+                uuid = "uuid:" + UUID.randomUUID().toString();
+            }
+        }
+        return uuid;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Messages.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Messages.java
new file mode 100644
index 00000000000..93367d5a3c3
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Messages.java
@@ -0,0 +1,360 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.message;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.bind.api.JAXBRIContext;
+import com.sun.xml.internal.bind.v2.runtime.MarshallerImpl;
+import com.sun.xml.internal.stream.buffer.XMLStreamBuffer;
+import com.sun.xml.internal.ws.api.SOAPVersion;
+import com.sun.xml.internal.ws.api.addressing.AddressingVersion;
+import com.sun.xml.internal.ws.api.pipe.Tube;
+import com.sun.xml.internal.ws.api.pipe.Codecs;
+import com.sun.xml.internal.ws.encoding.StreamSOAPCodec;
+import com.sun.xml.internal.ws.fault.SOAPFaultBuilder;
+import com.sun.xml.internal.ws.message.AttachmentSetImpl;
+import com.sun.xml.internal.ws.message.DOMMessage;
+import com.sun.xml.internal.ws.message.EmptyMessageImpl;
+import com.sun.xml.internal.ws.message.ProblemActionHeader;
+import com.sun.xml.internal.ws.message.stream.PayloadStreamReaderMessage;
+import com.sun.xml.internal.ws.message.jaxb.JAXBMessage;
+import com.sun.xml.internal.ws.message.saaj.SAAJMessage;
+import com.sun.xml.internal.ws.message.source.PayloadSourceMessage;
+import com.sun.xml.internal.ws.message.source.ProtocolSourceMessage;
+import com.sun.xml.internal.ws.streaming.XMLStreamReaderException;
+import com.sun.xml.internal.ws.streaming.XMLStreamReaderUtil;
+import com.sun.xml.internal.ws.util.DOMUtil;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.Marshaller;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.namespace.QName;
+import javax.xml.soap.*;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.transform.Source;
+import javax.xml.ws.ProtocolException;
+import javax.xml.ws.WebServiceException;
+
+/**
+ * Factory methods for various {@link Message} implementations.
+ *
+ * 
    
+ * This class provides various methods to create different
+ * flavors of {@link Message} classes that store data
+ * in different formats.
+ *
+ * 
    
+ * This is a part of the JAX-WS RI internal API so that
+ * {@link Tube} implementations can reuse the implementations
+ * done inside the JAX-WS.
+ *
+ * 
    
+ * If you find some of the useful convenience methods missing
+ * from this class, please talk to us.
+ *
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public abstract class Messages {
+    private Messages() {}
+
+    /**
+     * Creates a {@link Message} backed by a JAXB bean.
+     *
+     * @param context
+     *      The context to be used to produce infoset from the object. Must not be null.
+     * @param jaxbObject
+     *      The JAXB object that represents the payload. must not be null. This object
+     *      must be bound to an element (which means it either is a {@link JAXBElement} or
+     *      an instanceof a class with {@link XmlRootElement}).
+     * @param soapVersion
+     *      The SOAP version of the message. Must not be null.
+     */
+    public static Message create(JAXBRIContext context, Object jaxbObject, SOAPVersion soapVersion) {
+        return JAXBMessage.create(context,jaxbObject,soapVersion);
+    }
+
+    /**
+     * @deprecated
+     *      Use {@link #create(JAXBRIContext, Object, SOAPVersion)}
+     */
+    public static Message create(Marshaller marshaller, Object jaxbObject, SOAPVersion soapVersion) {
+        return create(((MarshallerImpl)marshaller).getContext(),jaxbObject,soapVersion);
+    }
+
+    /**
+     * Creates a {@link Message} backed by a SAAJ {@link SOAPMessage} object.
+     *
+     * 
    
+     * If the {@link SOAPMessage} contains headers and attachments, this method
+     * does the right thing.
+     *
+     * @param saaj
+     *      The SOAP message to be represented as a {@link Message}.
+     *      Must not be null. Once this method is invoked, the created
+     *      {@link Message} will own the {@link SOAPMessage}, so it shall
+     *      never be touched directly.
+     */
+    public static Message create(SOAPMessage saaj) {
+        return new SAAJMessage(saaj);
+    }
+
+    /**
+     * Creates a {@link Message} using {@link Source} as payload.
+     *
+     * @param payload
+     *      Source payload is {@link Message}'s payload
+     *      Must not be null. Once this method is invoked, the created
+     *      {@link Message} will own the {@link Source}, so it shall
+     *      never be touched directly.
+     *
+     * @param ver
+     *      The SOAP version of the message. Must not be null.
+     */
+    public static Message createUsingPayload(Source payload, SOAPVersion ver) {
+        return new PayloadSourceMessage(payload, ver);
+    }
+
+    /**
+     * Creates a {@link Message} using {@link XMLStreamReader} as payload.
+     *
+     * @param payload
+     *      XMLStreamReader payload is {@link Message}'s payload
+     *      Must not be null. Once this method is invoked, the created
+     *      {@link Message} will own the {@link XMLStreamReader}, so it shall
+     *      never be touched directly.
+     *
+     * @param ver
+     *      The SOAP version of the message. Must not be null.
+     */
+    public static Message createUsingPayload(XMLStreamReader payload, SOAPVersion ver) {
+        return new PayloadStreamReaderMessage(payload, ver);
+    }
+
+    /**
+     * Creates a {@link Message} from an {@link Element} that represents
+     * a payload.
+     *
+     * @param payload
+     *      The element that becomes the child element of the SOAP body.
+     *      Must not be null.
+     *
+     * @param ver
+     *      The SOAP version of the message. Must not be null.
+     */
+    public static Message createUsingPayload(Element payload, SOAPVersion ver) {
+        return new DOMMessage(ver,payload);
+    }
+
+    /**
+     * Creates a {@link Message} from an {@link Element} that represents
+     * the whole SOAP message.
+     *
+     * @param soapEnvelope
+     *      The SOAP envelope element.
+     */
+    public static Message create(Element soapEnvelope) {
+        SOAPVersion ver = SOAPVersion.fromNsUri(soapEnvelope.getNamespaceURI());
+        // find the headers
+        Element header = DOMUtil.getFirstChild(soapEnvelope, ver.nsUri, "Header");
+        HeaderList headers = null;
+        if(header!=null) {
+            for( Node n=header.getFirstChild(); n!=null; n=n.getNextSibling() ) {
+                if(n.getNodeType()==Node.ELEMENT_NODE) {
+                    if(headers==null)
+                        headers = new HeaderList();
+                    headers.add(Headers.create((Element)n));
+                }
+            }
+        }
+
+        // find the payload
+        Element body = DOMUtil.getFirstChild(soapEnvelope, ver.nsUri, "Body");
+        if(body==null)
+            throw new WebServiceException("Message doesn't have  "+soapEnvelope);
+        Element payload = DOMUtil.getFirstChild(soapEnvelope, ver.nsUri, "Body");
+
+        if(payload==null) {
+            return new EmptyMessageImpl(headers, new AttachmentSetImpl(), ver);
+        } else {
+            return new DOMMessage(ver,headers,payload);
+        }
+    }
+
+    /**
+     * Creates a {@link Message} using Source as entire envelope.
+     *
+     * @param envelope
+     *      Source envelope is used to create {@link Message}
+     *      Must not be null. Once this method is invoked, the created
+     *      {@link Message} will own the {@link Source}, so it shall
+     *      never be touched directly.
+     *
+     */
+    public static Message create(Source envelope, SOAPVersion soapVersion) {
+        return new ProtocolSourceMessage(envelope, soapVersion);
+    }
+
+
+    /**
+     * Creates a {@link Message} that doesn't have any payload.
+     */
+    public static Message createEmpty(SOAPVersion soapVersion) {
+        return new EmptyMessageImpl(soapVersion);
+    }
+
+    /**
+     * Creates a {@link Message} from {@link XMLStreamReader} that points to
+     * the start of the envelope.
+     *
+     * @param reader
+     *      can point to the start document or the start element (of <s:Envelope>)
+     */
+    public static @NotNull Message create(@NotNull XMLStreamReader reader) {
+        // skip until the root element
+        if(reader.getEventType()!=XMLStreamConstants.START_ELEMENT)
+            XMLStreamReaderUtil.nextElementContent(reader);
+        assert reader.getEventType()== XMLStreamConstants.START_ELEMENT :reader.getEventType();
+
+        SOAPVersion ver = SOAPVersion.fromNsUri(reader.getNamespaceURI());
+
+        return Codecs.createSOAPEnvelopeXmlCodec(ver).decode(reader);
+    }
+
+    /**
+     * Creates a {@link Message} from {@link XMLStreamBuffer} that retains the
+     * whole envelope infoset.
+     *
+     * @param xsb
+     *      This buffer must contain the infoset of the whole envelope.
+     */
+    public static @NotNull Message create(@NotNull XMLStreamBuffer xsb) {
+        // TODO: we should be able to let Messae know that it's working off from a buffer,
+        // to make some of the operations more efficient.
+        // meanwhile, adding this as an API so that our users can take advantage of it
+        // when we get around to such an implementation later.
+        try {
+            return create(xsb.readAsXMLStreamReader());
+        } catch (XMLStreamException e) {
+            throw new XMLStreamReaderException(e);
+        }
+    }
+
+    /**
+     * Creates a {@link Message} that represents an exception as a fault. The
+     * created message reflects if t or t.getCause() is SOAPFaultException.
+     *
+     * creates a fault message with default faultCode env:Server if t or t.getCause()
+     * is not SOAPFaultException. Otherwise, it use SOAPFaultException's faultCode
+     *
+     * @return
+     *      Always non-null. A message that wraps this {@link Throwable}.
+     *
+     */
+    public static Message create(Throwable t, SOAPVersion soapVersion) {
+        return SOAPFaultBuilder.createSOAPFaultMessage(soapVersion, null, t);
+    }
+
+    /**
+     * Creates a fault {@link Message}.
+     *
+     * 
    
+     * This method is not designed for efficiency, and we don't expect
+     * to be used for the performance critical codepath.
+     *
+     * @param fault
+     *      The populated SAAJ data structure that represents a fault
+     *      in detail.
+     *
+     * @return
+     *      Always non-null. A message that wraps this {@link SOAPFault}.
+     */
+    public static Message create(SOAPFault fault) {
+        SOAPVersion ver = SOAPVersion.fromNsUri(fault.getNamespaceURI());
+        return new DOMMessage(ver,fault);
+    }
+
+    /**
+     * Creates a fault {@link Message} that captures the code/subcode/subsubcode
+     * defined by WS-Addressing if wsa:Action is not supported.
+     *
+     * @param unsupportedAction The unsupported Action. Must not be null.
+     * @param av The WS-Addressing version of the message. Must not be null.
+     * @param sv The SOAP Version of the message. Must not be null.
+     *
+     * @return
+     *      A message representing SOAPFault that contains the WS-Addressing code/subcode/subsubcode.
+     */
+    public static Message create(@NotNull String unsupportedAction, @NotNull AddressingVersion av, @NotNull SOAPVersion sv) {
+        QName subcode = av.actionNotSupportedTag;
+        String faultstring = String.format(av.actionNotSupportedText, unsupportedAction);
+
+        Message faultMessage;
+        SOAPFault fault;
+        try {
+            if (sv == SOAPVersion.SOAP_12) {
+                fault = SOAPVersion.SOAP_12.saajSoapFactory.createFault();
+                fault.setFaultCode(SOAPConstants.SOAP_SENDER_FAULT);
+                fault.appendFaultSubcode(subcode);
+                Detail detail = fault.addDetail();
+                SOAPElement se = detail.addChildElement(av.problemActionTag);
+                se = se.addChildElement(av.actionTag);
+                se.addTextNode(unsupportedAction);
+            } else {
+                fault = SOAPVersion.SOAP_11.saajSoapFactory.createFault();
+                fault.setFaultCode(subcode);
+            }
+            fault.setFaultString(faultstring);
+
+            faultMessage = SOAPFaultBuilder.createSOAPFaultMessage(sv, fault);
+            if (sv == SOAPVersion.SOAP_11) {
+                faultMessage.getHeaders().add(new ProblemActionHeader(unsupportedAction, av));
+            }
+        } catch (SOAPException e) {
+            throw new WebServiceException(e);
+        }
+
+        return faultMessage;
+    }
+
+    /**
+     * To be called to convert a  {@link ProtocolException} and faultcode for a given {@link SOAPVersion} in to a {@link Message}.
+     *
+     * @param soapVersion {@link SOAPVersion#SOAP_11} or {@link SOAPVersion#SOAP_12}
+     * @param pex a ProtocolException
+     * @param faultcode soap faultcode. Its ignored if the {@link ProtocolException} instance is {@link javax.xml.ws.soap.SOAPFaultException} and it has a
+     * faultcode present in the underlying {@link SOAPFault}.
+     * @return {@link Message} representing SOAP fault
+     */
+    public static @NotNull Message create(@NotNull SOAPVersion soapVersion, @NotNull ProtocolException pex, @Nullable QName faultcode){
+        return SOAPFaultBuilder.createSOAPFaultMessage(soapVersion, pex, faultcode);
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Packet.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Packet.java
new file mode 100644
index 00000000000..9a9ddfa9980
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Packet.java
@@ -0,0 +1,763 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.api.message;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.bind.marshaller.SAX2DOMEx;
+import com.sun.xml.internal.ws.addressing.WsaTubeHelper;
+import com.sun.xml.internal.ws.addressing.model.InvalidMapException;
+import com.sun.xml.internal.ws.api.DistributedPropertySet;
+import com.sun.xml.internal.ws.api.EndpointAddress;
+import com.sun.xml.internal.ws.api.PropertySet;
+import com.sun.xml.internal.ws.api.SOAPVersion;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.addressing.AddressingVersion;
+import com.sun.xml.internal.ws.api.addressing.WSEndpointReference;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLOperation;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
+import com.sun.xml.internal.ws.api.model.SEIModel;
+import com.sun.xml.internal.ws.api.pipe.Tube;
+import com.sun.xml.internal.ws.api.server.TransportBackChannel;
+import com.sun.xml.internal.ws.api.server.WSEndpoint;
+import com.sun.xml.internal.ws.api.server.WebServiceContextDelegate;
+import com.sun.xml.internal.ws.client.BindingProviderProperties;
+import com.sun.xml.internal.ws.client.ContentNegotiation;
+import com.sun.xml.internal.ws.client.HandlerConfiguration;
+import com.sun.xml.internal.ws.client.ResponseContext;
+import com.sun.xml.internal.ws.developer.JAXWSProperties;
+import com.sun.xml.internal.ws.message.RelatesToHeader;
+import com.sun.xml.internal.ws.message.StringHeader;
+import com.sun.xml.internal.ws.util.DOMUtil;
+import com.sun.xml.internal.ws.util.xml.XmlUtil;
+import com.sun.xml.internal.ws.model.JavaMethodImpl;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.xml.sax.SAXException;
+
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Dispatch;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.handler.LogicalMessageContext;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.soap.SOAPMessageContext;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Represents a container of a {@link Message}.
+ *
+ * 
    What is a {@link Packet}?
    
+ * 
    
+ * A packet can be thought of as a frame/envelope/package that wraps
+ * a {@link Message}. A packet keeps track of optional metadata (properties)
+ * about a {@link Message} that doesn't go across the wire.
+ * This roughly corresponds to {@link MessageContext} in the JAX-WS API.
+ *
+ * 
    
+ * Usually a packet contains a {@link Message} in it, but sometimes
+ * (such as for a reply of an one-way operation), a packet may
+ * float around without a {@link Message} in it.
+ *
+ *
+ * 
+ * 
    Properties
    
+ * 
    
+ * Information frequently used inside the JAX-WS RI
+ * is stored in the strongly-typed fields. Other information is stored
+ * in terms of a generic {@link Map} (see
+ * {@link #invocationProperties}.)
+ *
+ * 
    
+ * Some properties need to be retained between request and response,
+ * some don't. For strongly typed fields, this characteristic is
+ * statically known for each of them, and propagation happens accordingly.
+ * For generic information stored in {@link Map}, {@link #invocationProperties}
+ * stores per-invocation scope information (which carries over to
+ * the response.)
+ *
+ * 
    
+ * This object is used as the backing store of {@link MessageContext}, and
+ * {@link LogicalMessageContext} and {@link SOAPMessageContext} will
+ * be delegating to this object for storing/retrieving values.
+ *
+ *
+ * 
    Relationship to request/response context
    
+ * 
    
+ * {@link BindingProvider#getRequestContext() Request context} is used to
+ * seed the initial values of {@link Packet}.
+ * Some of those values go to strongly-typed fields, and others go to
+ * {@link #invocationProperties}, as they need to be retained in the reply message.
+ *
+ * 
    
+ * Similarly, {@link BindingProvider#getResponseContext() response context}
+ * is constructed from {@link Packet} (or rather it's just a view of {@link Packet}.)
+ * by using properties from {@link #invocationProperties},
+ * modulo properties named explicitly in {@link #getHandlerScopePropertyNames(boolean)}.
+ * IOW, properties added to {@link #invocationProperties}
+ * are exposed to the response context by default.
+ *
+ *
+ *
+ * 
    TODO
    
+ * 
      
+ *  
    1. this class needs to be cloneable since Message is copiable.
+ *  
    2. The three live views aren't implemented correctly. It will be
+ *      more work to do so, although I'm sure it's possible.
+ *  
    3. {@link Property} annotation is to make it easy
+ *      for {@link MessageContext} to export properties on this object,
+ *      but it probably needs some clean up.
+ * 
    
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public final class Packet extends DistributedPropertySet {
+
+    /**
+     * Creates a {@link Packet} that wraps a given {@link Message}.
+     *
+     * 
    
+     * This method should be only used to create a fresh {@link Packet}.
+     * To create a {@link Packet} for a reply, use {@link #createResponse(Message)}.
+     *
+     * @param request
+     *      The request {@link Message}. Can be null.
+     */
+    public Packet(Message request) {
+        this();
+        this.message = request;
+    }
+
+    /**
+     * Creates an empty {@link Packet} that doesn't have any {@link Message}.
+     */
+    public Packet() {
+        this.invocationProperties = new HashMap();
+    }
+
+    /**
+     * Used by {@link #createResponse(Message)}.
+     */
+    private Packet(Packet that) {
+        that.copySatelliteInto(this);
+        this.handlerConfig = that.handlerConfig;
+        this.invocationProperties = that.invocationProperties;
+        this.handlerScopePropertyNames = that.handlerScopePropertyNames;
+        this.contentNegotiation = that.contentNegotiation;
+        this.wasTransportSecure = that.wasTransportSecure;
+        // copy other properties that need to be copied. is there any?
+    }
+
+    private Message message;
+
+    /**
+     * Gets the last {@link Message} set through {@link #setMessage(Message)}.
+     *
+     * @return
+     *      may null. See the class javadoc for when it's null.
+     */
+    public Message getMessage() {
+        return message;
+    }
+
+    /**
+     * Sets a {@link Message} to this packet.
+     *
+     * @param message
+     *      Can be null.
+     */
+    public void setMessage(Message message) {
+        this.message = message;
+    }
+
+    /**
+     * True if this message came from a transport (IOW inbound),
+     * and in paricular from a "secure" transport. A transport
+     * needs to set this flag appropriately.
+     *
+     * 
    
+     * This is a requirement from the security team.
+     */
+    // TODO: expose this as a property
+    public boolean wasTransportSecure;
+
+    /**
+     * Inbound transport headers are captured in a transport neutral way.
+     * Transports are expected to fill this data after creating a Packet.
+     * 
    
+     * {@link SOAPMessage#getMimeHeaders()} would return these headers.
+     *
+     */
+    public static final String INBOUND_TRANSPORT_HEADERS = "com.sun.xml.internal.ws.api.message.packet.inbound.transport.headers";
+
+    /**
+     * Outbound transport headers are captured in a transport neutral way.
+     *
+     * 
    
+     * Transports may choose to ignore certain headers that interfere with
+     * its correct operation, such as
+     * Content-Type and Content-Length.
+     */
+    public static final String OUTBOUND_TRANSPORT_HEADERS = "com.sun.xml.internal.ws.api.message.packet.outbound.transport.headers";
+
+
+    /**
+     * This property holds the snapshot of HandlerConfiguration
+     * at the time of invocation.
+     * This property is used by MUPipe and HandlerPipe implementations.
+     */
+    @Property(BindingProviderProperties.JAXWS_HANDLER_CONFIG)
+    public HandlerConfiguration handlerConfig;
+
+    /**
+     * If a message originates from a proxy stub that implements
+     * a port interface, this field is set to point to that object.
+     *
+     * TODO: who's using this property?
+     */
+    @Property(BindingProviderProperties.JAXWS_CLIENT_HANDLE_PROPERTY)
+    public BindingProvider proxy;
+
+    /**
+     * The endpoint address to which this message is sent to.
+     *
+     * 
    
+     * The JAX-WS spec allows this to be changed for each message,
+     * so it's designed to be a property.
+     *
+     * 
    
+     * Must not be null for a request message on the client. Otherwise
+     * it's null.
+     */
+    public EndpointAddress endpointAddress;
+
+    /**
+     * @deprecated
+     *      The programatic acccess should be done via
+     *      {@link #endpointAddress}. This is for JAX-WS client applications
+     *      that access this property via {@link BindingProvider#ENDPOINT_ADDRESS_PROPERTY}.
+     */
+    @Property(BindingProvider.ENDPOINT_ADDRESS_PROPERTY)
+    public String getEndPointAddressString() {
+        if(endpointAddress==null)
+            return null;
+        else
+            return endpointAddress.toString();
+    }
+
+    public void setEndPointAddressString(String s) {
+        if(s==null)
+            this.endpointAddress = null;
+        else
+            this.endpointAddress = EndpointAddress.create(s);
+    }
+
+    /**
+     * The value of {@link ContentNegotiation#PROPERTY}
+     * property.
+     *
+     * This property is used only on the client side.
+     */
+    public ContentNegotiation contentNegotiation;
+
+    @Property(ContentNegotiation.PROPERTY)
+    public String getContentNegotiationString() {
+        return (contentNegotiation != null) ? contentNegotiation.toString() : null;
+    }
+
+    public void setContentNegotiationString(String s) {
+        if(s==null)
+            contentNegotiation = null;
+        else {
+            try {
+                contentNegotiation = ContentNegotiation.valueOf(s);
+            } catch (IllegalArgumentException e) {
+                // If the value is not recognized default to none
+                contentNegotiation = ContentNegotiation.none;
+            }
+        }
+    }
+
+    /**
+     * Gives a list of Reference Parameters in the Message
+     * 
    
+     * Headers which have attribute wsa:IsReferenceParameter="true"
+     * This is not cached as one may reset the Message.
+     *
    
+     */
+    @Property(MessageContext.REFERENCE_PARAMETERS)
+    public @NotNull List getReferenceParameters() {
+        List refParams =  new ArrayList();
+        HeaderList hl = message.getHeaders();
+        for(Header h :hl) {
+            String attr = h.getAttribute(AddressingVersion.W3C.nsUri,"IsReferenceParameter");
+            if(attr!=null && (attr.equals("true") || attr.equals("1"))) {
+                Document d = DOMUtil.createDom();
+                SAX2DOMEx s2d = new SAX2DOMEx(d);
+                try {
+                    h.writeTo(s2d, XmlUtil.DRACONIAN_ERROR_HANDLER);
+                    refParams.add((Element) d.getLastChild());
+                } catch (SAXException e) {
+                    throw new WebServiceException(e);
+                }
+                /*
+                DOMResult result = new DOMResult(d);
+                XMLDOMWriterImpl domwriter = new XMLDOMWriterImpl(result);
+                try {
+                    h.writeTo(domwriter);
+                    refParams.add((Element) result.getNode().getLastChild());
+                } catch (XMLStreamException e) {
+                    throw new WebServiceException(e);
+                }
+                */
+            }
+        }
+        return refParams;
+    }
+
+    /**
+     * @deprecated
+     *      This method is for exposing header list through {@link PropertySet#get(Object)},
+     *      for user applications, and should never be invoked directly from within the JAX-WS RI.
+     */
+    @Property(JAXWSProperties.INBOUND_HEADER_LIST_PROPERTY)
+    /*package*/ HeaderList getHeaderList() {
+        if(message==null)   return null;
+        return message.getHeaders();
+    }
+
+    /**
+     * The list of MIME types that are acceptable to a receiver
+     * of an outbound message.
+     *
+     * This property is used only on the server side.
+     *
+     * 
    The representation shall be that specified by the HTTP Accept
+     * request-header field.
+     *
+     * 
    The list of content types will be obtained from the transport
+     * meta-data of a inbound message in a request/response message exchange.
+     * Hence this property will be set by the service-side transport pipe.
+     *
+     */
+    public String acceptableMimeTypes;
+
+    /**
+     * When non-null, this object is consulted to
+     * implement {@link WebServiceContext} methods
+     * exposed to the user application.
+     *
+     * Used only on the server side.
+     *
+     * 
    
+     * This property is set from the parameter
+     * of {@link WSEndpoint.PipeHead#process}.
+     */
+    public WebServiceContextDelegate webServiceContextDelegate;
+
+    /**
+     * Used only on the server side so that the transport
+     * can close the connection early.
+     *
+     * 
    
+     * This field can be null. While a message is being processed,
+     * this field can be set explicitly to null, to prevent
+     * future pipes from closing a transport.
+     *
+     * 
    
+     * This property is set from the parameter
+     * of {@link WSEndpoint.PipeHead#process}.
+     */
+    public @Nullable TransportBackChannel transportBackChannel;
+
+    /**
+     * The governing {@link WSEndpoint} in which this message is floating.
+     *
+     * 
    
+     * This property is set if and only if this is on the server side.
+     */
+    public WSEndpoint endpoint;
+
+    /**
+     * The value of the SOAPAction header associated with the message.
+     *
+     * 
    
+     * For outgoing messages, the transport may sends out this value.
+     * If this field is null, the transport may choose to send ""
+     * (quoted empty string.)
+     *
+     * For incoming messages, the transport will set this field.
+     * If the incoming message did not contain the SOAPAction header,
+     * the transport sets this field to null.
+     *
+     * 
    
+     * If the value is non-null, it must be always in the quoted form.
+     * The value can be null.
+     *
+     * 
    
+     * Note that the way the transport sends this value out depends on
+     * transport and SOAP version.
+     *
+     * For HTTP transport and SOAP 1.1, BP requires that SOAPAction
+     * header is present (See {@BP R2744} and {@BP R2745}.) For SOAP 1.2,
+     * this is moved to the parameter of the "application/soap+xml".
+     */
+    @Property(BindingProvider.SOAPACTION_URI_PROPERTY)
+    public String soapAction;
+
+    /**
+     * A hint indicating that whether a transport should expect
+     * a reply back from the server.
+     *
+     * 
    
+     * This property is used on the client-side for
+     * outbound messages, so that a pipeline
+     * can communicate to the terminal (or intermediate) {@link Tube}s
+     * about this knowledge.
+     *
+     * 
    
+     * This property MUST NOT be used by 2-way transports
+     * that have the transport back channel. Those transports
+     * must always check a reply coming through the transport back
+     * channel regardless of this value, and act accordingly.
+     * (This is because the expectation of the client and
+     * that of the server can be different, for example because
+     * of a bug in user's configuration.)
+     *
+     * 
    
+     * This property is for one-way transports, and more
+     * specifically for the coordinator that correlates sent requests
+     * and incoming replies, to decide whether to block
+     * until a response is received.
+     *
+     * 
    
+     * Also note that this property is related to
+     * {@link WSDLOperation#isOneWay()} but not the same thing.
+     * In fact in general, they are completely orthogonal.
+     *
+     * For example, the calling application can choose to invoke
+     * {@link Dispatch#invoke(Object)} or {@link Dispatch#invokeOneWay(Object)}
+     * with an operation (which determines the value of this property),
+     * regardless of whether WSDL actually says it's one way or not.
+     * So these two booleans can take any combinations.
+     *
+     *
+     * 
    
+     * When this property is {@link Boolean#TRUE}, it means that
+     * the pipeline does not expect a reply from a server (and therefore
+     * the correlator should not block for a reply message
+     * -- if such a reply does arrive, it can be just ignored.)
+     *
+     * 
    
+     * When this property is {@link Boolean#FALSE}, it means that
+     * the pipeline expects a reply from a server (and therefore
+     * the correlator should block to see if a reply message is received,
+     *
+     * 
    
+     * This property is always set to {@link Boolean#TRUE} or
+     * {@link Boolean#FALSE} when used on the request message
+     * on the client side.
+     * No other {@link Boolean} instances are allowed.
+     * 
    
+     *
+     * In all other situations, this property is null.
+     *
+     */
+    @Property(BindingProviderProperties.ONE_WAY_OPERATION)
+    public Boolean expectReply;
+
+
+    /**
+     * This property will be removed in a near future.
+     *
+     * 
    
+     * A part of what this flag represented moved to
+     * {@link #expectReply} and the other part was moved
+     * to {@link Message#isOneWay(WSDLPort)}. Please update
+     * your code soon, or risk breaking your build!!
+     */
+    @Deprecated
+    public Boolean isOneWay;
+
+    /**
+     * Lazily created set of handler-scope property names.
+     *
+     * 
    
+     * We expect that this is only used when handlers are present
+     * and they explicitly set some handler-scope values.
+     *
+     * @see #getHandlerScopePropertyNames(boolean)
+     */
+    private Set handlerScopePropertyNames;
+
+    /**
+     * Bag to capture properties that are available for the whole
+     * message invocation (namely on both requests and responses.)
+     *
+     * 
    
+     * These properties are copied from a request to a response.
+     * This is where we keep properties that are set by handlers.
+     *
+     * 
    
+     * See class javadoc for more discussion.
+     *
+     * @see #getHandlerScopePropertyNames(boolean)
+     */
+    public final Map invocationProperties;
+
+    /**
+     * Gets a {@link Set} that stores handler-scope properties.
+     *
+     * 
    
+     * These properties will not be exposed to the response context.
+     * Consequently, if a {@link Tube} wishes to hide a property
+     * to {@link ResponseContext}, it needs to add the property name
+     * to this set.
+     *
+     * @param readOnly
+     *      Return true if the caller only intends to read the value of this set.
+     *      Internally, the {@link Set} is allocated lazily, and this flag helps
+     *      optimizing the strategy.
+     *
+     * @return
+     *      always non-null, possibly empty set that stores property names.
+     */
+    public final Set getHandlerScopePropertyNames( boolean readOnly ) {
+        Set o = this.handlerScopePropertyNames;
+        if(o==null) {
+            if(readOnly)
+                return Collections.emptySet();
+            o = new HashSet();
+            this.handlerScopePropertyNames = o;
+        }
+        return o;
+    }
+
+    /**
+     * This method no longer works.
+     *
+     * @deprecated
+     *      Use {@link #getHandlerScopePropertyNames(boolean)}.
+     *      To be removed once Tango components are updated.
+     */
+    public final Set getApplicationScopePropertyNames( boolean readOnly ) {
+        assert false;
+        return new HashSet();
+    }
+
+    /**
+     * Creates a response {@link Packet} from a request packet ({@code this}).
+     *
+     * 
    
+     * When a {@link Packet} for a reply is created, some properties need to be
+     * copied over from a request to a response, and this method handles it correctly.
+     *
+     * @deprecated
+     *      Use createClientResponse(Message) for client side and
+     *      createServerResponse(Message, String) for server side response
+     *      creation.
+     *
+     * @param msg
+     *      The {@link Message} that represents a reply. Can be null.
+     */
+    @Deprecated
+    public Packet createResponse(Message msg) {
+        Packet response = new Packet(this);
+        response.setMessage(msg);
+        return response;
+    }
+
+    /**
+     * Creates a response {@link Packet} from a request packet ({@code this}).
+     *
+     * 
    
+     * When a {@link Packet} for a reply is created, some properties need to be
+     * copied over from a request to a response, and this method handles it correctly.
+     *
+     * @param msg
+     *      The {@link Message} that represents a reply. Can be null.
+     */
+    public Packet createClientResponse(Message msg) {
+        Packet response = new Packet(this);
+        response.setMessage(msg);
+        return response;
+    }
+
+    /**
+     * Creates a server-side response {@link Packet} from a request
+     * packet ({@code this}). If WS-Addressing is enabled, a default Action
+     * Message Addressing Property is obtained using wsdlPort {@link WSDLPort}
+     * and binding {@link WSBinding}.
+     * 
    
+     * This method should be called to create application response messages
+     * since they are associated with a {@link WSBinding} and {@link WSDLPort}.
+     * For creating protocol messages that require a non-default Action, use
+     * {@link #createServerResponse(Message, com.sun.xml.internal.ws.api.addressing.AddressingVersion, com.sun.xml.internal.ws.api.SOAPVersion, String)}.
+     *
+     * @param responseMessage The {@link Message} that represents a reply. Can be null.
+     * @param wsdlPort The response WSDL port.
+     * @param binding The response Binding. Cannot be null.
+     * @return response packet
+     */
+    public Packet createServerResponse(@Nullable Message responseMessage, @Nullable WSDLPort wsdlPort, @Nullable SEIModel seiModel, @NotNull WSBinding binding) {
+        Packet r = createClientResponse(responseMessage);
+
+        AddressingVersion av = binding.getAddressingVersion();
+        // populate WS-A headers only if WS-A is enabled
+        if (av == null)
+            return r;
+        //populate WS-A headers only if the request has addressing headers
+        String inputAction = this.getMessage().getHeaders().getAction(av, binding.getSOAPVersion());
+        if (inputAction == null) {
+            return r;
+        }
+        // if one-way, then dont populate any WS-A headers
+        if (message == null || (wsdlPort != null && message.isOneWay(wsdlPort)))
+            return r;
+
+        // otherwise populate WS-Addressing headers
+        return populateAddressingHeaders(binding, r, wsdlPort,seiModel);
+
+    }
+
+    /**
+     * Creates a server-side response {@link Packet} from a request
+     * packet ({@code this}). If WS-Addressing is enabled, action
+     * is used as Action Message Addressing Property.
+     * 
    
+     * This method should be called only for creating protocol response messages
+     * that require a particular value of Action since they are not associated
+     * with a {@link WSBinding} and {@link WSDLPort} but do know the {@link AddressingVersion}
+     * and {@link SOAPVersion}.
+     *
+     * @param responseMessage The {@link Message} that represents a reply. Can be null.
+     * @param addressingVersion The WS-Addressing version of the response message.
+     * @param soapVersion The SOAP version of the response message.
+     * @param action The response Action Message Addressing Property value.
+     * @return response packet
+     */
+    public Packet createServerResponse(@Nullable Message responseMessage, @NotNull AddressingVersion addressingVersion, @NotNull SOAPVersion soapVersion, @NotNull String action) {
+        Packet responsePacket = createClientResponse(responseMessage);
+
+        // populate WS-A headers only if WS-A is enabled
+        if (addressingVersion == null)
+            return responsePacket;
+        //populate WS-A headers only if the request has addressing headers
+        String inputAction = this.getMessage().getHeaders().getAction(addressingVersion, soapVersion);
+        if (inputAction == null) {
+            return responsePacket;
+        }
+
+        return populateAddressingHeaders(responsePacket,
+                addressingVersion,
+                soapVersion,
+                action);
+    }
+
+    private Packet populateAddressingHeaders(Packet responsePacket, AddressingVersion av, SOAPVersion sv, String action) {
+        // populate WS-A headers only if WS-A is enabled
+        if (av == null)
+            return responsePacket;
+
+        // if one-way, then dont populate any WS-A headers
+        if (responsePacket.getMessage() == null)
+            return responsePacket;
+
+        HeaderList hl = responsePacket.getMessage().getHeaders();
+
+        // wsa:To
+        WSEndpointReference replyTo;
+        try {
+        replyTo = message.getHeaders().getReplyTo(av, sv);
+        if (replyTo != null)
+            hl.add(new StringHeader(av.toTag, replyTo.getAddress()));
+        } catch (InvalidMapException e) {
+            replyTo = null;
+        }
+
+        // wsa:Action
+        hl.add(new StringHeader(av.actionTag, action));
+
+        // wsa:MessageID
+        hl.add(new StringHeader(av.messageIDTag, responsePacket.getMessage().getID(av, sv)));
+
+        // wsa:RelatesTo
+        // TODO: this property is defined in WsaServerTube.REQUEST_MESSAGE_ID
+        String mid = (String)responsePacket.invocationProperties.get("com.sun.xml.internal.ws.addressing.request.messageID");
+        if (mid != null)
+            hl.add(new RelatesToHeader(av.relatesToTag, mid));
+
+        // populate reference parameters
+        WSEndpointReference refpEPR;
+        if (responsePacket.getMessage().isFault()) {
+            // choose FaultTo
+            refpEPR = message.getHeaders().getFaultTo(av, sv);
+
+            // if FaultTo is null, then use ReplyTo
+            if (refpEPR == null)
+                refpEPR = replyTo;
+        } else {
+            // choose ReplyTo
+            refpEPR = replyTo;
+        }
+        if (refpEPR != null) {
+            refpEPR.addReferenceParameters(hl);
+        }
+
+        return responsePacket;
+    }
+
+    private Packet populateAddressingHeaders(WSBinding binding, Packet responsePacket, WSDLPort wsdlPort, SEIModel seiModel) {
+        AddressingVersion addressingVersion = binding.getAddressingVersion();
+
+        if (addressingVersion == null)
+            return responsePacket;
+
+        WsaTubeHelper wsaHelper = addressingVersion.getWsaHelper(wsdlPort,seiModel, binding);
+        String action = responsePacket.message.isFault() ?
+                wsaHelper.getFaultAction(this, responsePacket) :
+                wsaHelper.getOutputAction(this);
+
+        return populateAddressingHeaders(responsePacket, addressingVersion, binding.getSOAPVersion(), action);
+    }
+
+    // completes TypedMap
+    private static final PropertyMap model;
+
+    static {
+        model = parse(Packet.class);
+    }
+
+    protected PropertyMap getPropertyMap() {
+        return model;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/spi/runtime/ClientTransportFactoryTypes.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/package-info.java
similarity index 79%
rename from jaxws/src/share/classes/com/sun/xml/internal/ws/spi/runtime/ClientTransportFactoryTypes.java
rename to jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/package-info.java
index ff8d3647478..d98d30526e9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/spi/runtime/ClientTransportFactoryTypes.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-package com.sun.xml.internal.ws.spi.runtime;
 
 /**
- * This defines the types of ClientTransportFactory
+ * {@link Message} and related abstractions that represent a SOAP message.
  */
-public interface ClientTransportFactoryTypes {
-    public static final int HTTP  = 0;
-    public static final int LOCAL = 1;
-}
+package com.sun.xml.internal.ws.api.message;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/stream/InputStreamMessage.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/stream/InputStreamMessage.java
new file mode 100644
index 00000000000..096aa2f11ae
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/stream/InputStreamMessage.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.api.message.stream;
+
+import com.sun.xml.internal.ws.api.message.AttachmentSet;
+import com.sun.xml.internal.ws.api.message.Packet;
+import java.io.InputStream;
+
+/**
+ * Low level representation of an XML or SOAP message as an {@link InputStream}.
+ *
+ */
+public class InputStreamMessage extends StreamBasedMessage {
+    /**
+     * The MIME content-type of the encoding.
+     */
+    public final String contentType;
+
+    /**
+     * The message represented as an {@link InputStream}.
+     */
+    public final InputStream msg;
+
+    /**
+     * Create a new message.
+     *
+     * @param properties
+     *      the properties of the message.
+     *
+     * @param contentType
+     *      the MIME content-type of the encoding.
+     *
+     * @param msg
+     *      always a non-null unconsumed {@link InputStream} that
+     *      represents a request.
+     */
+    public InputStreamMessage(Packet properties, String contentType, InputStream msg) {
+        super(properties);
+
+        this.contentType = contentType;
+        this.msg = msg;
+    }
+
+    /**
+     * Create a new message.
+     *
+     * @param properties
+     *      the properties of the message.
+     *
+     * @param attachments
+     *      the attachments of the message.
+     *
+     * @param contentType
+     *      the MIME content-type of the encoding.
+     *
+     * @param msg
+     *      always a non-null unconsumed {@link InputStream} that
+     *      represents a request.
+     */
+    public InputStreamMessage(Packet properties, AttachmentSet attachments,
+            String contentType, InputStream msg) {
+        super(properties, attachments);
+
+        this.contentType = contentType;
+        this.msg = msg;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/util/GeneratedFileInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/stream/StreamBasedMessage.java
similarity index 52%
rename from jaxws/src/share/classes/com/sun/tools/internal/ws/processor/util/GeneratedFileInfo.java
rename to jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/stream/StreamBasedMessage.java
index b56cc9606cb..4331793f683 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/util/GeneratedFileInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/stream/StreamBasedMessage.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,61 +22,51 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+package com.sun.xml.internal.ws.api.message.stream;
 
-package com.sun.tools.internal.ws.processor.util;
-
-import java.io.File;
+import com.sun.xml.internal.ws.api.message.AttachmentSet;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.message.AttachmentSetImpl;
 
 /**
- * A container to hold info on the files that get
- * generated.
+ * Base representation an XML or SOAP message as stream.
  *
- * @author WS Development Team
  */
-public class GeneratedFileInfo {
-
+abstract class StreamBasedMessage {
     /**
-     * local variables
+     * The properties of the message.
      */
-    private File file = null;
-    private String type = null;
-
-    /* constructor */
-    public GeneratedFileInfo() {}
+    public final Packet properties;
 
     /**
-     * Adds the file object to the container
+     * The attachments of this message
+     * (attachments live outside a message.)
+     */
+    public final AttachmentSet attachments;
+
+    /**
+     * Create a new message.
+     *
+     * @param properties
+     *      the properties of the message.
      *
-     * @param file instance of the file to be added
      */
-    public void setFile( File file ) {
-        this.file = file;
+    protected StreamBasedMessage(Packet properties) {
+        this.properties = properties;
+        this.attachments = new AttachmentSetImpl();
     }
 
     /**
-     * Adds the type of file it is the container
+     * Create a new message.
      *
-     * @param type string which specifices the type
-     */
-    public void setType( String type ) {
-        this.type = type;
-    }
-
-    /**
-     * Gets the file that got added
+     * @param properties
+     *      the properties of the message.
      *
-     * @return File that got added
+     * @param attachments
+     *      the attachments of the message.
      */
-    public File getFile() {
-        return( file );
-    }
-
-    /**
-     * Get the file type that got added
-     *
-     * @return File type of datatype String
-     */
-    public String getType() {
-        return ( type );
+    protected StreamBasedMessage(Packet properties, AttachmentSet attachments) {
+        this.properties = properties;
+        this.attachments = attachments;
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/stream/XMLStreamReaderMessage.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/stream/XMLStreamReaderMessage.java
new file mode 100644
index 00000000000..24bd047ae0c
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/stream/XMLStreamReaderMessage.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.api.message.stream;
+
+import com.sun.xml.internal.ws.api.message.AttachmentSet;
+import com.sun.xml.internal.ws.api.message.Packet;
+import javax.xml.stream.XMLStreamReader;
+
+/**
+ * Low level representation of an XML or SOAP message as an {@link XMLStreamReader}.
+ *
+ */
+public class XMLStreamReaderMessage extends StreamBasedMessage {
+    /**
+     * The message represented as an {@link XMLStreamReader}.
+     */
+    public final XMLStreamReader msg;
+
+    /**
+     * Create a new message.
+     *
+     * @param properties
+     *      the properties of the message.
+     *
+     * @param msg
+     *      always a non-null unconsumed {@link XMLStreamReader} that
+     *      represents a request.
+     */
+    public XMLStreamReaderMessage(Packet properties, XMLStreamReader msg) {
+        super(properties);
+        this.msg = msg;
+    }
+
+    /**
+     * Create a new message.
+     *
+     * @param properties
+     *      the properties of the message.
+     *
+     * @param attachments
+     *      the attachments of the message.
+     *
+     * @param msg
+     *      always a non-null unconsumed {@link XMLStreamReader} that
+     *      represents a request.
+     */
+    public XMLStreamReaderMessage(Packet properties, AttachmentSet attachments, XMLStreamReader msg) {
+        super(properties, attachments);
+        this.msg = msg;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/CheckedException.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/CheckedException.java
new file mode 100644
index 00000000000..41a258e869e
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/CheckedException.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.model;
+
+import com.sun.xml.internal.bind.api.Bridge;
+
+import javax.xml.ws.WebFault;
+import javax.xml.namespace.QName;
+import java.rmi.RemoteException;
+
+/**
+ * This class provides abstractio to the  the exception class
+ * corresponding to the wsdl:fault, such as class MUST have
+ * {@link WebFault} annotation defined on it.
+ *
+ * Also the exception class must have
+ *
+ * public WrapperException()String message, FaultBean){}
+ *
+ * and method
+ *
+ * public FaultBean getFaultInfo();
+ *
+ * @author Vivek Pandey
+ */
+public interface CheckedException {
+    /**
+     * Gets the root {@link SEIModel} that owns this model.
+     */
+    SEIModel getOwner();
+
+    /**
+     * Gets the parent {@link JavaMethod} to which this checked exception belongs.
+     */
+    JavaMethod getParent();
+
+    /**
+     * The returned exception class would be userdefined or WSDL exception class.
+     *
+     * @return
+     *      always non-null same object.
+     */
+    Class getExceptionClass();
+
+    /**
+     * The detail bean is serialized inside the detail entry in the SOAP message.
+     * This must be known to the {@link javax.xml.bind.JAXBContext} inorder to get
+     * marshalled/unmarshalled.
+     *
+     * @return the detail bean
+     */
+    Class getDetailBean();
+
+    /**
+     * Gives the {@link com.sun.xml.internal.bind.api.Bridge} associated with the detail
+     */
+    Bridge getBridge();
+
+    /**
+     * Tells whether the exception class is a userdefined or a WSDL exception.
+     * A WSDL exception class follows the pattern defined in JSR 224. According to that
+     * a WSDL exception class must have:
+     *
+     * public WrapperException()String message, FaultBean){}
+     *
+     * and accessor method
+     *
+     * public FaultBean getFaultInfo();
+     */
+    ExceptionType getExceptionType();
+
+    /**
+     * Gives the wsdl:portType/wsdl:operation/wsdl:fault@message value - that is the wsdl:message
+     * referenced by wsdl:fault
+     */
+    String getMessageName();
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/ExceptionType.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/ExceptionType.java
new file mode 100644
index 00000000000..925d00d2359
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/ExceptionType.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.api.model;
+/**
+ * Type of java exception as defined by JAXWS 2.0 JSR 224.
+ *
+ * Tells whether the exception class is a userdefined or a WSDL exception.
+ * A WSDL exception class follows the pattern defined in JSR 224. According to that
+ * a WSDL exception class must have:
+ *
+ * public WrapperException()String message, FaultBean){}
+ *
+ * and accessor method
+ *
+ * public FaultBean getFaultInfo();
+ *
+ * @author Vivek Pandey
+ */
+public enum ExceptionType {
+    WSDLException(0), UserDefined(1);
+
+    ExceptionType(int exceptionType){
+        this.exceptionType = exceptionType;
+    }
+
+    public int value() {
+        return exceptionType;
+    }
+    private final int exceptionType;
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/JavaMethod.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/JavaMethod.java
new file mode 100644
index 00000000000..91a384e0481
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/JavaMethod.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.model;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.api.model.soap.SOAPBinding;
+
+import java.lang.reflect.Method;
+
+/**
+ * Abstracts the annotated {@link Method} of a SEI.
+ *
+ * @author Vivek Pandey
+ */
+public interface JavaMethod {
+
+    /**
+     * Gets the root {@link SEIModel} that owns this model.
+     */
+    SEIModel getOwner();
+
+    /**
+     * On the server side, it uses this for invocation of the web service
+     *
+     * 
    
+     * {@link @WebService}(endpointInterface="I")
+     * class A { }
+     *
+     * In this case, it retuns A's method
+     *
+     * 
    
+     * {@link @WebService}(endpointInterface="I")
+     * class A implements I { }
+     * In this case, it returns A's method
+     *
+     * 
    
+     * {@link @WebService}
+     * class A { }
+     * In this case, it returns A's method
+     *
+     * @return Returns the java {@link Method}
+     */
+    @NotNull Method getMethod();
+
+    /**
+     * This should be used if you want to access annotations on WebMethod
+     * Returns the SEI method if there is one.
+     *
+     * 
    
+     * {@link @WebService}(endpointInterface="I")
+     * class A { }
+     * In this case, it retuns I's method
+     *
+     * 
    
+     * {@link @WebService}(endpointInterface="I")
+     * class A implements I { }
+     * In this case, it returns I's method
+     *
+     * 
    
+     * {@link @WebService}
+     * class A { }
+     * In this case, it returns A's method
+     *
+     * @return Returns the java {@link Method}
+     */
+    @NotNull Method getSEIMethod();
+
+    /**
+     * @return Returns the {@link MEP}.
+     */
+    MEP getMEP();
+
+    /**
+     * Binding object - a {@link SOAPBinding} isntance.
+     *
+     * @return the Binding object
+     */
+    SOAPBinding getBinding();
+
+    /**
+     * Gives the wsdl:operation@name value
+     */
+    @NotNull String getOperationName();
+
+
+    /**
+     * Gives the request wsdl:message@name value
+     */
+    @NotNull String getRequestMessageName();
+
+    /**
+     * Gives the response wsdl:messageName value
+     * @return null if its a oneway operation that is getMEP().isOneWay()==true.
+     * @see com.sun.xml.internal.ws.api.model.MEP#isOneWay()
+     */
+    @Nullable String getResponseMessageName();
+
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/prop/ValueProp.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/MEP.java
similarity index 69%
rename from jaxws/src/share/classes/com/sun/tools/internal/txw2/model/prop/ValueProp.java
rename to jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/MEP.java
index 57c17c56926..bd0d98e3d2d 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/prop/ValueProp.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/MEP.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,29 +23,29 @@
  * have any questions.
  */
 
-package com.sun.tools.internal.txw2.model.prop;
-
-import com.sun.codemodel.JType;
+package com.sun.xml.internal.ws.api.model;
 
 /**
+ * Constants that represents four message exchange patterns.
+ *
  * @author Kohsuke Kawaguchi
  */
-public class ValueProp extends Prop {
-    private final JType type;
+public enum MEP {
+    REQUEST_RESPONSE(false),
+    ONE_WAY(false),
+    ASYNC_POLL(true),
+    ASYNC_CALLBACK(true);
 
-    public ValueProp(JType type) {
-        this.type = type;
+    /**
+     * True for {@link #ASYNC_CALLBACK} and {@link #ASYNC_POLL}.
+     */
+    public final boolean isAsync;
+
+    MEP(boolean async) {
+        isAsync = async;
     }
 
-    public boolean equals(Object o) {
-        if (!(o instanceof ValueProp)) return false;
-
-        final ValueProp that = (ValueProp) o;
-
-        return type.equals(that.type);
-    }
-
-    public int hashCode() {
-        return type.hashCode();
+    public final boolean isOneWay() {
+        return this==ONE_WAY;
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/Parameter.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/Parameter.java
new file mode 100644
index 00000000000..b1b5e128b08
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/Parameter.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.model;
+
+import com.sun.xml.internal.bind.api.Bridge;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Holder;
+import javax.jws.WebParam;
+import javax.jws.WebParam.Mode;
+
+/**
+ * Runtime Parameter that abstracts the annotated java parameter
+ * 
    
+ * 
    
+ * A parameter may be bound to a header, a body, or an attachment.
+ * Note that when it's bound to a body, it's bound to a body,
+ * it binds to the whole payload.
+ * 
    
+ * 
    
+ * Sometimes multiple Java parameters are packed into the payload,
+ * in which case the subclass {@link com.sun.xml.internal.ws.model.WrapperParameter} is used.
+ *
+ * @author Vivek Pandey
+ */
+public interface Parameter {
+    /**
+     * Gets the root {@link SEIModel} that owns this model.
+     */
+    SEIModel getOwner();
+
+    /**
+     * Gets the parent {@link JavaMethod} to which this parameter belongs.
+     */
+    JavaMethod getParent();
+
+    /**
+     * @return Returns the {@link QName} of the payload/infoset of a SOAP body or header.
+     */
+    QName getName();
+
+    /**
+     * Gives the {@link Bridge} associated with this Parameter
+     */
+    Bridge getBridge();
+
+    /**
+     * @return Returns the mode, such as IN, OUT or INOUT.
+     */
+    Mode getMode();
+
+    /**
+     * Position of a parameter in the method signature. It would be -1 if the parameter is a return.
+     *
+     * @return Returns the index.
+     */
+    int getIndex();
+
+    /**
+     * @return true if this instanceof {@link com.sun.xml.internal.ws.model.WrapperParameter}.
+     */
+    boolean isWrapperStyle();
+
+    /**
+     * Returns true if this parameter is bound to the return value from the {@link JavaMethod}.
+     *
+     * 
    
+     * Just the convenience method for getIndex()==-1
+     */
+    boolean isReturnValue();
+
+    /**
+     * Returns the binding associated with the parameter. For IN parameter the binding will be
+     * same as {@link #getInBinding()}, for OUT parameter the binding will be same as
+     * {@link #getOutBinding()} and for INOUT parameter the binding will be same as calling
+     * {@link #getInBinding()}
+     *
+     * @return the Binding for this Parameter. Returns {@link ParameterBinding#BODY} by default.
+     */
+    ParameterBinding getBinding();
+
+    /**
+     * Returns the {@link ParameterBinding} associated with the IN mode
+     *
+     * @return the binding
+     */
+    ParameterBinding getInBinding();
+
+    /**
+     * Returns the {@link ParameterBinding} associated with the OUT mode
+     *
+     * @return the binding
+     */
+    ParameterBinding getOutBinding();
+
+    /**
+     * @return true if the {@link Mode} associated with the parameter is {@link Mode#IN} and false otherwise.
+     */
+    boolean isIN();
+
+    /**
+     * @return true if the {@link Mode} associated with the parameter is {@link Mode#OUT} and false otherwise.
+     */
+    boolean isOUT();
+
+    /**
+     * @return true if the {@link Mode} associated with the parameter is {@link Mode#INOUT} and false otherwise.
+     */
+    boolean isINOUT();
+
+    /**
+     * If true, this parameter maps to the return value of a method invocation.
+     *
+     * 
    
+     * {@link JavaMethod#getResponseParameters()} is guaranteed to have
+     * at most one such {@link Parameter}. Note that there coule be none,
+     * in which case the method returns void.
+     *
+     * 
    
+     * Other response parameters are bound to {@link Holder}.
+     */
+    boolean isResponse();
+
+    /**
+     * Gets the holder value if applicable. To be called for inbound client side
+     * message.
+     *
+     * @param obj
+     * @return the holder value if applicable.
+     */
+    Object getHolderValue(Object obj);
+
+    /**
+     * Gives the wsdl:part@name value
+     *
+     * @return Value of {@link WebParam#partName()} annotation if present,
+     *         otherwise its the localname of the infoset associated with the parameter
+     */
+    String getPartName();
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/model/ParameterBinding.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/ParameterBinding.java
similarity index 81%
rename from jaxws/src/share/classes/com/sun/xml/internal/ws/model/ParameterBinding.java
rename to jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/ParameterBinding.java
index ddc3fbb96e8..53a9b6adc18 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/model/ParameterBinding.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/ParameterBinding.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-package com.sun.xml.internal.ws.model;
+package com.sun.xml.internal.ws.api.model;
 
 /**
  * Denotes the binding of a parameter.
@@ -43,16 +43,16 @@ public final class ParameterBinding {
     /**
      * Singleton instance that represents 'BODY'
      */
-    public static final ParameterBinding BODY = new ParameterBinding("BODY",null);
+    public static final ParameterBinding BODY = new ParameterBinding(Kind.BODY,null);
     /**
      * Singleton instance that represents 'HEADER'
      */
-    public static final ParameterBinding HEADER = new ParameterBinding("HEADER",null);
+    public static final ParameterBinding HEADER = new ParameterBinding(Kind.HEADER,null);
     /**
      * Singleton instance that represents 'UNBOUND',
      * meaning the parameter doesn't have a representation in a SOAP message.
      */
-    public static final ParameterBinding UNBOUND = new ParameterBinding("UNBOUND",null);
+    public static final ParameterBinding UNBOUND = new ParameterBinding(Kind.UNBOUND,null);
     /**
      * Creates an instance that represents the attachment
      * with a given MIME type.
@@ -63,22 +63,37 @@ public final class ParameterBinding {
      * no where in JAX-WS RI two {@link ParameterBinding}s are compared today,
      */
     public static ParameterBinding createAttachment(String mimeType) {
-        return new ParameterBinding("ATTACHMENT",mimeType);
+        return new ParameterBinding(Kind.ATTACHMENT,mimeType);
+    }
+
+    /**
+     * Represents 4 kinds of binding.
+     */
+    public static enum Kind {
+        BODY, HEADER, UNBOUND, ATTACHMENT;
     }
 
 
-    private String mimeType;
-    private final String name;
+    /**
+     * Represents the kind of {@link ParameterBinding}.
+     * Always non-null.
+     */
+    public final Kind kind;
 
-    private ParameterBinding(String name,String mimeType) {
-        this.name = name;
+    /**
+     * Only used with attachment binding.
+     */
+    private String mimeType;
+
+    private ParameterBinding(Kind kind,String mimeType) {
+        this.kind = kind;
         this.mimeType = mimeType;
     }
 
 
 
     public String toString() {
-        return name;
+        return kind.toString();
     }
 
     /**
@@ -109,6 +124,6 @@ public final class ParameterBinding {
     }
 
     public boolean isAttachment(){
-        return name=="ATTACHMENT";
+        return kind==Kind.ATTACHMENT;
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/SEIModel.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/SEIModel.java
new file mode 100644
index 00000000000..330a7f614e8
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/SEIModel.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.model;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.bind.api.Bridge;
+import com.sun.xml.internal.bind.api.JAXBRIContext;
+import com.sun.xml.internal.bind.api.TypeReference;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
+import com.sun.xml.internal.ws.util.Pool;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Dispatch;
+import javax.xml.ws.Provider;
+import java.lang.reflect.Method;
+import java.util.Collection;
+
+/**
+ * Represents abstraction of SEI.
+ *
+ * 
    
+ * This interface would be used to access which Java concepts correspond to
+ * which WSDL concepts, such as which wsdl:port corresponds to
+ * a SEI, or which wsdl:operation corresponds to {@link JavaMethod}.
+ *
+ * 
    
+ * It also retains information about the databinding done for a SEI;
+ * such as {@link JAXBRIContext} and {@link Bridge}.
+ *
+ * 
    
+ * This model is constructed only when there is a Java SEI. Therefore it's
+ * not available with {@link Dispatch} or {@link Provider}. Technologies that
+ * need to work regardless of such surface API difference shall not be using
+ * this model.
+ *
+ * @author Vivek Pandey
+ */
+public interface SEIModel {
+    Pool.Marshaller getMarshallerPool();
+
+    /**
+     * JAXBContext that will be used to marshall/unmarshall the java classes found in the SEI.
+     *
+     * @return the {@link JAXBRIContext}
+     */
+    JAXBRIContext getJAXBContext();
+
+    /**
+     * Get the Bridge associated with the {@link TypeReference}
+     *
+     * @param type
+     * @return the {@link Bridge} for the type
+     */
+//    Bridge getBridge(TypeReference type);
+
+    /**
+     * Its a known fault if the exception thrown by {@link Method} is annotated with the
+     * {@link javax.xml.ws.WebFault#name()} thas equal to the name passed as parameter.
+     *
+     * @param name   is the qualified name of fault detail element as specified by wsdl:fault@element value.
+     * @param method is the Java {@link Method}
+     * @return true if name is the name
+     *         of a known fault name for the method
+     */
+//    boolean isKnownFault(QName name, Method method);
+
+    /**
+     * Checks if the {@link JavaMethod} for the {@link Method} knowns the exception class.
+     *
+     * @param m  {@link Method} to pickup the right {@link JavaMethod} model
+     * @param ex exception class
+     * @return true if ex is a Checked Exception
+     *         for m
+     */
+//    boolean isCheckedException(Method m, Class ex);
+
+    /**
+     * This method will be useful to get the {@link JavaMethod} corrrespondiong to
+     * a {@link Method} - such as on the client side.
+     *
+     * @param method for which {@link JavaMethod} is asked for
+     * @return the {@link JavaMethod} representing the method
+     */
+    JavaMethod getJavaMethod(Method method);
+
+    /**
+     * Gives a {@link JavaMethod} for a given {@link QName}. The {@link QName} will
+     * be equivalent to the SOAP Body or Header block or can simply be the name of an
+     * infoset that corresponds to the payload.
+     *
+     * @param name
+     * @return the JavaMethod associated with the
+     *         operation named name
+     */
+    public JavaMethod getJavaMethod(QName name);
+
+    /**
+     * Gives all the {@link JavaMethod} for a wsdl:port for which this {@link SEIModel} is
+     * created.
+     *
+     * @return a {@link Collection} of {@link JavaMethod}
+     *         associated with the {@link SEIModel}
+     */
+    Collection getJavaMethods();
+
+    /**
+     * Location of the WSDL that defines the port associated with the {@link SEIModel}
+     *
+     * @return wsdl location uri - always non-null
+     */
+    @NotNull String getWSDLLocation();
+
+    /**
+     * wsdl:service qualified name for the port associated with the {@link SEIModel)
+     *
+     * @return wsdl:service@name value - always non-null
+     */
+    @NotNull QName getServiceQName();
+
+    /**
+     * Gets the {@link WSDLPort} that represents the port that this SEI binds to.
+     */
+    @NotNull WSDLPort getPort();
+
+    /**
+     * Value of the wsdl:port name associated with the {@link SEIModel)
+     *
+     * @return wsdl:service/wsdl:port@name value, always non-null
+     */
+    @NotNull QName getPortName();
+
+    /**
+     * Value of wsdl:portType bound to the port associated with the {@link SEIModel)
+     *
+     * @return
+     */
+    @NotNull QName getPortTypeName();
+
+    /**
+     *  Gives the wsdl:binding@name value
+     */
+    @NotNull QName getBoundPortTypeName();
+
+    /**
+     * Namespace of the wsd;:port associated with the {@link SEIModel)
+     */
+    @NotNull String getTargetNamespace();
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/soap/SOAPBinding.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/soap/SOAPBinding.java
new file mode 100644
index 00000000000..c1e17303fdd
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/soap/SOAPBinding.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.model.soap;
+
+import com.sun.xml.internal.ws.api.SOAPVersion;
+import com.sun.xml.internal.ws.api.model.JavaMethod;
+
+import javax.jws.soap.SOAPBinding.Style;
+import javax.jws.soap.SOAPBinding.Use;
+import javax.jws.WebMethod;
+
+/**
+ * Models soap:binding in a WSDL document or a {@link javax.jws.soap.SOAPBinding} annotation. This
+ * can be the return of {@link JavaMethod#getBinding()}.
+ *
+ * @author Vivek Pandey
+ */
+abstract public class SOAPBinding {
+    protected Use use = Use.LITERAL;
+    protected Style style = Style.DOCUMENT;
+    protected SOAPVersion soapVersion = SOAPVersion.SOAP_11;
+    protected String soapAction = "";
+
+    /**
+     * Get {@link Use} such as literal or encoded.
+     */
+    public Use getUse() {
+        return use;
+    }
+
+    /**
+     * Get {@link Style} - such as document or rpc.
+     */
+    public Style getStyle() {
+        return style;
+    }
+
+    /**
+     * Get the {@link SOAPVersion}
+     */
+    public SOAPVersion getSOAPVersion() {
+        return soapVersion;
+    }
+
+    /**
+     * Returns true if its document/literal
+     */
+    public boolean isDocLit() {
+        return style == Style.DOCUMENT && use == Use.LITERAL;
+    }
+
+    /**
+     * Returns true if this is a rpc/literal binding
+     */
+    public boolean isRpcLit() {
+        return style == Style.RPC && use == Use.LITERAL;
+    }
+
+    /**
+     * Value of wsdl:binding/wsdl:operation/soap:operation@soapAction attribute or
+     * {@link WebMethod#action()} annotation.
+     * 
    +     * For example:
+     * <wsdl:binding name="HelloBinding" type="tns:Hello">
+     *   <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+     *   <wsdl:operation name="echoData">
+     *       <soap12:operation soapAction=""/>
+     * ...
+     * 
    
+     * It's always non-null. soap message serializer needs to generated SOAPAction HTTP header with
+     * the return of this method enclosed in quotes("").
+     *
+     * @see com.sun.xml.internal.ws.api.message.Packet#soapAction
+     */
+    public String getSOAPAction() {
+        return soapAction;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundOperation.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundOperation.java
new file mode 100644
index 00000000000..af6e9582fb4
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundOperation.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.model.wsdl;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+
+import javax.xml.namespace.QName;
+import java.util.List;
+
+/**
+ * Abstracts wsdl:binding/wsdl:operation. It can be used to determine the parts and their binding.
+ *
+ * @author Vivek Pandey
+ */
+public interface WSDLBoundOperation extends WSDLObject, WSDLExtensible {
+    /**
+     * Short-cut for {@code getOperation().getName()}
+     */
+    @NotNull QName getName();
+
+    /**
+     * Gives soapbinding:operation@soapAction value. soapbinding:operation@soapAction is optional attribute.
+     * If not present an empty String is returned as per BP 1.1 R2745.
+     */
+    @NotNull String getSOAPAction();
+
+    /**
+     * Gets the wsdl:portType/wsdl:operation model - {@link WSDLOperation},
+     * associated with this binding operation.
+     *
+     * @return always same {@link WSDLOperation}
+     */
+    @NotNull WSDLOperation getOperation();
+
+    /**
+     * Gets the soapbinding:binding/operation/wsaw:Anonymous. A default value of OPTIONAL is returned.
+     *
+     * @return Anonymous value of the operation
+     */
+    public ANONYMOUS getAnonymous();
+
+    enum ANONYMOUS { optional, required, prohibited }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundPortType.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundPortType.java
new file mode 100644
index 00000000000..8398dc8b163
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundPortType.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.model.wsdl;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.api.BindingID;
+import com.sun.xml.internal.ws.api.message.Message;
+
+import javax.xml.namespace.QName;
+
+/**
+ * {@link WSDLPortType} bound with a specific binding.
+ *
+ * @author Vivek Pandey
+ */
+public interface WSDLBoundPortType extends WSDLFeaturedObject, WSDLExtensible {
+    /**
+     * Gets the name of the wsdl:binding@name attribute value as local name and wsdl:definitions@targetNamespace
+     * as the namespace uri.
+     */
+    QName getName();
+
+    /**
+     * Gets the {@link WSDLModel} that owns this port type.
+     */
+    @NotNull WSDLModel getOwner();
+
+    /**
+     * Gets the {@link WSDLBoundOperation} for a given operation name
+     *
+     * @param operationName non-null operationName
+     * @return null if a {@link WSDLBoundOperation} is not found
+     */
+    public WSDLBoundOperation get(QName operationName);
+
+    /**
+     * Gets the wsdl:binding@type value, same as {@link WSDLPortType#getName()}
+     */
+    QName getPortTypeName();
+
+    /**
+     * Gets the {@link WSDLPortType} associated with the wsdl:binding
+     */
+    WSDLPortType getPortType();
+
+    /**
+     * Gets the {@link WSDLBoundOperation}s
+     */
+    Iterable getBindingOperations();
+
+    /**
+     * Returns the binding ID.
+     * This would typically determined by the binding extension elements in wsdl:binding.
+     */
+    BindingID getBindingId();
+
+    /**
+     * Gets the bound operation in this port for a tag name. Here the operation would be the one whose
+     * input part descriptor bound to soap:body is same as the tag name except for rpclit where the tag
+     * name would be {@link WSDLBoundOperation#getName()}.
+     *
+     * 
    
+     * If you have a {@link Message} and trying to figure out which operation it belongs to,
+     * always use {@link Message#getOperation}, as that performs better.
+     *
+     * 
    
+     * For example this can be used in the case when a message receipient can get the
+     * {@link WSDLBoundOperation} from the payload tag name.
+     *
+     * 
    
+     * namespaceUri and the local name both can be null to get the WSDLBoundOperation that has empty body -
+     * there is no payload. According to BP 1.1 in a port there can be at MOST one operation with empty body.
+     * Its an error to have namespace URI non-null but local name as null.
+     *
+     * @param namespaceUri namespace of the payload element.
+     * @param localName local name of the payload
+     * @throws NullPointerException if localName is null and namespaceUri is not.
+     * @return
+     *      null if no operation with the given tag name is found.
+     */
+    @Nullable WSDLBoundOperation getOperation(String namespaceUri, String localName);
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLDescriptorKind.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLDescriptorKind.java
new file mode 100644
index 00000000000..f4f016f565d
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLDescriptorKind.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.model.wsdl;
+
+/**
+ * Enumeration that tells a wsdl:part that can be defined either using a type
+ * attribute or an element attribute.
+ *
+ * @author Vivek Pandey
+ */
+public enum WSDLDescriptorKind {
+    /**
+     * wsdl:part is defined using element attribute.
+     *
+     * 
    +     * for exmaple,
+     * <wsdl:part name="foo" element="ns1:FooElement">
+     * 
    
+     */
+    ELEMENT(0),
+
+    /**
+     * wsdl:part is defined using type attribute.
+     *
+     * 
    +     * for exmaple,
+     * <wsdl:part name="foo" element="ns1:FooType">
+     * 
    
+     */
+    TYPE(1);
+
+    WSDLDescriptorKind(int value) {
+        this.value = value;
+    }
+
+    private final int value;
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtensible.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtensible.java
new file mode 100644
index 00000000000..423b8476741
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtensible.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.model.wsdl;
+
+/**
+ * Interface that represents WSDL concepts that
+ * can have extensions.
+ *
+ * @author Vivek Pandey
+ * @author Kohsuke Kawaguchi
+ */
+public interface WSDLExtensible extends WSDLObject {
+    /**
+     * Gets all the {@link WSDLExtension}s
+     * added through {@link #addExtension(WSDLExtension)}.
+     *
+     * @return
+     *      never null.
+     */
+    Iterable getExtensions();
+
+    /**
+     * Gets all the extensions that is assignable to the given type.
+     *
+     * 
    
+     * This allows clients to find specific extensions in a type-safe
+     * and convenient way.
+     *
+     * @param type
+     *      The type of the extension to obtain. Must not be null.
+     *
+     * @return
+     *      Can be an empty collection but never null.
+     */
+     Iterable getExtensions(Class type);
+
+    /**
+     * Gets the extension that is assignable to the given type.
+     *
+     * 
    
+     * This is just a convenient version that does
+     *
+     * 
    +     * Iterator itr = getExtensions(type);
+     * if(itr.hasNext())  return itr.next();
+     * else               return null;
+     * 
    
+     *
+     * @return
+     *      null if the extension was not found.
+     */
+     T getExtension(Class type);
+
+    /**
+     * Adds a new {@link WSDLExtension}
+     * to this object.
+     *
+     * @param extension
+     *      must not be null.
+     */
+    void addExtension(WSDLExtension extension);
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtension.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtension.java
new file mode 100644
index 00000000000..518793c5a79
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtension.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.model.wsdl;
+
+import javax.xml.namespace.QName;
+
+/**
+ * Represents a WSDL extensibility element or attribute.
+ *
+ * 
    
+ * This interface can be implemented by the programs that build
+ * on top of the JAX-WS RI, to hook additional information into
+ * {@link WSDLModel}.
+ *
+ * @author Vivek Pandey
+ */
+public interface WSDLExtension {
+    /**
+     * Gets the qualified name of the WSDL extensibility element or attribute.
+     *
+     * @return
+     *      must not be null.
+     */
+    public QName getName();
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/spi/runtime/Invoker.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFault.java
similarity index 62%
rename from jaxws/src/share/classes/com/sun/xml/internal/ws/spi/runtime/Invoker.java
rename to jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFault.java
index e26a43cd1eb..e435aa0ef66 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/spi/runtime/Invoker.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFault.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,28 +22,27 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-package com.sun.xml.internal.ws.spi.runtime;
 
-import java.lang.reflect.Method;
-import javax.xml.namespace.QName;
+package com.sun.xml.internal.ws.api.model.wsdl;
 
 /**
- * Complete invocation of webservice can be done using this object. So this
- * object can be wrapped in other blocks to provide certain context(for e.g.
- * can be wrapped in doAsPrivileged())
+ * Abstracts wsdl:portType/wsdl:operation/wsdl:fault
  *
- * @author WS Development Team
+ * @author Vivek Pandey
  */
-public interface Invoker {
+public interface WSDLFault extends WSDLObject, WSDLExtensible {
     /**
-     * Invokes request handler chain, endpoint, response handler chain
+     * Gives wsdl:fault@name value
      */
-    public void invoke() throws Exception;
+    String getName();
 
     /**
-     * It gives java methods for a give operation name
+     * Gives the WSDLMessage corresponding to wsdl:fault@message
+     * This method should not be called before the entire WSDLModel is built. Basically after the WSDLModel is built
+     * all the references are resolve in a post processing phase. IOW, the WSDL extensions should
+     * not call this method.
      *
-     * @return corresponding java method for operation name, otherwise null
+     * @return Always returns null when called from inside WSDL extensions.
      */
-    public Method getMethod(QName name);
+    WSDLMessage getMessage();
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFeaturedObject.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFeaturedObject.java
new file mode 100644
index 00000000000..4911ec9e2e5
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFeaturedObject.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.model.wsdl;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.api.WSFeatureList;
+import com.sun.xml.internal.ws.api.wsdl.parser.WSDLParserExtension;
+
+import javax.xml.ws.Dispatch;
+import javax.xml.ws.WebServiceFeature;
+
+/**
+ * {@link WSDLObject} that can have features associated with it.
+ *
+ * 
    
+ * {@link WSDLParserExtension}s can add features to this object,
+ * which will then be incorporated when {@link Dispatch}s and
+ * proxies are created for the port.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public interface WSDLFeaturedObject extends WSDLObject {
+
+    @Nullable
+     F getFeature(@NotNull Class featureType);
+
+    /**
+     * Gets the feature list associated with this object.
+     */
+    @NotNull WSFeatureList getFeatures();
+
+    /**
+     * Enables a {@link WebServiceFeature} based upon policy assertions on this port.
+     * This method would be called during WSDL parsing by WS-Policy code.
+     */
+    void addFeature(@NotNull WebServiceFeature feature);
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/spi/runtime/MessageContext.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLInput.java
similarity index 52%
rename from jaxws/src/share/classes/com/sun/xml/internal/ws/spi/runtime/MessageContext.java
rename to jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLInput.java
index 4a3158ec121..b2e0af81561 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/spi/runtime/MessageContext.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLInput.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,46 +22,40 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-package com.sun.xml.internal.ws.spi.runtime;
 
-import java.lang.reflect.Method;
+package com.sun.xml.internal.ws.api.model.wsdl;
 
 /**
- * Enhanced API' MessageContext with some extra properties
+ * Abstraction of wsdl:portType/wsdl:operation/wsdl:input
+ *
+ * @author Vivek Pandey
  */
-public interface MessageContext extends javax.xml.ws.handler.MessageContext {
+public interface WSDLInput extends WSDLObject, WSDLExtensible {
     /**
-     * Returns binding id defined in API
-     * @return bindingId is one of these values:
-     * javax.xml.ws.soap.SOAPBinding.SOAP11HTTP_BINDING,
-     * javax.xml.ws.soap.SOAPBinding.SOAP12HTTP_BINDING,
-     * javax.xml.ws.http.HTTPBinding.HTTP_BINDING
+     * Gives the wsdl:portType/wsdl:operation/wsdl:input@name
      */
-    public String getBindingId();
+    String getName();
 
     /**
-     * Returns the invocation method.
+     * Gives the WSDLMessage corresponding to wsdl:input@message
+     * 
    
+     * This method should not be called before the entire WSDLModel is built. Basically after the WSDLModel is built
+     * all the references are resolve in a post processing phase. IOW, the WSDL extensions should
+     * not call this method.
      *
-     * @return invocation method, null if the model doesn't know
+     * @return Always returns null when called from inside WSDL extensions.
      */
-    public Method getMethod();
+    WSDLMessage getMessage();
 
     /**
-     * Sets cannonicalization algorithm that is used while writing JAXB objects
+     * Gives the Action Message Addressing Property value for
+     * {@link this} message.
+     * 
    
+     * This method provides the correct value irrespective of
+     * whether the Action is explicitly specified in the WSDL or
+     * implicitly derived using the rules defined in WS-Addressing.
      *
+     * @return Action
      */
-    public void setCanonicalization(String algorithm);
-
-    /**
-     * Returns the Invoker
-     *
-     * @return Invoker
-     */
-    public Invoker getInvoker();
-
-    /**
-     * Returns if MTOM is anbled
-     * @return true if MTOM is enabled otherwise returns false;
-     */
-    public boolean isMtomEnabled();
+    String getAction();
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/prop/AttributeProp.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLMessage.java
similarity index 78%
rename from jaxws/src/share/classes/com/sun/tools/internal/txw2/model/prop/AttributeProp.java
rename to jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLMessage.java
index d8c2fe86d14..2cba1354495 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/prop/AttributeProp.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,17 +23,18 @@
  * have any questions.
  */
 
-package com.sun.tools.internal.txw2.model.prop;
-
-import com.sun.codemodel.JType;
+package com.sun.xml.internal.ws.api.model.wsdl;
 
 import javax.xml.namespace.QName;
 
 /**
- * @author Kohsuke Kawaguchi
+ * Abstraction of wsdl:message.
+ *
+ * @author Vivek Pandey
  */
-public final class AttributeProp extends XmlItemProp {
-    public AttributeProp(QName name, JType valueType) {
-        super(name, valueType);
-    }
+public interface WSDLMessage extends WSDLObject, WSDLExtensible {
+    /**
+     * Gives wsdl:message@name value.
+     */
+    QName getName();
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLModel.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLModel.java
new file mode 100644
index 00000000000..7c948a11ea5
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLModel.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.model.wsdl;
+
+
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.ws.api.wsdl.parser.WSDLParserExtension;
+import com.sun.xml.internal.ws.api.wsdl.parser.XMLEntityResolver;
+import com.sun.xml.internal.ws.wsdl.parser.RuntimeWSDLParser;
+import org.xml.sax.SAXException;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * Provides abstraction of wsdl:definitions.
+ *
+ * @author Vivek Pandey
+ */
+public interface WSDLModel extends WSDLExtensible {
+    /**
+     * Gets {@link WSDLPortType} that models wsdl:portType
+     *
+     * @param name non-null quaified name of wsdl:message, where the localName is the value of wsdl:portType@name and
+     *             the namespaceURI is the value of wsdl:definitions@targetNamespace
+     * @return A {@link com.sun.xml.internal.ws.api.model.wsdl.WSDLPortType} or null if no wsdl:portType found.
+     */
+    WSDLPortType getPortType(@NotNull QName name);
+
+    /**
+     * Gets {@link WSDLBoundPortType} that models wsdl:binding
+     *
+     * @param name non-null quaified name of wsdl:binding, where the localName is the value of wsdl:binding@name and
+     *             the namespaceURI is the value of wsdl:definitions@targetNamespace
+     * @return A {@link WSDLBoundPortType} or null if no wsdl:binding found
+     */
+    WSDLBoundPortType getBinding(@NotNull QName name);
+
+    /**
+     * Give a {@link WSDLBoundPortType} for the given wsdl:service and wsdl:port names.
+     *
+     * @param serviceName service QName
+     * @param portName    port QName
+     * @return A {@link WSDLBoundPortType}. null if the Binding for the given wsd:service and wsdl:port name are not
+     *         found.
+     */
+    WSDLBoundPortType getBinding(@NotNull QName serviceName, @NotNull QName portName);
+
+    /**
+     * Gets {@link WSDLService} that models wsdl:service
+     *
+     * @param name non-null quaified name of wsdl:service, where the localName is the value of wsdl:service@name and
+     *             the namespaceURI is the value of wsdl:definitions@targetNamespace
+     * @return A {@link WSDLService} or null if no wsdl:service found
+     */
+    WSDLService getService(@NotNull QName name);
+
+    /**
+     * Gives a {@link Map} of wsdl:portType {@link QName} and {@link WSDLPortType}
+     *
+     * @return an empty Map if the wsdl document has no wsdl:portType
+     */
+    @NotNull Map getPortTypes();
+
+    /**
+     * Gives a {@link Map} of wsdl:binding {@link QName} and {@link WSDLBoundPortType}
+     *
+     * @return an empty Map if the wsdl document has no wsdl:binding
+     */
+    @NotNull Map getBindings();
+
+    /**
+     * Gives a {@link Map} of wsdl:service qualified name and {@link com.sun.xml.internal.ws.api.model.wsdl.WSDLService}
+     *
+     * @return an empty Map if the wsdl document has no wsdl:service
+     */
+    @NotNull Map getServices();
+
+    /**
+     * Main purpose of this class is to  parsing of a WSDL and get the {@link WSDLModel} from it.
+     */
+    public class WSDLParser{
+       /**
+         * Parses WSDL from the given wsdlLoc and gives a {@link WSDLModel} built from it.
+         *
+         * @param wsdlEntityParser  Works like an entityResolver to resolve WSDLs
+         * @param resolver  {@link XMLEntityResolver}, works at XML infoset level
+         * @param isClientSide  true - its invoked on the client, false means its invoked on the server
+         * @param extensions var args of {@link com.sun.xml.internal.ws.api.wsdl.parser.WSDLParserExtension}s
+         * @return A {@link WSDLModel} built from the given wsdlLocation}
+         * @throws java.io.IOException
+         * @throws javax.xml.stream.XMLStreamException
+         * @throws org.xml.sax.SAXException
+         */
+        public static @NotNull WSDLModel parse(XMLEntityResolver.Parser wsdlEntityParser, XMLEntityResolver resolver, boolean isClientSide, WSDLParserExtension... extensions) throws IOException, XMLStreamException, SAXException {
+            return RuntimeWSDLParser.parse(wsdlEntityParser, resolver, isClientSide, extensions);
+        }
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/Empty.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLObject.java
similarity index 72%
rename from jaxws/src/share/classes/com/sun/tools/internal/txw2/model/Empty.java
rename to jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLObject.java
index 4c209a4427a..916a773f359 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/Empty.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,23 +23,21 @@
  * have any questions.
  */
 
-package com.sun.tools.internal.txw2.model;
+package com.sun.xml.internal.ws.api.model.wsdl;
 
-import com.sun.codemodel.JDefinedClass;
-import com.sun.tools.internal.txw2.model.prop.Prop;
+import com.sun.istack.internal.NotNull;
 import org.xml.sax.Locator;
 
-import java.util.Set;
-
 /**
- * @author Kohsuke Kawaguchi
+ * Marker interface serves as base interface for the wsdl model
+ * @author Vivek Pandey
  */
-public class Empty extends Leaf {
-    public Empty(Locator location) {
-        super(location);
-    }
-
-    void generate(JDefinedClass clazz, NodeSet nset, Set props) {
-        // noop
-    }
+public interface WSDLObject {
+    /**
+     * Gets the source location information in the parsed WSDL.
+     *
+     * This is useful when producing error messages.
+     */
+    @NotNull
+    Locator getLocation();
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOperation.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOperation.java
new file mode 100644
index 00000000000..76a8ba3c9c9
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOperation.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.model.wsdl;
+
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLExtensible;
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+
+import javax.xml.namespace.QName;
+
+/**
+ * Provides abstraction of wsdl:portType/wsdl:operation.
+ *
+ * @author Vivek Pandey
+ */
+public interface WSDLOperation extends WSDLObject, WSDLExtensible {
+    /**
+     * Gets the name of the wsdl:portType/wsdl:operation@name attribute value as local name and wsdl:definitions@targetNamespace
+     * as the namespace uri.
+     */
+    @NotNull QName getName();
+
+    /**
+     * Gets the wsdl:input of this operation
+     */
+    @NotNull WSDLInput getInput();
+
+    /**
+     * Gets the wsdl:output of this operation.
+     *
+     * @return
+     *      null if this is an one-way operation.
+     */
+    @Nullable WSDLOutput getOutput();
+
+
+
+    /**
+     * Returns true if this operation is an one-way operation.
+     */
+    boolean isOneWay();
+
+    /**
+     * Gets the {link WSDLFault} corresponding to wsdl:fault of this operation.
+     */
+    Iterable getFaults();
+
+    /**
+     * Gives {@link WSDLFault} for the given soap fault detail value.
+     *
+     * 
    +     *
+     * Given a wsdl fault:
+     *
+     * <wsdl:message nae="faultMessage">
+     *  <wsdl:part name="fault" element="ns:myException/>
+     * </wsdl:message>
+     *
+     * <wsdl:portType>
+     *  <wsdl:operation ...>
+     *      <wsdl:fault name="aFault" message="faultMessage"/>
+     *  </wsdl:operation>
+     * <wsdl:portType>
+     *
+     *
+     * For example given a soap 11 soap message:
+     *
+     * <soapenv:Fault>
+     *      ...
+     *      <soapenv:detail>
+     *          <ns:myException>
+     *              ...
+     *          </ns:myException>
+     *      </soapenv:detail>
+     *
+     * QName faultQName = new QName(ns, "myException");
+     * WSDLFault wsdlFault  = getFault(faultQName);
+     *
+     * The above call will return a WSDLFault that abstracts wsdl:portType/wsdl:operation/wsdl:fault.
+     *
+     * 
    
+     *
+     * @param faultDetailName tag name of the element inside soaenv:Fault/detail/, must be non-null.
+     * @return returns null if a wsdl fault corresponding to the detail entry name not found.
+     */
+    @Nullable WSDLFault getFault(QName faultDetailName);
+
+    /**
+     * Gives the enclosing wsdl:portType@name attribute value.
+     */
+    @NotNull QName getPortTypeName();
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/spi/runtime/SOAPMessageContext.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOutput.java
similarity index 51%
rename from jaxws/src/share/classes/com/sun/xml/internal/ws/spi/runtime/SOAPMessageContext.java
rename to jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOutput.java
index c6bc173d48f..a39cb2c91ab 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/spi/runtime/SOAPMessageContext.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOutput.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,45 +22,40 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-package com.sun.xml.internal.ws.spi.runtime;
-import java.util.List;
+
+package com.sun.xml.internal.ws.api.model.wsdl;
 
 /**
- * This enhances API's SOAPMessageContext and provides internal representation
- * of SOAPMessage so that it can be encoded optimally
+ * Abstraction of wsdl:portType/wsdl:operation/wsdl:output
+ *
+ * @author Vivek Pandey
  */
-public interface SOAPMessageContext
-    extends javax.xml.ws.handler.soap.SOAPMessageContext, MessageContext {
-
+public interface WSDLOutput extends WSDLObject, WSDLExtensible {
     /**
-     * If there is a SOAPMessage already, use getSOAPMessage(). Ignore all other methods
-     * @return
+     * Gives the wsdl:portType/wsdl:operation/wsdl:output@name
      */
-    public boolean isAlreadySoap();
+    String getName();
 
     /**
-     * Returns InternalMessage's BodyBlock value
-     * @return
-     */
-    public Object getBody();
-
-    /**
-     * Returns InternalMessage's HeaderBlock values
-     * @return
-     */
-    public List getHeaders();
-
-    /**
-     * Use this object to pass to InternalSoapEncoder write methods
-     * @return object containg information thats used by InternalEncoderDecoder write methods.
+     * Gives the WSDLMessage corresponding to wsdl:output@message
+     * 
    
+     * This method should not be called before the entire WSDLModel is built. Basically after the WSDLModel is built
+     * all the references are resolve in a post processing phase. IOW, the WSDL extensions should
+     * not call this method.
      *
+     * @return Always returns null when called from inside WSDL extensions.
      */
-    public Object getMessageInfo();
+    WSDLMessage getMessage();
 
     /**
-     * Returns to marshall all JAXWS objects: RpcLitPayload, JAXBBridgeInfo etc
-     * @return
+     * Gives the Action Message Addressing Property value for
+     * {@link this} message.
+     * 
    
+     * This method provides the correct value irrespective of
+     * whether the Action is explicitly specified in the WSDL or
+     * implicitly derived using the rules defined in WS-Addressing.
+     *
+     * @return Action
      */
-    public InternalSoapEncoder getEncoder();
-
+    String getAction();
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPart.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPart.java
new file mode 100644
index 00000000000..08ab97d765d
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPart.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.model.wsdl;
+
+import com.sun.xml.internal.ws.api.model.ParameterBinding;
+
+/**
+ * Abstracts wsdl:part after applying binding information from wsdl:binding.
+ *
+ * @author Vivek Pandey
+ */
+public interface WSDLPart extends WSDLObject {
+    /**
+     * Gets wsdl:part@name attribute value.
+     */
+    String getName();
+
+    /**
+     * Gets the wsdl:part binding as seen thru wsdl:binding
+     */
+    ParameterBinding getBinding();
+
+    /**
+     * Index value is as the order in which the wsdl:part appears inside the input or output wsdl:message.
+     * @return n where n >= 0
+     */
+    int getIndex();
+
+    /**
+     * Gives the XML Schema descriptor referenced using either wsdl:part@element or wsdl:part@type.
+     */
+    public WSDLPartDescriptor getDescriptor();
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/internal/HeaderBlock.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPartDescriptor.java
similarity index 69%
rename from jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/internal/HeaderBlock.java
rename to jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPartDescriptor.java
index cb24f7a3ad4..d183b6efd95 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/internal/HeaderBlock.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPartDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,27 +22,25 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-package com.sun.xml.internal.ws.encoding.soap.internal;
 
-import com.sun.xml.internal.ws.encoding.jaxb.JAXBBridgeInfo;
+package com.sun.xml.internal.ws.api.model.wsdl;
+
 import javax.xml.namespace.QName;
 
 /**
- * @author WS Development Team
+ * Abstracts wsdl:part descriptor that is defined using element or type attribute.
+ *
+ * @author Vivek Pandey
  */
-public class HeaderBlock {
+public interface WSDLPartDescriptor extends WSDLObject {
+    /**
+     * Gives Qualified name of the XML Schema element or type
+     */
+    public QName name();
 
-    private JAXBBridgeInfo value;
+    /**
+     * Gives whether wsdl:part references a schema type or a global element.
+     */
+    public WSDLDescriptorKind type();
 
-    public HeaderBlock(JAXBBridgeInfo bridgeInfo) {
-        this.value = bridgeInfo;
-    }
-
-    public Object getValue() {
-        return value;
-    }
-
-    public QName getName() {
-        return value.getName();
-    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/internal/MessageBlock.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPort.java
similarity index 58%
rename from jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/internal/MessageBlock.java
rename to jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPort.java
index f52633acbba..652247a18d0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/soap/internal/MessageBlock.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPort.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,54 +22,46 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-package com.sun.xml.internal.ws.encoding.soap.internal;
+
+package com.sun.xml.internal.ws.api.model.wsdl;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.ws.api.EndpointAddress;
 
 import javax.xml.namespace.QName;
 
 /**
- * @author WS Development Team
+ * Abstracts wsdl:service/wsdl:port
+ *
+ * @author Vivek Pandey
  */
-public class MessageBlock {
-    protected QName _name;
-    protected Object _value;
-
-    public MessageBlock() {
-    }
-
-    public MessageBlock(QName name, Object value) {
-        _name = name;
-        _value = value;
-    }
-
-    public MessageBlock(QName name) {
-        _name = name;
-    }
+public interface WSDLPort extends WSDLFeaturedObject, WSDLExtensible {
+    /**
+     * Gets wsdl:port@name attribute value as local name and wsdl:definitions@targetNamespace
+     * as the namespace uri.
+     */
+    QName getName();
 
     /**
-     * @return the value of this block
+     * Gets {@link WSDLBoundPortType} associated with the {@link WSDLPort}.
      */
-    public Object getValue() {
-        return _value;
-    }
+    @NotNull
+    WSDLBoundPortType getBinding();
 
     /**
-     * @param element
+     * Gets endpoint address of this port.
+     *
+     * @return
+     *      always non-null.
      */
-    public void setValue(Object element) {
-        _value = element;
-    }
+    EndpointAddress getAddress();
 
     /**
-     * @return the QName of this block
+     * Gets the {@link WSDLService} that owns this port.
+     *
+     * @return
+     *      always non-null.
      */
-    public QName getName() {
-        return _name;
-    }
-
-    /**
-     * @param name
-     */
-    public void setName(QName name) {
-        _name = name;
-    }
+    @NotNull
+    WSDLService getOwner();
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPortType.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPortType.java
new file mode 100644
index 00000000000..3407bc280c3
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPortType.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.model.wsdl;
+
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLExtensible;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLOperation;
+
+import javax.xml.namespace.QName;
+
+/**
+ * Abstraction of wsdl:portType.
+ *
+ * @author Vivek Pandey
+ */
+public interface WSDLPortType extends WSDLObject, WSDLExtensible {
+    /**
+     * Gets the name of the wsdl:portType@name attribute value as local name and wsdl:definitions@targetNamespace
+     * as the namespace uri.
+     */
+    public QName getName();
+
+    /**
+     * Gets the {@link WSDLOperation} for a given operation name
+     *
+     * @param operationName non-null operationName
+     * @return null if a {@link WSDLOperation} is not found
+     */
+    public WSDLOperation get(String operationName);
+
+
+    /**
+     * Gets {@link Iterable}<{$link WSDLOperation}>
+     */
+    public Iterable getOperations();
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLService.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLService.java
new file mode 100644
index 00000000000..78fa22cd76d
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLService.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.model.wsdl;
+
+import com.sun.istack.internal.NotNull;
+
+import javax.xml.namespace.QName;
+
+/**
+ * Abstracts wsdl:service.
+ *
+ * @author Vivek Pandey
+ */
+public interface WSDLService extends WSDLObject, WSDLExtensible {
+    /**
+     * Gets the {@link WSDLModel} that owns this service.
+     */
+    @NotNull
+    WSDLModel getParent();
+
+    /**
+     * Gets the name of the wsdl:service@name attribute value as local name and wsdl:definitions@targetNamespace
+     * as the namespace uri.
+     */
+    @NotNull
+    QName getName();
+
+    /**
+     * Gets the {@link WSDLPort} for a given port name
+     *
+     * @param portName non-null operationName
+     * @return null if a {@link WSDLPort} is not found
+     */
+    WSDLPort get(QName portName);
+
+    /**
+     * Gets the first {@link WSDLPort} if any, or otherwise null.
+     */
+    WSDLPort getFirstPort();
+
+    /**
+     * Gives all the {@link WSDLPort} in a wsdl:service {@link WSDLService}
+     */
+    Iterable getPorts();
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/pept/presentation/Stub.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/package-info.java
similarity index 59%
rename from jaxws/src/share/classes/com/sun/xml/internal/ws/pept/presentation/Stub.java
rename to jaxws/src/share/classes/com/sun/xml/internal/ws/api/package-info.java
index 2667efbdda4..bdc4e22baf1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/pept/presentation/Stub.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,44 +22,25 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/** Java interface "Stub.java" generated from Poseidon for UML.
- *  Poseidon for UML is developed by Gentleware.
- *  Generated with velocity template engine.
- */
-package com.sun.xml.internal.ws.pept.presentation;
-
-import com.sun.xml.internal.ws.pept.Delegate;
 
 /**
+ * JAX-WS RI extension of JAX-WS API.
+ *
  * 
    
+ * This package hosts classes/interfaces that directly extend
+ * the JAX-WS API. Sometimes objects of these types are passed
+ * to external components from higher layers, only to be passed
+ * back into other parts of the JAX-WS RI.
+ * By defining these types, we improve the type-safety in
+ * this scenario, while isolating the actual implementation classes.
  *
- * @author Dr. Harold Carr
- * 
    
- */
-public interface Stub {
-
-  ///////////////////////////////////////
-  // operations
-
-/**
  * 
    
- * Does ...
- * 
    
+ * Sometimes these types also define additional methods.
  *
- * 
    
- *
- * @param delegate ...
- * 
    
- */
-    public void _setDelegate(Delegate delegate);
-/**
  * 
    
- * Does ...
- * 
    
- *
- * @return a Delegate with ...
- * 
    
+ * Types defined in package can only be implemented by the JAX-WS RI.
+ * The code internal to the JAX-WS RI may safely case instances
+ * of these types to their implementation classes. This warning doesn't
+ * apply to subpackages.
  */
-    public Delegate _getDelegate();
-
-} // end Stub
+package com.sun.xml.internal.ws.api;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ClientPipeAssemblerContext.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ClientPipeAssemblerContext.java
new file mode 100644
index 00000000000..4f6ed00c115
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ClientPipeAssemblerContext.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.pipe;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.ws.api.EndpointAddress;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.WSService;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
+import com.sun.xml.internal.ws.api.pipe.helper.PipeAdapter;
+import com.sun.xml.internal.ws.api.server.Container;
+
+import java.io.PrintStream;
+
+/**
+ * Factory for well-known {@link Pipe} implementations
+ * that the {@link PipelineAssembler} needs to use
+ * to satisfy JAX-WS requirements.
+ *
+ * @author Kohsuke Kawaguchi
+ * @deprecated Use {@link ClientTubeAssemblerContext}.
+ */
+public final class ClientPipeAssemblerContext extends ClientTubeAssemblerContext {
+
+    public ClientPipeAssemblerContext(@NotNull EndpointAddress address, @NotNull WSDLPort wsdlModel, @NotNull WSService rootOwner, @NotNull WSBinding binding) {
+        this(address, wsdlModel, rootOwner, binding, Container.NONE);
+    }
+
+    public ClientPipeAssemblerContext(@NotNull EndpointAddress address, @NotNull WSDLPort wsdlModel,
+                                      @NotNull WSService rootOwner, @NotNull WSBinding binding,
+                                      @NotNull Container container) {
+        super(address, wsdlModel, rootOwner, binding, container);
+    }
+
+    /**
+     * creates a {@link Pipe} that dumps messages that pass through.
+     */
+    public Pipe createDumpPipe(String name, PrintStream out, Pipe next) {
+        return PipeAdapter.adapt(super.createDumpTube(name, out, PipeAdapter.adapt(next)));
+    }
+
+    /**
+     * Creates a {@link Pipe} that performs WS-Addressig processing.
+     * This pipe should be before {@link com.sun.xml.internal.ws.protocol.soap.ClientMUTube}.
+     */
+    public Pipe createWsaPipe(Pipe next) {
+        return PipeAdapter.adapt(super.createWsaTube(PipeAdapter.adapt(next)));
+    }
+
+    /**
+     * Creates a {@link Pipe} that performs SOAP mustUnderstand processing.
+     * This pipe should be before HandlerPipes.
+     */
+    public Pipe createClientMUPipe(Pipe next) {
+        return PipeAdapter.adapt(super.createClientMUTube(PipeAdapter.adapt(next)));
+    }
+
+    /**
+     * Creates a {@link Pipe} that invokes protocol and logical handlers.
+     */
+    public Pipe createHandlerPipe(Pipe next) {
+        return PipeAdapter.adapt(super.createHandlerTube(PipeAdapter.adapt(next)));
+    }
+
+    /**
+     * Creates a {@link Tube} that adds container specific security
+     */
+    public @NotNull Pipe createSecurityPipe(@NotNull Pipe next) {
+        return PipeAdapter.adapt(super.createSecurityTube(PipeAdapter.adapt(next)));
+    }
+
+    /**
+     * Creates a transport pipe (for client), which becomes the terminal pipe.
+     */
+    public Pipe createTransportPipe() {
+        return PipeAdapter.adapt(super.createTransportTube());
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ClientTubeAssemblerContext.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ClientTubeAssemblerContext.java
new file mode 100644
index 00000000000..da7cd48191a
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ClientTubeAssemblerContext.java
@@ -0,0 +1,231 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.pipe;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.addressing.WsaClientTube;
+import com.sun.xml.internal.ws.api.EndpointAddress;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.WSService;
+import com.sun.xml.internal.ws.api.addressing.AddressingVersion;
+import com.sun.xml.internal.ws.api.client.ClientPipelineHook;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
+import com.sun.xml.internal.ws.api.pipe.helper.PipeAdapter;
+import com.sun.xml.internal.ws.api.server.Container;
+import com.sun.xml.internal.ws.binding.BindingImpl;
+import com.sun.xml.internal.ws.handler.ClientLogicalHandlerTube;
+import com.sun.xml.internal.ws.handler.ClientSOAPHandlerTube;
+import com.sun.xml.internal.ws.handler.HandlerTube;
+import com.sun.xml.internal.ws.protocol.soap.ClientMUTube;
+import com.sun.xml.internal.ws.transport.DeferredTransportPipe;
+import com.sun.xml.internal.ws.util.pipe.DumpTube;
+
+import javax.xml.ws.soap.SOAPBinding;
+import java.io.PrintStream;
+
+/**
+ * Factory for well-known {@link Tube} implementations
+ * that the {@link TubelineAssembler} needs to use
+ * to satisfy JAX-WS requirements.
+ *
+ * @author Jitendra Kotamraju
+ */
+public class ClientTubeAssemblerContext {
+
+    private final @NotNull EndpointAddress address;
+    private final @NotNull WSDLPort wsdlModel;
+    private final @NotNull WSService rootOwner;
+    private final @NotNull WSBinding binding;
+    private final @NotNull Container container;
+    private @NotNull Codec codec;
+
+    public ClientTubeAssemblerContext(@NotNull EndpointAddress address, @NotNull WSDLPort wsdlModel, @NotNull WSService rootOwner, @NotNull WSBinding binding) {
+        this(address, wsdlModel, rootOwner, binding, Container.NONE);
+    }
+
+    public ClientTubeAssemblerContext(@NotNull EndpointAddress address, @NotNull WSDLPort wsdlModel,
+                                      @NotNull WSService rootOwner, @NotNull WSBinding binding,
+                                      @NotNull Container container, Codec codec) {
+        this.address = address;
+        this.wsdlModel = wsdlModel;
+        this.rootOwner = rootOwner;
+        this.binding = binding;
+        this.container = container;
+        this.codec = codec;
+    }
+
+    public ClientTubeAssemblerContext(@NotNull EndpointAddress address, @NotNull WSDLPort wsdlModel,
+                                      @NotNull WSService rootOwner, @NotNull WSBinding binding,
+                                      @NotNull Container container) {
+        // WSBinding is actually BindingImpl
+        this(address, wsdlModel, rootOwner, binding, container, ((BindingImpl)binding).createCodec() );
+    }
+
+    /**
+     * The endpoint address. Always non-null. This parameter is taken separately
+     * from {@link com.sun.xml.internal.ws.api.model.wsdl.WSDLPort} (even though there's {@link com.sun.xml.internal.ws.api.model.wsdl.WSDLPort#getAddress()})
+     * because sometimes WSDL is not available.
+     */
+    public @NotNull EndpointAddress getAddress() {
+        return address;
+    }
+
+    /**
+     * The created pipeline will be used to serve this port.
+     * Null if the service isn't associated with any port definition in WSDL,
+     * and otherwise non-null.
+     */
+    public @Nullable WSDLPort getWsdlModel() {
+        return wsdlModel;
+    }
+
+    /**
+     * The pipeline is created for this {@link com.sun.xml.internal.ws.api.WSService}.
+     * Always non-null. (To be precise, the newly created pipeline
+     * is owned by a proxy or a dispatch created from thsi {@link com.sun.xml.internal.ws.api.WSService}.)
+     */
+    public @NotNull WSService getService() {
+        return rootOwner;
+    }
+
+    /**
+     * The binding of the new pipeline to be created.
+     */
+    public @NotNull WSBinding getBinding() {
+        return binding;
+    }
+
+    /**
+     * Returns the Container in which the client is running
+     *
+     * @return Container in which client is running
+     */
+    public Container getContainer() {
+        return container;
+    }
+
+    /**
+     * creates a {@link Tube} that dumps messages that pass through.
+     */
+    public Tube createDumpTube(String name, PrintStream out, Tube next) {
+        return new DumpTube(name, out, next);
+    }
+
+    /**
+     * Creates a {@link Tube} that adds container specific security
+     */
+    public @NotNull Tube createSecurityTube(@NotNull Tube next) {
+        ClientPipelineHook hook = container.getSPI(ClientPipelineHook.class);
+        if (hook != null) {
+            ClientPipeAssemblerContext ctxt = new ClientPipeAssemblerContext(address, wsdlModel,
+                                      rootOwner, binding, container);
+            return PipeAdapter.adapt(hook.createSecurityPipe(ctxt, PipeAdapter.adapt(next)));
+        }
+        return next;
+    }
+
+    /**
+     * Creates a {@link Tube} that invokes protocol and logical handlers.
+     */
+    public Tube createWsaTube(Tube next) {
+        if (binding instanceof SOAPBinding && AddressingVersion.isEnabled(binding) && wsdlModel!=null)
+            return new WsaClientTube(wsdlModel, binding, next);
+        else
+            return next;
+    }
+
+    /**
+     * Creates a {@link Tube} that invokes protocol and logical handlers.
+     */
+    public Tube createHandlerTube(Tube next) {
+        HandlerTube soapHandlerTube = null;
+        //XML/HTTP Binding can have only LogicalHandlerPipe
+        if (binding instanceof SOAPBinding) {
+            soapHandlerTube = new ClientSOAPHandlerTube(binding, wsdlModel, next);
+            next = soapHandlerTube;
+        }
+        return new ClientLogicalHandlerTube(binding, next, soapHandlerTube);
+    }
+
+    /**
+     * Creates a {@link Tube} that performs SOAP mustUnderstand processing.
+     * This pipe should be before HandlerPipes.
+     */
+    public Tube createClientMUTube(Tube next) {
+        if(binding instanceof SOAPBinding)
+            return new ClientMUTube(binding,next);
+        else
+            return next;
+    }
+
+    /**
+     * Creates a transport pipe (for client), which becomes the terminal pipe.
+     */
+    public Tube createTransportTube() {
+        ClassLoader cl = Thread.currentThread().getContextClassLoader();
+
+        // wsgen generates a WSDL with the address attribute that says "REPLACE_WITH_ACTUAL_URL".
+        // while it's technically correct to reject such address (since there's no transport registered
+        // with it), it's desirable to allow the user a benefit of doubt, and wait until the runtime
+        // to see if the user configures the endpoint address through request context.
+        // DeferredTransportPipe is used for this purpose.
+        //
+        // Ideally, we shouldn't have @address at all for such cases, but due to the backward
+        // compatibility and the fact that this attribute is mandatory, we have no option but
+        // to check for REPLACE_WITH_ACTUAL_URL.
+        if(address.toString().equals("") || address.toString().equals("REPLACE_WITH_ACTUAL_URL"))
+            return new DeferredTransportPipe(cl,this);
+
+        return TransportTubeFactory.create(cl, this);
+    }
+
+    /**
+     * Gets the {@link Codec} that is set by {@link #setCodec} or the default codec
+     * based on the binding.
+     *
+     * @return codec to be used for web service requests
+     */
+    public @NotNull Codec getCodec() {
+        return codec;
+    }
+
+    /**
+     * Interception point to change {@link Codec} during {@link Tube}line assembly. The
+     * new codec will be used by jax-ws client runtime for encoding/decoding web service
+     * request/response messages. The new codec should be used by the transport tubes.
+     *
+     * 
    
+     * the codec should correctly implement {@link Codec#copy} since it is used while
+     * serving requests concurrently.
+     *
+     * @param codec codec to be used for web service requests
+     */
+    public void setCodec(@NotNull Codec codec) {
+        this.codec = codec;
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Codec.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Codec.java
new file mode 100644
index 00000000000..ff2d73ccf67
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Codec.java
@@ -0,0 +1,238 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.api.pipe;
+
+import com.sun.xml.internal.ws.api.BindingID;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.message.Message;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.server.EndpointAwareCodec;
+
+import javax.xml.stream.XMLStreamWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritableByteChannel;
+
+/**
+ * Encodes a {@link Message} (its XML infoset and attachments) to a sequence of bytes.
+ *
+ * 
    
+ * This interface provides pluggability for different ways of encoding XML infoset,
+ * such as plain XML (plus MIME attachments), XOP, and FastInfoset.
+ *
+ * 
    
+ * Transport usually needs a MIME content type of the encoding, so the {@link Codec}
+ * interface is designed to return this information. However, for some encoding
+ * (such as XOP), the encoding may actually change based on the actual content of
+ * {@link Message}, therefore the codec returns the content type as a result of encoding.
+ *
+ * 
    
+ * {@link Codec} does not produce transport-specific information, such as HTTP headers.
+ *
+ * 
    
+ * {@link Codec} is a non-reentrant object, meaning no two threads
+ * can concurrently invoke the decode method. This allows the implementation
+ * to easily reuse parser objects (as instance variables), which are costly otherwise.
+ *
+ *
+ * 
    
+ * {@link BindingID} determines the {@link Codec}. See {@link BindingID#createEncoder(WSBinding)}.
+ *
+ * @author Kohsuke Kawaguchi
+ * @see EndpointAwareCodec
+ */
+public interface Codec {
+
+    /**
+     * Get the MIME type associated with this Codec.
+     * 
    
+     * If available the MIME type will represent the media that the codec
+     * encodes and decodes.
+     *
+     * The MIME type returned will be the most general representation independent
+     * of an instance of this MIME type utilized as a MIME content-type.
+     *
+     * @return
+     *      null if the MIME type can't be determined by the Codec
+     *      implementation. Otherwise the MIME type is returned.
+     */
+    public String getMimeType();
+
+    /**
+     * If the MIME content-type of the encoding is known statically
+     * then this method returns it.
+     *
+     * 
    
+     * Transports often need to write the content type before it writes
+     * the message body, and since the encode method returns the content type
+     * after the body is written, it requires a buffering.
+     *
+     * For those {@link Codec}s that always use a constant content type,
+     * This method allows a transport to streamline the write operation.
+     *
+     * @return
+     *      null if the content-type can't be determined in short of
+     *      encodin the packet. Otherwise content type for this {@link Packet},
+     *      such as "application/xml".
+     */
+    ContentType getStaticContentType(Packet packet);
+
+    /**
+     * Encodes an XML infoset portion of the {@link Message}
+     * (from <soap:Envelope> to </soap:Envelope>).
+     *
+     * 
    
+     * Internally, this method is most likely invoke {@link Message#writeTo(XMLStreamWriter)}
+     * to turn the message into infoset.
+     *
+     * @param packet
+     * @param out
+     *      Must not be null. The caller is responsible for closing the stream,
+     *      not the callee.
+     *
+     * @return
+     *      The MIME content type of the encoded message (such as "application/xml").
+     *      This information is often ncessary by transport.
+     *
+     * @throws IOException
+     *      if a {@link OutputStream} throws {@link IOException}.
+     */
+    ContentType encode( Packet packet, OutputStream out ) throws IOException;
+
+    /**
+     * The version of {@link #encode(Packet,OutputStream)}
+     * that writes to NIO {@link ByteBuffer}.
+     *
+     * 
    
+     * TODO: for the convenience of implementation, write
+     * an adapter that wraps {@link WritableByteChannel} to {@link OutputStream}.
+     */
+    ContentType encode( Packet packet, WritableByteChannel buffer );
+
+    /*
+     * The following methods need to be documented and implemented.
+     *
+     * Such methods will be used by a client side
+     * transport pipe that implements the ClientEdgePipe.
+     *
+    String encode( InputStreamMessage message, OutputStream out ) throws IOException;
+    String encode( InputStreamMessage message, WritableByteChannel buffer );
+    */
+
+    /**
+     * Creates a copy of this {@link Codec}.
+     *
+     * 
    
+     * Since {@link Codec} instance is not re-entrant, the caller
+     * who needs to encode two {@link Message}s simultaneously will
+     * want to have two {@link Codec} instances. That's what this
+     * method produces.
+     *
+     * 
    Implentation Note
    
+     * 
    
+     * Note that this method might be invoked by one thread while
+     * another thread is executing one of the {@link #encode} methods.
+     * 
+     * 
+     * This should be OK because you'll be only copying things that
+     * are thread-safe, and creating new ones for thread-unsafe resources,
+     * but please let us know if this contract is difficult.
+     *
+     * @return
+     *      always non-null valid {@link Codec} that performs
+     *      the encoding work in the same way --- that is, if you
+     *      copy an FI codec, you'll get another FI codec.
+     *
+     *      
    
+     *      Once copied, two {@link Codec}s may be invoked from
+     *      two threads concurrently; therefore, they must not share
+     *      any state that requires isolation (such as temporary buffer.)
+     *
+     *      
    
+     *      If the {@link Codec} implementation is already
+     *      re-entrant and multi-thread safe to begin with,
+     *      then this method may simply return this.
+     */
+    Codec copy();
+
+    /**
+     * Reads bytes from {@link InputStream} and constructs a {@link Message}.
+     *
+     * 
    
+     * The design encourages lazy decoding of a {@link Message}, where
+     * a {@link Message} is returned even before the whole message is parsed,
+     * and additional parsing is done as the {@link Message} body is read along.
+     * A {@link Codec} is most likely have its own implementation of {@link Message}
+     * for this purpose.
+     *
+     * @param in
+     *      the data to be read into a {@link Message}. The transport would have
+     *      read any transport-specific header before it passes an {@link InputStream},
+     *      and {@link InputStream} is expected to be read until EOS. Never null.
+     *
+     *      
    
+     *      Some transports, such as SMTP, may 'encode' data into another format
+     *      (such as uuencode, base64, etc.) It is the caller's responsibility to
+     *      'decode' these transport-level encoding before it passes data into
+     *      {@link Codec}.
+     *
+     * @param contentType
+     *      The MIME content type (like "application/xml") of this byte stream.
+     *      Thie text includes all the sub-headers of the content-type header. Therefore,
+     *      in more complex case, this could be something like
+     *      multipart/related; boundary="--=_outer_boundary"; type="multipart/alternative".
+     *      This parameter must not be null.
+     *
+     * @param response
+     *      The parsed {@link Message} will be set to this {@link Packet}.
+     *      {@link Codec} may add additional properties to this {@link Packet}.
+     *      On a successful method completion, a {@link Packet} must contain a
+     *      {@link Message}.
+     *
+     * @throws IOException
+     *      if {@link InputStream} throws an exception.
+     */
+    void decode( InputStream in, String contentType, Packet response ) throws IOException;
+
+    /**
+     *
+     * @see #decode(InputStream, String, Packet)
+     */
+    void decode( ReadableByteChannel in, String contentType, Packet response );
+
+    /*
+     * The following methods need to be documented and implemented.
+     *
+     * Such methods will be used by a server side
+     * transport pipe that can support the invocation of methods on a
+     * ServerEdgePipe.
+     *
+    XMLStreamReaderMessage decode( InputStream in, String contentType ) throws IOException;
+    XMLStreamReaderMessage decode( ReadableByteChannel in, String contentType );
+    */
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Codecs.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Codecs.java
new file mode 100644
index 00000000000..201779f0e67
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Codecs.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.pipe;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.ws.api.SOAPVersion;
+import com.sun.xml.internal.ws.api.WSBinding;
+
+/**
+ * Factory methods for some of the {@link Codec} implementations.
+ *
+ * 
    
+ * This class provides methods to create codecs for SOAP/HTTP binding.
+ * It allows to replace default SOAP envelope(primary part in MIME message)
+ * codec in the whole Codec.
+ *
+ * 
    
+ * This is a part of the JAX-WS RI internal API so that
+ * {@link Tube} and transport implementations can reuse the implementations
+ * done inside the JAX-WS.
+ *
+ * @author Jitendra Kotamraju
+ * @author Kohsuke Kawaguchi
+ */
+public abstract class Codecs {
+
+    /**
+     * This creates a full {@link Codec} for SOAP binding using the primary
+     * XML codec argument. The codec argument is used to encode/decode SOAP envelopes
+     * while the returned codec is responsible for encoding/decoding the whole
+     * message.
+     *
+     * 
    
+     * Creates codecs can be set during the {@link Tube}line assembly process.
+     *
+     * @see ServerTubeAssemblerContext#setCodec(Codec)
+     * @see ClientTubeAssemblerContext#setCodec(Codec)
+     *
+     * @param binding binding of the webservice
+     * @param xmlEnvelopeCodec SOAP envelope codec
+     * @return non null codec to parse entire SOAP message(including MIME parts)
+     */
+    public static @NotNull SOAPBindingCodec createSOAPBindingCodec(WSBinding binding, StreamSOAPCodec xmlEnvelopeCodec) {
+        return new com.sun.xml.internal.ws.encoding.SOAPBindingCodec(binding, xmlEnvelopeCodec);
+    }
+
+    /**
+     * Creates a default {@link Codec} that can be used to used to
+     * decode XML infoset in SOAP envelope(primary part in MIME message). New codecs
+     * can be written using this codec as delegate.
+     *
+     * @param version SOAP version of the binding
+     * @return non null default xml codec
+     */
+    public static @NotNull
+    StreamSOAPCodec createSOAPEnvelopeXmlCodec(@NotNull SOAPVersion version) {
+        return com.sun.xml.internal.ws.encoding.StreamSOAPCodec.create(version);
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ContentType.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ContentType.java
new file mode 100644
index 00000000000..a11bcfdced4
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ContentType.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.pipe;
+
+/**
+ * A Content-Type transport header that will be returned by {@link Codec#encode(com.sun.xml.internal.ws.api.message.Packet, java.io.OutputStream)}.
+ * It will provide the Content-Type header and also take care of SOAP 1.1 SOAPAction header.
+ *
+ * TODO: rename to ContentMetadata?
+ *
+ * @author Vivek Pandey
+ */
+public interface ContentType {
+    /**
+     * Gives non-null Content-Type header value.
+     */
+    public String getContentType();
+
+    /**
+     * Gives SOAPAction transport header value. It will be non-null only for SOAP 1.1 messages. In other cases
+     * it MUST be null. The SOAPAction transport header should be written out only when its non-null.
+     *
+     * @return It can be null, in that case SOAPAction header should be written.
+     */
+    public String getSOAPActionHeader();
+
+    /**
+     * Controls the Accept transport header, if the transport supports it.
+     * Returning null means the transport need not add any new header.
+     *
+     * 
    
+     * We realize that this is not an elegant abstraction, but
+     * this would do for now. If another person comes and asks for
+     * a similar functionality, we'll define a real abstraction.
+     */
+    public String getAcceptHeader();
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Engine.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Engine.java
new file mode 100644
index 00000000000..3830248366c
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Engine.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.pipe;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import com.sun.xml.internal.ws.api.message.Packet;
+
+/**
+ * Collection of {@link Fiber}s.
+ * Owns an {@link Executor} to run them.
+ *
+ * @author Kohsuke Kawaguchi
+ * @author Jitendra Kotamraju
+ */
+public class Engine {
+    private volatile Executor threadPool;
+    public final String id;
+
+    public Engine(String id, Executor threadPool) {
+        this(id);
+        this.threadPool = threadPool;
+    }
+
+    public Engine(String id) {
+        this.id = id;
+    }
+
+    public void setExecutor(Executor threadPool) {
+        this.threadPool = threadPool;
+    }
+
+    void addRunnable(Fiber fiber) {
+        if(threadPool==null) {
+            synchronized(this) {
+                threadPool = Executors.newFixedThreadPool(5, new DaemonThreadFactory());
+            }
+        }
+        threadPool.execute(fiber);
+    }
+
+    /**
+     * Creates a new fiber in a suspended state.
+     *
+     * 
    
+     * To start the returned fiber, call {@link Fiber#start(Tube,Packet,Fiber.CompletionCallback)}.
+     * It will start executing the given {@link Tube} with the given {@link Packet}.
+     *
+     * @return new Fiber
+     */
+    public Fiber createFiber() {
+        return new Fiber(this);
+    }
+
+    private static class DaemonThreadFactory implements ThreadFactory {
+        private final AtomicInteger threadNumber = new AtomicInteger(1);
+
+        public Thread newThread(Runnable r) {
+            Thread daemonThread = new Thread(r, "JAXWS-Engine-"+threadNumber.getAndIncrement());
+            daemonThread.setDaemon(Boolean.TRUE);
+            return daemonThread;
+        }
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Fiber.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Fiber.java
new file mode 100644
index 00000000000..99e46113707
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Fiber.java
@@ -0,0 +1,771 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.pipe;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.pipe.helper.AbstractFilterTubeImpl;
+import com.sun.xml.internal.ws.api.server.Adapter;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * User-level thread. Represents the execution of one request/response processing.
+ *
+ * 
    
+ * JAX-WS RI is capable of running a large number of request/response concurrently by
+ * using a relatively small number of threads. This is made possible by utilizing
+ * a {@link Fiber} — a user-level thread that gets created for each request/response
+ * processing.
+ *
+ * 
    
+ * A fiber remembers where in the pipeline the processing is at, what needs to be
+ * executed on the way out (when processing response), and other additional information
+ * specific to the execution of a particular request/response.
+ *
+ * 
    Suspend/Resume
    
+ * 
    
+ * Fiber can be {@link NextAction#suspend() suspended} by a {@link Tube}.
+ * When a fiber is suspended, it will be kept on the side until it is
+ * {@link #resume(Packet) resumed}. This allows threads to go execute
+ * other runnable fibers, allowing efficient utilization of smaller number of
+ * threads.
+ *
+ * 
    Context-switch Interception
    
+ * 
    
+ * {@link FiberContextSwitchInterceptor} allows {@link Tube}s and {@link Adapter}s
+ * to perform additional processing every time a thread starts running a fiber
+ * and stops running it.
+ *
+ * 
    Context ClassLoader
    
+ * 
    
+ * Just like thread, a fiber has a context class loader (CCL.) A fiber's CCL
+ * becomes the thread's CCL when it's executing the fiber. The original CCL
+ * of the thread will be restored when the thread leaves the fiber execution.
+ *
+ *
+ * 
    Debugging Aid
    
+ * 
    
+ * Because {@link Fiber} doesn't keep much in the call stack, and instead use
+ * {@link #conts} to store the continuation, debugging fiber related activities
+ * could be harder.
+ *
+ * 
    
+ * Setting the {@link #LOGGER} for FINE would give you basic start/stop/resume/suspend
+ * level logging. Using FINER would cause more detailed logging, which includes
+ * what tubes are executed in what order and how they behaved.
+ *
+ * 
    
+ * When you debug the server side, consider setting {@link Fiber#serializeExecution}
+ * to true, so that execution of fibers are serialized. Debugging a server
+ * with more than one running threads is very tricky, and this switch will
+ * prevent that. This can be also enabled by setting the system property on.
+ * See the source code.
+ *
+ * @author Kohsuke Kawaguchi
+ * @author Jitendra Kotamraju
+ */
+public final class Fiber implements Runnable {
+    /**
+     * {@link Tube}s whose {@link Tube#processResponse(Packet)} method needs
+     * to be invoked on the way back.
+     */
+    private Tube[] conts = new Tube[16];
+    private int contsSize;
+
+    /**
+     * If this field is non-null, the next instruction to execute is
+     * to call its {@link Tube#processRequest(Packet)}. Otherwise
+     * the instruction is to call {@link #conts}.
+     */
+    private Tube next;
+
+    private Packet packet;
+
+    private Throwable/*but really it's either RuntimeException or Error*/ throwable;
+
+    public final Engine owner;
+
+    /**
+     * Is this thread suspended? 0=not suspended, 1=suspended.
+     *
+     * 
    
+     * Logically this is just a boolean, but we need to prepare for the case
+     * where the thread is {@link #resume(Packet) resumed} before we get to the {@link #suspend()}.
+     * This happens when things happen in the following order:
+     *
+     * 
      
+     *  
    1. Tube decides that the fiber needs to be suspended to wait for the external event.
+     *  
    2. Tube hooks up fiber with some external mechanism (like NIO channel selector)
+     *  
    3. Tube returns with {@link NextAction#suspend()}.
+     *  
    4. "External mechanism" becomes signal state and invokes {@link Fiber#resume(Packet)}
+     *      to wake up fiber
+     *  
    5. {@link Fiber#doRun} invokes {@link Fiber#suspend()}.
+     * 
    
+     *
+     * 
    
+     * Using int, this will work OK because {@link #suspendedCount} becomes -1 when
+     * {@link #resume(Packet)} occurs before {@link #suspend()}.
+     *
+     * 
    
+     * Increment and decrement is guarded by 'this' object.
+     */
+    private volatile int suspendedCount = 0;
+
+    /**
+     * Is this fiber completed?
+     */
+    private volatile boolean completed;
+
+    /**
+     * Is this {@link Fiber} currently running in the synchronous mode?
+     */
+    private boolean synchronous;
+
+    private boolean interrupted;
+
+    private final int id;
+
+    /**
+     * Active {@link FiberContextSwitchInterceptor}s for this fiber.
+     */
+    private List interceptors;
+
+    /**
+     * Not null when {@link #interceptors} is not null.
+     */
+    private InterceptorHandler interceptorHandler;
+
+    /**
+     * This flag is set to true when a new interceptor is added.
+     *
+     * When that happens, we need to first exit the current interceptors
+     * and then reenter them, so that the newly added interceptors start
+     * taking effect. This flag is used to control that flow.
+     */
+    private boolean needsToReenter;
+
+    /**
+     * Fiber's context {@link ClassLoader}.
+     */
+    private @Nullable ClassLoader contextClassLoader;
+
+    private @Nullable CompletionCallback completionCallback;
+
+    /**
+     * Set to true if this fiber is started asynchronously, to avoid
+     * doubly-invoking completion code.
+     */
+    private boolean started;
+
+    /**
+     * Callback to be invoked when a {@link Fiber} finishs execution.
+     */
+    public interface CompletionCallback {
+        /**
+         * Indicates that the fiber has finished its execution.
+         *
+         * 
    
+         * Since the JAX-WS RI runs asynchronously,
+         * this method maybe invoked by a different thread
+         * than any of the threads that started it or run a part of tubeline.
+         */
+        void onCompletion(@NotNull Packet response);
+
+        /**
+         * Indicates that the fiber has finished abnormally, by throwing a given {@link Throwable}.
+         */
+        void onCompletion(@NotNull Throwable error);
+    }
+
+    Fiber(Engine engine) {
+        this.owner = engine;
+        if(isTraceEnabled()) {
+            id = iotaGen.incrementAndGet();
+            LOGGER.fine(getName()+" created");
+        } else {
+            id = -1;
+        }
+
+        // if this is run from another fiber, then we naturally inherit its context classloader,
+        // so this code works for fiber->fiber inheritance just fine.
+        contextClassLoader = Thread.currentThread().getContextClassLoader();
+    }
+
+    /**
+     * Starts the execution of this fiber asynchronously.
+     *
+     * 
    
+     * This method works like {@link Thread#start()}.
+     *
+     * @param tubeline
+     *      The first tube of the tubeline that will act on the packet.
+     * @param request
+     *      The request packet to be passed to startPoint.processRequest().
+     * @param completionCallback
+     *      The callback to be invoked when the processing is finished and the
+     *      final response packet is available.
+     *
+     * @see #runSync(Tube,Packet)
+     */
+    public void start(@NotNull Tube tubeline, @NotNull Packet request, @Nullable CompletionCallback completionCallback) {
+        next = tubeline;
+        this.packet = request;
+        this.completionCallback = completionCallback;
+        this.started = true;
+        owner.addRunnable(this);
+    }
+
+    /**
+     * Wakes up a suspended fiber.
+     *
+     * 
    
+     * If a fiber was suspended from the {@link Tube#processRequest(Packet)} method,
+     * then the execution will be resumed from the corresponding
+     * {@link Tube#processResponse(Packet)} method with the specified response packet
+     * as the parameter.
+     *
+     * 
    
+     * If a fiber was suspended from the {@link Tube#processResponse(Packet)} method,
+     * then the execution will be resumed from the next tube's
+     * {@link Tube#processResponse(Packet)} method with the specified response packet
+     * as the parameter.
+     *
+     * 
    
+     * This method is implemented in a race-free way. Another thread can invoke
+     * this method even before this fiber goes into the suspension mode. So the caller
+     * need not worry about synchronizing {@link NextAction#suspend()} and this method.
+     */
+    public synchronized void resume(@NotNull Packet response) {
+        if(isTraceEnabled())
+            LOGGER.fine(getName()+" resumed");
+        packet = response;
+        if( --suspendedCount == 0 ) {
+            if(synchronous) {
+                notifyAll();
+            } else {
+                owner.addRunnable(this);
+            }
+        }
+    }
+
+
+    /**
+     * Suspends this fiber's execution until the resume method is invoked.
+     *
+     * The call returns immediately, and when the fiber is resumed
+     * the execution picks up from the last scheduled continuation.
+     */
+    private synchronized void suspend() {
+        if(isTraceEnabled())
+            LOGGER.fine(getName()+" suspended");
+        suspendedCount++;
+    }
+
+    /**
+     * Adds a new {@link FiberContextSwitchInterceptor} to this fiber.
+     *
+     * 
    
+     * The newly installed fiber will take effect immediately after the current
+     * tube returns from its {@link Tube#processRequest(Packet)} or
+     * {@link Tube#processResponse(Packet)}, before the next tube begins processing.
+     *
+     * 
    
+     * So when the tubeline consists of X and Y, and when X installs an interceptor,
+     * the order of execution will be as follows:
+     *
+     * 
      
+     *  
    1. X.processRequest()
+     *  
    2. interceptor gets installed
+     *  
    3. interceptor.execute() is invoked
+     *  
    4. Y.processRequest()
+     * 
    
+     */
+    public void addInterceptor(@NotNull FiberContextSwitchInterceptor interceptor) {
+        if(interceptors ==null) {
+            interceptors = new ArrayList();
+            interceptorHandler = new InterceptorHandler();
+        }
+        interceptors.add(interceptor);
+        needsToReenter = true;
+    }
+
+    /**
+     * Removes a {@link FiberContextSwitchInterceptor} from this fiber.
+     *
+     * 
    
+     * The removal of the interceptor takes effect immediately after the current
+     * tube returns from its {@link Tube#processRequest(Packet)} or
+     * {@link Tube#processResponse(Packet)}, before the next tube begins processing.
+     *
+     *
+     * 
    
+     * So when the tubeline consists of X and Y, and when Y uninstalls an interceptor
+     * on the way out, then the order of execution will be as follows:
+     *
+     * 
      
+     *  
    1. Y.processResponse() (notice that this happens with interceptor.execute() in the callstack)
+     *  
    2. interceptor gets uninstalled
+     *  
    3. interceptor.execute() returns
+     *  
    4. X.processResponse()
+     * 
    
+     *
+     * @return
+     *      true if the specified interceptor was removed. False if
+     *      the specified interceptor was not registered with this fiber to begin with.
+     */
+    public boolean removeInterceptor(@NotNull FiberContextSwitchInterceptor interceptor) {
+        if(interceptors !=null && interceptors.remove(interceptor)) {
+            needsToReenter = true;
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Gets the context {@link ClassLoader} of this fiber.
+     */
+    public @Nullable ClassLoader getContextClassLoader() {
+        return contextClassLoader;
+    }
+
+    /**
+     * Sets the context {@link ClassLoader} of this fiber.
+     */
+    public ClassLoader setContextClassLoader(@Nullable ClassLoader contextClassLoader) {
+        ClassLoader r = this.contextClassLoader;
+        this.contextClassLoader = contextClassLoader;
+        return r;
+    }
+
+    /**
+     * DO NOT CALL THIS METHOD. This is an implementation detail
+     * of {@link Fiber}.
+     */
+    @Deprecated
+    public void run() {
+        assert !synchronous;
+        next = doRun(next);
+        completionCheck();
+    }
+
+    /**
+     * Runs a given {@link Tube} (and everything thereafter) synchronously.
+     *
+     * 
    
+     * This method blocks and returns only when all the successive {@link Tube}s
+     * complete their request/response processing. This method can be used
+     * if a {@link Tube} needs to fallback to synchronous processing.
+     *
+     * 
    Example:
    
+     * 
    +     * class FooTube extends {@link AbstractFilterTubeImpl} {
+     *   NextAction processRequest(Packet request) {
+     *     // run everything synchronously and return with the response packet
+     *     return doReturnWith(Fiber.current().runSync(next,request));
+     *   }
+     *   NextAction processResponse(Packet response) {
+     *     // never be invoked
+     *   }
+     * }
+     * 
    
+     *
+     * @param tubeline
+     *      The first tube of the tubeline that will act on the packet.
+     * @param request
+     *      The request packet to be passed to startPoint.processRequest().
+     * @return
+     *      The response packet to the request.
+     *
+     * @see #start(Tube, Packet, CompletionCallback)
+     */
+    public synchronized @NotNull Packet runSync(@NotNull Tube tubeline, @NotNull Packet request) {
+        // save the current continuation, so that we return runSync() without executing them.
+        final Tube[] oldCont = conts;
+        final int oldContSize = contsSize;
+        final boolean oldSynchronous = synchronous;
+
+        if(oldContSize>0) {
+            conts = new Tube[16];
+            contsSize=0;
+        }
+
+        try {
+            synchronous = true;
+            this.packet = request;
+            doRun(tubeline);
+            if(throwable!=null) {
+                if (throwable instanceof RuntimeException) {
+                    throw (RuntimeException) throwable;
+                }
+                if (throwable instanceof Error) {
+                    throw (Error) throwable;
+                }
+                // our system is supposed to only accept Error or RuntimeException
+                throw new AssertionError(throwable);
+            }
+            return this.packet;
+        } finally {
+            conts = oldCont;
+            contsSize = oldContSize;
+            synchronous = oldSynchronous;
+            if(interrupted) {
+                Thread.currentThread().interrupt();
+                interrupted = false;
+            }
+            if(!started)
+                completionCheck();
+        }
+    }
+
+    private synchronized void completionCheck() {
+        if(contsSize==0) {
+            if(isTraceEnabled())
+                LOGGER.fine(getName()+" completed");
+            completed = true;
+            notifyAll();
+            if(completionCallback!=null) {
+                if(throwable!=null)
+                    completionCallback.onCompletion(throwable);
+                else
+                    completionCallback.onCompletion(packet);
+            }
+        }
+    }
+
+    ///**
+    // * Blocks until the fiber completes.
+    // */
+    //public synchronized void join() throws InterruptedException {
+    //    while(!completed)
+    //        wait();
+    //}
+
+    /**
+     * Invokes all registered {@link InterceptorHandler}s and then call into
+     * {@link Fiber#__doRun(Tube)}.
+     */
+    private class InterceptorHandler implements FiberContextSwitchInterceptor.Work {
+        /**
+         * Index in {@link Fiber#interceptors} to invoke next.
+         */
+        private int idx;
+
+        /**
+         * Initiate the interception, and eventually invokes {@link Fiber#__doRun(Tube)}.
+         */
+        Tube invoke(Tube next) {
+            idx=0;
+            return execute(next);
+        }
+
+        public Tube execute(Tube next) {
+            if(idx==interceptors.size()) {
+                return __doRun(next);
+            } else {
+                FiberContextSwitchInterceptor interceptor = interceptors.get(idx++);
+                return interceptor.execute(Fiber.this,next,this);
+            }
+        }
+    }
+
+    /**
+     * Executes the fiber as much as possible.
+     *
+     * @param next
+     *      The next tube whose {@link Tube#processRequest(Packet)} is to be invoked. If null,
+     *      that means we'll just call {@link Tube#processResponse(Packet)} on the continuation.
+     *
+     * @return
+     *      If non-null, the next time execution resumes, it should resume from calling
+     *      the {@link Tube#processRequest(Packet)}. Otherwise it means just finishing up
+     *      the continuation.
+     */
+    @SuppressWarnings({"LoopStatementThatDoesntLoop"}) // IntelliJ reports this bogus error
+    private Tube doRun(Tube next) {
+        Thread currentThread = Thread.currentThread();
+
+        if(isTraceEnabled())
+            LOGGER.fine(getName()+" running by "+currentThread.getName());
+
+        if(serializeExecution) {
+            serializedExecutionLock.lock();
+            try {
+                return _doRun(next);
+            } finally {
+                serializedExecutionLock.unlock();
+            }
+        } else {
+            return _doRun(next);
+        }
+    }
+
+    private Tube _doRun(Tube next) {
+        Thread currentThread = Thread.currentThread();
+
+        ClassLoader old = currentThread.getContextClassLoader();
+        currentThread.setContextClassLoader(contextClassLoader);
+        try {
+            do {
+                needsToReenter = false;
+
+                // if interceptors are set, go through the interceptors.
+                if(interceptorHandler ==null)
+                    next = __doRun(next);
+                else
+                    next = interceptorHandler.invoke(next);
+            } while(needsToReenter);
+
+            return next;
+        } finally {
+            currentThread.setContextClassLoader(old);
+        }
+    }
+
+    /**
+     * To be invoked from {@link #doRun(Tube)}.
+     *
+     * @see #doRun(Tube)
+     */
+    private Tube __doRun(Tube next) {
+        final Fiber old = CURRENT_FIBER.get();
+        CURRENT_FIBER.set(this);
+
+        // if true, lots of debug messages to show what's being executed
+        final boolean traceEnabled = LOGGER.isLoggable(Level.FINER);
+
+        try {
+            while(!isBlocking() && !needsToReenter) {
+                try {
+                    NextAction na;
+                    Tube last;
+                    if(throwable!=null) {
+                        if(contsSize==0) {
+                            // nothing else to execute. we are done.
+                            return null;
+                        }
+                        last = popCont();
+                        if(traceEnabled)
+                            LOGGER.finer(getName()+' '+last+".processException("+throwable+')');
+                        na = last.processException(throwable);
+                    } else {
+                        if(next!=null) {
+                            if(traceEnabled)
+                                LOGGER.finer(getName()+' '+next+".processRequest("+packet+')');
+                            na = next.processRequest(packet);
+                            last = next;
+                        } else {
+                            if(contsSize==0) {
+                                // nothing else to execute. we are done.
+                                return null;
+                            }
+                            last = popCont();
+                            if(traceEnabled)
+                                LOGGER.finer(getName()+' '+last+".processResponse("+packet+')');
+                            na = last.processResponse(packet);
+                        }
+                    }
+
+                    if(traceEnabled)
+                        LOGGER.finer(getName()+' '+last+" returned with "+na);
+
+                    // If resume is called before suspend, then make sure
+                                        // resume(Packet) is not lost
+                    if (na.kind != NextAction.SUSPEND) {
+                        packet = na.packet;
+                        throwable = na.throwable;
+                    }
+
+                    switch(na.kind) {
+                    case NextAction.INVOKE:
+                        pushCont(last);
+                        // fall through next
+                    case NextAction.INVOKE_AND_FORGET:
+                        next = na.next;
+                        break;
+                    case NextAction.RETURN:
+                    case NextAction.THROW:
+                        next = null;
+                        break;
+                    case NextAction.SUSPEND:
+                        pushCont(last);
+                        next = null;
+                        suspend();
+                        break;
+                    default:
+                        throw new AssertionError();
+                    }
+                } catch (RuntimeException t) {
+                    if(traceEnabled)
+                        LOGGER.log(Level.FINER,getName()+" Caught "+t+". Start stack unwinding",t);
+                    throwable = t;
+                } catch (Error t) {
+                    if(traceEnabled)
+                        LOGGER.log(Level.FINER,getName()+" Caught "+t+". Start stack unwinding",t);
+                    throwable = t;
+                }
+            }
+            // there's nothing we can execute right away.
+            // we'll be back when this fiber is resumed.
+            return next;
+        } finally {
+            CURRENT_FIBER.set(old);
+        }
+    }
+
+    private void pushCont(Tube tube) {
+        conts[contsSize++] = tube;
+
+        // expand if needed
+        int len = conts.length;
+        if(contsSize==len) {
+            Tube[] newBuf = new Tube[len*2];
+            System.arraycopy(conts,0,newBuf,0,len);
+            conts = newBuf;
+        }
+    }
+
+    private Tube popCont() {
+        return conts[--contsSize];
+    }
+
+    /**
+     * Returns true if the fiber needs to block its execution.
+     */
+    // TODO: synchronization on synchronous case is wrong.
+    private boolean isBlocking() {
+        if(synchronous) {
+            while(suspendedCount==1)
+                try {
+                    if (isTraceEnabled()) {
+                        LOGGER.fine(getName()+" is blocking thread "+Thread.currentThread().getName());
+                    }
+                    wait(); // the synchronized block is the whole runSync method.
+                } catch (InterruptedException e) {
+                    // remember that we are interrupted, but don't respond to it
+                    // right away. This behavior is in line with what happens
+                    // when you are actually running the whole thing synchronously.
+                    interrupted = true;
+                }
+            return false;
+        }
+        else
+            return suspendedCount==1;
+    }
+
+    private String getName() {
+        return "engine-"+owner.id+"fiber-"+id;
+    }
+
+    public String toString() {
+        return getName();
+    }
+
+    /**
+     * Gets the current {@link Packet} associated with this fiber.
+     *
+     * 
    
+     * This method returns null if no packet has been associated with the fiber yet.
+     */
+    public @Nullable Packet getPacket() {
+        return packet;
+    }
+
+    /**
+     * Returns true if this fiber is still running or suspended.
+     */
+    public boolean isAlive() {
+        return !completed;
+    }
+
+    /**
+     * (ADVANCED) Returns true if the current fiber is being executed synchronously.
+     *
+     * 
    
+     * Fiber may run synchronously for various reasons. Perhaps this is
+     * on client side and application has invoked a synchronous method call.
+     * Perhaps this is on server side and we have deployed on a synchronous
+     * transport (like servlet.)
+     *
+     * 
    
+     * When a fiber is run synchronously (IOW by {@link #runSync(Tube, Packet)}),
+     * further invocations to {@link #runSync(Tube, Packet)} can be done
+     * without degrading the performance.
+     *
+     * 
    
+     * So this value can be used as a further optimization hint for
+     * advanced {@link Tube}s to choose the best strategy to invoke
+     * the next {@link Tube}. For example, a tube may want to install
+     * a {@link FiberContextSwitchInterceptor} if running async, yet
+     * it might find it faster to do {@link #runSync(Tube, Packet)}
+     * if it's already running synchronously.
+     */
+    public static boolean isSynchronous() {
+        return current().synchronous;
+    }
+
+    /**
+     * Gets the current fiber that's running.
+     *
+     * 
    
+     * This works like {@link Thread#currentThread()}.
+     * This method only works when invoked from {@link Tube}.
+     */
+    public static @NotNull Fiber current() {
+        Fiber fiber = CURRENT_FIBER.get();
+        if(fiber==null)
+            throw new IllegalStateException("Can be only used from fibers");
+        return fiber;
+    }
+
+    private static final ThreadLocal CURRENT_FIBER = new ThreadLocal();
+
+    /**
+     * Used to allocate unique number for each fiber.
+     */
+    private static final AtomicInteger iotaGen = new AtomicInteger();
+
+    private static boolean isTraceEnabled() {
+        return LOGGER.isLoggable(Level.FINE);
+    }
+
+    private static final Logger LOGGER = Logger.getLogger(Fiber.class.getName());
+
+
+    private static final ReentrantLock serializedExecutionLock = new ReentrantLock();
+
+    /**
+     * Set this boolean to true to execute fibers sequentially one by one.
+     * See class javadoc.
+     */
+    public static volatile boolean serializeExecution = Boolean.getBoolean(Fiber.class.getName()+".serialize");
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptor.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptor.java
new file mode 100644
index 00000000000..47d5e3611da
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptor.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.pipe;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+/**
+ * Interception for {@link Fiber} context switch.
+ *
+ * 
    
+ * Even though pipeline runs asynchronously, sometimes it's desirable
+ * to bind some state to the current thread running a fiber. Such state
+ * may include security subject (in terms of {@link AccessController#doPrivileged}),
+ * or a transaction.
+ *
+ * 
    
+ * This mechanism makes it possible to do such things, by allowing
+ * some code to be executed before and after a thread executes a fiber.
+ *
+ * 
    
+ * The design also encapsulates the entire fiber execution in a single
+ * opaque method invocation {@link Work#execute}, allowing the use of
+ * finally block.
+ *
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public interface FiberContextSwitchInterceptor {
+    /**
+     * Allows the interception of the fiber execution.
+     *
+     * 
    
+     * This method needs to be implemented like this:
+     *
+     * 
    +     * <R,P> R execute( Fiber f, P p, Work<R,P> work ) {
+     *   // do some preparation work
+     *   ...
+     *   try {
+     *     // invoke
+     *     return work.execute(p);
+     *   } finally {
+     *     // do some clean up work
+     *     ...
+     *   }
+     * }
+     * 
    
+     *
+     * 
    
+     * While somewhat unintuitive,
+     * this interception mechanism enables the interceptor to wrap
+     * the whole fiber execution into a {@link AccessController#doPrivileged(PrivilegedAction)},
+     * for example.
+     *
+     * @param f
+     *      {@link Fiber} to be executed.
+     * @param p
+     *      The opaque parameter value for {@link Work}. Simply pass this value to
+     *      {@link Work#execute(Object)}.
+     * @return
+     *      The opaque return value from the the {@link Work}. Simply return
+     *      the value from {@link Work#execute(Object)}.
+     */
+     R execute( Fiber f, P p, Work work );
+
+    /**
+     * Abstraction of the execution that happens inside the interceptor.
+     */
+    interface Work {
+        /**
+         * Have the current thread executes the current fiber,
+         * and returns when it stops doing so.
+         *
+         * 
    
+         * The parameter and the return value is controlled by the
+         * JAX-WS runtime, and interceptors should simply treat
+         * them as opaque values.
+         */
+        R execute(P param);
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/NextAction.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/NextAction.java
new file mode 100644
index 00000000000..bbd35d3555c
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/NextAction.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.pipe;
+
+import com.sun.xml.internal.ws.api.message.Packet;
+
+/**
+ * Indicates what shall happen after {@link Tube#processRequest(Packet)} or
+ * {@link Tube#processResponse(Packet)} returns.
+ *
+ * 
    
+ * To allow reuse of this object, this class is mutable.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public final class NextAction {
+    int kind;
+    Tube next;
+    Packet packet;
+    /**
+     * Really either {@link RuntimeException} or {@link Error}.
+     */
+    Throwable throwable;
+
+    // public enum Kind { INVOKE, INVOKE_AND_FORGET, RETURN, SUSPEND }
+
+    static final int INVOKE = 0;
+    static final int INVOKE_AND_FORGET = 1;
+    static final int RETURN = 2;
+    static final int THROW = 3;
+    static final int SUSPEND = 4;
+
+    private void set(int k, Tube v, Packet p, Throwable t) {
+        this.kind = k;
+        this.next = v;
+        this.packet = p;
+        this.throwable = t;
+    }
+
+    /**
+     * Indicates that the next action should be to
+     * invoke the next tube's {@link Tube#processRequest(Packet)},
+     * then later invoke the current tube's {@link Tube#processResponse(Packet)}
+     * with the response packet.
+     */
+    public void invoke(Tube next, Packet p) {
+        set(INVOKE, next, p, null);
+    }
+
+    /**
+     * Indicates that the next action should be to
+     * invoke the next tube's {@link Tube#processRequest(Packet)},
+     * but the current tube doesn't want to receive the response packet to
+     * its {@link Tube#processResponse(Packet)}.
+     */
+    public void invokeAndForget(Tube next, Packet p) {
+        set(INVOKE_AND_FORGET, next, p, null);
+    }
+
+    /**
+     * Indicates that the next action is to flip the processing direction
+     * and starts response processing.
+     */
+    public void returnWith( Packet response ) {
+        set(RETURN, null, response, null);
+    }
+
+    /**
+     * Indicates that the next action is to flip the processing direction
+     * and starts exception processing.
+     *
+     * @param t
+     *      Either {@link RuntimeException} or {@link Error}, but defined to
+     *      take {@link Throwable} because {@link Tube#processException(Throwable)}
+     *      takes {@link Throwable}.
+     */
+    public void throwException(Throwable t) {
+        assert t instanceof RuntimeException || t instanceof Error;
+        set(THROW,null,null,t);
+    }
+
+    /**
+     * Indicates that the fiber should be suspended.
+     * Once {@link Fiber#resume(Packet) resumed}, return the response processing.
+     */
+    public void suspend() {
+        set(SUSPEND, null, null, null);
+    }
+
+    /**
+     * Dumps the contents to assist debugging.
+     */
+    public String toString() {
+        StringBuilder buf = new StringBuilder();
+        buf.append(super.toString()).append(" [");
+        buf.append("kind=").append(getKindString()).append(',');
+        buf.append("next=").append(next).append(',');
+        buf.append("packet=").append(packet).append(',');
+        buf.append("throwable=").append(throwable).append(']');
+        return buf.toString();
+    }
+
+    /**
+     * Returns {@link #kind} in a human readable string, to assist debugging.
+     */
+    public String getKindString() {
+        switch(kind) {
+        case INVOKE:            return "INVOKE";
+        case INVOKE_AND_FORGET: return "INVOKE_AND_FORGET";
+        case RETURN:            return "RETURN";
+        case THROW:             return "THROW";
+        case SUSPEND:           return "SUSPEND";
+        default:                throw new AssertionError(kind);
+        }
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Pipe.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Pipe.java
new file mode 100644
index 00000000000..6c86e6def9b
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Pipe.java
@@ -0,0 +1,346 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.api.pipe;
+
+import com.sun.xml.internal.ws.api.message.Message;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.pipe.helper.AbstractFilterPipeImpl;
+import com.sun.xml.internal.ws.api.pipe.helper.AbstractPipeImpl;
+
+import javax.annotation.PreDestroy;
+import javax.xml.ws.Dispatch;
+import javax.xml.ws.Provider;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.handler.Handler;
+import javax.xml.ws.handler.LogicalHandler;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.soap.SOAPHandler;
+
+/**
+ * Abstraction of the intermediate layers in the processing chain
+ * and transport.
+ *
+ * 
    What is a {@link Pipe}?
    
+ * 
    
+ * Transport is a kind of pipe. It sends the {@link Packet}
+ * through, say, HTTP connection, and receives the data back into another {@link Packet}.
+ *
+ * 
    
+ * More often, a pipe is a filter. It acts on a packet,
+ * and then it passes the packet into another pipe. It can
+ * do the same on the way back.
+ *
+ * 
    
+ * For example, XWSS will be a {@link Pipe}
+ * that delegates to another {@link Pipe}, and it can wrap a {@link Packet} into
+ * another {@link Packet} to encrypt the body and add a header, for example.
+ *
+ * 
    
+ * Yet another kind of filter pipe is those that wraps {@link LogicalHandler}
+ * and {@link SOAPHandler}. These pipes are heavy-weight; they often consume
+ * a message in a packet and create a new one, and then pass it to the next pipe.
+ * For performance reason it probably makes sense to have one {@link Pipe}
+ * instance that invokes a series of {@link LogicalHandler}s, another one
+ * for {@link SOAPHandler}.
+ *
+ * 
    
+ * There would be a {@link Pipe} implementation that invokes {@link Provider}.
+ * There would be a {@link Pipe} implementation that invokes a service method
+ * on the user's code.
+ * There would be a {@link Dispatch} implementation that invokes a {@link Pipe}.
+ *
+ * 
    
+ * WS-MEX can be implemented as a {@link Pipe} that looks for
+ * {@link Message#getPayloadNamespaceURI()} and serves the request.
+ *
+ *
+ * 
    Pipe Lifecycle
    
+ * {@link Pipe}line is expensive to set up, so once it's created it will be reused.
+ * A {@link Pipe}line is not reentrant; one pipeline is used to process one request/response
+ * at at time. The same pipeline instance may serve request/response for different threads,
+ * if one comes after another and they don't overlap.
+ * 
    
+ * Where a need arises to process multiple requests concurrently, a pipeline
+ * gets cloned through {@link PipeCloner}. Note that this need may happen on
+ * both server (because it quite often serves multiple requests concurrently)
+ * and client (because it needs to support asynchronous method invocations.)
+ * 
    
+ * Created pipelines (including cloned ones and the original) may be discarded and GCed
+ * at any time at the discretion of whoever owns pipelines. Pipes can, however, expect
+ * at least one copy (or original) of pipeline to live at any given time while a pipeline
+ * owner is interested in the given pipeline configuration (in more concerete terms,
+ * for example, as long as a dispatch object lives, it's going to keep at least one
+ * copy of a pipeline alive.)
+ * 
    
+ * Before a pipeline owner dies, it may invoke {@link #preDestroy()} on the last
+ * remaining pipeline. It is "may" for pipeline owners that live in the client-side
+ * of JAX-WS (such as dispatches and proxies), but it is a "must" for pipeline owners
+ * that live in the server-side of JAX-WS.
+ * 
    
+ * This last invocation gives a chance for some pipes to clean up any state/resource
+ * acquired (such as WS-RM's sequence, WS-Trust's SecurityToken), although as stated above,
+ * this is not required for clients.
+ *
+ *
+ *
+ * 
    Pipe and State
    
+ * 
    
+ * The lifecycle of pipelines is designed to allow a {@link Pipe} to store various
+ * state in easily accessible fashion.
+ *
+ *
+ * 
    Per-packet state
    
+ * 
    
+ * Any information that changes from a packet to packet should be
+ * stored in {@link Packet}. This includes information like
+ * transport-specific headers.
+ *
+ * 
    Per-thread state
    
+ * 
    
+ * Any expensive objects that are non-reentrant can be stored in
+ * instance variables of a {@link Pipe}, since {@link #process(Packet)} is
+ * non reentrant. When a pipe is copied, new instances should be allocated
+ * so that two {@link Pipe} instances don't share thread-unsafe resources.
+ * This includes things like canonicalizers, JAXB unmarshallers, buffers,
+ * and so on.
+ *
+ * 
    Per-proxy/per-endpoint state
    
+ * 
    
+ * Information that is tied to a particular proxy/dispatch can be stored
+ * in a separate object that is referenced from a pipe. When
+ * a new pipe is copied, you can simply hand out a reference to the newly
+ * created one, so that all copied pipes refer to the same instance.
+ * See the following code as an example:
+ *
+ * 
    + * class PipeImpl {
+ *   // this object stores per-proxy state
+ *   class DataStore {
+ *     int counter;
+ *   }
+ *
+ *   private DataStore ds;
+ *
+ *   // create a fresh new pipe
+ *   public PipeImpl(...) {
+ *     ....
+ *     ds = new DataStore();
+ *   }
+ *
+ *   // copy constructor
+ *   private PipeImpl(PipeImpl that, PipeCloner cloner) {
+ *     cloner.add(that,this);
+ *     ...
+ *     this.ds = that.ds;
+ *   }
+ *
+ *   public PipeImpl copy(PipeCloner pc) {
+ *     return new PipeImpl(this,pc);
+ *   }
+ * }
+ * 
    
+ *
+ * 
    
+ * Note that access to such resource often needs to be synchronized,
+ * since multiple copies of pipelines may execute concurrently.
+ *
+ * 
    
+ * If such information is read-only,
+ * it can be stored as instance variables of a pipe,
+ * and its reference copied as pipes get copied. (The only difference between
+ * this and per-thread state is that you just won't allocate new things when
+ * pipes get copied here.)
+ *
+ *
+ * 
    VM-wide state
    
+ * 
    
+ * static is always there for you to use.
+ *
+ *
+ *
+ * 
    Pipes and Handlers
    
+ * 
    
+ * JAX-WS has a notion of {@link LogicalHandler} and {@link SOAPHandler}, and
+ * we intend to have one {@link Pipe} implementation that invokes all the
+ * {@link LogicalHandler}s and another {@link Pipe} implementation that invokes
+ * all the {@link SOAPHandler}s. Those implementations need to convert a {@link Message}
+ * into an appropriate format, but grouping all the handlers together eliminates
+ * the intermediate {@link Message} instanciation between such handlers.
+ * 
    
+ * This grouping also allows such implementations to follow the event notifications
+ * to handlers (i.e. {@link Handler#close(MessageContext)} method.
+ *
+ *
+ * 
    + * TODO: Possible types of pipe:
+ *      creator: create message from wire
+ *          to SAAJ SOAP message
+ *          to cached representation
+ *          directly to JAXB beans
+ *      transformer: transform message from one representation to another
+ *          JAXB beans to encoded SOAP message
+ *          StAX writing + JAXB bean to encoded SOAP message
+ *      modifier: modify message
+ *          add SOAP header blocks
+ *          security processing
+ *      header block processor:
+ *          process certain SOAP header blocks
+ *      outbound initiator: input from the client
+ *          Manage input e.g. JAXB beans and associated with parts of the SOAP message
+ *      inbound invoker: invoke the service
+ *         Inkoke SEI, e.g. EJB or SEI in servlet.
+ * 
    
+ *
+ * @see AbstractPipeImpl
+ * @see AbstractFilterPipeImpl
+ * @deprecated
+ *      Use {@link Tube}.
+ */
+public interface Pipe {
+    /**
+     * Sends a {@link Packet} and returns a response {@link Packet} to it.
+     *
+     * @throws WebServiceException
+     *      On the server side, this signals an error condition where
+     *      a fault reply is in order (or the exception gets eaten by
+     *      the top-most transport {@link Pipe} if it's one-way.)
+     *      This frees each {@link Pipe} from try/catching a
+     *      {@link WebServiceException} in every layer.
+     *
+     *      Note that this method is also allowed to return a {@link Packet}
+     *      that has a fault as the payload.
+     *
+     *      
    
+     *      On the client side, the {@link WebServiceException} thrown
+     *      will be propagated all the way back to the calling client
+     *      applications. (The consequence of that is that if you are
+     *      a filtering {@link Pipe}, you must not catch the exception
+     *      that your next {@link Pipe} threw.
+     *
+     * @throws RuntimeException
+     *      Other runtime exception thrown by this method must
+     *      be treated as a bug in the pipe implementation,
+     *      and therefore should not be converted into a fault.
+     *      (Otherwise it becomes very difficult to debug implementation
+     *      problems.)
+     *
+     *      
    
+     *      On the server side, this exception should be most likely
+     *      just logged. On the client-side it gets propagated to the
+     *      client application.
+     *
+     *      
    
+     *      The consequence of this is that if a pipe calls
+     *      into an user application (such as {@link SOAPHandler}
+     *      or {@link LogicalHandler}), where a {@link RuntimeException}
+     *      is *not* a bug in the JAX-WS implementation, it must be catched
+     *      and wrapped into a {@link WebServiceException}.
+     *
+     * @param request
+     *      The packet that represents a request message. Must not be null.
+     *      If the packet has a non-null message, it must be a valid
+     *      unconsumed {@link Message}. This message represents the
+     *      SOAP message to be sent as a request.
+     *      
    
+     *      The packet is also allowed to carry no message, which indicates
+     *      that this is an output-only request.
+     *      (that's called "solicit", right? - KK)
+     *
+     * @return
+     *      The packet that represents a response message. Must not be null.
+     *      If the packet has a non-null message, it must be
+     *      a valid unconsumed {@link Message}. This message represents
+     *      a response to the request message passed as a parameter.
+     *      
    
+     *      The packet is also allowed to carry no message, which indicates
+     *      that there was no response. This is used for things like
+     *      one-way message and/or one-way transports.
+     */
+    Packet process( Packet request);
+
+    /**
+     * Invoked before the last copy of the pipeline is about to be discarded,
+     * to give {@link Pipe}s a chance to clean up any resources.
+     *
+     * 
    
+     * This can be used to invoke {@link PreDestroy} lifecycle methods
+     * on user handler. The invocation of it is optional on the client side,
+     * but mandatory on the server side.
+     *
+     * 
    
+     * When multiple copies of pipelines are created, this method is called
+     * only on one of them.
+     *
+     * @throws WebServiceException
+     *      If the clean up fails, {@link WebServiceException} can be thrown.
+     *      This exception will be propagated to users (if this is client),
+     *      or recorded (if this is server.)
+     */
+    void preDestroy();
+
+    /**
+     * Creates an identical clone of this {@link Pipe}.
+     *
+     * 
    
+     * This method creates an identical pipeline that can be used
+     * concurrently with this pipeline. When the caller of a pipeline
+     * is multi-threaded and need concurrent use of the same pipeline,
+     * it can do so by creating copies through this method.
+     *
+     * 
    Implementation Note
    
+     * 
    
+     * It is the implementation's responsibility to call
+     * {@link PipeCloner#add(Pipe,Pipe)} to register the copied pipe
+     * with the original. This is required before you start copying
+     * the other {@link Pipe} references you have, or else there's a
+     * risk of infinite recursion.
+     * 
    
+     * For most {@link Pipe} implementations that delegate to another
+     * {@link Pipe}, this method requires that you also copy the {@link Pipe}
+     * that you delegate to.
+     * 
    
+     * For limited number of {@link Pipe}s that do not maintain any
+     * thread unsafe resource, it is allowed to simply return this
+     * from this method (notice that even if you are stateless, if you
+     * got a delegating {@link Pipe} and that one isn't stateless, you
+     * still have to copy yourself.)
+     *
+     * 
    
+     * Note that this method might be invoked by one thread while another
+     * thread is executing the {@link #process(Packet)} method. See
+     * the {@link Codec#copy()} for more discussion about this.
+     *
+     * @param cloner
+     *      Use this object (in particular its {@link PipeCloner#copy(Pipe)} method
+     *      to clone other pipe references you have
+     *      in your pipe. See {@link PipeCloner} for more discussion
+     *      about why.
+     *
+     * @return
+     *      always non-null {@link Pipe}.
+     * @param cloner
+     */
+    Pipe copy(PipeCloner cloner);
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/PipeCloner.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/PipeCloner.java
new file mode 100644
index 00000000000..a3312417dd1
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/PipeCloner.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.api.pipe;
+
+import com.sun.xml.internal.ws.api.pipe.helper.AbstractTubeImpl;
+
+/**
+ * Clones the whole pipeline.
+ *
+ * 
    
+ * Since {@link Pipe}s may form an arbitrary directed graph, someone needs
+ * to keep track of isomorphism for a clone to happen correctly. This class
+ * serves that role.
+ *
+ * @deprecated
+ *      Use {@link TubeCloner}.
+ * @author Kohsuke Kawaguchi
+ */
+public final class PipeCloner extends TubeCloner {
+    /**
+     * {@link Pipe} version of {@link #clone(Tube)}
+     */
+    public static Pipe clone(Pipe p) {
+        return new PipeCloner().copy(p);
+    }
+
+    // no need to be constructed publicly. always use the static clone method.
+    /*package*/ PipeCloner() {}
+
+    /**
+     * {@link Pipe} version of {@link #copy(Tube)}
+     */
+    public  T copy(T p) {
+        Pipe r = (Pipe)master2copy.get(p);
+        if(r==null) {
+            r = p.copy(this);
+            // the pipe must puts its copy to the map by itself
+            assert master2copy.get(p)==r : "the pipe must call the add(...) method to register itself before start copying other pipes, but "+p+" hasn't done so";
+        }
+        return (T)r;
+    }
+
+
+    /**
+     * The {@link Pipe} version of {@link #add(Tube, Tube)}.
+     */
+    public void add(Pipe original, Pipe copy) {
+        assert !master2copy.containsKey(original);
+        assert original!=null && copy!=null;
+        master2copy.put(original,copy);
+    }
+
+    /**
+     * Disambiguation version.
+     */
+    public void add(AbstractTubeImpl original, AbstractTubeImpl copy) {
+        add((Tube)original,copy);
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/PipelineAssembler.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/PipelineAssembler.java
new file mode 100644
index 00000000000..ebc37d33df9
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/PipelineAssembler.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.pipe;
+
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.server.WSEndpoint;
+import com.sun.xml.internal.ws.api.WSService;
+import com.sun.xml.internal.ws.api.EndpointAddress;
+import com.sun.xml.internal.ws.api.model.SEIModel;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+
+import javax.xml.ws.Dispatch;
+import javax.xml.ws.Provider;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebServiceException;
+
+/**
+ * Creates a pipeline.
+ *
+ * 
    
+ * This pluggability layer enables the upper layer to
+ * control exactly how the pipeline is composed.
+ *
+ * 
    
+ * JAX-WS is going to have its own default implementation
+ * when used all by itself, but it can be substituted by
+ * other implementations.
+ *
+ * 
    
+ * See {@link PipelineAssemblerFactory} for how {@link PipelineAssembler}s
+ * are located.
+ *
+ * 
    
+ * TODO: the JAX-WS team felt that no {@link Pipe} should be relying
+ * on the {@link SEIModel}, so it is no longer given to the assembler.
+ * Talk to us if you need it.
+ *
+ * @see ClientPipeAssemblerContext
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public interface PipelineAssembler {
+    /**
+     * Creates a new pipeline for clients.
+     *
+     * 
    
+     * When a JAX-WS client creates a proxy or a {@link Dispatch} from
+     * a {@link Service}, JAX-WS runtime internally uses this method
+     * to create a new pipeline as a part of the initilization.
+     *
+     * @param context
+     *      Object that captures various contextual information
+     *      that can be used to determine the pipeline to be assembled.
+     *
+     * @return
+     *      non-null freshly created pipeline.
+     *
+     * @throws WebServiceException
+     *      if there's any configuration error that prevents the
+     *      pipeline from being constructed. This exception will be
+     *      propagated into the application, so it must have
+     *      a descriptive error.
+     */
+    @NotNull Pipe createClient(@NotNull ClientPipeAssemblerContext context);
+
+    /**
+     * Creates a new pipeline for servers.
+     *
+     * 
    
+     * When a JAX-WS server deploys a new endpoint, it internally
+     * uses this method to create a new pipeline as a part of the
+     * initialization.
+     *
+     * 
    
+     * Note that this method is called only once to set up a
+     * 'master pipeline', and it gets {@link Pipe#copy(PipeCloner) copied}
+     * from it.
+     *
+     * @param context
+     *      Object that captures various contextual information
+     *      that can be used to determine the pipeline to be assembled.
+     *
+     * @return
+     *      non-null freshly created pipeline.
+     *
+     * @throws WebServiceException
+     *      if there's any configuration error that prevents the
+     *      pipeline from being constructed. This exception will be
+     *      propagated into the container, so it must have
+     *      a descriptive error.
+     *
+     */
+    @NotNull Pipe createServer(@NotNull ServerPipeAssemblerContext context);
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/PipelineAssemblerFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/PipelineAssemblerFactory.java
new file mode 100644
index 00000000000..610e7baf740
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/PipelineAssemblerFactory.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.pipe;
+
+import com.sun.xml.internal.ws.api.BindingID;
+import com.sun.xml.internal.ws.util.ServiceFinder;
+
+import javax.xml.ws.soap.SOAPBinding;
+import java.util.logging.Logger;
+
+/**
+ * Creates {@link PipelineAssembler}.
+ *
+ * 
    
+ * To create a pipeline,
+ * the JAX-WS runtime locates {@link PipelineAssemblerFactory}s through
+ * the META-INF/services/com.sun.xml.internal.ws.api.pipe.PipelineAssemblerFactory files.
+ * Factories found are checked to see if it supports the given binding ID one by one,
+ * and the first valid {@link PipelineAssembler} returned will be used to create
+ * a pipeline.
+ *
+ * 
    
+ * TODO: is bindingId really extensible? for this to be extensible,
+ * someone seems to need to hook into WSDL parsing.
+ *
+ * 
    
+ * TODO: JAX-WSA might not define its own binding ID -- it may just go to an extension element
+ * of WSDL. So this abstraction might need to be worked on.
+ *
+ * @author Kohsuke Kawaguchi
+ * @deprecated
+ *      Use {@link TubelineAssemblerFactory} instead.
+ */
+public abstract class PipelineAssemblerFactory {
+    /**
+     * Creates a {@link PipelineAssembler} applicable for the given binding ID.
+     *
+     * @param bindingId
+     *      The binding ID for which a pipeline will be created,
+     *      such as {@link SOAPBinding#SOAP11HTTP_BINDING}.
+     *      Must not be null.
+     *
+     * @return
+     *      null if this factory doesn't recognize the given binding ID.
+     */
+    public abstract PipelineAssembler doCreate(BindingID bindingId);
+
+    /**
+     * Locates {@link PipelineAssemblerFactory}s and create
+     * a suitable {@link PipelineAssembler}.
+     *
+     * @param bindingId
+     *      The binding ID string for which the new {@link PipelineAssembler}
+     *      is created. Must not be null.
+     * @return
+     *      Always non-null, since we fall back to our default {@link PipelineAssembler}.
+     */
+    public static PipelineAssembler create(ClassLoader classLoader, BindingID bindingId) {
+        for (PipelineAssemblerFactory factory : ServiceFinder.find(PipelineAssemblerFactory.class,classLoader)) {
+            PipelineAssembler assembler = factory.doCreate(bindingId);
+            if(assembler!=null) {
+                logger.fine(factory.getClass()+" successfully created "+assembler);
+                return assembler;
+            }
+        }
+
+        // default binding IDs that are known
+        // TODO: replace this with proper ones
+        return new com.sun.xml.internal.ws.util.pipe.StandalonePipeAssembler();
+    }
+
+    private static final Logger logger = Logger.getLogger(PipelineAssemblerFactory.class.getName());
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/prop/ElementProp.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/SOAPBindingCodec.java
similarity index 73%
rename from jaxws/src/share/classes/com/sun/tools/internal/txw2/model/prop/ElementProp.java
rename to jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/SOAPBindingCodec.java
index f20bd34edc3..6b274de1e2d 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/prop/ElementProp.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/SOAPBindingCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,19 +23,19 @@
  * have any questions.
  */
 
-package com.sun.tools.internal.txw2.model.prop;
+package com.sun.xml.internal.ws.api.pipe;
 
-import com.sun.codemodel.JType;
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.ws.api.message.Message;
 
-import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamReader;
 
 /**
- * Property generated from elements.
  *
- * @author Kohsuke Kawaguchi
+ *
+ * @see com.sun.xml.internal.ws.api.pipe.Codecs
+ * @author Jitendra Kotamraju
  */
-public final class ElementProp extends XmlItemProp {
-    public ElementProp(QName name, JType valueType) {
-        super(name, valueType);
-    }
+public interface SOAPBindingCodec extends Codec {
+    StreamSOAPCodec getXMLCodec();
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ServerPipeAssemblerContext.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ServerPipeAssemblerContext.java
new file mode 100644
index 00000000000..48af034d4b8
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ServerPipeAssemblerContext.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.pipe;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.api.model.SEIModel;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
+import com.sun.xml.internal.ws.api.pipe.helper.PipeAdapter;
+import com.sun.xml.internal.ws.api.server.WSEndpoint;
+
+import java.io.PrintStream;
+
+/**
+ * Factory for well-known server {@link Pipe} implementations
+ * that the {@link PipelineAssembler} needs to use
+ * to satisfy JAX-WS requirements.
+ *
+ * @author Jitendra Kotamraju
+ * @deprecated Use {@link ServerTubeAssemblerContext}.
+ */
+public final class ServerPipeAssemblerContext extends ServerTubeAssemblerContext {
+
+    public ServerPipeAssemblerContext(@Nullable SEIModel seiModel, @Nullable WSDLPort wsdlModel, @NotNull WSEndpoint endpoint, @NotNull Tube terminal, boolean isSynchronous) {
+        super(seiModel, wsdlModel, endpoint, terminal, isSynchronous);
+    }
+
+    /**
+     * Creates a {@link Pipe} that performs SOAP mustUnderstand processing.
+     * This pipe should be before HandlerPipes.
+     */
+    public @NotNull Pipe createServerMUPipe(@NotNull Pipe next) {
+        return PipeAdapter.adapt(super.createServerMUTube(PipeAdapter.adapt(next)));
+    }
+
+    /**
+     * creates a {@link Pipe} that dumps messages that pass through.
+     */
+    public Pipe createDumpPipe(String name, PrintStream out, Pipe next) {
+        return PipeAdapter.adapt(super.createDumpTube(name, out, PipeAdapter.adapt(next)));
+    }
+
+    /**
+     * Creates a {@link Pipe} that does the monitoring of the invocation for a
+     * container
+     */
+    public @NotNull Pipe createMonitoringPipe(@NotNull Pipe next) {
+        return PipeAdapter.adapt(super.createMonitoringTube(PipeAdapter.adapt(next)));
+    }
+
+    /**
+     * Creates a {@link Pipe} that adds container specific security
+     */
+    public @NotNull Pipe createSecurityPipe(@NotNull Pipe next) {
+        return PipeAdapter.adapt(super.createSecurityTube(PipeAdapter.adapt(next)));
+    }
+
+    /**
+     * Creates a {@link Pipe} that invokes protocol and logical handlers.
+     */
+    public @NotNull Pipe createHandlerPipe(@NotNull Pipe next) {
+        return PipeAdapter.adapt(super.createHandlerTube(PipeAdapter.adapt(next)));
+    }
+
+    /**
+     * The last {@link Pipe} in the pipeline. The assembler is expected to put
+     * additional {@link Pipe}s in front of it.
+     *
+     * 
    
+     * (Just to give you the idea how this is used, normally the terminal pipe
+     * is the one that invokes the user application or {@link javax.xml.ws.Provider}.)
+     *
+     * @return always non-null terminal pipe
+     */
+     public @NotNull Pipe getTerminalPipe() {
+         return PipeAdapter.adapt(super.getTerminalTube());
+    }
+
+     /**
+     * Creates WS-Addressing pipe
+     */
+    public Pipe createWsaPipe(Pipe next) {
+        return PipeAdapter.adapt(super.createWsaTube(PipeAdapter.adapt(next)));
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ServerTubeAssemblerContext.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ServerTubeAssemblerContext.java
new file mode 100644
index 00000000000..4a0a325c8d3
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ServerTubeAssemblerContext.java
@@ -0,0 +1,234 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.pipe;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.addressing.WsaServerTube;
+import com.sun.xml.internal.ws.api.addressing.AddressingVersion;
+import com.sun.xml.internal.ws.api.model.SEIModel;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
+import com.sun.xml.internal.ws.api.pipe.helper.PipeAdapter;
+import com.sun.xml.internal.ws.api.server.ServerPipelineHook;
+import com.sun.xml.internal.ws.api.server.WSEndpoint;
+import com.sun.xml.internal.ws.binding.BindingImpl;
+import com.sun.xml.internal.ws.handler.HandlerTube;
+import com.sun.xml.internal.ws.handler.ServerLogicalHandlerTube;
+import com.sun.xml.internal.ws.handler.ServerSOAPHandlerTube;
+import com.sun.xml.internal.ws.protocol.soap.ServerMUTube;
+import com.sun.xml.internal.ws.util.pipe.DumpTube;
+
+import javax.xml.ws.soap.SOAPBinding;
+import java.io.PrintStream;
+
+/**
+ * Factory for well-known server {@link Tube} implementations
+ * that the {@link TubelineAssembler} needs to use
+ * to satisfy JAX-WS requirements.
+ *
+ * @author Jitendra Kotamraju
+ */
+public class ServerTubeAssemblerContext {
+
+    private final SEIModel seiModel;
+    private final WSDLPort wsdlModel;
+    private final WSEndpoint endpoint;
+    private final BindingImpl binding;
+    private final Tube terminal;
+    private final boolean isSynchronous;
+    private @NotNull Codec codec;
+
+    public ServerTubeAssemblerContext(@Nullable SEIModel seiModel,
+                                      @Nullable WSDLPort wsdlModel, @NotNull WSEndpoint endpoint,
+                                      @NotNull Tube terminal, boolean isSynchronous) {
+        this.seiModel = seiModel;
+        this.wsdlModel = wsdlModel;
+        this.endpoint = endpoint;
+        this.terminal = terminal;
+        // WSBinding is actually BindingImpl
+        this.binding = (BindingImpl)endpoint.getBinding();
+        this.isSynchronous = isSynchronous;
+        this.codec = this.binding.createCodec();
+    }
+
+    /**
+     * The created pipeline will use seiModel to get java concepts for the endpoint
+     *
+     * @return Null if the service doesn't have SEI model e.g. Provider endpoints,
+     *         and otherwise non-null.
+     */
+    public @Nullable SEIModel getSEIModel() {
+        return seiModel;
+    }
+
+    /**
+     * The created pipeline will be used to serve this port.
+     *
+     * @return Null if the service isn't associated with any port definition in WSDL,
+     *         and otherwise non-null.
+     */
+    public @Nullable WSDLPort getWsdlModel() {
+        return wsdlModel;
+    }
+
+    /**
+     *
+     * The created pipeline is used to serve this {@link com.sun.xml.internal.ws.api.server.WSEndpoint}.
+     * Specifically, its {@link com.sun.xml.internal.ws.api.WSBinding} should be of interest to  many
+     * {@link com.sun.xml.internal.ws.api.pipe.Pipe}s.
+     *  @return Always non-null.
+     */
+    public @NotNull WSEndpoint getEndpoint() {
+        return endpoint;
+    }
+
+    /**
+     * The last {@link com.sun.xml.internal.ws.api.pipe.Pipe} in the pipeline. The assembler is expected to put
+     * additional {@link com.sun.xml.internal.ws.api.pipe.Pipe}s in front of it.
+     *
+     * 
    
+     * (Just to give you the idea how this is used, normally the terminal pipe
+     * is the one that invokes the user application or {@link javax.xml.ws.Provider}.)
+     *
+     * @return always non-null terminal pipe
+     */
+     public @NotNull Tube getTerminalTube() {
+         return terminal;
+    }
+
+    /**
+     * If this server pipeline is known to be used for serving synchronous transport,
+     * then this method returns true. This can be potentially use as an optimization
+     * hint, since often synchronous versions are cheaper to execute than asycnhronous
+     * versions.
+     */
+    public boolean isSynchronous() {
+        return isSynchronous;
+    }
+
+    /**
+     * Creates a {@link Tube} that performs SOAP mustUnderstand processing.
+     * This pipe should be before HandlerPipes.
+     */
+    public @NotNull Tube createServerMUTube(@NotNull Tube next) {
+        if (binding instanceof SOAPBinding)
+            return new ServerMUTube(binding,next);
+        else
+            return next;
+    }
+
+    /**
+     * Creates a {@link Tube} that invokes protocol and logical handlers.
+     */
+    public @NotNull Tube createHandlerTube(@NotNull Tube next) {
+        if (!binding.getHandlerChain().isEmpty()) {
+            HandlerTube cousin = new ServerLogicalHandlerTube(binding, wsdlModel, next);
+            next = cousin;
+            if (binding instanceof SOAPBinding) {
+                return new ServerSOAPHandlerTube(binding, next, cousin);
+            }
+        }
+        return next;
+    }
+
+    /**
+     * Creates a {@link Tube} that does the monitoring of the invocation for a
+     * container
+     */
+    public @NotNull Tube createMonitoringTube(@NotNull Tube next) {
+        ServerPipelineHook hook = endpoint.getContainer().getSPI(ServerPipelineHook.class);
+        if (hook != null) {
+            ServerPipeAssemblerContext ctxt = new ServerPipeAssemblerContext(seiModel, wsdlModel, endpoint, terminal, isSynchronous);
+            return PipeAdapter.adapt(hook.createMonitoringPipe(ctxt, PipeAdapter.adapt(next)));
+        }
+        return next;
+    }
+
+    /**
+     * Creates a {@link Tube} that adds container specific security
+     */
+    public @NotNull Tube createSecurityTube(@NotNull Tube next) {
+        ServerPipelineHook hook = endpoint.getContainer().getSPI(ServerPipelineHook.class);
+        if (hook != null) {
+            ServerPipeAssemblerContext ctxt = new ServerPipeAssemblerContext(seiModel, wsdlModel, endpoint, terminal, isSynchronous);
+            return PipeAdapter.adapt(hook.createSecurityPipe(ctxt, PipeAdapter.adapt(next)));
+        }
+        return next;
+    }
+
+    /**
+     * creates a {@link Tube} that dumps messages that pass through.
+     */
+    public Tube createDumpTube(String name, PrintStream out, Tube next) {
+        return new DumpTube(name, out, next);
+    }
+
+    /**
+     * Creates WS-Addressing pipe
+     */
+    public Tube createWsaTube(Tube next) {
+        if (binding instanceof SOAPBinding && AddressingVersion.isEnabled(binding) && wsdlModel!=null)
+            return new WsaServerTube(wsdlModel, binding, next);
+        else
+            return next;
+    }
+
+    /**
+     * Gets the {@link Codec} that is set by {@link #setCodec} or the default codec
+     * based on the binding. The codec is a full codec that is responsible for
+     * encoding/decoding entire protocol message(for e.g: it is responsible to
+     * encode/decode entire MIME messages in SOAP binding)
+     *
+     * @return codec to be used for web service requests
+     * @see {@link Codecs}
+     */
+    public @NotNull Codec getCodec() {
+        return codec;
+    }
+
+    /**
+     * Interception point to change {@link Codec} during {@link Tube}line assembly. The
+     * new codec will be used by jax-ws server runtime for encoding/decoding web service
+     * request/response messages. {@link WSEndpoint#createCodec()} will return a copy
+     * of this new codec and will be used in the server runtime.
+     *
+     * 
    
+     * The codec is a full codec that is responsible for
+     * encoding/decoding entire protocol message(for e.g: it is responsible to
+     * encode/decode entire MIME messages in SOAP binding)
+     *
+     * 
    
+     * the codec should correctly implement {@link Codec#copy} since it is used while
+     * serving requests concurrently.
+     *
+     * @param codec codec to be used for web service requests
+     * @see {@link Codecs}
+     */
+    public void setCodec(@NotNull Codec codec) {
+        this.codec = codec;
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/spi/runtime/MtomCallback.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/StreamSOAPCodec.java
similarity index 57%
rename from jaxws/src/share/classes/com/sun/xml/internal/ws/spi/runtime/MtomCallback.java
rename to jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/StreamSOAPCodec.java
index 7802095264f..36f3b417c15 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/spi/runtime/MtomCallback.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/StreamSOAPCodec.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,23 +22,31 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-package com.sun.xml.internal.ws.spi.runtime;
 
-import javax.activation.DataHandler;
+package com.sun.xml.internal.ws.api.pipe;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.ws.api.message.Message;
+
+import javax.xml.stream.XMLStreamReader;
 
 /**
- * MTOM callback class that is passed to InternalSoapEncoder.write() to get notification when
- * mtom attachment is added or the message is xopped.
+ * Reads events from {@link XMLStreamReader} and constructs a
+ * {@link Message} for SOAP envelope. {@link Codecs} allows a
+ * way to construct a whole codec that can handle MTOM, MIME
+ * encoded packages using this codec.
+ *
+ *
+ * @see Codecs
+ * @author Jitendra Kotamraju
  */
-public interface MtomCallback {
+public interface StreamSOAPCodec extends Codec {
     /**
-     * This method provides the content-id that will be set to Content-ID MIME header, the
-     * element which will be xop encoded by JAXB.
+     * Reads events from {@link XMLStreamReader} and constructs a
+     * {@link Message} for SOAP envelope.
      *
-     * @param contentId
-     * @param attachment
-     * @param elementTargetNamespace
-     * @param elementLocalName
+     * @param reader that represents SOAP envelope infoset
+     * @return a {@link Message} for SOAP envelope
      */
-    public void addedMtomAttachment(String contentId, DataHandler attachment, String elementTargetNamespace, String elementLocalName);
+    public @NotNull Message decode(@NotNull XMLStreamReader reader);
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Stubs.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Stubs.java
new file mode 100644
index 00000000000..8349d214e67
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Stubs.java
@@ -0,0 +1,253 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.pipe;
+
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.WSService;
+import com.sun.xml.internal.ws.api.addressing.WSEndpointReference;
+import com.sun.xml.internal.ws.api.message.Message;
+import com.sun.xml.internal.ws.api.model.SEIModel;
+import com.sun.xml.internal.ws.binding.BindingImpl;
+import com.sun.xml.internal.ws.client.WSServiceDelegate;
+import com.sun.xml.internal.ws.client.dispatch.DataSourceDispatch;
+import com.sun.xml.internal.ws.client.dispatch.DispatchImpl;
+import com.sun.xml.internal.ws.client.dispatch.JAXBDispatch;
+import com.sun.xml.internal.ws.client.dispatch.MessageDispatch;
+import com.sun.xml.internal.ws.client.sei.SEIStub;
+import com.sun.xml.internal.ws.developer.WSBindingProvider;
+import com.sun.xml.internal.ws.model.SOAPSEIModel;
+
+import javax.activation.DataSource;
+import javax.xml.bind.JAXBContext;
+import javax.xml.namespace.QName;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.transform.Source;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Dispatch;
+import javax.xml.ws.Service;
+import javax.xml.ws.Service.Mode;
+import javax.xml.ws.WebServiceException;
+import java.lang.reflect.Proxy;
+
+/**
+ * Factory methods of various stubs.
+ *
+ * 
    
+ * This class provides various methods to create "stub"s,
+ * which are the component that turns a method invocation
+ * into a {@link Message} and back into a return value.
+ *
+ * 
    
+ * This class is meant to serve as the API from JAX-WS to
+ * Tango, so that they don't have hard-code dependency on
+ * our implementation classes.
+ *
+ * 
+ * 
    Common Parameters and Their Meanings
    
+ *
+ * 
    Pipe next
    
+ * 
    
+ * Stubs turn a method invocation into a {@link Pipe#process(com.sun.xml.internal.ws.api.message.Packet)} invocation,
+ * and this pipe passed in as the next parameter will receive a {@link Message}
+ * from newly created stub.
+ *
+ * 
    BindingImpl binding
    
+ * 
    
+ * Stubs implement {@link BindingProvider}, and its {@link BindingProvider#getBinding()}
+ * will return this binding object. Stubs often also use this information
+ * to decide which SOAP version a {@link Message} should be created in.
+ *
+ * 
    {@link WSService} service
    
+ * 
    
+ * This object represents a {@link Service} that owns the newly created stub.
+ * For example, asynchronous method invocation will use {@link Service#getExecutor()}.
+ *
+ * 
    {@link WSEndpointReference} epr
    
+ * 
    
+ * If you want the created {@link Dispatch} to talk to the given EPR, specify the parameter.
+ * Otherwise leave it null. Note that the addressing needs to be enabled separately
+ * for this to take effect.
+ *
+ * @author Kohsuke Kawaguchi
+ * @author Kathy Walsh
+ */
+public abstract class Stubs {
+    private Stubs() {}   // no instanciation please
+
+    /**
+     * Creates a new {@link Dispatch} stub for {@link SOAPMessage}.
+     *
+     * This is short-cut of calling
+     * 
    +     * createDispatch(port,owner,binding,SOAPMessage.class,mode,next);
+     * 
    
+     */
+    public static Dispatch createSAAJDispatch(QName portName, WSService owner, WSBinding binding, Service.Mode mode, Tube next, @Nullable WSEndpointReference epr) {
+        DispatchImpl.checkValidSOAPMessageDispatch(binding, mode);
+        return new com.sun.xml.internal.ws.client.dispatch.SOAPMessageDispatch(portName, mode, (WSServiceDelegate)owner, next, (BindingImpl)binding, epr);
+    }
+
+    /**
+     * Creates a new {@link Dispatch} stub for {@link DataSource}.
+     *
+     * This is short-cut of calling
+     * 
    +     * createDispatch(port,owner,binding,DataSource.class,mode,next);
+     * 
    
+     */
+    public static Dispatch createDataSourceDispatch(QName portName, WSService owner, WSBinding binding, Service.Mode mode, Tube next, @Nullable WSEndpointReference epr) {
+        DispatchImpl.checkValidDataSourceDispatch(binding, mode);
+        return new DataSourceDispatch(portName, mode, (WSServiceDelegate)owner, next, (BindingImpl)binding, epr);
+    }
+
+    /**
+     * Creates a new {@link Dispatch} stub for {@link Source}.
+     *
+     * This is short-cut of calling
+     * 
    +     * createDispatch(port,owner,binding,Source.class,mode,next);
+     * 
    
+     */
+    public static Dispatch createSourceDispatch(QName portName, WSService owner, WSBinding binding, Service.Mode mode, Tube next, @Nullable WSEndpointReference epr) {
+        return DispatchImpl.createSourceDispatch(portName, mode, (WSServiceDelegate)owner, next, (BindingImpl)binding, epr);
+    }
+
+    /**
+     * Creates a new {@link Dispatch} stub that connects to the given pipe.
+     *
+     * @param portName
+     *      see {@link Service#createDispatch(QName, Class, Service.Mode)}.
+     * @param owner
+     *      see common parameters
+     * @param binding
+     *      see common parameters
+     * @param clazz
+     *      Type of the {@link Dispatch} to be created.
+     *      See {@link Service#createDispatch(QName, Class, Service.Mode)}.
+     * @param mode
+     *      The mode of the dispatch.
+     *      See {@link Service#createDispatch(QName, Class, Service.Mode)}.
+     * @param next
+     *      see common parameters
+     * @param epr
+     *      see common parameters
+     * TODO: are these parameters making sense?
+     */
+    public static  Dispatch createDispatch(QName portName,
+                                                 WSService owner,
+                                                 WSBinding binding,
+                                                 Class clazz, Service.Mode mode, Tube next,
+                                                 @Nullable WSEndpointReference epr) {
+        if (clazz == SOAPMessage.class) {
+            return (Dispatch) createSAAJDispatch(portName, owner, binding, mode, next, epr);
+        } else if (clazz == Source.class) {
+            return (Dispatch) createSourceDispatch(portName, owner, binding, mode, next, epr);
+        } else if (clazz == DataSource.class) {
+            return (Dispatch) createDataSourceDispatch(portName, owner, binding, mode, next, epr);
+        } else if (clazz == Message.class) {
+            if(mode==Mode.MESSAGE)
+                return (Dispatch) createMessageDispatch(portName, owner, binding, next, epr);
+            else
+                throw new WebServiceException(mode+" not supported with Dispatch");
+        } else
+            throw new WebServiceException("Unknown class type " + clazz.getName());
+    }
+
+    /**
+     * Creates a new JAXB-based {@link Dispatch} stub that connects to the given pipe.
+     *
+     * @param portName
+     *      see {@link Service#createDispatch(QName, Class, Service.Mode)}.
+     * @param owner
+     *      see common parameters
+     * @param binding
+     *      see common parameters
+     * @param jaxbContext
+     *      {@link JAXBContext} used to convert between objects and XML.
+     * @param mode
+     *      The mode of the dispatch.
+     *      See {@link Service#createDispatch(QName, Class, Service.Mode)}.
+     * @param next
+     *      see common parameters
+     * @param epr
+     *      see common parameters
+     */
+    public static Dispatch createJAXBDispatch(
+                                           QName portName, WSService owner, WSBinding binding,
+                                           JAXBContext jaxbContext, Service.Mode mode, Tube next,
+                                           @Nullable WSEndpointReference epr) {
+        return new JAXBDispatch(portName, jaxbContext, mode, (WSServiceDelegate)owner, next, (BindingImpl)binding, epr);
+    }
+
+    /**
+     * Creates a new {@link Message}-based {@link Dispatch} stub that connects to the given pipe.
+     * The returned dispatch is always {@link Service.Mode#MESSAGE}.
+     *
+     * @param portName
+     *      see {@link Service#createDispatch(QName, Class, Service.Mode)}.
+     * @param owner
+     *      see common parameters
+     * @param binding
+     *      see common parameters
+     * @param next
+     *      see common parameters
+     * @param epr
+     *      see common parameters
+     */
+    public static Dispatch createMessageDispatch(
+                                           QName portName, WSService owner, WSBinding binding,
+                                           Tube next, @Nullable WSEndpointReference epr) {
+        return new MessageDispatch(portName, (WSServiceDelegate)owner, next, (BindingImpl)binding, epr);
+    }
+
+    /**
+     * Creates a new strongly-typed proxy object that implements a given port interface.
+     *
+     * @param service
+     *      see common parameters
+     * @param binding
+     *      see common parameters
+     * @param model
+     *      This model shall represent a port interface.
+     *      TODO: can model be constructed from portInterface and binding?
+     *      Find out and update.
+     * @param portInterface
+     *      The port interface that has operations as Java methods.
+     * @param next
+     *      see common parameters
+     * @param epr
+     *      see common parameters
+     */
+    public  T createPortProxy( WSService service, WSBinding binding, SEIModel model,
+                                  Class portInterface, Tube next, @Nullable WSEndpointReference epr ) {
+
+        SEIStub ps = new SEIStub((WSServiceDelegate)service,(BindingImpl)binding, (SOAPSEIModel)model,next, epr);
+        return portInterface.cast(
+            Proxy.newProxyInstance( portInterface.getClassLoader(),
+                new Class[]{portInterface, WSBindingProvider.class}, ps ));
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/TransportPipeFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/TransportPipeFactory.java
new file mode 100644
index 00000000000..23cac620565
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/TransportPipeFactory.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.pipe;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.api.EndpointAddress;
+import com.sun.xml.internal.ws.api.pipe.helper.PipeAdapter;
+import com.sun.xml.internal.ws.util.pipe.StandalonePipeAssembler;
+
+import javax.xml.ws.WebServiceException;
+
+/**
+ * Factory for transport pipes that enables transport pluggability.
+ *
+ * 
    
+ * At runtime, on the client side, JAX-WS (more specifically the default {@link PipelineAssembler}
+ * of JAX-WS client runtime) relies on this factory to create a suitable transport {@link Pipe}
+ * that can handle the given {@link EndpointAddress endpoint address}.
+ *
+ * 
    
+ * JAX-WS extensions that provide additional transport support can
+ * extend this class and implement the {@link #doCreate} method.
+ * They are expected to check the scheme of the endpoint address
+ * (and possibly some other settings from bindings), and create
+ * their transport pipe implementations accordingly.
+ * For example,
+ *
+ * 
    + * class MyTransportPipeFactoryImpl {
+ *   Pipe doCreate(...) {
+ *     String scheme = address.getURI().getScheme();
+ *     if(scheme.equals("foo"))
+ *       return new MyTransport(...);
+ *     else
+ *       return null;
+ *   }
+ * }
+ * 
    
+ *
+ * 
    
+ * {@link TransportPipeFactory} look-up follows the standard service
+ * discovery mechanism, so you need
+ * {@code META-INF/services/com.sun.xml.internal.ws.api.pipe.TransportPipeFactory}.
+ *
+ *
+ *
+ * 
    TODO
    
+ * 
    
+ * One of the JAX-WS operation mode is supposedly where it doesn't have no WSDL whatsoever.
+ * How do we identify the endpoint in such case?
+ *
+ * @author Kohsuke Kawaguchi
+ * @see StandalonePipeAssembler
+ */
+public abstract class TransportPipeFactory {
+    /**
+     * Creates a transport {@link Pipe} for the given port, if this factory can do so,
+     * or return null.
+     *
+     * @param context
+     *      Object that captures various contextual information
+     *      that can be used to determine the pipeline to be assembled.
+     *
+     * @return
+     *      null to indicate that this factory isn't capable of creating a transport
+     *      for this port (which causes the caller to search for other {@link TransportPipeFactory}s
+     *      that can. Or non-null.
+     *
+     * @throws WebServiceException
+     *      if this factory is capable of creating a transport pipe but some fatal
+     *      error prevented it from doing so. This exception will be propagated
+     *      back to the user application, and no further {@link TransportPipeFactory}s
+     *      are consulted.
+     */
+    public abstract Pipe doCreate(@NotNull ClientPipeAssemblerContext context);
+
+    /**
+     * Locates {@link PipelineAssemblerFactory}s and create
+     * a suitable {@link PipelineAssembler}.
+     *
+     * @param classLoader
+     *      used to locate {@code META-INF/servces} files.
+     * @return
+     *      Always non-null, since we fall back to our default {@link PipelineAssembler}.
+     *
+     * @deprecated
+     *      Use {@link TransportTubeFactory#create(ClassLoader, ClientTubeAssemblerContext)}
+     */
+    public static Pipe create(@Nullable ClassLoader classLoader, @NotNull ClientPipeAssemblerContext context) {
+        return PipeAdapter.adapt(TransportTubeFactory.create(classLoader,context));
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/TransportTubeFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/TransportTubeFactory.java
new file mode 100644
index 00000000000..cab59529532
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/TransportTubeFactory.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.pipe;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.api.EndpointAddress;
+import com.sun.xml.internal.ws.api.pipe.helper.PipeAdapter;
+import com.sun.xml.internal.ws.transport.http.client.HttpTransportPipe;
+import com.sun.xml.internal.ws.util.ServiceFinder;
+import com.sun.xml.internal.ws.util.pipe.StandaloneTubeAssembler;
+
+import javax.xml.ws.WebServiceException;
+import java.util.logging.Logger;
+
+/**
+ * Factory for transport tubes that enables transport pluggability.
+ *
+ * 
    
+ * At runtime, on the client side, JAX-WS (more specifically the default {@link TubelineAssembler}
+ * of JAX-WS client runtime) relies on this factory to create a suitable transport {@link Tube}
+ * that can handle the given {@link EndpointAddress endpoint address}.
+ *
+ * 
    
+ * JAX-WS extensions that provide additional transport support can
+ * extend this class and implement the {@link #doCreate} method.
+ * They are expected to check the scheme of the endpoint address
+ * (and possibly some other settings from bindings), and create
+ * their transport tube implementations accordingly.
+ * For example,
+ *
+ * 
    + * class MyTransportTubeFactoryImpl {
+ *   Tube doCreate(...) {
+ *     String scheme = address.getURI().getScheme();
+ *     if(scheme.equals("foo"))
+ *       return new MyTransport(...);
+ *     else
+ *       return null;
+ *   }
+ * }
+ * 
    
+ *
+ * 
    
+ * {@link TransportTubeFactory} look-up follows the standard service
+ * discovery mechanism, so you need
+ * {@code META-INF/services/com.sun.xml.internal.ws.api.pipe.TransportTubeFactory}.
+ *
+ * @author Jitendra Kotamraju
+ * @see StandaloneTubeAssembler
+ */
+public abstract class TransportTubeFactory {
+    /**
+     * Creates a transport {@link Tube} for the given port, if this factory can do so,
+     * or return null.
+     *
+     * @param context
+     *      Object that captures various contextual information
+     *      that can be used to determine the tubeline to be assembled.
+     *
+     * @return
+     *      null to indicate that this factory isn't capable of creating a transport
+     *      for this port (which causes the caller to search for other {@link TransportTubeFactory}s
+     *      that can. Or non-null.
+     *
+     * @throws WebServiceException
+     *      if this factory is capable of creating a transport tube but some fatal
+     *      error prevented it from doing so. This exception will be propagated
+     *      back to the user application, and no further {@link TransportTubeFactory}s
+     *      are consulted.
+     */
+    public abstract Tube doCreate(@NotNull ClientTubeAssemblerContext context);
+
+    /**
+     * Locates {@link TransportTubeFactory}s and create a suitable transport {@link Tube}.
+     *
+     * @param classLoader
+     *      used to locate {@code META-INF/servces} files.
+     * @return
+     *      Always non-null, since we fall back to our default {@link Tube}.
+     */
+    public static Tube create(@Nullable ClassLoader classLoader, @NotNull ClientTubeAssemblerContext context) {
+        for (TransportTubeFactory factory : ServiceFinder.find(TransportTubeFactory.class,classLoader)) {
+            Tube tube = factory.doCreate(context);
+            if(tube !=null) {
+                TransportTubeFactory.logger.fine(factory.getClass()+" successfully created "+tube);
+                return tube;
+            }
+        }
+
+        // See if there is a {@link TransportPipeFactory} out there and use it for compatibility.
+        ClientPipeAssemblerContext ctxt = new ClientPipeAssemblerContext(
+                context.getAddress(), context.getWsdlModel(), context.getService(),
+                context.getBinding(), context.getContainer());
+        for (TransportPipeFactory factory : ServiceFinder.find(TransportPipeFactory.class,classLoader)) {
+            Pipe pipe = factory.doCreate(ctxt);
+            if (pipe!=null) {
+                logger.fine(factory.getClass()+" successfully created "+pipe);
+                return PipeAdapter.adapt(pipe);
+            }
+        }
+
+        // default built-in transports
+        String scheme = context.getAddress().getURI().getScheme();
+        if (scheme != null) {
+            if(scheme.equalsIgnoreCase("http") || scheme.equalsIgnoreCase("https"))
+                return new HttpTransportPipe(context.getCodec());
+        }
+
+        throw new WebServiceException("Unsupported endpoint address: "+context.getAddress());    // TODO: i18n
+    }
+
+    private static final Logger logger = Logger.getLogger(TransportTubeFactory.class.getName());
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Tube.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Tube.java
new file mode 100644
index 00000000000..53a18232065
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Tube.java
@@ -0,0 +1,397 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.pipe;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.ws.api.message.Message;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.pipe.helper.AbstractFilterTubeImpl;
+import com.sun.xml.internal.ws.api.pipe.helper.AbstractTubeImpl;
+import com.sun.xml.internal.ws.api.server.Adapter;
+
+import javax.annotation.PreDestroy;
+import javax.xml.ws.Dispatch;
+import javax.xml.ws.Provider;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.handler.LogicalHandler;
+import javax.xml.ws.handler.soap.SOAPHandler;
+import java.text.SimpleDateFormat;
+
+/**
+ * Abstraction of the intermediate layers in the processing chain
+ * and transport.
+ *
+ * 
    What is a {@link Tube}?
    
+ * 
    
+ * {@link Tube} is a basic processing unit that represents SOAP-level
+ * protocol handling code. Mutliple tubes are often put together in
+ * a line (it needs not one dimensional — more later), and act on
+ * {@link Packet}s in a sequential fashion.
+ *
+ * 
    
+ * {@link Tube}s run asynchronously. That is, there is no guarantee that
+ * {@link #processRequest(Packet)} and {@link #processResponse(Packet)} runs
+ * in the same thread, nor is there any guarantee that this tube and next
+ * tube runs in the same thread. Furthermore, one thread may be used to
+ * run multiple pipeline in turn (just like a real CPU runs multiple
+ * threads in turn.)
+ *
+ *
+ * 
    Tube examples
    
+ * 
    
+ * Transport is a kind of tube. It sends the {@link Packet}
+ * through, say, HTTP connection, and receives the data back into another {@link Packet}.
+ *
+ * 
    
+ * More often, a tube works like a filter. It acts on a packet,
+ * and then it tells the JAX-WS that the packet should be passed into another
+ * tube. It can do the same on the way back.
+ *
+ * 
    
+ * For example, XWSS will be a {@link Tube}. It will act on a request
+ * {@link Packet}, then perhaps wrap it into
+ * another {@link Packet} to encrypt the body and add a header, then
+ * the processing will go on to the next tube.
+ *
+ * 
    
+ * Yet another kind of filter tube is those that wraps {@link LogicalHandler}
+ * and {@link SOAPHandler}. These tubes are heavy-weight; they often consume
+ * a message in a packet and create a new one, and then pass it to the next tube.
+ *
+ * 
    
+ * There would be a {@link Tube} implementation that invokes {@link Provider}.
+ * There would be a {@link Tube} implementation that invokes a service method
+ * on the user's code.
+ * There would be a {@link Dispatch} implementation that invokes a {@link Tube}.
+ *
+ * 
    
+ * WS-MEX can be implemented as a {@link Tube} that looks for
+ * {@link Message#getPayloadNamespaceURI()} and serves the request.
+ *
+ *
+ *
+ *
+ * 
    Tube Lifecycle
    
+ * Pipeline is expensive to set up, so once it's created it will be reused.
+ * A pipeline is not reentrant; one pipeline is used to process one request/response
+ * at at time. The same pipeline instance may serve multiple request/response,
+ * if one comes after another and they don't overlap.
+ * 
    
+ * Where a need arises to process multiple requests concurrently, a pipeline
+ * gets cloned through {@link TubeCloner}. Note that this need may happen on
+ * both server (because it quite often serves multiple requests concurrently)
+ * and client (because it needs to support asynchronous method invocations.)
+ * 
    
+ * Created pipelines (including cloned ones and the original) may be discarded and GC-ed
+ * at any time at the discretion of whoever owns pipelines. Tubes can, however, expect
+ * at least one copy (or original) of pipeline to live at any given time while a pipeline
+ * owner is interested in the given pipeline configuration (in more concerete terms,
+ * for example, as long as a dispatch object lives, it's going to keep at least one
+ * copy of a pipeline alive.)
+ * 
    
+ * Before a pipeline owner dies, it may invoke {@link #preDestroy()} on the last
+ * remaining pipeline. It is "may" for pipeline owners that live in the client-side
+ * of JAX-WS (such as dispatches and proxies), but it is a "must" for pipeline owners
+ * that live in the server-side of JAX-WS.
+ * 
    
+ * This last invocation gives a chance for some pipes to clean up any state/resource
+ * acquired (such as WS-RM's sequence, WS-Trust's SecurityToken), although as stated above,
+ * this is not required for clients.
+ *
+ *
+ *
+ * 
    Tube and state
    
+ * 
    
+ * The lifecycle of pipelines is designed to allow a {@link Tube} to store various
+ * state in easily accessible fashion.
+ *
+ *
+ * 
    Per-packet state
    
+ * 
    
+ * Any information that changes from a packet to packet should be
+ * stored in {@link Packet} (if such informaton is specific to your problem domain,
+ * then most likely {@link Packet#invocationProperties}.)
+ * This includes information like transport-specific headers.
+ *
+ * 
    Per-thread state
    
+ * 
    
+ * Any expensive-to-create objects that are non-reentrant can be stored
+ * either in instance variables of a {@link Tube}, or a static {@link ThreadLocal}.
+ *
+ * 
    
+ * The first approach works, because {@link Tube} is
+ * non reentrant. When a tube is copied, new instances should be allocated
+ * so that two {@link Tube} instances don't share thread-unsafe resources.
+ *
+ * Similarly the second approach works, since {@link ThreadLocal} guarantees
+ * that each thread gets its own private copy.
+ *
+ * 
    
+ * The former is faster to access, and you need not worry about clean up.
+ * On the other hand, because there can be many more concurrent requests
+ * than # of threads, you may end up holding onto more resources than necessary.
+ *
+ * 
    
+ * This includes state like canonicalizers, JAXB unmarshallers,
+ * {@link SimpleDateFormat}, etc.
+ *
+ *
+ * 
    Per-proxy/per-endpoint state
    
+ * 
    
+ * Information that is tied to a particular proxy/dispatch can be stored
+ * in a separate object that is referenced from a tube. When
+ * a new tube is copied, you can simply hand out a reference to the newly
+ * created one, so that all copied tubes refer to the same instance.
+ * See the following code as an example:
+ *
+ * 
    + * class TubeImpl {
+ *   // this object stores per-proxy state
+ *   class DataStore {
+ *     int counter;
+ *   }
+ *
+ *   private DataStore ds;
+ *
+ *   // create a fresh new pipe
+ *   public TubeImpl(...) {
+ *     ....
+ *     ds = new DataStore();
+ *   }
+ *
+ *   // copy constructor
+ *   private TubeImpl(TubeImpl that, PipeCloner cloner) {
+ *     cloner.add(that,this);
+ *     ...
+ *     this.ds = that.ds;
+ *   }
+ *
+ *   public TubeImpl copy(PipeCloner pc) {
+ *     return new TubeImpl(this,pc);
+ *   }
+ * }
+ * 
    
+ *
+ * 
    
+ * Note that access to such resource may need to be synchronized,
+ * since multiple copies of pipelines may execute concurrently.
+ *
+ *
+ *
+ * 
    VM-wide state
    
+ * 
    
+ * static is always there for you to use.
+ *
+ *
+ *
+ * @see AbstractTubeImpl
+ * @see AbstractFilterTubeImpl
+ *
+ * @author Kohsuke Kawaguchi
+ * @author Jitendra Kotamraju
+ */
+public interface Tube {
+    /**
+     * Acts on a request and perform some protocol specific operation.
+     *
+     * TODO: exception handling semantics need more discussion
+     *
+     * @throws WebServiceException
+     *      On the server side, this signals an error condition where
+     *      a fault reply is in order (or the exception gets eaten by
+     *      the top-most transport {@link Adapter} if it's one-way.)
+     *      This frees each {@link Tube} from try/catching a
+     *      {@link WebServiceException} in every layer.
+     *
+     *      Note that this method is also allowed to return
+     *      {@link NextAction#returnWith(Packet)} with
+     *      a {@link Packet} that has a fault as the payload.
+     *
+     *      
    
+     *      On the client side, the {@link WebServiceException} thrown
+     *      will be propagated all the way back to the calling client
+     *      applications. (The consequence of that is that if you are
+     *      a filtering {@link Tube}, you must not eat the exception
+     *      that was given to {@link #processException(Throwable)} .
+     *
+     * @throws RuntimeException
+     *      Other runtime exception thrown by this method must
+     *      be treated as a bug in the tube implementation,
+     *      and therefore should not be converted into a fault.
+     *      (Otherwise it becomes very difficult to debug implementation
+     *      problems.)
+     *
+     *      
    
+     *      On the server side, this exception should be most likely
+     *      just logged. On the client-side it gets propagated to the
+     *      client application.
+     *
+     *      
    
+     *      The consequence of this is that if a pipe calls
+     *      into an user application (such as {@link SOAPHandler}
+     *      or {@link LogicalHandler}), where a {@link RuntimeException}
+     *      is *not* a bug in the JAX-WS implementation, it must be catched
+     *      and wrapped into a {@link WebServiceException}.
+     *
+     * @param request
+     *      The packet that represents a request message.
+     *      If the packet has a non-null message, it must be a valid
+     *      unconsumed {@link Message}. This message represents the
+     *      SOAP message to be sent as a request.
+     *      
    
+     *      The packet is also allowed to carry no message, which indicates
+     *      that this is an output-only request.
+     *      (that's called "solicit", right? - KK)
+     *
+     * @return
+     *      A {@link NextAction} object that represents the next action
+     *      to be taken by the JAX-WS runtime.
+     */
+    @NotNull NextAction processRequest(@NotNull Packet request);
+
+    /**
+     * Acts on a response and performs some protocol specific operation.
+     *
+     * 
    
+     * Once a {@link #processRequest(Packet)} is invoked, this method
+     * will be always invoked with the response, before this {@link Tube}
+     * processes another request.
+     *
+     * @param response
+     *      If the packet has a non-null message, it must be
+     *      a valid unconsumed {@link Message}. This message represents
+     *      a response to the request message passed to
+     *      {@link #processRequest(Packet)} earlier.
+     *      
    
+     *      The packet is also allowed to carry no message, which indicates
+     *      that there was no response. This is used for things like
+     *      one-way message and/or one-way transports.
+     *
+     * TODO: exception handling semantics need more discussion
+     *
+     * @return
+     *      A {@link NextAction} object that represents the next action
+     *      to be taken by the JAX-WS runtime.
+     */
+    @NotNull NextAction processResponse(@NotNull Packet response);
+
+
+    /**
+     * Acts on a exception and performs some clean up operations.
+     *
+     * 
    
+     * If a {@link #processRequest(Packet)}, {@link #processResponse(Packet)},
+     * {@link #processException(Throwable)} throws an exception, this method
+     * will be always invoked on all the {@link Tube}s in the remaining
+     * {@link NextAction}s.
+     *
+     * 
    
+     * On the server side, the {@link Throwable} thrown will be propagated to the
+     * top-most transport. The transport converts the exception to fault reply or
+     * simply logs in case of one-way MEP. If you are a filtering {@link Tube} like
+     * {@link AbstractTubeImpl}, you don't have to override the implementation). On
+     * the other hand, any intermediate {@link Tube} may want to convert the exception
+     * to a fault message.
+     *
+     * 
    
+     * On the client side, the {@link Throwable} thrown
+     * will be propagated all the way back to the calling client
+     * applications. (The consequence of that is that if you are
+     * a filtering {@link Tube} like {@link AbstractTubeImpl}, you don't have to
+     * override the implementation)
+     *
+     * @param t
+     *
+     * @return
+     *      A {@link NextAction} object that represents the next action
+     *      to be taken by the JAX-WS runtime.
+     */
+    @NotNull NextAction processException(@NotNull Throwable t);
+
+    /**
+     * Invoked before the last copy of the pipeline is about to be discarded,
+     * to give {@link Tube}s a chance to clean up any resources.
+     *
+     * 
    
+     * This can be used to invoke {@link PreDestroy} lifecycle methods
+     * on user handler. The invocation of it is optional on the client side,
+     * but mandatory on the server side.
+     *
+     * 
    
+     * When multiple copies of pipelines are created, this method is called
+     * only on one of them.
+     *
+     * @throws WebServiceException
+     *      If the clean up fails, {@link WebServiceException} can be thrown.
+     *      This exception will be propagated to users (if this is client),
+     *      or recorded (if this is server.)
+     */
+    void preDestroy();
+
+    /**
+     * Creates an identical clone of this {@link Tube}.
+     *
+     * 
    
+     * This method creates an identical pipeline that can be used
+     * concurrently with this pipeline. When the caller of a pipeline
+     * is multi-threaded and need concurrent use of the same pipeline,
+     * it can do so by creating copies through this method.
+     *
+     * 
    Implementation Note
    
+     * 
    
+     * It is the implementation's responsibility to call
+     * {@link TubeCloner#add(Tube,Tube)} to register the copied pipe
+     * with the original. This is required before you start copying
+     * the other {@link Tube} references you have, or else there's a
+     * risk of infinite recursion.
+     * 
    
+     * For most {@link Tube} implementations that delegate to another
+     * {@link Tube}, this method requires that you also copy the {@link Tube}
+     * that you delegate to.
+     * 
    
+     * For limited number of {@link Tube}s that do not maintain any
+     * thread unsafe resource, it is allowed to simply return this
+     * from this method (notice that even if you are stateless, if you
+     * got a delegating {@link Tube} and that one isn't stateless, you
+     * still have to copy yourself.)
+     *
+     * 
    
+     * Note that this method might be invoked by one thread while another
+     * thread is executing the other process method. See
+     * the {@link Codec#copy()} for more discussion about this.
+     *
+     * @param cloner
+     *      Use this object (in particular its {@link TubeCloner#copy(Tube)} method
+     *      to clone other pipe references you have
+     *      in your pipe. See {@link TubeCloner} for more discussion
+     *      about why.
+     *
+     * @return
+     *      always non-null {@link Tube}.
+     * @param cloner
+     */
+    Tube copy(TubeCloner cloner);
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/TubeCloner.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/TubeCloner.java
new file mode 100644
index 00000000000..0c4d24f8206
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/TubeCloner.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.pipe;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Clones the whole pipeline.
+ *
+ * 
    
+ * Since {@link Tube}s may form an arbitrary directed graph, someone needs
+ * to keep track of isomorphism for a clone to happen correctly. This class
+ * serves that role.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public class TubeCloner {
+    // Pipe to pipe, or tube to tube
+    protected final Map master2copy = new HashMap();
+
+    /*package*/ TubeCloner() {
+    }
+
+    /**
+     * Invoked by a client of a tube to clone the whole pipeline.
+     *
+     * 
    
+     * {@link Tube}s implementing the {@link Tube#copy(TubeCloner)} method
+     * shall use {@link #copy(Tube)} method.
+     *
+     * @param p
+     *      The entry point of a pipeline to be copied. must not be null.
+     * @return
+     *      The cloned pipeline. Always non-null.
+     */
+    public static Tube clone(Tube p) {
+        // we often want to downcast TubeCloner to PipeCloner,
+        // so let's create PipeCloner to make that possible
+        return new PipeCloner().copy(p);
+    }
+
+    /**
+     * Invoked by a {@link Tube#copy(TubeCloner)} implementation
+     * to copy a reference to another pipe.
+     *
+     * 
    
+     * This method is for {@link Tube} implementations, not for users.
+     *
+     * 
    
+     * If the given tube is already copied for this cloning episode,
+     * this method simply returns that reference. Otherwise it copies
+     * a tube, make a note, and returns a copied tube. This additional
+     * step ensures that a graph is cloned isomorphically correctly.
+     *
+     * 
    
+     * (Think about what happens when a graph is A->B, A->C, B->D, and C->D
+     * if you don't have this step.)
+     *
+     * @param t
+     *      The tube to be copied.
+     * @return
+     *      The cloned tube. Always non-null.
+     */
+    public  T copy(T t) {
+        Tube r = (Tube)master2copy.get(t);
+        if(r==null) {
+            r = t.copy(this);
+            // the pipe must puts its copy to the map by itself
+            assert master2copy.get(t)==r : "the tube must call the add(...) method to register itself before start copying other pipes, but "+t +" hasn't done so";
+        }
+        return (T)r;
+    }
+
+    /**
+     * This method must be called from within the copy constructor
+     * to notify that the copy was created.
+     *
+     * 
    
+     * When your pipe has references to other pipes,
+     * it's particularly important to call this method
+     * before you start copying the pipes you refer to,
+     * or else there's a chance of inifinite loop.
+     */
+    public void add(Tube original, Tube copy) {
+        assert !master2copy.containsKey(original);
+        assert original!=null && copy!=null;
+        master2copy.put(original,copy);
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/TubelineAssembler.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/TubelineAssembler.java
new file mode 100644
index 00000000000..b05c245a7f9
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/TubelineAssembler.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.pipe;
+
+import com.sun.istack.internal.NotNull;
+
+/**
+ * Creates a tubeline.
+ *
+ * 
    
+ * This pluggability layer enables the upper layer to
+ * control exactly how the tubeline is composed.
+ *
+ * 
    
+ * JAX-WS is going to have its own default implementation
+ * when used all by itself, but it can be substituted by
+ * other implementations.
+ *
+ * 
    
+ * See {@link TubelineAssemblerFactory} for how {@link TubelineAssembler}s
+ * are located.
+ *
+ *
+ * @see com.sun.xml.internal.ws.api.pipe.ClientTubeAssemblerContext
+ *
+ * @author Kohsuke Kawaguchi
+ * @author Jitendra Kotamraju
+ */
+public interface TubelineAssembler {
+    /**
+     * Creates a new tubeline for clients.
+     *
+     * 
    
+     * When a JAX-WS client creates a proxy or a {@link javax.xml.ws.Dispatch} from
+     * a {@link javax.xml.ws.Service}, JAX-WS runtime internally uses this method
+     * to create a new tubeline as a part of the initilization.
+     *
+     * @param context
+     *      Object that captures various contextual information
+     *      that can be used to determine the tubeline to be assembled.
+     *
+     * @return
+     *      non-null freshly created tubeline.
+     *
+     * @throws javax.xml.ws.WebServiceException
+     *      if there's any configuration error that prevents the
+     *      tubeline from being constructed. This exception will be
+     *      propagated into the application, so it must have
+     *      a descriptive error.
+     */
+    @NotNull Tube createClient(@NotNull ClientTubeAssemblerContext context);
+
+    /**
+     * Creates a new tubeline for servers.
+     *
+     * 
    
+     * When a JAX-WS server deploys a new endpoint, it internally
+     * uses this method to create a new tubeline as a part of the
+     * initialization.
+     *
+     * 
    
+     * Note that this method is called only once to set up a
+     * 'master tubeline', and it gets {@link Tube#copy(TubeCloner) copied}
+     * from it.
+     *
+     * @param context
+     *      Object that captures various contextual information
+     *      that can be used to determine the tubeline to be assembled.
+     *
+     * @return
+     *      non-null freshly created tubeline.
+     *
+     * @throws javax.xml.ws.WebServiceException
+     *      if there's any configuration error that prevents the
+     *      tubeline from being constructed. This exception will be
+     *      propagated into the container, so it must have
+     *      a descriptive error.
+     *
+     */
+    @NotNull Tube createServer(@NotNull ServerTubeAssemblerContext context);
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/TubelineAssemblerFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/TubelineAssemblerFactory.java
new file mode 100644
index 00000000000..22f2678a074
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/TubelineAssemblerFactory.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.pipe;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.api.BindingID;
+import com.sun.xml.internal.ws.api.pipe.helper.PipeAdapter;
+import com.sun.xml.internal.ws.api.server.Container;
+import com.sun.xml.internal.ws.util.ServiceFinder;
+import com.sun.xml.internal.ws.util.pipe.StandaloneTubeAssembler;
+
+import java.util.logging.Logger;
+
+/**
+ * Creates {@link TubelineAssembler}.
+ * 
    
+ * 
    
+ * To create a tubeline,
+ * the JAX-WS runtime locates {@link TubelineAssemblerFactory}s through
+ * the META-INF/services/com.sun.xml.internal.ws.api.pipe.TubelineAssemblerFactory files.
+ * Factories found are checked to see if it supports the given binding ID one by one,
+ * and the first valid {@link TubelineAssembler} returned will be used to create
+ * a tubeline.
+ *
+ * @author Jitendra Kotamraju
+ */
+public abstract class TubelineAssemblerFactory {
+    /**
+     * Creates a {@link TubelineAssembler} applicable for the given binding ID.
+     *
+     * @param bindingId The binding ID for which a tubeline will be created,
+     *                  such as {@link javax.xml.ws.soap.SOAPBinding#SOAP11HTTP_BINDING}.
+     *                  Must not be null.
+     * @return null if this factory doesn't recognize the given binding ID.
+     */
+    public abstract TubelineAssembler doCreate(BindingID bindingId);
+
+    /**
+     * @deprecated
+     *      Use {@link #create(ClassLoader, BindingID, Container)}
+     */
+    public static TubelineAssembler create(ClassLoader classLoader, BindingID bindingId) {
+        return create(classLoader,bindingId,null);
+    }
+
+    /**
+     * Locates {@link TubelineAssemblerFactory}s and create
+     * a suitable {@link TubelineAssembler}.
+     *
+     * @param bindingId The binding ID string for which the new {@link TubelineAssembler}
+     *                  is created. Must not be null.
+     * @param container
+     *      if specified, the container is given a chance to specify a {@link TubelineAssembler}
+     *      instance. This parameter should be always given on the server, but can be null.
+     * @return Always non-null, since we fall back to our default {@link TubelineAssembler}.
+     */
+    public static TubelineAssembler create(ClassLoader classLoader, BindingID bindingId, @Nullable Container container) {
+
+        if(container!=null) {
+            // first allow the container to control pipeline for individual endpoint.
+            TubelineAssemblerFactory taf = container.getSPI(TubelineAssemblerFactory.class);
+            if(taf!=null) {
+                TubelineAssembler a = taf.doCreate(bindingId);
+                if(a!=null)
+                    return a;
+            }
+        }
+
+        for (TubelineAssemblerFactory factory : ServiceFinder.find(TubelineAssemblerFactory.class, classLoader)) {
+            TubelineAssembler assembler = factory.doCreate(bindingId);
+            if (assembler != null) {
+                TubelineAssemblerFactory.logger.fine(factory.getClass() + " successfully created " + assembler);
+                return assembler;
+            }
+        }
+
+        // See if there is a PipelineAssembler out there and use it for compatibility.
+        for (PipelineAssemblerFactory factory : ServiceFinder.find(PipelineAssemblerFactory.class,classLoader)) {
+            PipelineAssembler assembler = factory.doCreate(bindingId);
+            if(assembler!=null) {
+                logger.fine(factory.getClass()+" successfully created "+assembler);
+                return new TubelineAssemblerAdapter(assembler);
+            }
+        }
+
+        // default binding IDs that are known
+        return new StandaloneTubeAssembler();
+    }
+
+    private static class TubelineAssemblerAdapter implements TubelineAssembler {
+        private PipelineAssembler assembler;
+
+        TubelineAssemblerAdapter(PipelineAssembler assembler) {
+            this.assembler = assembler;
+        }
+
+        public @NotNull Tube createClient(@NotNull ClientTubeAssemblerContext context) {
+            ClientPipeAssemblerContext ctxt = new ClientPipeAssemblerContext(
+                    context.getAddress(), context.getWsdlModel(), context.getService(),
+                    context.getBinding(), context.getContainer());
+            return PipeAdapter.adapt(assembler.createClient(ctxt));
+        }
+
+        public @NotNull Tube createServer(@NotNull ServerTubeAssemblerContext context) {
+            return PipeAdapter.adapt(assembler.createServer((ServerPipeAssemblerContext) context));
+        }
+    }
+
+    private static final Logger logger = Logger.getLogger(TubelineAssemblerFactory.class.getName());
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterPipeImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterPipeImpl.java
new file mode 100644
index 00000000000..10a9f7a5a67
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterPipeImpl.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.pipe.helper;
+
+import com.sun.xml.internal.ws.api.pipe.Pipe;
+import com.sun.xml.internal.ws.api.pipe.PipeCloner;
+import com.sun.xml.internal.ws.api.message.Packet;
+
+/**
+ * Default implementation of {@link Pipe} that is used as a filter.
+ *
+ * 
    
+ * A filter pipe works on a {@link Packet}, then pass it onto the next pipe.
+ *
+ *
+ * 
    How do I implement a filter?
    
+ * 
    
+ * Filter {@link Pipe}s are ideal for those components that wish to
+ * do some of the followings:
+ *
+ * 
    
+ * 
    
+ * To read an incoming message and perform some work before the
+ * application (or more precisely the next pipe sees it)
+ * 
+ * 
    
+ * Implement the {@link #process} method and do some processing before
+ * you pass the packet to the next pipe:
+ * 
    + * process(request) {
+ *   doSomethingWith(request);
+ *   return next.process(request);
+ * }
+ * 
    
+ *
+ *
+ * 
    
+ * To intercept an incoming message and prevent the next pipe from seeing it.
+ * 
+ * 
    
+ * Implement the {@link #process} method and do some processing,
+ * then do NOT pass the request onto the next pipe.
+ * 
    + * process(request) {
+ *   if(isSomethingWrongWith(request))
+ *     return createErrorMessage();
+ *   else
+ *     return next.proces(request);
+ * }
+ * 
    
+ *
+ * 
    
+ * To post process a reply and possibly modify a message:
+ * 
+ * 
    
+ * Implement the {@link #process} method and do some processing,
+ * then do NOT pass the request onto the next pipe.
+ * 
    + * process(request) {
+ *   op = request.getMessage().getOperation();
+ *   reply = next.proces(request);
+ *   if(op is something I care) {
+ *     reply = playWith(reply);
+ *   }
+ *   return reply;
+ * }
+ * 
    
+ *
+ * 
    
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public abstract class AbstractFilterPipeImpl extends AbstractPipeImpl {
+    /**
+     * Next pipe to call.
+     */
+    protected final Pipe next;
+
+    protected AbstractFilterPipeImpl(Pipe next) {
+        this.next = next;
+        assert next!=null;
+    }
+
+    protected AbstractFilterPipeImpl(AbstractFilterPipeImpl that, PipeCloner cloner) {
+        super(that, cloner);
+        this.next = cloner.copy(that.next);
+        assert next!=null;
+    }
+
+    public Packet process(Packet packet) {
+        return next.process(packet);
+    }
+
+    @Override
+    public void preDestroy() {
+        next.preDestroy();
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterTubeImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterTubeImpl.java
new file mode 100644
index 00000000000..3b8ed52735d
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterTubeImpl.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.pipe.helper;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.pipe.NextAction;
+import com.sun.xml.internal.ws.api.pipe.Tube;
+import com.sun.xml.internal.ws.api.pipe.TubeCloner;
+
+/**
+ * Convenient default implementation for filtering {@link Tube}.
+ *
+ * 
    
+ * In this prototype, this is not that convenient, but in the real production
+ * code where we have {@code preDestroy()} and {@code clone()}, this
+ * is fairly handy.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public abstract class AbstractFilterTubeImpl extends AbstractTubeImpl {
+    protected final Tube next;
+
+    protected AbstractFilterTubeImpl(Tube next) {
+        this.next = next;
+    }
+
+    protected AbstractFilterTubeImpl(AbstractFilterTubeImpl that, TubeCloner cloner) {
+        super(that, cloner);
+        this.next = cloner.copy(that.next);
+    }
+
+    /**
+     * Default no-op implementation.
+     */
+    public @NotNull NextAction processRequest(Packet request) {
+        return doInvoke(next,request);
+    }
+
+    /**
+     * Default no-op implementation.
+     */
+    public @NotNull NextAction processResponse(Packet response) {
+        return doReturnWith(response);
+    }
+
+    /**
+     * Default no-op implementation.
+     */
+    public @NotNull NextAction processException(Throwable t) {
+        return doThrow(t);
+    }
+
+    public void preDestroy() {
+        next.preDestroy();
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/Grammar.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractPipeImpl.java
similarity index 57%
rename from jaxws/src/share/classes/com/sun/tools/internal/txw2/model/Grammar.java
rename to jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractPipeImpl.java
index 1a5e97ccde0..99bbc17a13e 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/Grammar.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractPipeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,42 +23,41 @@
  * have any questions.
  */
 
-package com.sun.tools.internal.txw2.model;
+package com.sun.xml.internal.ws.api.pipe.helper;
 
-import org.kohsuke.rngom.ast.builder.GrammarSection;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Collection;
+import com.sun.xml.internal.ws.api.pipe.Pipe;
+import com.sun.xml.internal.ws.api.pipe.PipeCloner;
 
 /**
- * Represents a RELAX NG grammar.
+ * Partial default implementation of {@link Pipe}.
  *
- * A {@link Grammar} extends a {@link Define} as "start"
+ * 
    
+ * To be shielded from potentail changes in JAX-WS,
+ * please consider extending from this class, instead
+ * of implementing {@link Pipe} directly.
  *
  * @author Kohsuke Kawaguchi
  */
-public class Grammar extends Define {
-    private final Map patterns = new HashMap();
+public abstract class AbstractPipeImpl implements Pipe {
 
-    public Grammar() {
-        super(null,START);
-        patterns.put(START,this);
-    }
-
-    public Define get(String name) {
-        Define def = patterns.get(name);
-        if(def==null)
-            patterns.put(name,def=new Define(this,name));
-        return def;
-    }
-
-    public Collection getDefinitions() {
-        return patterns.values();
+    /**
+     * Do-nothing constructor.
+     */
+    protected AbstractPipeImpl() {
     }
 
     /**
-     * The name for the start pattern
+     * Basis for the copy constructor.
+     *
+     * 
    
+     * This registers the newly created {@link Pipe} with the {@link PipeCloner}
+     * through {@link PipeCloner#add(Pipe, Pipe)}.
      */
-    public static final String START = GrammarSection.START;
+    protected AbstractPipeImpl(Pipe that, PipeCloner cloner) {
+        cloner.add(that,this);
+    }
+
+    public void preDestroy() {
+        // noop
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractTubeImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractTubeImpl.java
new file mode 100644
index 00000000000..32a4cc72de0
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractTubeImpl.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.pipe.helper;
+
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.pipe.Fiber;
+import com.sun.xml.internal.ws.api.pipe.NextAction;
+import com.sun.xml.internal.ws.api.pipe.Pipe;
+import com.sun.xml.internal.ws.api.pipe.PipeCloner;
+import com.sun.xml.internal.ws.api.pipe.Tube;
+import com.sun.xml.internal.ws.api.pipe.TubeCloner;
+
+/**
+ * Base class for {@link Tube} implementation.
+ *
+ * 
    
+ * This can be also used as a {@link Pipe}, and thus effectively
+ * making every {@link Tube} usable as a {@link Pipe}.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public abstract class AbstractTubeImpl implements Tube, Pipe {
+
+    /**
+     * Default constructor.
+     */
+    protected AbstractTubeImpl() {
+    }
+
+    /**
+     * Copy constructor.
+     */
+    protected AbstractTubeImpl(AbstractTubeImpl that, TubeCloner cloner) {
+        cloner.add(that,this);
+    }
+
+    protected final NextAction doInvoke(Tube next, Packet packet) {
+        NextAction na = new NextAction();
+        na.invoke(next,packet);
+        return na;
+    }
+
+    protected final NextAction doInvokeAndForget(Tube next, Packet packet) {
+        NextAction na = new NextAction();
+        na.invokeAndForget(next,packet);
+        return na;
+    }
+
+    protected final NextAction doReturnWith(Packet response) {
+        NextAction na = new NextAction();
+        na.returnWith(response);
+        return na;
+    }
+
+    protected final NextAction doSuspend() {
+        NextAction na = new NextAction();
+        na.suspend();
+        return na;
+    }
+
+    protected final NextAction doThrow(Throwable t) {
+        NextAction na = new NextAction();
+        na.throwException(t);
+        return na;
+    }
+
+    /**
+     * "Dual stack" compatibility mechanism.
+     * Allows {@link Tube} to be invoked from a {@link Pipe}.
+     */
+    public Packet process(Packet p) {
+        return Fiber.current().runSync(this,p);
+    }
+
+    /**
+     * Needs to be implemented by the derived class, but we can't make it abstract
+     * without upsetting javac.
+     */
+    public final AbstractTubeImpl copy(PipeCloner cloner) {
+        return copy((TubeCloner)cloner);
+    }
+
+    public abstract AbstractTubeImpl copy(TubeCloner cloner);
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/PipeAdapter.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/PipeAdapter.java
new file mode 100644
index 00000000000..38b3e1f60d1
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/PipeAdapter.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.pipe.helper;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.pipe.Fiber;
+import com.sun.xml.internal.ws.api.pipe.NextAction;
+import com.sun.xml.internal.ws.api.pipe.Pipe;
+import com.sun.xml.internal.ws.api.pipe.PipeCloner;
+import com.sun.xml.internal.ws.api.pipe.Tube;
+import com.sun.xml.internal.ws.api.pipe.TubeCloner;
+
+/**
+ * {@link Tube} that invokes {@link Pipe}.
+ *
+ * 
    
+ * This can be used to make a {@link Pipe} look like a {@link Tube}.
+ *
+ * @author Kohsuke Kawaguchi
+ * @author Jitendra Kotamraju
+ */
+public class PipeAdapter extends AbstractTubeImpl {
+    private final Pipe next;
+
+    public static Tube adapt(Pipe p) {
+        if (p instanceof Tube) {
+            return (Tube) p;
+        } else {
+            return new PipeAdapter(p);
+        }
+    }
+
+    public static Pipe adapt(Tube p) {
+        if (p instanceof Pipe) {
+            return (Pipe) p;
+        } else {
+            class TubeAdapter extends AbstractPipeImpl {
+                private final Tube t;
+
+                public TubeAdapter(Tube t) {
+                    this.t = t;
+                }
+
+                private TubeAdapter(TubeAdapter that, PipeCloner cloner) {
+                    super(that, cloner);
+                    this.t = cloner.copy(that.t);
+                }
+
+                public Packet process(Packet request) {
+                    return Fiber.current().runSync(t,request);
+                }
+
+                public Pipe copy(PipeCloner cloner) {
+                    return new TubeAdapter(this,cloner);
+                }
+            }
+
+            return new TubeAdapter(p);
+        }
+    }
+
+
+    private PipeAdapter(Pipe next) {
+        this.next = next;
+    }
+
+    /**
+     * Copy constructor
+     */
+    private PipeAdapter(PipeAdapter that, TubeCloner cloner) {
+        super(that,cloner);
+        this.next = ((PipeCloner)cloner).copy(that.next);
+    }
+
+    /**
+     * Uses the current fiber and runs the whole pipe to the completion
+     * (meaning everything from now on will run synchronously.)
+     */
+    public @NotNull NextAction processRequest(@NotNull Packet p) {
+        return doReturnWith(next.process(p));
+    }
+
+    public @NotNull NextAction processResponse(@NotNull Packet p) {
+        throw new IllegalStateException();
+    }
+
+    @NotNull
+    public NextAction processException(@NotNull Throwable t) {
+        throw new IllegalStateException();
+    }
+
+    public void preDestroy() {
+        next.preDestroy();
+    }
+
+    public PipeAdapter copy(TubeCloner cloner) {
+        return new PipeAdapter(this,cloner);
+    }
+
+    public String toString() {
+        return super.toString()+"["+next.toString()+"]";
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/package-info.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/package-info.java
new file mode 100644
index 00000000000..189550b1149
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/package-info.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/**
+ * Default partial implementations of {@link Pipe}.
+ *
+ * 
    
+ * This is intended to be useful for projects building on
+ * top of the JAX-WS RI.
+ */
+package com.sun.xml.internal.ws.api.pipe.helper;
+
+import com.sun.xml.internal.ws.api.pipe.Pipe;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/package-info.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/package-info.java
new file mode 100644
index 00000000000..cf411608d77
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/package-info.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/**
+ * {@link com.sun.xml.internal.ws.api.pipe.Pipe} and related abstractions.
+ */
+package com.sun.xml.internal.ws.api.pipe;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/AbstractServerAsyncTransport.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/AbstractServerAsyncTransport.java
new file mode 100644
index 00000000000..8f936f89d51
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/AbstractServerAsyncTransport.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.server;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.api.PropertySet;
+import com.sun.xml.internal.ws.api.message.Message;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.pipe.Codec;
+import com.sun.xml.internal.ws.api.pipe.Fiber;
+import com.sun.xml.internal.ws.util.Pool;
+
+import java.io.IOException;
+
+/**
+ * Partial server side async transport implementation. It manages pooling of
+ * {@link Codec} and other details.
+ *
+ * @author Jitendra Kotamraju
+ */
+public abstract class AbstractServerAsyncTransport {
+
+    private final WSEndpoint endpoint;
+    private final CodecPool codecPool;
+
+    /**
+     * {@link WSEndpoint#setExecutor} should be called before creating the
+     * transport
+     *
+     * @param endpoint webservices requests are directed towards this endpoint
+     */
+    public AbstractServerAsyncTransport(WSEndpoint endpoint) {
+        this.endpoint = endpoint;
+        codecPool = new CodecPool(endpoint);
+    }
+
+    /**
+     * decodes the transport data to Packet
+     *
+     * @param connection that carries the web service request
+     * @param codec for encoding/decoding {@link Message}
+     * @return decoded {@link Packet}
+     * @throws IOException if an i/o error happens while encoding/decoding
+     */
+    protected Packet decodePacket(T connection, @NotNull Codec codec) throws IOException {
+        Packet packet = new Packet();
+        packet.acceptableMimeTypes = getAcceptableMimeTypes(connection);
+        packet.addSatellite(getPropertySet(connection));
+        packet.transportBackChannel = getTransportBackChannel(connection);
+        return packet;
+    }
+
+    /**
+     * Encodes the {@link Packet} to infoset and writes on the connection.
+     *
+     * @param connection that carries the web service request
+     * @param packet that needs to encoded to infoset
+     * @param codec that does the encoding of Packet
+     * @throws IOException if an i/o error happens while encoding/decoding
+     */
+    protected abstract void encodePacket(T connection, @NotNull Packet packet, @NotNull Codec codec) throws IOException;
+
+    /**
+     * If the request has Accept header, return that value
+     *
+     * @param connection that carries the web service request
+     * @return Accept MIME types
+     */
+    protected abstract @Nullable String getAcceptableMimeTypes(T connection);
+
+    /**
+     * {@link TransportBackChannel} used by jax-ws runtime to close the connection
+     * while the processing of the request is still continuing. In oneway HTTP case, a
+     * response code needs to be sent before invoking the endpoint.
+     *
+     * @param connection that carries the web service request
+     * @return TransportBackChannel instance using the connection
+     */
+    protected abstract @Nullable TransportBackChannel getTransportBackChannel(T connection);
+
+    /**
+     * If there are any properties associated with the connection, those will
+     * be added to {@link Packet}
+     *
+     * @param connection that carries the web service request
+     * @return {@link PropertySet} for the connection
+     */
+    protected abstract @NotNull PropertySet getPropertySet(T connection);
+
+    /**
+     * Return a {@link WebServiceContextDelegate} using the underlying connection.
+     *
+     * @param connection that carries the web service request
+     * @return non-null WebServiceContextDelegate instance
+     */
+    protected abstract @NotNull WebServiceContextDelegate getWebServiceContextDelegate(T connection);
+
+    /**
+     * Reads and decodes infoset from the connection and invokes the endpoints. The
+     * response is encoded and written to the connection. The response could be
+     * written using a different thread.
+     *
+     * @param connection that carries the web service request
+     * @throws IOException if an i/o error happens while encoding/decoding
+     */
+    protected void handle(final T connection) throws IOException {
+        final Codec codec = codecPool.take();
+        Packet request = decodePacket(connection, codec);
+        if (!request.getMessage().isFault()) {
+            endpoint.schedule(request, new WSEndpoint.CompletionCallback() {
+                public void onCompletion(@NotNull Packet response) {
+                    try {
+                        encodePacket(connection, response, codec);
+                    } catch(IOException ioe) {
+                        ioe.printStackTrace();
+                    }
+                    codecPool.recycle(codec);
+                }
+            });
+        }
+    }
+
+    private static final class CodecPool extends Pool {
+        WSEndpoint endpoint;
+
+        CodecPool(WSEndpoint endpoint) {
+            this. endpoint = endpoint;
+        }
+
+        protected Codec create() {
+            return endpoint.createCodec();
+        }
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/Adapter.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/Adapter.java
new file mode 100644
index 00000000000..a0501562a28
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/Adapter.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.server;
+
+import com.sun.xml.internal.ws.api.pipe.Codec;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.server.WSEndpoint.PipeHead;
+import com.sun.xml.internal.ws.util.Pool;
+
+/**
+ * Receives incoming messages from a transport (such as HTTP, JMS, etc)
+ * in a transport specific way, and delivers it to {@link WSEndpoint.PipeHead#process}.
+ *
+ * 
    
+ * Since this class mostly concerns itself with converting a
+ * transport-specific message representation to a {@link Packet},
+ * the name is the "adapter".
+ *
+ * 
    
+ * The purpose of this class is twofolds:
+ *
+ * 
      
+ * 
    1. 
+ * To hide the logic of converting a transport-specific connection
+ * to a {@link Packet} and do the other way around.
+ *
+ * 
    2. 
+ * To manage thread-unsafe resources, such as {@link WSEndpoint.PipeHead},
+ * and {@link Codec}.
+ * 
    
+ *
+ * 
    
+ * {@link Adapter}s are extended to work with each kind of transport,
+ * and therefore {@link Adapter} class itself is not all that
+ * useful by itself --- it merely provides a design template
+ * that can be followed.
+ *
+ * 
    
+ * For managing resources, an adapter uses an object called {@link Toolkit}
+ * (think of it as a tray full of tools that a dentist uses ---
+ * trays are identical, but each patient has to get one. You have
+ * a pool of them and you assign it to a patient.)
+ *
+ * {@link Adapter.Toolkit} can be extended by derived classes.
+ * That actual type is the {@code TK} type parameter this class takes.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public abstract class Adapter {
+
+    protected final WSEndpoint endpoint;
+
+    /**
+     * Object that groups all thread-unsafe resources.
+     */
+    public class Toolkit {
+        /**
+         * For encoding/decoding infoset to/from the byte stream.
+         */
+        public final Codec codec;
+        /**
+         * This object from {@link WSEndpoint} serves the request.
+         */
+        public final PipeHead head;
+
+        public Toolkit() {
+            this.codec = endpoint.createCodec();
+            this.head = endpoint.createPipeHead();
+        }
+    }
+
+    /**
+     * Pool of {@link Toolkit}s.
+     */
+    protected final Pool pool = new Pool() {
+        protected TK create() {
+            return createToolkit();
+        }
+    };
+
+    /**
+     * Creates an {@link Adapter} that delivers
+     * messages to the given endpoint.
+     */
+    protected Adapter(WSEndpoint endpoint) {
+        assert endpoint!=null;
+        this.endpoint = endpoint;
+    }
+
+    /**
+     * Gets the endpoint that this {@link Adapter} is serving.
+     *
+     * @return
+     *      always non-null.
+     */
+    public WSEndpoint getEndpoint() {
+        return endpoint;
+    }
+
+    /**
+     * Creates a {@link Toolkit} instance.
+     *
+     * 
    
+     * If the derived class doesn't have to add any per-thread state
+     * to {@link Toolkit}, simply implement this as {@code new Toolkit()}.
+     */
+    protected abstract TK createToolkit();
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/AsyncProvider.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/AsyncProvider.java
new file mode 100644
index 00000000000..288076b6476
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/AsyncProvider.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.server;
+
+import com.sun.istack.internal.NotNull;
+
+import javax.xml.ws.Provider;
+import javax.xml.ws.WebServiceContext;
+import java.util.concurrent.Executor;
+
+/**
+ * Asynchronous version of {@link Provider}.
+ *
+ * 
    
+ * Applications that use the JAX-WS RI can implement this interface instead of
+ * {@link Provider} to implement asynchronous web services (AWS.) AWS enables
+ * applications to perform operations with long latency without blocking a thread,
+ * and thus particularly suitable for highly scalable service implementation,
+ * at the expesnce of implementation complexity.
+ *
+ * 
    Programming Model
    
+ * 
    
+ * Whenever a new reuqest arrives, the JAX-WS RI invokes the {@link #invoke} method
+ * to notify the application. Normally, the application then schedules an execution
+ * of this request, and exit from this method immediately (the point of AWS is not
+ * to use this calling thread for request processing.)
+ *
+ * 
    
+ * Unlike the synchronous version, which requires the response to be given as the return value,
+ * with AWS the JAX-WS RI will keep the connection with client open, until the application
+ * eventually notifies the JAX-WS RI via {@link AsyncProviderCallback}. When that
+ * happens that causes the JAX-WS RI to send back a response to the client.
+ *
+ * 
    
+ * The following code shows a very simple AWS example:
+ *
+ * 
    + * @WebService
+ * class MyAsyncEchoService implements AsyncProvider<Source> {
+ *     private static final {@link Executor} exec = ...;
+ *
+ *     public void invoke( final Source request, final AsyncProviderCallback<Source> callback, final WebServiceContext context) {
+ *         exec.execute(new {@link Runnable}() {
+ *             public void run() {
+ *                 Thread.sleep(1000);     // kill time.
+ *                 callback.send(request); // just echo back
+ *             }
+ *         });
+ *     }
+ * }
+ * 
    
+ *
+ * 
    
+ * Please also check the {@link Provider} and its programming model for general
+ * provider programming model.
+ *
+ *
+ * 
    WebServiceContext
    
+ * 
    
+ * In synchronous web services, the injected {@link WebServiceContext} instance uses
+ * the calling {@link Thread} to determine which request it should return information about.
+ * This no longer works with AWS, as you may need to call {@link WebServiceContext}
+ * much later, possibly from entirely different thread.
+ *
+ * 
    
+ * For this reason, {@link AsyncProvider} passes in {@link WebServiceContext} as
+ * a parameter. This object remains usable until you invoke {@link AsyncProviderCallback},
+ * and it can be invoked from any thread, even concurrently. AWS must not use the injected
+ * {@link WebServiceContext}, as its behavior is undefined.
+ *
+ * @see Provider
+ * @author Jitendra Kotamraju
+ * @author Kohsuke Kawaguchi
+ * @since 2.1
+ */
+public interface AsyncProvider {
+    /**
+     * Schedules an execution of a request.
+     *
+     * @param request
+     *      Represents the request message or payload.
+     * @param callback
+     *      Application must notify this callback interface when the processing
+     *      of a request is complete.
+     * @param context
+     *      The web service context instance that can be used to retrieve
+     *      context information about the given request.
+     */
+    public void invoke(
+        @NotNull T request,
+        @NotNull AsyncProviderCallback callback,
+        @NotNull WebServiceContext context);
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/AsyncProviderCallback.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/AsyncProviderCallback.java
new file mode 100644
index 00000000000..22752832a23
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/AsyncProviderCallback.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.server;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+
+/**
+ * Callback interface to signal JAX-WS RI that the processing of an asynchronous request is complete.
+ *
+ * 
    
+ * The application is responsible for invoking one of the two defined methods to
+ * indicate the result of the request processing.
+ *
+ * 
    
+ * Both methods will return immediately, and the JAX-WS RI will
+ * send out an actual response at some later point.
+ *
+ * @author Jitendra Kotamraju
+ * @author Kohsuke Kawaguchi
+ * @since 2.1
+ * @see AsyncProvider
+ */
+public interface AsyncProviderCallback {
+    /**
+     * Indicates that a request was processed successfully.
+     *
+     * @param response
+     *      Represents an object to be sent back to the client
+     *      as a response. To indicate one-way, response needs to be null
+     */
+    void send(@Nullable T response);
+
+    /**
+     * Indicates that an error had occured while processing a request.
+     *
+     * @param t
+     *      The error is propagated to the client. For example, if this is
+     *      a SOAP-based web service, the server will send back a SOAP fault.
+     */
+    void sendError(@NotNull Throwable t);
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/WriterNode.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/BoundEndpoint.java
similarity index 59%
rename from jaxws/src/share/classes/com/sun/tools/internal/txw2/model/WriterNode.java
rename to jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/BoundEndpoint.java
index 67f1762a087..2eb9cd7df3e 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/WriterNode.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/BoundEndpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,43 +23,35 @@
  * have any questions.
  */
 
-package com.sun.tools.internal.txw2.model;
+package com.sun.xml.internal.ws.api.server;
 
-import org.xml.sax.Locator;
+import com.sun.istack.internal.NotNull;
+
+import java.net.URI;
 
 /**
- * The {@link Node} that maps to the program element.
+ * Represents the {@link WSEndpoint} bound to a particular transport.
  *
+ * @see Module#getBoundEndpoints()
  * @author Kohsuke Kawaguchi
  */
-public abstract class WriterNode extends Node {
+public interface BoundEndpoint {
     /**
-     * If this node is the sole child of a pattern block,
-     * this field points to its name.
+     * The endpoint that was bound.
      *
      * 
    
-     * When the element names are in conflict, this can be used.
+     * Multiple {@link BoundEndpoint}s may point to the same {@link WSEndpoint},
+     * if it's bound to multiple transports.
      */
-    protected String alternativeName;
-
-    public WriterNode(Locator location, Leaf leaf) {
-        super(location, leaf);
-    }
+    @NotNull WSEndpoint getEndpoint();
 
     /**
-     * Declares the class without its contents.
+     * The address of the bound endpoint.
      *
-     * The first step of the code generation.
+     * 
    
+     * For example, if this endpoint is bound to a servlet endpoint
+     * "http://foobar/myapp/myservice", then this method should
+     * return that address.
      */
-    abstract void declare(NodeSet nset);
-
-    /**
-     * Generates the contents.
-     */
-    abstract void generate(NodeSet nset);
-
-    /**
-     * Prepares for the code generation.
-     */
-    void prepare(NodeSet nset) {}
+    @NotNull URI getAddress();
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/Container.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/Container.java
new file mode 100644
index 00000000000..37baf8b6abc
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/Container.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.server;
+
+/**
+ * Root of the SPI implemented by the container
+ * (such as application server.)
+ *
+ * 
    
+ * Often technologies that are built on top of JAX-WS
+ * (such as Tango) needs to negotiate private contracts between
+ * them and the container. This interface allows such technologies
+ * to query the negotiated SPI by using the {@link #getSPI(Class)}.
+ *
+ * 
    
+ * For example, if a security pipe needs to get some information
+ * from a container, they can do the following:
+ * 
      
+ *  
    1. Negotiate an interface with the container and define it.
+ *      (let's call it ContainerSecuritySPI.)
+ *  
    2. The container will implement ContainerSecuritySPI.
+ *  
    3. At the runtime, a security pipe gets
+ *      {@link WSEndpoint} and then to {@link Container}.
+ *  
    4. It calls container.getSPI(ContainerSecuritySPI.class)
+ *  
    5. The container returns an instance of ContainerSecuritySPI.
+ *  
    6. The security pipe talks to the container through this SPI.
+ * 
    
+ *
+ * 
    
+ * This protects JAX-WS from worrying about the details of such contracts,
+ * while still providing the necessary service of hooking up those parties.
+ *
+ * 
    
+ * Technologies that run inside JAX-WS server runtime can access this object through
+ * {@link WSEndpoint#getContainer()}. In the client runtime, it can be accessed from
+ * {@link ContainerResolver#getContainer()}
+ *
+ * @author Kohsuke Kawaguchi
+ * @see WSEndpoint
+ */
+public abstract class Container {
+    /**
+     * For derived classes.
+     */
+    protected Container() {
+    }
+
+    /**
+     * Gets the specified SPI.
+     *
+     * 
    
+     * This method works as a kind of directory service
+     * for SPIs between technologies on top of JAX-WS
+     * and the container.
+     *
+     * @param spiType
+     *      Always non-null.
+     *
+     * @return
+     *      null if such an SPI is not implemented by this container.
+     */
+    public abstract  T getSPI(Class spiType);
+
+
+    /**
+     * Constant that represents a "no {@link Container}",
+     * which always returns null from {@link #getSPI(Class)}.
+     */
+    public static final Container NONE = new Container() {
+        public  T getSPI(Class spiType) {
+            return null;
+        }
+    };
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/ContainerResolver.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/ContainerResolver.java
new file mode 100644
index 00000000000..f00ac38e18a
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/ContainerResolver.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.server;
+
+import com.sun.istack.internal.NotNull;
+
+/**
+ * This class determines an instance of {@link Container} for the runtime.
+ * It applies for both server and client runtimes(for e.g in Servlet could
+ * be accessing a Web Service). Always call {@link #setInstance} when the
+ * application's environment is initailized and a Container instance should
+ * be associated with an application.
+ *
+ * A client that is invoking a web service may be running in a
+ * container(for e.g servlet). T
+ *
+ * 
    
+ * ContainerResolver uses a static field to keep the instance of the resolver object.
+ * Typically appserver may set its custom container resolver using the static method
+ * {@link #setInstance(ContainerResolver)}
+ *
+ * @author Jitendra Kotamraju
+ */
+public abstract class ContainerResolver {
+
+    private static final ContainerResolver NONE = new ContainerResolver() {
+        public Container getContainer() {
+            return Container.NONE;
+        }
+    };
+
+    private static volatile ContainerResolver theResolver = NONE;
+
+    /**
+     * Sets the custom container resolver which can be used to get client's
+     * {@link Container}.
+     *
+     * @param resolver container resolver
+     */
+    public static void setInstance(ContainerResolver resolver) {
+        if(resolver==null)
+            resolver = NONE;
+        theResolver = resolver;
+    }
+
+    /**
+     * Returns the container resolver which can be used to get client's {@link Container}.
+     *
+     * @return container resolver instance
+     */
+    public static @NotNull ContainerResolver getInstance() {
+        return theResolver;
+    }
+
+    /**
+     * Returns the default container resolver which can be used to get {@link Container}.
+     *
+     * @return default container resolver
+     */
+    public static ContainerResolver getDefault() {
+        return NONE;
+    }
+
+    /**
+     * Returns the {@link Container} context in which client is running.
+     *
+     * @return container instance for the client
+     */
+    public abstract @NotNull Container getContainer();
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/DocumentAddressResolver.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/DocumentAddressResolver.java
new file mode 100644
index 00000000000..d4387ea7945
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/DocumentAddressResolver.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.server;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+
+/**
+ * Resolves relative references among {@link SDDocument}s.
+ *
+ * 
    
+ * This interface is implemented by the caller of
+ * {@link SDDocument#writeTo} method so
+ * that the {@link SDDocument} can correctly produce references
+ * to other documents.
+ *
+ * 
    
+ * This mechanism allows the user of {@link WSEndpoint} to
+ * assign logical URLs to each {@link SDDocument} (which is often
+ * necessarily done in a transport-dependent way), and then
+ * serve description documents.
+ *
+ *
+ *
+ * 
    Usage Example 1
    
+ * 
    
+ * HTTP servlet transport chose to expose those metadata documents
+ * to HTTP GET requests where each {@link SDDocument} is identified
+ * by a simple query string "?ID". (HTTP servlet transport
+ * assigns such IDs by itself.)
+ *
+ * 
    
+ * In this nameing scheme, when {@link SDDocument} X refers to
+ * {@link SDDocument} Y, it can put a reference as "?IDofY".
+ * By implementing {@link DocumentAddressResolver} it can do so.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public interface DocumentAddressResolver {
+    /**
+     * Produces a relative reference from one document to another.
+     *
+     * @param current
+     *      The document that is being generated.
+     * @param referenced
+     *      The document that is referenced.
+     * @return
+     *      The reference to be put inside {@code current} to refer to
+     *      {@code referenced}. This can be a relative URL as well as
+     *      an absolute. If null is returned, then the {@link SDDocument}
+     *      will produce a "implicit reference" (for example, <xs:import>
+     *      without the @schemaLocation attribute, etc).
+     */
+    @Nullable String getRelativeAddressFor(@NotNull SDDocument current, @NotNull SDDocument referenced);
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/prop/Prop.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/EndpointAwareCodec.java
similarity index 68%
rename from jaxws/src/share/classes/com/sun/tools/internal/txw2/model/prop/Prop.java
rename to jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/EndpointAwareCodec.java
index 876ac6f3c60..650ade9204f 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/txw2/model/prop/Prop.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/EndpointAwareCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,18 +23,22 @@
  * have any questions.
  */
 
-package com.sun.tools.internal.txw2.model.prop;
+package com.sun.xml.internal.ws.api.server;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.ws.api.pipe.Codec;
 
 /**
- * Immutable object that captures the characterstic
- * of the generated writer method.
- *
- * 
    
- * Instances of this class implement {@link #equals(Object)}
- * and {@link #hashCode()}. By using these we avoid generating
- * the same method twice.
+ * Implemented by {@link Codec}s that want to have access to
+ * {@link WSEndpoint} object.
  *
  * @author Kohsuke Kawaguchi
+ * @since 2.1.1
  */
-public abstract class Prop {
+public interface EndpointAwareCodec extends Codec {
+    /**
+     * Called by the {@linK WSEndpoint} implementation
+     * when the codec is associated with an endpoint.
+     */
+    void setEndpoint(@NotNull WSEndpoint endpoint);
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java
new file mode 100644
index 00000000000..9da551e612f
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java
@@ -0,0 +1,230 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.server;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.ws.api.message.Message;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.resources.ServerMessages;
+import com.sun.xml.internal.ws.resources.WsservletMessages;
+import com.sun.xml.internal.ws.server.ServerRtException;
+import com.sun.xml.internal.ws.server.SingletonResolver;
+
+import javax.xml.ws.Provider;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.WebServiceException;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Determines the instance that serves
+ * the given request packet.
+ *
+ * 
    
+ * The JAX-WS spec always use a singleton instance
+ * to serve all the requests, but this hook provides
+ * a convenient way to route messages to a proper receiver.
+ *
+ * 
    
+ * Externally, an instance of {@link InstanceResolver} is
+ * associated with {@link WSEndpoint}.
+ *
+ * 
    Possible Uses
    
+ * 
    
+ * One can use WS-Addressing message properties to
+ * decide which instance to deliver a message. This
+ * would be an important building block for a stateful
+ * web services.
+ *
+ * 
    
+ * One can associate an instance of a service
+ * with a specific WS-RM session.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public abstract class InstanceResolver {
+    /**
+     * Decides which instance of 'T' serves the given request message.
+     *
+     * 
    
+     * This method is called concurrently by multiple threads.
+     * It is also on a criticail path that affects the performance.
+     * A good implementation should try to avoid any synchronization,
+     * and should minimize the amount of work as much as possible.
+     *
+     * @param request
+     *      Always non-null. Represents the request message to be served.
+     *      The caller may not consume the {@link Message}.
+     */
+    public abstract @NotNull T resolve(Packet request);
+
+    /**
+     * Called by {@link WSEndpoint} when it's set up.
+     *
+     * 
    
+     * This is an opportunity for {@link InstanceResolver}
+     * to do a endpoint-specific initialization process.
+     *
+     * @param wsc
+     *      The {@link WebServiceContext} instance to be injected
+     *      to the user instances (assuming {@link InstanceResolver}
+     */
+    public void start(@NotNull WSWebServiceContext wsc, @NotNull WSEndpoint endpoint) {
+        // backward compatibility
+        start(wsc);
+    }
+
+    /**
+     * @deprecated
+     *      Use {@link #start(WSWebServiceContext,WSEndpoint)}.
+     */
+    public void start(@NotNull WebServiceContext wsc) {}
+
+    /**
+     * Called by {@link WSEndpoint}
+     * when {@link WSEndpoint#dispose()} is called.
+     *
+     * This allows {@link InstanceResolver} to do final clean up.
+     *
+     * 
    
+     * This method is guaranteed to be only called once by {@link WSEndpoint}.
+     */
+    public void dispose() {}
+
+
+    /**
+     * Creates a {@link InstanceResolver} implementation that always
+     * returns the specified singleton instance.
+     */
+    public static  InstanceResolver createSingleton(T singleton) {
+        assert singleton!=null;
+        InstanceResolver ir = createFromInstanceResolverAnnotation(singleton.getClass());
+        if(ir==null)
+            ir = new SingletonResolver(singleton);
+        return ir;
+    }
+
+    /**
+     * @deprecated
+     *      This is added here because a Glassfish integration happened
+     *      with this signature. Please do not use this. Will be removed
+     *      after the next GF integration.
+     */
+    public static  InstanceResolver createDefault(@NotNull Class clazz, boolean bool) {
+        return createDefault(clazz);
+    }
+
+    /**
+     * Creates a default {@link InstanceResolver} that serves the given class.
+     */
+    public static  InstanceResolver createDefault(@NotNull Class clazz) {
+        InstanceResolver ir = createFromInstanceResolverAnnotation(clazz);
+        if(ir==null)
+            ir = new SingletonResolver(createNewInstance(clazz));
+        return ir;
+    }
+
+    /**
+     * Checks for {@link InstanceResolverAnnotation} and creates an instance resolver from it if any.
+     * Otherwise null.
+     */
+    private static  InstanceResolver createFromInstanceResolverAnnotation(@NotNull Class clazz) {
+        for( Annotation a : clazz.getAnnotations() ) {
+            InstanceResolverAnnotation ira = a.annotationType().getAnnotation(InstanceResolverAnnotation.class);
+            if(ira==null)   continue;
+            Class ir = ira.value();
+            try {
+                return ir.getConstructor(Class.class).newInstance(clazz);
+            } catch (InstantiationException e) {
+                throw new WebServiceException(ServerMessages.FAILED_TO_INSTANTIATE_INSTANCE_RESOLVER(
+                    ir.getName(),a.annotationType(),clazz.getName()));
+            } catch (IllegalAccessException e) {
+                throw new WebServiceException(ServerMessages.FAILED_TO_INSTANTIATE_INSTANCE_RESOLVER(
+                    ir.getName(),a.annotationType(),clazz.getName()));
+            } catch (InvocationTargetException e) {
+                throw new WebServiceException(ServerMessages.FAILED_TO_INSTANTIATE_INSTANCE_RESOLVER(
+                    ir.getName(),a.annotationType(),clazz.getName()));
+            } catch (NoSuchMethodException e) {
+                throw new WebServiceException(ServerMessages.FAILED_TO_INSTANTIATE_INSTANCE_RESOLVER(
+                    ir.getName(),a.annotationType(),clazz.getName()));
+            }
+        }
+
+        return null;
+    }
+
+    protected static  T createNewInstance(Class cl) {
+        try {
+            return cl.newInstance();
+        } catch (InstantiationException e) {
+            logger.log(Level.SEVERE, e.getMessage(), e);
+            throw new ServerRtException(
+                WsservletMessages.ERROR_IMPLEMENTOR_FACTORY_NEW_INSTANCE_FAILED(cl));
+        } catch (IllegalAccessException e) {
+            logger.log(Level.SEVERE, e.getMessage(), e);
+            throw new ServerRtException(
+                WsservletMessages.ERROR_IMPLEMENTOR_FACTORY_NEW_INSTANCE_FAILED(cl));
+        }
+    }
+
+    /**
+     * Wraps this {@link InstanceResolver} into an {@link Invoker}.
+     */
+    public @NotNull Invoker createInvoker() {
+        return new Invoker() {
+            @Override
+            public void start(@NotNull WSWebServiceContext wsc, @NotNull WSEndpoint endpoint) {
+                InstanceResolver.this.start(wsc,endpoint);
+            }
+
+            @Override
+            public void dispose() {
+                InstanceResolver.this.dispose();
+            }
+
+            @Override
+            public Object invoke(Packet p, Method m, Object... args) throws InvocationTargetException, IllegalAccessException {
+                return m.invoke( resolve(p), args );
+            }
+
+            @Override
+            public  T invokeProvider(@NotNull Packet p, T arg) {
+                return ((Provider)resolve(p)).invoke(arg);
+            }
+
+            public String toString() {
+                return "Default Invoker over "+InstanceResolver.this.toString();
+            }
+        };
+    }
+
+    private static final Logger logger =
+        Logger.getLogger(
+            com.sun.xml.internal.ws.util.Constants.LoggingDomain + ".server");
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/InstanceResolverAnnotation.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/InstanceResolverAnnotation.java
new file mode 100644
index 00000000000..8b4fa0b9126
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/InstanceResolverAnnotation.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.server;
+
+import com.sun.xml.internal.ws.developer.Stateful;
+
+import java.lang.annotation.Documented;
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Target;
+
+/**
+ * Meta annotation for selecting instance resolver.
+ *
+ * 
    
+ * When service class is annotated with an annotation that has
+ * {@link InstanceResolverAnnotation} as meta annotation, the JAX-WS RI
+ * runtime will use the instance resolver class specified on {@link #value()}.
+ *
+ * 
    
+ * The {@link InstanceResolver} class must have the public constructor that
+ * takes {@link Class}, which represents the type of the service.
+ *
+ * 
    
+ * See {@link Stateful} for a real example. This annotation is only for
+ * advanced users of the JAX-WS RI.
+ *
+ * @since JAX-WS 2.1
+ * @see Stateful
+ * @author Kohsuke Kawaguchi
+ */
+@Target(ANNOTATION_TYPE)
+@Retention(RUNTIME)
+@Documented
+public @interface InstanceResolverAnnotation {
+    Class value();
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/Invoker.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/Invoker.java
new file mode 100644
index 00000000000..011115481f8
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/Invoker.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.server;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.ws.api.message.Packet;
+
+import javax.xml.ws.Provider;
+import javax.xml.ws.WebServiceContext;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+/**
+ * Hides the detail of calling into application endpoint implementation.
+ *
+ * 
    
+ * Typical host of the JAX-WS RI would want to use
+ * {@link InstanceResolver#createDefault(Class)} and then
+ * use {@link InstanceResolver#createInvoker()} to obtain
+ * the default invoker implementation.
+ *
+ *
+ * @author Jitendra Kotamraju
+ * @author Kohsuke Kawaguchi
+ */
+public abstract class Invoker {
+    /**
+     * Called by {@link WSEndpoint} when it's set up.
+     *
+     * 
    
+     * This is an opportunity for {@link Invoker}
+     * to do a endpoint-specific initialization process.
+     *
+     * @param wsc
+     *      The {@link WebServiceContext} instance that can be injected
+     *      to the user instances.
+     * @param endpoint
+     */
+    public void start(@NotNull WSWebServiceContext wsc, @NotNull WSEndpoint endpoint) {
+        // backward compatibility
+        start(wsc);
+    }
+
+    /**
+     * @deprecated
+     *      Use {@link #start(WSWebServiceContext,WSEndpoint)}
+     */
+    public void start(@NotNull WebServiceContext wsc) {
+        throw new IllegalStateException("deprecated version called");
+    }
+
+    /**
+     * Called by {@link WSEndpoint}
+     * when {@link WSEndpoint#dispose()} is called.
+     *
+     * This allows {@link InstanceResolver} to do final clean up.
+     *
+     * 
    
+     * This method is guaranteed to be only called once by {@link WSEndpoint}.
+     */
+    public void dispose() {}
+
+    /**
+     *
+     */
+    public abstract Object invoke( @NotNull Packet p, @NotNull Method m, @NotNull Object... args ) throws InvocationTargetException, IllegalAccessException;
+
+    /**
+     * Invokes {@link Provider#invoke(Object)}
+     */
+    public  T invokeProvider( @NotNull Packet p, T arg ) throws IllegalAccessException, InvocationTargetException {
+        // default slow implementation that delegates to the other invoke method.
+        return (T)invoke(p,invokeMethod,arg);
+    }
+
+    /**
+     * Invokes {@link AsyncProvider#invoke(Object, AsyncProviderCallback, WebServiceContext)}
+     */
+    public  void invokeAsyncProvider( @NotNull Packet p, T arg, AsyncProviderCallback cbak, WebServiceContext ctxt ) throws IllegalAccessException, InvocationTargetException {
+        // default slow implementation that delegates to the other invoke method.
+        invoke(p, asyncInvokeMethod, arg, cbak, ctxt);
+    }
+
+    private static final Method invokeMethod;
+
+    static {
+        try {
+            invokeMethod = Provider.class.getMethod("invoke",Object.class);
+        } catch (NoSuchMethodException e) {
+            throw new AssertionError(e);
+        }
+    }
+
+    private static final Method asyncInvokeMethod;
+
+    static {
+        try {
+            asyncInvokeMethod = AsyncProvider.class.getMethod("invoke",Object.class, AsyncProviderCallback.class, WebServiceContext.class);
+        } catch (NoSuchMethodException e) {
+            throw new AssertionError(e);
+        }
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/Module.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/Module.java
new file mode 100644
index 00000000000..559d7e29d83
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/Module.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.server;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.ws.transport.http.HttpAdapterList;
+
+import javax.xml.ws.wsaddressing.W3CEndpointReferenceBuilder;
+import java.util.List;
+
+/**
+ * Represents an object scoped to the current "module" (like a JavaEE web appliation).
+ *
+ * 
    
+ * This object can be obtained from {@link Container#getSPI(Class)}.
+ *
+ * 
    
+ * The scope of the module is driven by {@link W3CEndpointReferenceBuilder#build()}'s
+ * requirement that we need to identify a {@link WSEndpoint} that has a specific
+ * service/port name.
+ *
+ * 
    
+ * For JavaEE containers this should be scoped to a JavaEE application. For
+ * other environment, this could be scoped to any similar notion. If no such
+ * notion is available, the implementation of {@link Container} can return
+ * a new {@link Module} object each time {@link Container#getSPI(Class)} is invoked.
+ *
+ * 
    
+ * There's a considerable overlap between this and {@link HttpAdapterList}.
+ * The SPI really needs to be reconsidered
+ *
+ *
+ * @see Container
+ * @author Kohsuke Kawaguchi
+ * @since 2.1 EA3
+ */
+public abstract class Module {
+    /**
+     * Gets the list of {@link BoundEndpoint} deployed in this module.
+     *
+     * 
    
+     * From the point of view of the {@link Module} implementation,
+     * it really only needs to provide a {@link List} object as a data store.
+     * JAX-WS will update this list accordingly.
+     *
+     * @return
+     *      always return the same non-null instance.
+     */
+    public abstract @NotNull List getBoundEndpoints();
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/PortAddressResolver.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/PortAddressResolver.java
new file mode 100644
index 00000000000..20e863745bd
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/PortAddressResolver.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.server;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+
+import javax.xml.namespace.QName;
+
+/**
+ * Resolves port address for an endpoint. A WSDL may contain multiple
+ * endpoints, and some of the endpoints may be packaged in a single WAR file.
+ * If an endpoint is serving the WSDL, it would be nice to fill the port addresses
+ * of other endpoints in the WAR.
+ *
+ * 
    
+ * This interface is implemented by the caller of
+ * {@link SDDocument#writeTo} method so
+ * that the {@link SDDocument} can correctly fills the addresses of known
+ * endpoints.
+ *
+ *
+ * @author Jitendra Kotamraju
+ */
+public abstract class PortAddressResolver {
+    /**
+     * Gets the endpoint address for a WSDL port
+     *
+     * @param serviceName
+     *       WSDL service name(wsd:service in WSDL) for which address is needed. Always non-null.
+     * @param portName
+     *       WSDL port name(wsdl:port in WSDL) for which address is needed. Always non-null.
+     * @return
+     *      The address needs to be put in WSDL for port element's location
+     *      attribute. Can be null. If it is null, existing port address
+     *      is written as it is (without any patching).
+     */
+    public abstract @Nullable String getAddressFor(@NotNull QName serviceName, @NotNull String portName);
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/ResourceInjector.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/ResourceInjector.java
new file mode 100644
index 00000000000..f24d59967e0
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/ResourceInjector.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.server;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.ws.server.DefaultResourceInjector;
+
+import javax.annotation.PostConstruct;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.WebServiceException;
+
+/**
+ * Represents a functionality of the container to inject resources
+ * to application service endpoint object (usually but not necessarily as per JavaEE spec.)
+ *
+ * 
    
+ * If {@link Container#getSPI(Class)} returns a valid instance of {@link ResourceInjector},
+ * The JAX-WS RI will call the {@link #inject} method for each service endpoint
+ * instance that it manages.
+ *
+ * 
    
+ * The JAX-WS RI will be responsible for calling {@link PostConstruct} callback,
+ * so implementations of this class need not do so.
+ *
+ * @author Kohsuke Kawaguchi
+ * @see Container
+ */
+public abstract class ResourceInjector {
+    /**
+     * Performs resource injection.
+     *
+     * @param context
+     *      {@link WebServiceContext} implementation to be injected into the instance.
+     * @param instance
+     *      Instance of the service endpoint class to which resources will be injected.
+     *
+     * @throws WebServiceException
+     *      If the resource injection fails.
+     */
+    public abstract void inject(@NotNull WSWebServiceContext context, @NotNull Object instance);
+
+    /**
+     * Fallback {@link ResourceInjector} implementation used when the {@link Container}
+     * doesn't provide one.
+     *
+     * 
    
+     * Just inject {@link WSWebServiceContext} and done.
+     */
+    public static final ResourceInjector STANDALONE = new DefaultResourceInjector();
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/SDDocument.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/SDDocument.java
new file mode 100644
index 00000000000..ea50c4cc634
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/SDDocument.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.server;
+
+import com.sun.istack.internal.Nullable;
+import javax.xml.stream.XMLStreamWriter;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.namespace.QName;
+import java.io.OutputStream;
+import java.io.IOException;
+import java.net.URL;
+
+/**
+ * Represents an individual document that forms a {@link ServiceDefinition}.
+ *
+ * 
    + * TODO:
+ *      how does those documents refer to each other?
+ *
+ * 
    
+ *
+ * @author Jitendra Kotamraju
+ */
+public interface SDDocument {
+
+    /**
+     * Gets the root tag name of this document.
+     *
+     * 
    
+     * This can be used to identify a kind of document quickly
+     * (such as schema, WSDL, ...)
+     *
+     * @return
+     *      always non-null.
+     */
+    QName getRootName();
+
+    /**
+     * Returns true if this document is WSDL.
+     */
+    boolean isWSDL();
+
+    /**
+     * Returns true if this document is schema.
+     */
+    boolean isSchema();
+
+    /**
+     * Gets the system ID of the document where it's taken from. Generated documents
+     * use a fake URL that can be used to resolve relative URLs. So donot use this URL
+     * for reading or writing.
+     */
+    URL getURL();
+
+    /**
+     * Writes the document to the given {@link OutputStream}.
+     *
+     * 
    
+     * Since {@link ServiceDefinition} doesn't know which endpoint address
+     * {@link Adapter} is serving to, (and often it serves multiple URLs
+     * simultaneously), this method takes the PortAddressResolver as a parameter,
+     * so that it can produce the corret address information in the generated WSDL.
+     *
+     * @param portAddressResolver
+     *      An endpoint address resolver that gives endpoint address for a WSDL
+     *      port. Can be null.
+     * @param resolver
+     *      Used to resolve relative references among documents.
+     * @param os
+     *      The {@link OutputStream} that receives the generated document.
+     *
+     * @throws IOException
+     *      if there was a failure reported from the {@link OutputStream}.
+     */
+    void writeTo(@Nullable PortAddressResolver portAddressResolver,
+            DocumentAddressResolver resolver, OutputStream os) throws IOException;
+
+    /**
+     * Writes the document to the given {@link XMLStreamWriter}.
+     *
+     * 
    
+     * The same as {@link #writeTo(PortAddressResolver,DocumentAddressResolver,OutputStream)} except
+     * it writes to an {@link XMLStreamWriter}.
+     *
+     * 
    
+     * The implementation must not call {@link XMLStreamWriter#writeStartDocument()}
+     * nor {@link XMLStreamWriter#writeEndDocument()}. Those are the caller's
+     * responsibility.
+     *
+     * @throws XMLStreamException
+     *      if the {@link XMLStreamWriter} reports an error.
+     */
+    void writeTo(PortAddressResolver portAddressResolver,
+            DocumentAddressResolver resolver, XMLStreamWriter out) throws XMLStreamException, IOException;
+
+    /**
+     * {@link SDDocument} that represents an XML Schema.
+     */
+    interface Schema extends SDDocument {
+        /**
+         * Gets the target namepsace of this schema.
+         */
+        String getTargetNamespace();
+    }
+
+    /**
+     * {@link SDDocument} that represents a WSDL.
+     */
+    interface WSDL extends SDDocument {
+        /**
+         * Gets the target namepsace of this schema.
+         */
+        String getTargetNamespace();
+
+        /**
+         * This WSDL has a portType definition
+         * that matches what {@link WSEndpoint} is serving.
+         *
+         * TODO: does this info needs to be exposed?
+         */
+        boolean hasPortType();
+
+        /**
+         * This WSDL has a service definition
+         * that matches the {@link WSEndpoint}.
+         *
+         * TODO: does this info need to be exposed?
+         */
+        boolean hasService();
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentFilter.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentFilter.java
new file mode 100644
index 00000000000..69c3d94b959
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentFilter.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.server;
+
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+import java.io.IOException;
+
+/**
+ * Provides a way to filter {@link SDDocument} infoset while writing it. These
+ * filter objects can be added to {@link ServiceDefinition} using
+ * {@link ServiceDefinition#addFilter(SDDocumentFilter)}
+ *
+ * @author Kohsuke Kawaguchi
+ * @author Jitendra Kotamraju
+ */
+public interface SDDocumentFilter {
+    /**
+     * Returns a wrapped XMLStreamWriter on top of passed-in XMLStreamWriter.
+     * It works like any filtering API for e.g. {@link java.io.FilterOutputStream}.
+     * The method returns a XMLStreamWriter that calls the same methods on original
+     * XMLStreamWriter with some modified events. The end result is some infoset
+     * is filtered before it reaches the original writer and the infoset writer
+     * doesn't have to change any code to incorporate this filter.
+     *
+     * @param doc gives context for the filter. This should only be used to query
+     *  read-only information. Calling doc.writeTo() may result in infinite loop.
+     * @param w Original XMLStreamWriter
+     * @return Filtering {@link XMLStreamWriter}
+     */
+    XMLStreamWriter filter(SDDocument doc, XMLStreamWriter w) throws XMLStreamException, IOException;
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentSource.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentSource.java
new file mode 100644
index 00000000000..cc6d1b3b15d
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentSource.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.server;
+
+import com.sun.xml.internal.stream.buffer.XMLStreamBuffer;
+import com.sun.xml.internal.ws.streaming.TidyXMLStreamReader;
+import com.sun.xml.internal.ws.api.streaming.XMLStreamReaderFactory;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+
+/**
+ * SPI that provides the source of {@link SDDocument}.
+ *
+ * 
    
+ * This abstract class could be implemented by appliations, or one of the
+ * {@link #create} methods can be used.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public abstract class SDDocumentSource {
+    /**
+     * Returns the {@link XMLStreamReader} that reads the document.
+     *
+     * 
    
+     * This method maybe invoked multiple times concurrently.
+     *
+     * @param xif
+     *      The implementation may choose to use this object when it wants to
+     *      create a new parser (or it can just ignore this parameter completely.)
+     * @return
+     *      The caller is responsible for closing the reader to avoid resource leak.
+     *
+     * @throws XMLStreamException
+     *      if something goes wrong while creating a parser.
+     * @throws IOException
+     *      if something goes wrong trying to read the document.
+     */
+    public abstract XMLStreamReader read(XMLInputFactory xif) throws IOException, XMLStreamException;
+
+    /**
+     * Returns the {@link XMLStreamReader} that reads the document.
+     *
+     * 
    
+     * This method maybe invoked multiple times concurrently.
+     *
+     * @return
+     *      The caller is responsible for closing the reader to avoid resource leak.
+     *
+     * @throws XMLStreamException
+     *      if something goes wrong while creating a parser.
+     * @throws IOException
+     *      if something goes wrong trying to read the document.
+     */
+    public abstract XMLStreamReader read() throws IOException, XMLStreamException;
+
+    /**
+     * System ID of this document.
+     */
+    public abstract URL getSystemId();
+
+    /**
+     * Creates {@link SDDocumentSource} from an URL.
+     */
+    public static SDDocumentSource create(final URL url) {
+        return new SDDocumentSource() {
+            private final URL systemId = url;
+
+            public XMLStreamReader read(XMLInputFactory xif) throws IOException, XMLStreamException {
+                InputStream is = url.openStream();
+                return new TidyXMLStreamReader(
+                    xif.createXMLStreamReader(systemId.toExternalForm(),is), is);
+            }
+
+            public XMLStreamReader read() throws IOException, XMLStreamException {
+                InputStream is = url.openStream();
+                return new TidyXMLStreamReader(
+                   XMLStreamReaderFactory.create(systemId.toExternalForm(),is,false), is);
+            }
+
+            public URL getSystemId() {
+                return systemId;
+            }
+        };
+    }
+
+    /**
+     * Creates a {@link SDDocumentSource} from {@link XMLStreamBuffer}.
+     */
+    public static SDDocumentSource create(final URL systemId, final XMLStreamBuffer xsb) {
+        return new SDDocumentSource() {
+            public XMLStreamReader read(XMLInputFactory xif) throws XMLStreamException {
+                return xsb.readAsXMLStreamReader();
+            }
+
+            public XMLStreamReader read() throws XMLStreamException {
+                return xsb.readAsXMLStreamReader();
+            }
+
+            public URL getSystemId() {
+                return systemId;
+            }
+        };
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/ServerPipelineHook.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/ServerPipelineHook.java
new file mode 100644
index 00000000000..1e995ca4a74
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/ServerPipelineHook.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.server;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.ws.api.pipe.Pipe;
+import com.sun.xml.internal.ws.api.pipe.ServerPipeAssemblerContext;
+import com.sun.xml.internal.ws.api.pipe.helper.AbstractFilterPipeImpl;
+
+/**
+ * Allow the container (primarily Glassfish) to inject
+ * their own pipes into the pipeline.
+ *
+ * 
    
+ * This interface has a rather ad-hoc set of methods, because
+ * we didn't want to define an autonomous pipe-assembly process.
+ * (We thought this is a smaller evil compared to that.)
+ *
+ * 
    
+ * JAX-WS obtains this through {@link Container#getSPI(Class)}.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public abstract class ServerPipelineHook {
+    /**
+     * Called during the pipeline construction process once to allow a container
+     * to register a pipe for monitoring.
+     *
+     * This pipe will be injected to a point very close to the transport, allowing
+     * it to measure the time it takes for processing as well as detecting errors.
+     *
+     * @param ctxt
+     *      Represents abstraction of SEI, WSDL abstraction etc. Context can be used
+     *      whether add a new pipe to the head or not.
+     *
+     * @param tail
+     *      Head of the partially constructed pipeline. If the implementation
+     *      wishes to add new pipes, it should do so by extending
+     *      {@link AbstractFilterPipeImpl} and making sure that this {@link Pipe}
+     *      eventually processes messages.
+     *
+     * @return
+     *      The default implementation just returns tail, which means
+     *      no additional pipe is inserted. If the implementation adds
+     *      new pipes, return the new head pipe.
+     */
+    public @NotNull Pipe createMonitoringPipe(ServerPipeAssemblerContext ctxt, @NotNull Pipe tail) {
+        return tail;
+    }
+
+    /**
+     * Called during the pipeline construction process once to allow a container
+     * to register a pipe for security.
+     *
+     * This pipe will be injected to a point very close to the transport, allowing
+     * it to do some security operations.
+     *
+     * @param ctxt
+     *      Represents abstraction of SEI, WSDL abstraction etc. Context can be used
+     *      whether add a new pipe to the head or not.
+     *
+     * @param tail
+     *      Head of the partially constructed pipeline. If the implementation
+     *      wishes to add new pipes, it should do so by extending
+     *      {@link AbstractFilterPipeImpl} and making sure that this {@link Pipe}
+     *      eventually processes messages.
+     *
+     * @return
+     *      The default implementation just returns tail, which means
+     *      no additional pipe is inserted. If the implementation adds
+     *      new pipes, return the new head pipe.
+     */
+    public @NotNull Pipe createSecurityPipe(ServerPipeAssemblerContext ctxt, @NotNull Pipe tail) {
+        return tail;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/ServiceDefinition.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/ServiceDefinition.java
new file mode 100644
index 00000000000..93513b08b36
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/ServiceDefinition.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.server;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLModel;
+
+/**
+ * Root of the unparsed WSDL and other resources referenced from it.
+ * This object represents the description of the service
+ * that a {@link WSEndpoint} offers.
+ *
+ * 
    
+ * A description consists of a set of {@link SDDocument}, which
+ * each represents a single XML document that forms a part of the
+ * descriptor (for example, WSDL might refer to separate schema documents,
+ * or a WSDL might refer to another WSDL.)
+ *
+ * 
    
+ * {@link ServiceDefinition} and its descendants are immutable
+ * read-only objects. Once they are created, they always return
+ * the same value.
+ *
+ * 
    Expected Usage
    
+ * 
    
+ * This object is intended to be used for serving the descriptors
+ * to remote clients (such as by MEX, or other protocol-specific
+ * metadata query, such as HTTP GET with "?wsdl" query string.)
+ *
+ * 
    
+ * This object is NOT intended to be used by other
+ * internal components to parse them. For that purpose, use
+ * {@link WSDLModel} instead.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public interface ServiceDefinition extends Iterable {
+    /**
+     * Gets the "primary" {@link SDDocument} that represents a WSDL.
+     *
+     * 
    
+     * This WSDL eventually refers to all the other {@link SDDocument}s.
+     *
+     * @return
+     *      always non-null.
+     */
+    @NotNull SDDocument getPrimary();
+
+    /**
+     * Adds a filter that is called while writing {@link SDDocument}'s infoset. This
+     * filter is applied to the all the other reachable {@link SDDocument}s.
+     *
+     * @param filter that is called while writing the document
+     */
+    void addFilter(@NotNull SDDocumentFilter filter);
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/TransportBackChannel.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/TransportBackChannel.java
new file mode 100644
index 00000000000..56867986958
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/TransportBackChannel.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.server;
+
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.server.WSEndpoint.PipeHead;
+
+/**
+ * Represents a transport back-channel.
+ *
+ * 
    
+ * When the JAX-WS runtime finds out that the request
+ * {@link Packet} being processed is known not to produce
+ * a response, it invokes the {@link #close()} method
+ * to indicate that the transport does not need to keep
+ * the channel for the response message open.
+ *
+ * 
    
+ * This allows the transport to close down the communication
+ * channel sooner than wainting for
+ * {@link PipeHead#process}
+ * method to return, thereby improving the overall throughput
+ * of the system.
+ *
+ * @author Kohsuke Kawaguchi
+ * @author Jitu
+ */
+public interface TransportBackChannel {
+    /**
+     * See the class javadoc for the discussion.
+     *
+     * 
    
+     * JAX-WS is not guaranteed to call this method for all
+     * operations that do not have a response. This is merely
+     * a hint.
+     *
+     * 
    
+     * When the implementation of this method fails to close
+     * the connection successfuly, it should record the error,
+     * and return normally. Do not throw any exception.
+     */
+    void close();
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/WSEndpoint.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/WSEndpoint.java
new file mode 100644
index 00000000000..5a9e033156c
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/WSEndpoint.java
@@ -0,0 +1,485 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.server;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.api.BindingID;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.message.Message;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
+import com.sun.xml.internal.ws.api.pipe.Codec;
+import com.sun.xml.internal.ws.api.pipe.Engine;
+import com.sun.xml.internal.ws.api.pipe.FiberContextSwitchInterceptor;
+import com.sun.xml.internal.ws.api.pipe.ServerTubeAssemblerContext;
+import com.sun.xml.internal.ws.api.pipe.Tube;
+import com.sun.xml.internal.ws.server.EndpointFactory;
+import com.sun.xml.internal.ws.util.xml.XmlUtil;
+import org.xml.sax.EntityResolver;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Binding;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.WebServiceException;
+import java.net.URL;
+import java.util.Collection;
+import java.util.concurrent.Executor;
+
+/**
+ * Root object that hosts the {@link Packet} processing code
+ * at the server.
+ *
+ * 
    
+ * One instance of {@link WSEndpoint} is created for each deployed service
+ * endpoint. A hosted service usually handles multiple concurrent
+ * requests. To do this efficiently, an endpoint handles incoming
+ * {@link Packet} through {@link PipeHead}s, where many copies can be created
+ * for each endpoint.
+ *
+ * 
    
+ * Each {@link PipeHead} is thread-unsafe, and request needs to be
+ * serialized. A {@link PipeHead} represents a sizable resource
+ * (in particular a whole pipeline), so the caller is expected to
+ * reuse them and avoid excessive allocations as much as possible.
+ * Making {@link PipeHead}s thread-unsafe allow the JAX-WS RI internal to
+ * tie thread-local resources to {@link PipeHead}, and reduce the total
+ * resource management overhead.
+ *
+ * 
    
+ * To abbreviate this resource management (and for a few other reasons),
+ * JAX-WS RI provides {@link Adapter} class. If you are hosting a JAX-WS
+ * service, you'll most likely want to send requests to {@link WSEndpoint}
+ * through {@link Adapter}.
+ *
+ * 
    
+ * {@link WSEndpoint} is ready to handle {@link Packet}s as soon as
+ * it's created. No separate post-initialization step is necessary.
+ * However, to comply with the JAX-WS spec requirement, the caller
+ * is expected to call the {@link #dispose()} method to allow an
+ * orderly shut-down of a hosted service.
+ *
+ *
+ *
+ * 
    Objects Exposed From Endpoint
    
+ * 
    
+ * {@link WSEndpoint} exposes a series of information that represents
+ * how an endpoint is configured to host a service. See the getXXX methods
+ * for more details.
+ *
+ *
+ *
+ * 
    Implementation Notes
    
+ * 
    
+ * {@link WSEndpoint} owns a {@link WSWebServiceContext} implementation.
+ * But a bulk of the work is delegated to {@link WebServiceContextDelegate},
+ * which is passed in as a parameter to {@link PipeHead#process(Packet, WebServiceContextDelegate, TransportBackChannel)}.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public abstract class WSEndpoint {
+
+    /**
+     * Gets the Endpoint's codec that is used to encode/decode {@link Message}s. This is a
+     * copy of the master codec and it shouldn't be shared across two requests running
+     * concurrently(unless it is stateless).
+     *
+     * @return codec to encode/decode
+     */
+    public abstract @NotNull Codec createCodec();
+
+    /**
+     * Gets the application endpoint's serviceName. It could be got from DD or annotations
+     *
+     * @return same as wsdl:service QName if WSDL exists or generated
+     */
+    public abstract @NotNull QName getServiceName();
+
+    /**
+     * Gets the application endpoint's portName. It could be got from DD or annotations
+     *
+     * @return same as wsdl:port QName if WSDL exists or generated
+     */
+    public abstract @NotNull QName getPortName();
+
+    /**
+     * Gets the application endpoint {@link Class} that eventually serves the request.
+     *
+     * 
    
+     * This is the same value given to the {@link #create} method.
+     */
+    public abstract @NotNull Class getImplementationClass();
+
+    /**
+     * Represents the binding for which this {@link WSEndpoint}
+     * is created for.
+     *
+     * @return
+     *      always same object.
+     */
+    public abstract @NotNull WSBinding getBinding();
+
+    /**
+     * Gets the {@link Container} object.
+     *
+     * 
    
+     * The components inside {@link WSEndpoint} uses this reference
+     * to communicate with the hosting environment.
+     *
+     * @return
+     *      always same object. If no "real" {@link Container} instance
+     *      is given, {@link Container#NONE} will be returned.
+     */
+    public abstract @NotNull Container getContainer();
+
+    /**
+     * Gets the port that this endpoint is serving.
+     *
+     * 
    
+     * A service is not required to have a WSDL, and when it doesn't,
+     * this method returns null. Otherwise it returns an object that
+     * describes the port that this {@link WSEndpoint} is serving.
+     *
+     * @return
+     *      Possibly null, but always the same value.
+     */
+    public abstract @Nullable WSDLPort getPort();
+
+    /**
+     * Set this {@link Executor} to run asynchronous requests using this executor.
+     * This executor is set on {@link Engine} and must be set before
+     * calling {@link #schedule(Packet,CompletionCallback) } and
+     * {@link #schedule(Packet,CompletionCallback,FiberContextSwitchInterceptor)} methods.
+     *
+     * @param exec Executor to run async requests
+     */
+    public abstract void setExecutor(@NotNull Executor exec);
+
+    /**
+     * This method takes a {@link Packet} that represents
+     * a request, run it through a {@link Tube}line, eventually
+     * pass it to the user implementation code, which produces
+     * a reply, then run that through the tubeline again,
+     * and eventually return it as a return value through {@link CompletionCallback}.
+     *
+     * 
    
+     * This takes care of pooling of {@link Tube}lines and reuses
+     * tubeline for requests. Same instance of tubeline is not used concurrently
+     * for two requests.
+     *
+     * 
    
+     * If the transport is capable of asynchronous execution, use this
+     * instead of using {@link PipeHead#process}.
+     *
+     * 
    
+     * Before calling this method, set the executor using {@link #setExecutor}. The
+     * executor may used multiple times to run this request in a asynchronous fashion.
+     * The calling thread will be returned immediately, and the callback will be
+     * called in a different a thread.
+     *
+     * 
    
+     * {@link Packet#transportBackChannel} should have the correct value, so that
+     * one-way message processing happens correctly. {@link Packet#webServiceContextDelegate}
+     * should have the correct value, so that some {@link WebServiceContext} methods correctly.
+     *
+     * @see {@link Packet#transportBackChannel}
+     * @see {@link Packet#webServiceContextDelegate}
+     *
+     * @param request web service request
+     * @param callback callback to get response packet
+     */
+    public final void schedule(@NotNull Packet request, @NotNull CompletionCallback callback ) {
+        schedule(request,callback,null);
+    }
+
+    /**
+     * Schedule invocation of web service asynchronously.
+     *
+     * @see {@link #schedule(Packet, CompletionCallback)}
+     *
+     * @param request web service request
+     * @param callback callback to get response packet(exception if there is one)
+     * @param interceptor caller's interceptor to impose a context of execution
+     */
+    public abstract void schedule(@NotNull Packet request, @NotNull CompletionCallback callback, @Nullable FiberContextSwitchInterceptor interceptor );
+
+    /**
+     * Callback to notify that jax-ws runtime has finished execution of a request
+     * submitted via schedule().
+     */
+    public interface CompletionCallback {
+        /**
+         * Indicates that the jax-ws runtime has finished execution of a request
+         * submitted via schedule().
+         *
+         * 
    
+         * Since the JAX-WS RI runs asynchronously,
+         * this method maybe invoked by a different thread
+         * than any of the threads that started it or run a part of tubeline.
+         *
+         * @param response {@link Packet}
+         */
+        void onCompletion(@NotNull Packet response);
+    }
+
+    /**
+     * Creates a new {@link PipeHead} to process
+     * incoming requests.
+     *
+     * 
    
+     * This is not a cheap operation. The caller is expected
+     * to reuse the returned {@link PipeHead}. See
+     * {@link WSEndpoint class javadoc} for details.
+     *
+     * @return
+     *      A newly created {@link PipeHead} that's ready to serve.
+     */
+    public abstract @NotNull PipeHead createPipeHead();
+
+    /**
+     * Represents a resource local to a thread.
+     *
+     * See {@link WSEndpoint} class javadoc for more discussion about
+     * this.
+     */
+    public interface PipeHead {
+        /**
+         * Processes a request and produces a reply.
+         *
+         * 
    
+         * This method takes a {@link Packet} that represents
+         * a request, run it through a {@link Tube}line, eventually
+         * pass it to the user implementation code, which produces
+         * a reply, then run that through the pipeline again,
+         * and eventually return it as a return value.
+         *
+         * @param request
+         *      Unconsumed {@link Packet} that represents
+         *      a request.
+         * @param wscd
+         *      {@link WebServiceContextDelegate} to be set to {@link Packet}.
+         *      (we didn't have to take this and instead just ask the caller to
+         *      set to {@link Packet#webServiceContextDelegate}, but that felt
+         *      too error prone.)
+         * @param tbc
+         *      {@link TransportBackChannel} to be set to {@link Packet}.
+         *      See the {@code wscd} parameter javadoc for why this is a parameter.
+         *      Can be null.
+         * @return
+         *      Unconsumed {@link Packet} that represents
+         *      a reply to the request.
+         *
+         * @throws WebServiceException
+         *      This method does not throw a {@link WebServiceException}.
+         *      The {@link WSEndpoint} must always produce a fault {@link Message}
+         *      for it.
+         *
+         * @throws RuntimeException
+         *      A {@link RuntimeException} thrown from this method, including
+         *      {@link WebServiceException}, must be treated as a bug in the
+         *      code (including JAX-WS and all the pipe implementations), not
+         *      an operator error by the user.
+         *
+         *      
    
+         *      Therefore, it should be recorded by the caller in a way that
+         *      allows developers to fix a bug.
+         */
+        @NotNull Packet process(
+            @NotNull Packet request, @Nullable WebServiceContextDelegate wscd, @Nullable TransportBackChannel tbc);
+    }
+
+    /**
+     * Indicates that the {@link WSEndpoint} is about to be turned off,
+     * and will no longer serve any packet anymore.
+     *
+     * 
    
+     * This method needs to be invoked for the JAX-WS RI to correctly
+     * implement some of the spec semantics (TODO: pointer.)
+     * It's the responsibility of the code that hosts a {@link WSEndpoint}
+     * to invoke this method.
+     *
+     * 
    
+     * Once this method is called, the behavior is undefed for
+     * all in-progress {@link PipeHead#process} methods (by other threads)
+     * and future {@link PipeHead#process} method invocations.
+     */
+    public abstract void dispose();
+
+    /**
+     * Gets the description of the service.
+     *
+     * 
    
+     * A description is a set of WSDL/schema and other documents that together
+     * describes a service.
+     * A service is not required to have a description, and when it doesn't,
+     * this method returns null.
+     *
+     * @return
+     *      Possibly null, but always the same value.
+     */
+    public abstract @Nullable ServiceDefinition getServiceDefinition();
+
+
+
+    /**
+     * Creates an endpoint from deployment or programmatic configuration
+     *
+     * 
    
+     * This method works like the following:
+     * 
      
+     * 
    1. {@link ServiceDefinition} is modeleed from the given SEI type.
+     * 
    2. {@link Invoker} that always serves implementationObject will be used.
+     * 
    
+     * @param implType
+     *      Endpoint class(not SEI). Enpoint class must have @WebService or @WebServiceProvider
+     *      annotation.
+     * @param processHandlerAnnotation
+     *      Flag to control processing of @HandlerChain on Impl class
+     *      if true, processes @HandlerChain on Impl
+     *      if false, DD might have set HandlerChain no need to parse.
+     * @param invoker
+     *      Pass an object to invoke the actual endpoint object. If it is null, a default
+     *      invoker is created using {@link InstanceResolver#createDefault}. Appservers
+     *      could create its own invoker to do additional functions like transactions,
+     *      invoking the endpoint through proxy etc.
+     * @param serviceName
+     *      Optional service name(may be from DD) to override the one given by the
+     *      implementation class. If it is null, it will be derived from annotations.
+     * @param portName
+     *      Optional port name(may be from DD) to override the one given by the
+     *      implementation class. If it is null, it will be derived from annotations.
+     * @param container
+     *      Allows technologies that are built on top of JAX-WS(such as WSIT) needs to
+     *      negotiate private contracts between them and the container
+     * @param binding
+     *      JAX-WS implementation of {@link Binding}. This object can be created by
+     *      {@link BindingID#createBinding()}. Usually the binding can be got from
+     *      DD, {@link javax.xml.ws.BindingType}.
+     *
+     *
+     * TODO: DD has a configuration for MTOM threshold.
+     * Maybe we need something more generic so that other technologies
+     * like Tango can get information from DD.
+     *
+     * TODO: does it really make sense for this to take EntityResolver?
+     * Given that all metadata has to be given as a list anyway.
+     *
+     * @param primaryWsdl
+     *      The {@link ServiceDefinition#getPrimary() primary} WSDL.
+     *      If null, it'll be generated based on the SEI (if this is an SEI)
+     *      or no WSDL is associated (if it's a provider.)
+     *      TODO: shouldn't the implementation find this from the metadata list?
+     * @param metadata
+     *      Other documents that become {@link SDDocument}s. Can be null.
+     * @param resolver
+     *      Optional resolver used to de-reference resources referenced from
+     *      WSDL. Must be null if the {@code url} is null.
+     * @param isTransportSynchronous
+     *      If the caller knows that the returned {@link WSEndpoint} is going to be
+     *      used by a synchronous-only transport, then it may pass in true
+     *      to allow the callee to perform an optimization based on that knowledge
+     *      (since often synchronous version is cheaper than an asynchronous version.)
+     *      This value is visible from {@link ServerTubeAssemblerContext#isSynchronous()}.
+     *
+     * @return newly constructed {@link WSEndpoint}.
+     * @throws WebServiceException
+     *      if the endpoint set up fails.
+     */
+    public static  WSEndpoint create(
+        @NotNull Class implType,
+        boolean processHandlerAnnotation,
+        @Nullable Invoker invoker,
+        @Nullable QName serviceName,
+        @Nullable QName portName,
+        @Nullable Container container,
+        @Nullable WSBinding binding,
+        @Nullable SDDocumentSource primaryWsdl,
+        @Nullable Collection metadata,
+        @Nullable EntityResolver resolver,
+        boolean isTransportSynchronous) {
+        return EndpointFactory.createEndpoint(
+            implType,processHandlerAnnotation, invoker,serviceName,portName,container,binding,primaryWsdl,metadata,resolver,isTransportSynchronous);
+    }
+
+    /**
+     * Deprecated version that assumes isTransportSynchronous==false
+     */
+    @Deprecated
+    public static  WSEndpoint create(
+        @NotNull Class implType,
+        boolean processHandlerAnnotation,
+        @Nullable Invoker invoker,
+        @Nullable QName serviceName,
+        @Nullable QName portName,
+        @Nullable Container container,
+        @Nullable WSBinding binding,
+        @Nullable SDDocumentSource primaryWsdl,
+        @Nullable Collection metadata,
+        @Nullable EntityResolver resolver) {
+        return create(implType,processHandlerAnnotation,invoker,serviceName,portName,container,binding,primaryWsdl,metadata,resolver,false);
+    }
+
+
+    /**
+     * The same as
+     * {@link #create(Class, boolean, Invoker, QName, QName, Container, WSBinding, SDDocumentSource, Collection, EntityResolver)}
+     * except that this version takes an url of the jax-ws-catalog.xml.
+     *
+     * @param catalogUrl
+     *      if not null, an {@link EntityResolver} is created from it and used.
+     *      otherwise no resolution will be performed.
+     */
+    public static  WSEndpoint create(
+        @NotNull Class implType,
+        boolean processHandlerAnnotation,
+        @Nullable Invoker invoker,
+        @Nullable QName serviceName,
+        @Nullable QName portName,
+        @Nullable Container container,
+        @Nullable WSBinding binding,
+        @Nullable SDDocumentSource primaryWsdl,
+        @Nullable Collection metadata,
+        @Nullable URL catalogUrl) {
+        return create(
+            implType,processHandlerAnnotation,invoker,serviceName,portName,container,binding,primaryWsdl,metadata,
+            XmlUtil.createEntityResolver(catalogUrl),false);
+    }
+
+    /**
+     * Gives the wsdl:service default name computed from the endpoint implementaiton class
+     */
+    public static @NotNull QName getDefaultServiceName(Class endpointClass){
+        return EndpointFactory.getDefaultServiceName(endpointClass);
+    }
+
+    /**
+     * Gives the wsdl:service/wsdl:port default name computed from the endpoint implementaiton class
+     */
+    public static @NotNull QName getDefaultPortName(@NotNull QName serviceName, Class endpointClass){
+        return EndpointFactory.getDefaultPortName(serviceName, endpointClass);
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/WSWebServiceContext.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/WSWebServiceContext.java
new file mode 100644
index 00000000000..c7cb6b78343
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/WSWebServiceContext.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.server;
+
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.api.message.Packet;
+
+import javax.xml.ws.WebServiceContext;
+
+/**
+ * {@link WebServiceContext} that exposes JAX-WS RI specific additions.
+ *
+ * 
    
+ * {@link WebServiceContext} instances that JAX-WS injects always
+ * implement this interface.
+ *
+ * 
    
+ * The JAX-WS RI may add methods on this interface, so do not implement
+ * this interface in your code, or risk {@link LinkageError}.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public interface WSWebServiceContext extends WebServiceContext {
+    /**
+     * Obtains the request packet that is being processed.
+     * @return Packet for the request
+     */
+    @Nullable Packet getRequestPacket();
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/WebModule.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/WebModule.java
new file mode 100644
index 00000000000..c9f5603faf4
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/WebModule.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.server;
+
+import com.sun.istack.internal.NotNull;
+
+/**
+ * {@link Module} that is an HTTP container.
+ *
+ * @author Kohsuke Kawaguchi
+ * @since 2.1 EA3
+ */
+public abstract class WebModule extends Module {
+    /**
+     * Gets the host, port, and context path portion of this module.
+     *
+     * 
    
+     * For example, if this is an web appliation running in a servlet
+     * container "http://myhost/myapp", then this method should return
+     * this URI.
+     *
+     * 
    
+     * This method follows the convention of the HttpServletRequest.getContextPath(),
+     * and accepts strings like "http://myhost" (for web applications that are deployed
+     * to the root context path), or "http://myhost/foobar" (for web applications
+     * that are deployed to context path "/foobar")
+     *
+     * 
    
+     * Notice that this method involves in determining the machine name
+     * without relying on HTTP "Host" header.
+     */
+    public abstract @NotNull String getContextPath();
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/WebServiceContextDelegate.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/WebServiceContextDelegate.java
new file mode 100644
index 00000000000..688650913c0
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/WebServiceContextDelegate.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.server;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.pipe.Pipe;
+
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.WebServiceException;
+import java.security.Principal;
+
+/**
+ * This object is set to {@link Packet#webServiceContextDelegate}
+ * to serve {@link WebServiceContext} methods for a {@link Packet}.
+ *
+ * 
    
+ * When the user application calls a method on {@link WebServiceContext},
+ * the JAX-WS RI goes to the {@link Packet} that represents the request,
+ * then check {@link Packet#webServiceContextDelegate}, and forwards
+ * the method calls to {@link WebServiceContextDelegate}.
+ *
+ * 
    
+ * All the methods defined on this interface takes {@link Packet}
+ * (whose {@link Packet#webServiceContextDelegate} points to
+ * this object), so that a single stateless {@link WebServiceContextDelegate}
+ * can be used to serve multiple concurrent {@link Packet}s,
+ * if the implementation wishes to do so.
+ *
+ * 
    
+ * (It is also allowed to create one instance of
+ * {@link WebServiceContextDelegate} for each packet,
+ * and thus effectively ignore the packet parameter.)
+ *
+ * 
    
+ * Attaching this on a {@link Packet} allows {@link Pipe}s to
+ * intercept and replace them, if they wish.
+ *
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public interface WebServiceContextDelegate {
+    /**
+     * Implements {@link WebServiceContext#getUserPrincipal()}
+     * for the given packet.
+     *
+     * @param request
+     *      Always non-null. See class javadoc.
+     * @see WebServiceContext#getUserPrincipal()
+     */
+    Principal getUserPrincipal(@NotNull Packet request);
+
+    /**
+     * Implements {@link WebServiceContext#isUserInRole(String)}
+     * for the given packet.
+     *
+     * @param request
+     *      Always non-null. See class javadoc.
+     * @see WebServiceContext#isUserInRole(String)
+     */
+    boolean isUserInRole(@NotNull Packet request,String role);
+
+    /**
+     * Gets the address of the endpoint.
+     *
+     * 
    
+     * The "address" of endpoints is always affected by a particular
+     * client being served, hence it's up to transport to provide this
+     * information.
+     *
+     * @param request
+     *      Always non-null. See class javadoc.
+     * @param endpoint
+     *      The endpoint whose address will be returned.
+     *
+     * @throws WebServiceException
+     *      if this method could not compute the address for some reason.
+     * @return
+     *      Absolute URL of the endpoint. This shold be an address that the client
+     *      can use to talk back to this same service later.
+     *
+     * @see WebServiceContext#getEndpointReference
+     */
+    @NotNull String getEPRAddress(@NotNull Packet request, @NotNull WSEndpoint endpoint);
+
+    /**
+     * Gets the address of the primary WSDL.
+     *
+     * 
    
+     * If a transport supports publishing of WSDL by itself (instead/in addition to MEX),
+     * then it should implement this method so that the rest of the JAX-WS RI can
+     * use that information.
+     *
+     * For example, HTTP transports often use the convention {@code getEPRAddress()+"?wsdl"}
+     * for publishing WSDL on HTTP.
+     *
+     * 
    
+     * Some transports may not have such WSDL publishing mechanism on its own.
+     * Those transports may choose to return null, indicating that WSDL
+     * is not published. If such transports are always used in conjunction with
+     * other transports that support WSDL publishing (such as SOAP/TCP used
+     * with Servlet transport), then such transport may
+     * choose to find the corresponding servlet endpoint by {@link Module#getBoundEndpoints()}
+     * and try to obtain the address from there.
+     *
+     * 
    
+     * This information is used to put a metadata reference inside an EPR,
+     * among other things. Clients that do not support MEX rely on this
+     * WSDL URL to retrieve metadata, it is desirable for transports to support
+     * this, but not mandatory.
+     *
+     * 
    
+     * This method will be never invoked if the {@link WSEndpoint}
+     * does not have a corresponding WSDL to begin with
+     * (IOW {@link WSEndpoint#getServiceDefinition() returning null}.
+     *
+     * @param request
+     *      Always non-null. See class javadoc.
+     * @param endpoint
+     *      The endpoint whose address will be returned.
+     *
+     * @return
+     *      null if the implementation does not support the notion of
+     *      WSDL publishing.
+     */
+    @Nullable String getWSDLAddress(@NotNull Packet request, @NotNull WSEndpoint endpoint);
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/package-info.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/package-info.java
new file mode 100644
index 00000000000..69e6b436ad8
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/package-info.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/**
+ * APIs for hosting JAX-WS services.
+ *
+ * If you are new to the code, start with {@link WSEndpoint}.
+ */
+package com.sun.xml.internal.ws.api.server;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java
new file mode 100644
index 00000000000..508c3f9a586
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java
@@ -0,0 +1,367 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.streaming;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.streaming.XMLReaderException;
+import org.xml.sax.InputSource;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+import java.io.StringReader;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.URL;
+
+/**
+ * Factory for {@link XMLStreamReader}.
+ *
+ * 
    
+ * This wraps {@link XMLInputFactory} and allows us to reuse {@link XMLStreamReader} instances
+ * when appropriate.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public abstract class XMLStreamReaderFactory {
+
+    /**
+     * Singleton instance.
+     */
+    private static volatile @NotNull XMLStreamReaderFactory theInstance;
+
+    static {
+        XMLInputFactory xif = XMLInputFactory.newInstance();
+        xif.setProperty(XMLInputFactory.IS_NAMESPACE_AWARE, true);
+        xif.setProperty(XMLInputFactory.SUPPORT_DTD, false);
+
+        XMLStreamReaderFactory f=null;
+
+        // this system property can be used to disable the pooling altogether,
+        // in case someone hits an issue with pooling in the production system.
+        if(!Boolean.getBoolean(XMLStreamReaderFactory.class.getName()+".noPool"))
+            f = Zephyr.newInstance(xif);
+
+        if(f==null) {
+            // is this Woodstox?
+            if(xif.getClass().getName().equals("com.ctc.wstx.stax.WstxInputFactory"))
+                f = new Woodstox(xif);
+        }
+
+        if(f==null)
+            f = new Default(xif);
+
+        theInstance = f;
+    }
+
+    /**
+     * Overrides the singleton {@link XMLStreamReaderFactory} instance that
+     * the JAX-WS RI uses.
+     */
+    public static void set(XMLStreamReaderFactory f) {
+        if(f==null) throw new IllegalArgumentException();
+        theInstance = f;
+    }
+
+    public static XMLStreamReaderFactory get() {
+        return theInstance;
+    }
+
+    public static XMLStreamReader create(InputSource source, boolean rejectDTDs) {
+        try {
+            // Char stream available?
+            if (source.getCharacterStream() != null) {
+                return get().doCreate(source.getSystemId(), source.getCharacterStream(), rejectDTDs);
+            }
+
+            // Byte stream available?
+            if (source.getByteStream() != null) {
+                return get().doCreate(source.getSystemId(), source.getByteStream(), rejectDTDs);
+            }
+
+            // Otherwise, open URI
+            return get().doCreate(source.getSystemId(), new URL(source.getSystemId()).openStream(),rejectDTDs);
+        } catch (IOException e) {
+            throw new XMLReaderException("stax.cantCreate",e);
+        }
+    }
+
+    public static XMLStreamReader create(@Nullable String systemId, InputStream in, boolean rejectDTDs) {
+        return get().doCreate(systemId,in,rejectDTDs);
+    }
+
+    public static XMLStreamReader create(@Nullable String systemId, Reader reader, boolean rejectDTDs) {
+        return get().doCreate(systemId,reader,rejectDTDs);
+    }
+
+    /**
+     * Should be invoked when the code finished using an {@link XMLStreamReader}.
+     *
+     * 
    
+     * If the recycled instance implements {@link RecycleAware},
+     * {@link RecycleAware#onRecycled()} will be invoked to let the instance
+     * know that it's being recycled.
+     *
+     * 
    
+     * It is not a hard requirement to call this method on every {@link XMLStreamReader}
+     * instance. Not doing so just reduces the performance by throwing away
+     * possibly reusable instances. So the caller should always consider the effort
+     * it takes to recycle vs the possible performance gain by doing so.
+     *
+     * 
    
+     * This method may be invked by multiple threads concurrently.
+     *
+     * @param r
+     *      The {@link XMLStreamReader} instance that the caller finished using.
+     *      This could be any {@link XMLStreamReader} implementation, not just
+     *      the ones that were created from this factory. So the implementation
+     *      of this class needs to be aware of that.
+     */
+    public static void recycle(XMLStreamReader r) {
+        get().doRecycle(r);
+    }
+
+    // implementations
+
+    public abstract XMLStreamReader doCreate(String systemId, InputStream in, boolean rejectDTDs);
+
+    public abstract XMLStreamReader doCreate(String systemId, Reader reader, boolean rejectDTDs);
+
+    public abstract void doRecycle(XMLStreamReader r);
+
+    /**
+     * Interface that can be implemented by {@link XMLStreamReader} to
+     * be notified when it's recycled.
+     *
+     * 
    
+     * This provides a filtering {@link XMLStreamReader} an opportunity to
+     * recycle its inner {@link XMLStreamReader}.
+     */
+    public interface RecycleAware {
+        void onRecycled();
+    }
+
+    /**
+     * {@link XMLStreamReaderFactory} implementation for SJSXP/JAXP RI.
+     */
+    public static final class Zephyr extends XMLStreamReaderFactory {
+        private final XMLInputFactory xif;
+
+        private final ThreadLocal pool = new ThreadLocal();
+
+        /**
+         * Sun StAX impl XMLReaderImpl.setInputSource() method via reflection.
+         */
+        private final Method setInputSourceMethod;
+
+        /**
+         * Sun StAX impl XMLReaderImpl.reset() method via reflection.
+         */
+        private final Method resetMethod;
+
+        /**
+         * The Sun StAX impl's {@link XMLStreamReader} implementation clas.
+         */
+        private final Class zephyrClass;
+
+        /**
+         * Creates {@link Zephyr} instance if the given {@link XMLInputFactory} is the one
+         * from Zephyr.
+         */
+        public static @Nullable
+        XMLStreamReaderFactory newInstance(XMLInputFactory xif) {
+            // check if this is from Zephyr
+            try {
+                Class clazz = xif.createXMLStreamReader(new StringReader("")).getClass();
+
+                if(!clazz.getName().startsWith("com.sun.xml.internal.stream."))
+                    return null;    // nope
+
+                return new Zephyr(xif,clazz);
+            } catch (NoSuchMethodException e) {
+                return null;    // this factory is not for zephyr
+            } catch (XMLStreamException e) {
+                return null;    // impossible to fail to parse , but anyway
+            }
+        }
+
+        public Zephyr(XMLInputFactory xif, Class clazz) throws NoSuchMethodException {
+            zephyrClass = clazz;
+            setInputSourceMethod = clazz.getMethod("setInputSource", InputSource.class);
+            resetMethod = clazz.getMethod("reset");
+
+            try {
+                // Turn OFF internal factory caching in Zephyr.
+                // Santiago told me that this makes it thread-safe.
+                xif.setProperty("reuse-instance", false);
+            } catch (IllegalArgumentException e) {
+                // falls through
+            }
+            this.xif = xif;
+        }
+
+        /**
+         * Fetchs an instance from the pool if available, otherwise null.
+         */
+        private @Nullable XMLStreamReader fetch() {
+            XMLStreamReader sr = pool.get();
+            if(sr==null)    return null;
+            pool.set(null);
+            return sr;
+        }
+
+        public void doRecycle(XMLStreamReader r) {
+            if(zephyrClass.isInstance(r))
+                pool.set(r);
+            if(r instanceof RecycleAware)
+                ((RecycleAware)r).onRecycled();
+        }
+
+        public XMLStreamReader doCreate(String systemId, InputStream in, boolean rejectDTDs) {
+            try {
+                XMLStreamReader xsr = fetch();
+                if(xsr==null)
+                    return xif.createXMLStreamReader(systemId,in);
+
+                // try re-using this instance.
+                InputSource is = new InputSource(systemId);
+                is.setByteStream(in);
+                reuse(xsr,is);
+                return xsr;
+            } catch (IllegalAccessException e) {
+                throw new XMLReaderException("stax.cantCreate",e);
+            } catch (InvocationTargetException e) {
+                throw new XMLReaderException("stax.cantCreate",e);
+            } catch (XMLStreamException e) {
+                throw new XMLReaderException("stax.cantCreate",e);
+            }
+        }
+
+        public XMLStreamReader doCreate(String systemId, Reader in, boolean rejectDTDs) {
+            try {
+                XMLStreamReader xsr = fetch();
+                if(xsr==null)
+                    return xif.createXMLStreamReader(systemId,in);
+
+                // try re-using this instance.
+                InputSource is = new InputSource(systemId);
+                is.setCharacterStream(in);
+                reuse(xsr,is);
+                return xsr;
+            } catch (IllegalAccessException e) {
+                throw new XMLReaderException("stax.cantCreate",e);
+            } catch (InvocationTargetException e) {
+                throw new XMLReaderException("stax.cantCreate",e);
+            } catch (XMLStreamException e) {
+                throw new XMLReaderException("stax.cantCreate",e);
+            }
+        }
+
+        private void reuse(XMLStreamReader xsr, InputSource in) throws IllegalAccessException, InvocationTargetException {
+            resetMethod.invoke(xsr);
+            setInputSourceMethod.invoke(xsr,in);
+        }
+    }
+
+    /**
+     * Default {@link XMLStreamReaderFactory} implementation
+     * that can work with any {@link XMLInputFactory}.
+     *
+     * 
    
+     * {@link XMLInputFactory} is not required to be thread-safe, so the
+     * create method on this implementation is synchronized.
+     */
+    public static final class Default extends NoLock {
+        public Default(XMLInputFactory xif) {
+            super(xif);
+        }
+
+        public synchronized XMLStreamReader doCreate(String systemId, InputStream in, boolean rejectDTDs) {
+            return super.doCreate(systemId, in, rejectDTDs);
+        }
+
+        public synchronized XMLStreamReader doCreate(String systemId, Reader in, boolean rejectDTDs) {
+            return super.doCreate(systemId, in, rejectDTDs);
+        }
+    }
+
+    /**
+     * Similar to {@link Default} but doesn't do any synchronization.
+     *
+     * 
    
+     * This is useful when you know your {@link XMLInputFactory} is thread-safe by itself.
+     */
+    public static class NoLock extends XMLStreamReaderFactory {
+        private final XMLInputFactory xif;
+
+        public NoLock(XMLInputFactory xif) {
+            this.xif = xif;
+        }
+
+        public XMLStreamReader doCreate(String systemId, InputStream in, boolean rejectDTDs) {
+            try {
+                return xif.createXMLStreamReader(systemId,in);
+            } catch (XMLStreamException e) {
+                throw new XMLReaderException("stax.cantCreate",e);
+            }
+        }
+
+        public XMLStreamReader doCreate(String systemId, Reader in, boolean rejectDTDs) {
+            try {
+                return xif.createXMLStreamReader(systemId,in);
+            } catch (XMLStreamException e) {
+                throw new XMLReaderException("stax.cantCreate",e);
+            }
+        }
+
+        public void doRecycle(XMLStreamReader r) {
+            // there's no way to recycle with the default StAX API.
+        }
+    }
+
+    /**
+     * Handles Woodstox's XIF but set properties to do the string interning.
+     * Woodstox {@link XMLInputFactory} is thread safe.
+     */
+    public static final class Woodstox extends NoLock {
+        public Woodstox(XMLInputFactory xif) {
+            super(xif);
+            xif.setProperty("org.codehaus.stax2.internNsUris",true);
+        }
+
+        public XMLStreamReader doCreate(String systemId, InputStream in, boolean rejectDTDs) {
+            return super.doCreate(systemId, in, rejectDTDs);
+        }
+
+        public XMLStreamReader doCreate(String systemId, Reader in, boolean rejectDTDs) {
+            return super.doCreate(systemId, in, rejectDTDs);
+        }
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java
new file mode 100644
index 00000000000..a6b6054283d
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java
@@ -0,0 +1,305 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.streaming;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.streaming.XMLReaderException;
+
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.ws.WebServiceException;
+import java.io.OutputStream;
+import java.io.StringWriter;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+/**
+ * Factory for {@link XMLStreamWriter}.
+ *
+ * 
    
+ * This wraps {@link XMLOutputFactory} and allows us to reuse {@link XMLStreamWriter} instances
+ * when appropriate.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public abstract class XMLStreamWriterFactory {
+
+    /**
+     * Singleton instance.
+     */
+    private static volatile @NotNull XMLStreamWriterFactory theInstance;
+
+
+    static {
+        XMLOutputFactory xof = XMLOutputFactory.newInstance();
+
+        XMLStreamWriterFactory f=null;
+
+        // this system property can be used to disable the pooling altogether,
+        // in case someone hits an issue with pooling in the production system.
+        if(!Boolean.getBoolean(XMLStreamWriterFactory.class.getName()+".noPool"))
+            f = Zephyr.newInstance(xof);
+        if(f==null)
+            f = new Default(xof);
+
+        theInstance = f;
+    }
+
+    /**
+     * See {@link #create(OutputStream)} for the contract.
+     * This method may be invoked concurrently.
+     */
+    public abstract XMLStreamWriter doCreate(OutputStream out);
+
+    /**
+     * See {@link #create(OutputStream,String)} for the contract.
+     * This method may be invoked concurrently.
+     */
+    public abstract XMLStreamWriter doCreate(OutputStream out, String encoding);
+
+    /**
+     * See {@link #recycle(XMLStreamWriter)} for the contract.
+     * This method may be invoked concurrently.
+     */
+    public abstract void doRecycle(XMLStreamWriter r);
+
+    /**
+     * Should be invoked when the code finished using an {@link XMLStreamWriter}.
+     *
+     * 
    
+     * If the recycled instance implements {@link RecycleAware},
+     * {@link RecycleAware#onRecycled()} will be invoked to let the instance
+     * know that it's being recycled.
+     *
+     * 
    
+     * It is not a hard requirement to call this method on every {@link XMLStreamReader}
+     * instance. Not doing so just reduces the performance by throwing away
+     * possibly reusable instances. So the caller should always consider the effort
+     * it takes to recycle vs the possible performance gain by doing so.
+     *
+     * 
    
+     * This method may be invked by multiple threads concurrently.
+     *
+     * @param r
+     *      The {@link XMLStreamReader} instance that the caller finished using.
+     *      This could be any {@link XMLStreamReader} implementation, not just
+     *      the ones that were created from this factory. So the implementation
+     *      of this class needs to be aware of that.
+     */
+    public static void recycle(XMLStreamWriter r) {
+        get().doRecycle(r);
+    }
+
+    /**
+     * Interface that can be implemented by {@link XMLStreamWriter} to
+     * be notified when it's recycled.
+     *
+     * 
    
+     * This provides a filtering {@link XMLStreamWriter} an opportunity to
+     * recycle its inner {@link XMLStreamWriter}.
+     */
+    public interface RecycleAware {
+        void onRecycled();
+    }
+
+    /**
+     * Gets the singleton instance.
+     */
+    public static @NotNull XMLStreamWriterFactory get() {
+        return theInstance;
+    }
+
+    /**
+     * Overrides the singleton {@link XMLStreamWriterFactory} instance that
+     * the JAX-WS RI uses.
+     *
+     * @param f
+     *      must not be null.
+     */
+    public static void set(@NotNull XMLStreamWriterFactory f) {
+        if(f==null) throw new IllegalArgumentException();
+        theInstance = f;
+    }
+
+    /**
+     * Short-cut for {@link #create(OutputStream, String)} with UTF-8.
+     */
+    public static XMLStreamWriter create(OutputStream out) {
+        return get().doCreate(out);
+    }
+
+    public static XMLStreamWriter create(OutputStream out, String encoding) {
+        return get().doCreate(out, encoding);
+    }
+
+    /**
+     * @deprecated
+     *      Use {@link #create(OutputStream)}
+     */
+    public static XMLStreamWriter createXMLStreamWriter(OutputStream out) {
+        return create(out);
+    }
+
+    /**
+     * @deprecated
+     *      Use {@link #create(OutputStream, String)}
+     */
+    public static XMLStreamWriter createXMLStreamWriter(OutputStream out, String encoding) {
+        return create(out, encoding);
+    }
+
+    /**
+     * @deprecated
+     *      Use {@link #create(OutputStream, String)}. The boolean flag was unused anyway.
+     */
+    public static XMLStreamWriter createXMLStreamWriter(OutputStream out, String encoding, boolean declare) {
+        return create(out,encoding);
+    }
+
+    /**
+     * Default {@link XMLStreamWriterFactory} implementation
+     * that can work with any {@link XMLOutputFactory}.
+     *
+     * 
    
+     * {@link XMLOutputFactory} is not required to be thread-safe, so the
+     * create method on this implementation is synchronized.
+     */
+    public static final class Default extends XMLStreamWriterFactory {
+        private final XMLOutputFactory xof;
+
+        public Default(XMLOutputFactory xof) {
+            this.xof = xof;
+        }
+
+        public XMLStreamWriter doCreate(OutputStream out) {
+            return doCreate(out,"UTF-8");
+        }
+
+        public synchronized XMLStreamWriter doCreate(OutputStream out, String encoding) {
+            try {
+                return xof.createXMLStreamWriter(out,encoding);
+            } catch (XMLStreamException e) {
+                throw new XMLReaderException("stax.cantCreate",e);
+            }
+        }
+
+        public void doRecycle(XMLStreamWriter r) {
+            // no recycling
+        }
+    }
+
+    /**
+     * {@link XMLStreamWriterFactory} implementation for Sun's StaX implementation.
+     *
+     * 
    
+     * This implementation supports instance reuse.
+     */
+    public static final class Zephyr extends XMLStreamWriterFactory {
+        private final XMLOutputFactory xof;
+        private final ThreadLocal pool = new ThreadLocal();
+        private final Method resetMethod;
+        private final Method setOutputMethod;
+        private final Class zephyrClass;
+
+        public static XMLStreamWriterFactory newInstance(XMLOutputFactory xof) {
+            try {
+                Class clazz = xof.createXMLStreamWriter(new StringWriter()).getClass();
+
+                if(!clazz.getName().startsWith("com.sun.xml.internal.stream."))
+                return null;    // nope
+
+                return new Zephyr(xof,clazz);
+            } catch (XMLStreamException e) {
+                return null;    // impossible
+            } catch (NoSuchMethodException e) {
+                return null;    // this xof wasn't Zephyr
+            }
+        }
+
+        private Zephyr(XMLOutputFactory xof, Class clazz) throws NoSuchMethodException {
+            this.xof = xof;
+
+            zephyrClass = clazz;
+            setOutputMethod = clazz.getMethod("setOutput", StreamResult.class, String.class);
+            resetMethod = clazz.getMethod("reset");
+        }
+
+        /**
+         * Fetchs an instance from the pool if available, otherwise null.
+         */
+        private @Nullable XMLStreamWriter fetch() {
+            XMLStreamWriter sr = pool.get();
+            if(sr==null)    return null;
+            pool.set(null);
+            return sr;
+        }
+
+        public XMLStreamWriter doCreate(OutputStream out) {
+            return doCreate(out,"UTF-8");
+        }
+
+        public XMLStreamWriter doCreate(OutputStream out, String encoding) {
+            XMLStreamWriter xsw = fetch();
+            if(xsw!=null) {
+                // try to reuse
+                try {
+                    resetMethod.invoke(xsw);
+                    setOutputMethod.invoke(xsw,new StreamResult(out),encoding);
+                    return xsw;
+                } catch (IllegalAccessException e) {
+                    throw new XMLReaderException("stax.cantCreate",e);
+                } catch (InvocationTargetException e) {
+                    throw new XMLReaderException("stax.cantCreate",e);
+                }
+            }
+
+            // create a new instance
+            try {
+                return xof.createXMLStreamWriter(out,encoding);
+            } catch (XMLStreamException e) {
+                throw new XMLReaderException("stax.cantCreate",e);
+            }
+        }
+
+        public void doRecycle(XMLStreamWriter r) {
+            if(zephyrClass.isInstance(r)) {
+                // this flushes the underlying stream, so it might cause chunking issue
+                try {
+                    r.close();
+                } catch (XMLStreamException e) {
+                    throw new WebServiceException(e);
+                }
+                pool.set(r);
+            }
+            if(r instanceof RecycleAware)
+                ((RecycleAware)r).onRecycled();
+        }
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/MetaDataResolver.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/MetaDataResolver.java
new file mode 100644
index 00000000000..bf5d632a5fc
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/MetaDataResolver.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.wsdl.parser;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+
+import java.net.URI;
+
+/**
+ * Resolves metadata such as WSDL/schema. This serves as extensibile plugin point which a wsdl parser can use to
+ * get the metadata from an endpoint.
+ *
+ * @author Vivek Pandey
+ */
+public abstract class MetaDataResolver {
+    /**
+     * Gives {@link com.sun.xml.internal.ws.api.wsdl.parser.ServiceDescriptor} resolved from the given location.
+     *
+     * TODO: Does this method need to propogate errors?
+     *
+     * @param location metadata location
+     * @return {@link com.sun.xml.internal.ws.api.wsdl.parser.ServiceDescriptor} resolved from the location. It may be null in the cases when MetadataResolver
+     *         can get the metada associated with the metadata loction.
+     */
+    public abstract @Nullable ServiceDescriptor resolve(@NotNull URI location);
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/MetadataResolverFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/MetadataResolverFactory.java
new file mode 100644
index 00000000000..41dd3fe9913
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/MetadataResolverFactory.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.wsdl.parser;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import org.xml.sax.EntityResolver;
+
+/**
+ * Extension point for resolving metadata using wsimport.
+ * 
    
+ * wsimport would get a {@link MetaDataResolver} using this factory and from it will resolve all the wsdl/schema
+ * metadata.
+ *
+ * Implementor of this class must provide a zero argument constructor so that
+ * it can be loaded during service lookup mechanism.
+ *
+ * @author Vivek Pandey
+ * @see com.sun.xml.internal.ws.api.wsdl.parser.MetaDataResolver#resolve(java.net.URI)
+ */
+public abstract class MetadataResolverFactory {
+    /**
+     * Gets a {@link com.sun.xml.internal.ws.api.wsdl.parser.MetaDataResolver}
+     *
+     * @param resolver
+     */
+    public abstract
+    @NotNull
+    MetaDataResolver metadataResolver(@Nullable EntityResolver resolver);
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLOutputResolver.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/ServiceDescriptor.java
similarity index 60%
rename from jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLOutputResolver.java
rename to jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/ServiceDescriptor.java
index 2007f127718..d8755bc194c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLOutputResolver.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/ServiceDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,33 +22,31 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-package com.sun.xml.internal.ws.wsdl.writer;
 
-import javax.xml.transform.Result;
-import javax.xml.ws.Holder;
+package com.sun.xml.internal.ws.api.wsdl.parser;
 
+import com.sun.istack.internal.NotNull;
+
+import javax.xml.transform.Source;
+import java.util.List;
 
 /**
+ * Abstraction over WSDL and Schema metadata
  *
- * @author WS Development Team
+ * @author Vivek Pandey
  */
-public interface WSDLOutputResolver {
-    public Result getWSDLOutput(String suggestedFilename);
-
-    /*
-     * Updates filename if the suggested filename need to be changed in
-     * wsdl:import
-     *
-     * return null if abstract WSDL need not be generated
+public abstract class ServiceDescriptor {
+    /**
+     * Gives list of wsdls
+     * @return List of WSDL documents as {@link Source}.
+     * {@link javax.xml.transform.Source#getSystemId()} must be Non-null
      */
-    public Result getAbstractWSDLOutput(Holder filename);
+    public abstract @NotNull List getWSDLs();
 
-    /*
-     * Updates filename if the suggested filename need to be changed in
-     * xsd:import
+    /**
+     * Gives list of schemas.
+     * @return List of XML schema documents as {@link Source}. {@link javax.xml.transform.Source#getSystemId()} must be Non-null.
      *
-     * return null if schema need not be generated
      */
-    public Result getSchemaOutput(String namespace, Holder filename);
-
+    public abstract @NotNull List getSchemas();
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtension.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtension.java
new file mode 100644
index 00000000000..eb2655614ec
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtension.java
@@ -0,0 +1,282 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.wsdl.parser;
+
+import com.sun.xml.internal.ws.api.WSService;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLBoundOperation;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLBoundPortType;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLExtensible;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLExtension;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLFault;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLInput;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLMessage;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLModel;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLOperation;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLOutput;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPortType;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLService;
+import com.sun.xml.internal.ws.api.pipe.Tube;
+import com.sun.xml.internal.ws.wsdl.parser.RuntimeWSDLParser;
+
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.ws.WebServiceException;
+
+/**
+ * Extends the WSDL parsing process.
+ *
+ * 
    
+ * This interface is implemented by components that build on top of the JAX-WS RI,
+ * to participate in the WSDL parsing process that happens in the runtime.
+ * This allows such components to retrieve information from WSDL extension elements,
+ * and use that later to, for example, configure {@link Tube}s.
+ *
+ *
+ *
+ * 
    How it works?
    
+ * 
    
+ * Each method on this interface denotes one extension point in WSDL
+ * (the place where foreign elements/attributes can be added.) A {@link RuntimeWSDLParser}
+ * starts parsing WSDL with a fixed set of {@link WSDLParserExtension}s, and
+ * as it finds extension elements/attributes, it calls appropriate callback methods
+ * to provide a chance for {@link WSDLParserExtension} to parse such
+ * an extension element.
+ *
+ * 
    
+ * There are two kinds of callbacks.
+ *
+ * 
    Attribute callbacks
    
+ * 
    
+ * One is for attributes, which ends with the name {@code Attributes}.
+ * This callback is invoked with {@link XMLStreamReader} that points
+ * to the start tag of the WSDL element.
+ *
+ * 
    
+ * The callback method can read interesting attributes on it.
+ * The method must return without advancing the parser to the next token.
+ *
+ * 
    Element callbacks
    
+ * 
    
+ * The other callback is for extension elements, which ends with the name
+ * {@code Elements}.
+ * When a callback is invoked, {@link XMLStreamReader} points to the
+ * start tag of the extension element. The callback method can do
+ * one of the following:
+ *
+ * 
      
+ *  
    1. Return {@code false} without moving {@link XMLStreamReader},
+ *      to indicate that the extension element isn't recognized.
+ *      This allows the next {@link WSDLParserExtension} to see this
+ *      extension element.
+ *  
    2. Parse the whole subtree rooted at the element,
+ *      move the cursor to the {@link XMLStreamConstants#END_ELEMENT} state,
+ *      and return {@code true}, indicating that the extension
+ *      element is consumed.
+ *      No other {@link WSDLParserExtension}s are notified of this extension.
+ * 
    
+ *
+ * 
    Parsing in callback
    
+ * 
    
+ * For each callback, the corresponding WSDL model object is passed in,
+ * so that {@link WSDLParserExtension} can relate what it's parsing
+ * to the {@link WSDLModel}. Most likely, extensions can parse
+ * their data into an {@link WSDLExtension}-derived classes, then
+ * use {@link WSDLExtensible} interface to hook them into {@link WSDLModel}.
+ *
+ * 
    
+ * Note that since the {@link WSDLModel} itself
+ * is being built, {@link WSDLParserExtension} may not invoke any of
+ * the query methods on the WSDL model. Those references are passed just so that
+ * {@link WSDLParserExtension} can hold on to those references, or put
+ * {@link WSDLExtensible} objects into the model, not to query it.
+ *
+ * 
    
+ * If {@link WSDLParserExtension} needs to query {@link WSDLModel},
+ * defer that processing until {@link #finished(WSDLParserExtensionContext)}, when it's
+ * safe to use {@link WSDLModel} can be used safely.
+ *
+ * 
    
+ * Also note that {@link WSDLParserExtension}s are called in no particular order.
+ * This interface is not designed for having multiple {@link WSDLParserExtension}s
+ * parse the same extension element.
+ *
+ *
+ * 
    Error Handling
    
+ * 
    
+ * For usability, {@link WSDLParserExtension}s are expected to check possible
+ * errors in the extension elements that it parses. When an error is found,
+ * it may throw a {@link WebServiceException} to abort the parsing of the WSDL.
+ * This exception will be propagated to the user, so it should have
+ * detailed error messages pointing at the problem.
+ *
+ * 
    Discovery
    
+ * 
    
+ * The JAX-WS RI locates the implementation of {@link WSDLParserExtension}s
+ * by using the standard service look up mechanism, in particular looking for
+ * META-INF/services/com.sun.xml.internal.ws.api.wsdl.parser.WSDLParserExtension
+ *
+ *
+ * 
    TODO
    
+ * 
    
+ * As it's designed today, extensions cannot access to any of the environmental
+ * information before the parsing begins (such as what {@link WSService} this
+ * WSDL is being parsed for, etc.) We might need to reconsider this aspect.
+ * The JAX-WS team waits for feedback on this topic.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public abstract class WSDLParserExtension {
+    public void start(WSDLParserExtensionContext context){
+        // noop
+    }
+    public void serviceAttributes(WSDLService service, XMLStreamReader reader) {
+        // noop
+    }
+
+    public boolean serviceElements(WSDLService service, XMLStreamReader reader) {
+        return false;
+    }
+
+    public void portAttributes(WSDLPort port, XMLStreamReader reader) {
+        // noop
+    }
+
+    public boolean portElements(WSDLPort port, XMLStreamReader reader) {
+        return false;
+    }
+
+    public boolean portTypeOperationInput(WSDLOperation op, XMLStreamReader reader) {
+        return false;
+    }
+
+    public boolean portTypeOperationOutput(WSDLOperation op, XMLStreamReader reader) {
+        return false;
+    }
+
+    public boolean portTypeOperationFault(WSDLOperation op, XMLStreamReader reader) {
+        return false;
+    }
+
+    public boolean definitionsElements(XMLStreamReader reader) {
+        return false;
+    }
+
+    public boolean bindingElements(WSDLBoundPortType binding, XMLStreamReader reader) {
+        return false;
+    }
+
+    public void bindingAttributes(WSDLBoundPortType binding, XMLStreamReader reader) {
+    }
+
+    public boolean portTypeElements(WSDLPortType portType, XMLStreamReader reader) {
+        return false;
+    }
+
+    public void portTypeAttributes(WSDLPortType portType, XMLStreamReader reader) {
+    }
+
+    public boolean portTypeOperationElements(WSDLOperation operation, XMLStreamReader reader) {
+        return false;
+    }
+
+    public void portTypeOperationAttributes(WSDLOperation operation, XMLStreamReader reader) {
+    }
+
+    public boolean bindingOperationElements(WSDLBoundOperation operation, XMLStreamReader reader) {
+        return false;
+    }
+
+    public void bindingOperationAttributes(WSDLBoundOperation operation, XMLStreamReader reader) {
+    }
+
+    public boolean messageElements(WSDLMessage msg, XMLStreamReader reader) {
+        return false;
+    }
+
+    public void messageAttributes(WSDLMessage msg, XMLStreamReader reader) {
+    }
+
+    public boolean portTypeOperationInputElements(WSDLInput input, XMLStreamReader reader) {
+        return false;
+    }
+
+    public void portTypeOperationInputAttributes(WSDLInput input, XMLStreamReader reader) {
+    }
+
+    public boolean portTypeOperationOutputElements(WSDLOutput output, XMLStreamReader reader) {
+        return false;
+    }
+
+    public void portTypeOperationOutputAttributes(WSDLOutput output, XMLStreamReader reader) {
+    }
+
+    public boolean portTypeOperationFaultElements(WSDLFault fault, XMLStreamReader reader) {
+        return false;
+    }
+
+    public void portTypeOperationFaultAttributes(WSDLFault fault, XMLStreamReader reader) {
+    }
+
+    public boolean bindingOperationInputElements(WSDLBoundOperation operation, XMLStreamReader reader) {
+        return false;
+    }
+
+    public void bindingOperationInputAttributes(WSDLBoundOperation operation, XMLStreamReader reader) {
+    }
+
+    public boolean bindingOperationOutputElements(WSDLBoundOperation operation, XMLStreamReader reader) {
+        return false;
+    }
+
+    public void bindingOperationOutputAttributes(WSDLBoundOperation operation, XMLStreamReader reader) {
+    }
+
+    public boolean bindingOperationFaultElements(WSDLBoundOperation operation, XMLStreamReader reader) {
+        return false;
+    }
+
+    public void bindingOperationFaultAttributes(WSDLBoundOperation operation, XMLStreamReader reader) {
+    }
+
+    // TODO: complete the rest of the callback
+
+    /**
+     * Called when the parsing of a set of WSDL documents are all done.
+     * 
    
+     * This is the opportunity to do any post-processing of the parsing
+     * you've done.
+     *
+     * @param context  {@link WSDLParserExtensionContext} gives fully parsed {@link WSDLModel}.
+     */
+    public void finished(WSDLParserExtensionContext context) {
+        // noop
+    }
+
+    public void postFinished(WSDLParserExtensionContext context) {
+        // noop
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtensionContext.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtensionContext.java
new file mode 100644
index 00000000000..20ce13e17ce
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtensionContext.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.api.wsdl.parser;
+
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLModel;
+
+/**
+ * Provides contextual information for {@link WSDLParserExtension}s.
+ *
+ * @author Vivek Pandey
+ */
+public interface WSDLParserExtensionContext {
+    /**
+     * Returns true if the WSDL parsing is happening on the client side. Returns false means
+     * its started on the server side.
+     */
+    boolean isClientSide();
+
+    /**
+     * Gives the {@link WSDLModel}. The WSDLModel may not be complete until
+     * {@link WSDLParserExtension#finished(WSDLParserExtensionContext)} is called.
+     */
+    WSDLModel getWSDLModel();
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/XMLEntityResolver.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/XMLEntityResolver.java
new file mode 100644
index 00000000000..a8ea70a58a9
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/XMLEntityResolver.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.wsdl.parser;
+
+import com.sun.xml.internal.ws.api.server.SDDocumentSource;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.SAXException;
+
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import java.io.IOException;
+import java.net.URL;
+
+/**
+ * Resolves a reference to {@link XMLStreamReader}.
+ *
+ * This is kinda like {@link EntityResolver} but works
+ * at the XML infoset level.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public interface XMLEntityResolver {
+    /**
+     * See {@link EntityResolver#resolveEntity(String, String)} for the contract.
+     */
+    Parser resolveEntity(String publicId,String systemId)
+        throws SAXException, IOException, XMLStreamException;
+
+    public static final class Parser {
+        /**
+         * System ID of the document being parsed.
+         */
+        public final URL systemId;
+        /**
+         * The parser instance parsing the infoset.
+         */
+        public final XMLStreamReader parser;
+
+        public Parser(URL systemId, XMLStreamReader parser) {
+            assert parser!=null;
+            this.systemId = systemId;
+            this.parser = parser;
+        }
+
+        /**
+         * Creates a {@link Parser} that reads from {@link SDDocumentSource}.
+         */
+        public Parser(SDDocumentSource doc) throws IOException, XMLStreamException {
+            this.systemId = doc.getSystemId();
+            this.parser = doc.read();
+        }
+
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/package-info.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/package-info.java
new file mode 100644
index 00000000000..4f6378ed872
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/package-info.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/**
+ * Extension point for WSDL parsing.
+ */
+package com.sun.xml.internal.ws.api.wsdl.parser;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGenExtnContext.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGenExtnContext.java
new file mode 100644
index 00000000000..7bbd77531b7
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGenExtnContext.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.wsdl.writer;
+
+import com.sun.xml.internal.txw2.TypedXmlWriter;
+import com.sun.xml.internal.ws.api.model.SEIModel;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.server.Container;
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+
+/**
+ * WSDLGeneatorContext provides a context for the WSDLGeneratorExtension and is used in
+ * {@link WSDLGeneratorExtension#start(WSDLGenExtnContext)}. This context consists of TXW, {@link SEIModel},
+ * {@link WSBinding}, {@link Container}, and implementation class. WSDL extensions are used to
+ * extend the generated WSDL by adding implementation specific extensions.
+ *
+ * @author Jitendra Kotamraju
+ */
+public class WSDLGenExtnContext {
+    private final TypedXmlWriter root;
+    private final SEIModel model;
+    private final WSBinding binding;
+    private final Container container;
+    private final Class endpointClass;
+
+    /**
+     * Constructs WSDL Generation context for the extensions
+     *
+     * @param root      This is the root element of the generated WSDL.
+     * @param model     WSDL is being generated from this {@link SEIModel}.
+     * @param binding   The binding for which we generate WSDL. the binding {@link WSBinding} represents a particular
+     *                  configuration of JAXWS. This can be typically be overriden by
+     * @param container The entry point to the external environment.
+     *                  If this extension is used at the runtime to generate WSDL, you get a {@link Container}
+     *                  that was given to {@link com.sun.xml.internal.ws.api.server.WSEndpoint#create}.
+     */
+    public WSDLGenExtnContext(@NotNull TypedXmlWriter root, @NotNull SEIModel model, @NotNull WSBinding binding,
+                              @Nullable Container container, @NotNull Class endpointClass) {
+        this.root = root;
+        this.model = model;
+        this.binding = binding;
+        this.container = container;
+        this.endpointClass = endpointClass;
+    }
+
+    public TypedXmlWriter getRoot() {
+        return root;
+    }
+
+    public SEIModel getModel() {
+        return model;
+    }
+
+    public WSBinding getBinding() {
+        return binding;
+    }
+
+    public Container getContainer() {
+        return container;
+    }
+
+    public Class getEndpointClass() {
+        return endpointClass;
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGeneratorExtension.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGeneratorExtension.java
new file mode 100644
index 00000000000..b58b4e6f974
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGeneratorExtension.java
@@ -0,0 +1,270 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.api.wsdl.writer;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.txw2.TypedXmlWriter;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.model.CheckedException;
+import com.sun.xml.internal.ws.api.model.JavaMethod;
+import com.sun.xml.internal.ws.api.model.SEIModel;
+import com.sun.xml.internal.ws.api.server.Container;
+import com.sun.xml.internal.ws.api.server.WSEndpoint;
+
+/**
+ * This is a callback interface used to extend the WSDLGenerator.  Implementors
+ * of this interface can add their own WSDL extensions to the generated WSDL.
+ * There are a number of methods that will be invoked allowing the extensions
+ * to be generated on various WSDL elements.
+ * 
    
+ * The JAX-WS WSDLGenerator uses TXW to serialize the WSDL out to XML.
+ * More information about TXW can be located at
+ * http://txw.dev.java.net.
+ */
+public abstract class WSDLGeneratorExtension {
+    /**
+     * Called at the very beginning of the process.
+     * 
    
+     * This method is invoked so that the root element can be manipulated before
+     * any tags have been written. This allows to set e.g. namespace prefixes.
+     * 
    
+     * Another purpose of this method is to let extensions know what model
+     * we are generating a WSDL for.
+     *
+     * @param root      This is the root element of the generated WSDL.
+     * @param model     WSDL is being generated from this {@link SEIModel}.
+     * @param binding   The binding for which we generate WSDL. the binding {@link WSBinding} represents a particular
+     *                  configuration of JAXWS. This can be typically be overriden by
+     * @param container The entry point to the external environment.
+     *                  If this extension is used at the runtime to generate WSDL, you get a {@link Container}
+     *                  that was given to {@link WSEndpoint#create}.
+     *                  TODO: think about tool side
+     * @deprecated
+     */
+    public void start(@NotNull TypedXmlWriter root, @NotNull SEIModel model, @NotNull WSBinding binding, @NotNull Container container) {
+    }
+
+    /**
+     * Called before writing .
+     *
+     * @param ctxt
+     */
+    public void end(@NotNull WSDLGenExtnContext ctxt) {
+    }
+
+    /**
+     * Called at the very beginning of the process.
+     * 
    
+     * This method is invoked so that the root element can be manipulated before
+     * any tags have been written. This allows to set e.g. namespace prefixes.
+     * 
    
+     * Another purpose of this method is to let extensions know what model
+     * we are generating a WSDL for.
+     *
+     * @param ctxt Provides the context for the generator extensions
+     */
+    public void start(WSDLGenExtnContext ctxt) {
+    }
+
+    /**
+     * This method is invoked so that extensions to a wsdl:definitions
+     * element can be generated.
+     *
+     * @param definitions This is the wsdl:defintions element that the extension can be added to.
+     */
+    public void addDefinitionsExtension(TypedXmlWriter definitions) {
+    }
+
+    /**
+     * This method is invoked so that extensions to a wsdl:service
+     * element can be generated.
+     *
+     * @param service This is the wsdl:service element that the extension can be added to.
+     */
+    public void addServiceExtension(TypedXmlWriter service) {
+    }
+
+    /**
+     * This method is invoked so that extensions to a wsdl:port
+     * element can be generated.
+     *
+     * @param port This is the wsdl:port element that the extension can be added to.
+     */
+    public void addPortExtension(TypedXmlWriter port) {
+    }
+
+    /**
+     * This method is invoked so that extensions to a wsdl:portType
+     * element can be generated.
+     * 
    
+     *
+     * @param portType This is the wsdl:portType element that the extension can be added to.
+     */
+    public void addPortTypeExtension(TypedXmlWriter portType) {
+    }
+
+    /**
+     * This method is invoked so that extensions to a wsdl:binding
+     * element can be generated.
+     * 
    
+     * 
    
+     * TODO:  Some other information may need to be passed
+     *
+     * @param binding This is the wsdl:binding element that the extension can be added to.
+     */
+    public void addBindingExtension(TypedXmlWriter binding) {
+    }
+
+    /**
+     * This method is invoked so that extensions to a wsdl:portType/wsdl:operation
+     * element can be generated.
+     *
+     * @param operation This is the wsdl:portType/wsdl:operation  element that the
+     *                  extension can be added to.
+     * @param method    {@link JavaMethod} which captures all the information to generate wsdl:portType/wsdl:operation
+     */
+    public void addOperationExtension(TypedXmlWriter operation, JavaMethod method) {
+    }
+
+
+    /**
+     * This method is invoked so that extensions to a wsdl:binding/wsdl:operation
+     * element can be generated.
+     *
+     * @param operation This is the wsdl:binding/wsdl:operation  element that the
+     *                  extension can be added to.
+     * @param method    {@link JavaMethod} which captures all the information to generate wsdl:portType/wsdl:operation
+     */
+    public void addBindingOperationExtension(TypedXmlWriter operation, JavaMethod method) {
+    }
+
+    /**
+     * This method is invoked so that extensions to an input wsdl:message
+     * element can be generated.
+     *
+     * @param message This is the input wsdl:message element that the
+     *                extension can be added to.
+     * @param method  {@link JavaMethod} which captures all the information to generate wsdl:portType/wsdl:operation
+     */
+    public void addInputMessageExtension(TypedXmlWriter message, JavaMethod method) {
+    }
+
+    /**
+     * This method is invoked so that extensions to an output wsdl:message
+     * element can be generated.
+     *
+     * @param message This is the output wsdl:message element that the
+     *                extension can be added to.
+     * @param method  {@link JavaMethod} which captures all the information to generate wsdl:portType/wsdl:operation
+     */
+    public void addOutputMessageExtension(TypedXmlWriter message, JavaMethod method) {
+    }
+
+
+    /**
+     * This method is invoked so that extensions to a
+     * wsdl:portType/wsdl:operation/wsdl:input
+     * element can be generated.
+     *
+     * @param input  This is the wsdl:portType/wsdl:operation/wsdl:input  element that the
+     *               extension can be added to.
+     * @param method {@link JavaMethod} which captures all the information to generate wsdl:portType/wsdl:operation
+     */
+    public void addOperationInputExtension(TypedXmlWriter input, JavaMethod method) {
+    }
+
+
+    /**
+     * This method is invoked so that extensions to a wsdl:portType/wsdl:operation/wsdl:output
+     * element can be generated.
+     *
+     * @param output This is the wsdl:portType/wsdl:operation/wsdl:output  element that the
+     *               extension can be added to.
+     * @param method {@link JavaMethod} which captures all the information to generate wsdl:portType/wsdl:operation
+     */
+    public void addOperationOutputExtension(TypedXmlWriter output, JavaMethod method) {
+    }
+
+    /**
+     * This method is invoked so that extensions to a
+     * wsdl:binding/wsdl:operation/wsdl:input
+     * element can be generated.
+     *
+     * @param input  This is the wsdl:binding/wsdl:operation/wsdl:input  element that the
+     *               extension can be added to.
+     * @param method {@link JavaMethod} which captures all the information to generate wsdl:portType/wsdl:operation
+     */
+    public void addBindingOperationInputExtension(TypedXmlWriter input, JavaMethod method) {
+    }
+
+
+    /**
+     * This method is invoked so that extensions to a  wsdl:binding/wsdl:operation/wsdl:output
+     * element can be generated.
+     *
+     * @param output This is the wsdl:binding/wsdl:operation/wsdl:output  element that the
+     *               extension can be added to.
+     * @param method {@link JavaMethod} which captures all the information to generate wsdl:portType/wsdl:operation
+     */
+    public void addBindingOperationOutputExtension(TypedXmlWriter output, JavaMethod method) {
+    }
+
+    /**
+     * This method is invoked so that extensions to a wsdl:binding/wsdl:operation/wsdl:fault
+     * element can be generated.
+     *
+     * @param fault  This is the wsdl:binding/wsdl:operation/wsdl:fault or wsdl:portType/wsdl:output/wsdl:operation/wsdl:fault
+     *               element that the extension can be added to.
+     * @param method {@link JavaMethod} which captures all the information to generate wsdl:portType/wsdl:operation
+     */
+    public void addBindingOperationFaultExtension(TypedXmlWriter fault, JavaMethod method, CheckedException ce) {
+    }
+
+    /**
+     * This method is invoked so that extensions to a wsdl:portType/wsdl:operation/wsdl:fault
+     * element can be generated.
+     *
+     * @param message This is the fault wsdl:message element that the
+     *                extension can be added to.
+     * @param method  {@link JavaMethod} which captures all the information to generate wsdl:portType/wsdl:operation
+     *
+     * @param ce      {@link CheckedException} that abstracts wsdl:fault
+     */
+    public void addFaultMessageExtension(TypedXmlWriter message, JavaMethod method, CheckedException ce) {
+    }
+
+    /**
+     * This method is invoked so that extensions to a wsdl:portType/wsdl:operation/wsdl:fault
+     * element can be generated.
+     *
+     * @param fault  This is the wsdl:portType/wsdl:operation/wsdl:fault  element that the
+     *               extension can be added to.
+     * @param method {@link JavaMethod} which captures all the information to generate wsdl:portType/wsdl:operation
+     * @param ce     {@link CheckedException} that abstracts wsdl:fault
+     */
+    public void addOperationFaultExtension(TypedXmlWriter fault, JavaMethod method, CheckedException ce) {
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/binding/BindingImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/binding/BindingImpl.java
index a0104c10ccf..239b6bbefd7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/binding/BindingImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/binding/BindingImpl.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,181 +25,152 @@
 
 package com.sun.xml.internal.ws.binding;
 
-import com.sun.xml.internal.ws.binding.http.HTTPBindingImpl;
-import com.sun.xml.internal.ws.binding.soap.SOAPBindingImpl;
-import com.sun.xml.internal.ws.handler.HandlerChainCaller;
-import com.sun.xml.internal.ws.modeler.RuntimeModeler;
-import com.sun.xml.internal.ws.spi.runtime.SystemHandlerDelegate;
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.api.BindingID;
+import com.sun.xml.internal.ws.api.SOAPVersion;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.addressing.AddressingVersion;
+import com.sun.xml.internal.ws.api.pipe.Codec;
+import com.sun.xml.internal.ws.client.HandlerConfiguration;
+import com.sun.xml.internal.ws.developer.MemberSubmissionAddressingFeature;
 
-import javax.xml.ws.Binding;
+import javax.xml.ws.WebServiceFeature;
+import javax.xml.ws.soap.AddressingFeature;
 import javax.xml.ws.handler.Handler;
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
-import javax.xml.ws.http.HTTPBinding;
-import javax.xml.ws.soap.SOAPBinding;
-import javax.xml.namespace.QName;
 
 /**
  * Instances are created by the service, which then
- * sets the handler chain on the binding impl. The handler
- * caller class actually creates and manages the handlers.
+ * sets the handler chain on the binding impl.
  *
- * 
    Also used on the server side, where non-api calls such as
- * getHandlerChainCaller cannot be used. So the binding impl
- * now stores the handler list rather than deferring to the
- * handler chain caller.
+ * 
    
+ * This class is made abstract as we don't see a situation when
+ * a BindingImpl has much meaning without binding id.
+ * IOW, for a specific binding there will be a class
+ * extending BindingImpl, for example SOAPBindingImpl.
  *
- * 
    This class is made abstract as we dont see a situation when a BindingImpl has much meaning without binding id.
- * IOw, for a specific binding there will be a class extending BindingImpl, for example SOAPBindingImpl.
- *
- * 
    The spi Binding interface extends Binding.
+ * 
    
+ * The spi Binding interface extends Binding.
  *
  * @author WS Development Team
  */
-public abstract class BindingImpl implements
-    com.sun.xml.internal.ws.spi.runtime.Binding {
+public abstract class BindingImpl implements WSBinding {
+    private HandlerConfiguration handlerConfig;
+    private final BindingID bindingId;
+    // Features that are set(enabled/disabled) on the binding
+    protected final WebServiceFeatureList features = new WebServiceFeatureList();
 
-    // caller ignored on server side
-    protected HandlerChainCaller chainCaller;
-
-    private SystemHandlerDelegate systemHandlerDelegate;
-    private List handlers;
-    private String bindingId;
-    protected QName serviceName;
-
-   // called by DispatchImpl
-    public BindingImpl(String bindingId, QName serviceName) {
+    protected BindingImpl(BindingID bindingId) {
         this.bindingId = bindingId;
-        this.serviceName = serviceName;
+        setHandlerConfig(createHandlerConfig(Collections.emptyList()));
     }
 
-    public BindingImpl(List handlerChain, String bindingId, QName serviceName) {
-        handlers = handlerChain;
-        this.bindingId = bindingId;
-        this.serviceName = serviceName;
+    public
+    @NotNull
+    List getHandlerChain() {
+        return handlerConfig.getHandlerChain();
+    }
+
+    public HandlerConfiguration getHandlerConfig() {
+        return handlerConfig;
     }
 
 
     /**
-     * Return a copy of the list. If there is a handler chain caller,
-     * this is the proper list. Otherwise, return a copy of 'handlers'
-     * or null if list is null. The RuntimeEndpointInfo.init() method
-     * relies on this list being null if there were no handlers
-     * in the deployment descriptor file.
-     *
-     * @return The list of handlers. This can be null if there are
-     * no handlers. The list may have a different order depending on
-     * whether or not the handlers have been called yet, since the
-     * logical and protocol handlers will be sorted before calling them.
-     *
-     * @see com.sun.xml.internal.ws.server.RuntimeEndpointInfo#init
-     */
-    public List getHandlerChain() {
-        if (chainCaller != null) {
-            return new ArrayList(chainCaller.getHandlerChain());
-        }
-        if (handlers == null) {
-            return null;
-        }
-        return new ArrayList(handlers);
-    }
-
-    public boolean hasHandlers() {
-        if (handlers == null || handlers.size() == 0) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Sets the handlers on the binding. If the handler chain
-     * caller already exists, then the handlers will be set on
-     * the caller and the handler chain held by the binding will
-     * be the sorted list.
+     * Sets the handlers on the binding and then
+     * sorts the handlers in to logical and protocol handlers.
+     * Creates a new HandlerConfiguration object and sets it on the BindingImpl.
      */
     public void setHandlerChain(List chain) {
-        if (chainCaller != null) {
-            chainCaller = new HandlerChainCaller(chain);
-            handlers = chainCaller.getHandlerChain();
-        } else {
-            handlers = chain;
-        }
+        setHandlerConfig(createHandlerConfig(chain));
     }
 
     /**
-     * Creates the handler chain caller if needed and returns
-     * it. Once the handler chain caller exists, this class
-     * defers getHandlers() calls to it to get the new sorted
-     * list of handlers.
+     * This is called when ever Binding.setHandlerChain() or SOAPBinding.setRoles()
+     * is called.
+     * This sorts out the Handlers into Logical and SOAP Handlers and
+     * sets the HandlerConfiguration.
      */
-    public HandlerChainCaller getHandlerChainCaller() {
-        if (chainCaller == null) {
-            chainCaller = new HandlerChainCaller(handlers);
-        }
-        return chainCaller;
+    protected void setHandlerConfig(HandlerConfiguration handlerConfig) {
+        this.handlerConfig = handlerConfig;
     }
 
-    public String getBindingId(){
+    protected abstract HandlerConfiguration createHandlerConfig(List handlerChain);
+
+    public
+    @NotNull
+    BindingID getBindingId() {
         return bindingId;
     }
 
-    public String getActualBindingId() {
-        return bindingId;
+    public final SOAPVersion getSOAPVersion() {
+        return bindingId.getSOAPVersion();
     }
 
-    public void setServiceName(QName serviceName){
-        this.serviceName = serviceName;
+    public AddressingVersion getAddressingVersion() {
+        AddressingVersion addressingVersion;
+        if (features.isEnabled(AddressingFeature.class))
+            addressingVersion = AddressingVersion.W3C;
+        else if (features.isEnabled(MemberSubmissionAddressingFeature.class))
+            addressingVersion = AddressingVersion.MEMBER;
+        else
+            addressingVersion = null;
+        return addressingVersion;
     }
 
-    public SystemHandlerDelegate getSystemHandlerDelegate() {
-        return systemHandlerDelegate;
+    public final
+    @NotNull
+    Codec createCodec() {
+        return bindingId.createEncoder(this);
     }
 
-    public void setSystemHandlerDelegate(SystemHandlerDelegate delegate) {
-        systemHandlerDelegate = delegate;
-    }
-
-    public static com.sun.xml.internal.ws.spi.runtime.Binding getBinding(String bindingId,
-                                                                Class implementorClass, QName serviceName, boolean tokensOK) {
-
-        if (bindingId == null) {
-            // Gets bindingId from @BindingType annotation
-            bindingId = RuntimeModeler.getBindingId(implementorClass);
-            if (bindingId == null) {            // Default one
-                bindingId = SOAPBinding.SOAP11HTTP_BINDING;
-            }
-        }
-        if (tokensOK) {
-            if (bindingId.equals("##SOAP11_HTTP")) {
-                bindingId = SOAPBinding.SOAP11HTTP_BINDING;
-            } else if (bindingId.equals("##SOAP11_HTTP_MTOM")) {
-                bindingId = SOAPBinding.SOAP11HTTP_MTOM_BINDING;
-            } else if (bindingId.equals("##SOAP12_HTTP")) {
-                bindingId = SOAPBinding.SOAP12HTTP_BINDING;
-            } else if (bindingId.equals("##SOAP12_HTTP_MTOM")) {
-                bindingId = SOAPBinding.SOAP12HTTP_MTOM_BINDING;
-            } else if (bindingId.equals("##XML_HTTP")) {
-                bindingId = HTTPBinding.HTTP_BINDING;
-            }
-        }
-        if (bindingId.equals(SOAPBinding.SOAP11HTTP_BINDING)
-            || bindingId.equals(SOAPBinding.SOAP11HTTP_MTOM_BINDING)
-            || bindingId.equals(SOAPBinding.SOAP12HTTP_BINDING)
-            || bindingId.equals(SOAPBinding.SOAP12HTTP_MTOM_BINDING)
-            || bindingId.equals(SOAPBindingImpl.X_SOAP12HTTP_BINDING)) {
-            return new SOAPBindingImpl(bindingId, serviceName);
-        } else if (bindingId.equals(HTTPBinding.HTTP_BINDING)) {
+    public static BindingImpl create(@NotNull BindingID bindingId) {
+        if (bindingId.equals(BindingID.XML_HTTP))
             return new HTTPBindingImpl();
-        } else {
-            throw new IllegalArgumentException("Wrong bindingId "+bindingId);
+        else
+            return new SOAPBindingImpl(bindingId);
+    }
+
+    public static BindingImpl create(@NotNull BindingID bindingId, WebServiceFeature[] features) {
+        if (bindingId.equals(BindingID.XML_HTTP))
+            return new HTTPBindingImpl();
+        else
+            return new SOAPBindingImpl(bindingId, features);
+    }
+
+    public static WSBinding getDefaultBinding() {
+        return new SOAPBindingImpl(BindingID.SOAP11_HTTP);
+    }
+
+    public String getBindingID() {
+        return bindingId.toString();
+    }
+
+    public @Nullable  F getFeature(@NotNull Class featureType){
+        return features.get(featureType);
+    }
+
+    public boolean isFeatureEnabled(@NotNull Class feature){
+        return features.isEnabled(feature);
+    }
+
+    @NotNull
+    public WebServiceFeatureList getFeatures() {
+        return features;
+    }
+
+
+    public void setFeatures(WebServiceFeature... newFeatures) {
+        if (newFeatures != null) {
+            for (WebServiceFeature f : newFeatures) {
+                features.add(f);
+            }
         }
     }
 
-    public static Binding getDefaultBinding() {
-        return new SOAPBindingImpl(SOAPBinding.SOAP11HTTP_BINDING);
-    }
-
-    public static Binding getDefaultBinding(QName serviceName) {
-        return new SOAPBindingImpl(SOAPBinding.SOAP11HTTP_BINDING, serviceName);
+    public void addFeature(@NotNull WebServiceFeature newFeature) {
+        features.add(newFeature);
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/binding/http/HTTPBindingImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/binding/HTTPBindingImpl.java
similarity index 52%
rename from jaxws/src/share/classes/com/sun/xml/internal/ws/binding/http/HTTPBindingImpl.java
rename to jaxws/src/share/classes/com/sun/xml/internal/ws/binding/HTTPBindingImpl.java
index 56a187074e4..97ef4bbbdad 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/binding/http/HTTPBindingImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/binding/HTTPBindingImpl.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,52 +22,52 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-package com.sun.xml.internal.ws.binding.http;
+package com.sun.xml.internal.ws.binding;
 
+import com.sun.xml.internal.ws.api.BindingID;
+import com.sun.xml.internal.ws.client.HandlerConfiguration;
+import com.sun.xml.internal.ws.resources.ClientMessages;
+
+import javax.xml.namespace.QName;
 import javax.xml.ws.WebServiceException;
 import javax.xml.ws.handler.Handler;
 import javax.xml.ws.handler.LogicalHandler;
 import javax.xml.ws.http.HTTPBinding;
-
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
-import com.sun.xml.internal.ws.binding.BindingImpl;
-import com.sun.xml.internal.ws.util.localization.Localizable;
-import com.sun.xml.internal.ws.util.localization.LocalizableMessageFactory;
-import com.sun.xml.internal.ws.util.localization.Localizer;
-
 /**
  * @author WS Development Team
  */
 public class HTTPBindingImpl extends BindingImpl implements HTTPBinding {
 
-    public HTTPBindingImpl() {
-        super(HTTPBinding.HTTP_BINDING, null);
-    }
-
-    public HTTPBindingImpl(List handlerChain) {
-        super(handlerChain, HTTPBinding.HTTP_BINDING, null);
-    }
-
-    /*
-     * Sets the handler chain. Only logical handlers are
-     * allowed with HTTPBinding.
+    /**
+     * Use {@link BindingImpl#create(BindingID)} to create this.
      */
-    @Override
-    public void setHandlerChain(List chain) {
-        for (Handler handler : chain) {
+    HTTPBindingImpl() {
+        // TODO: implement a real Codec for these
+        super(BindingID.XML_HTTP);
+    }
+
+    /**
+     * This method separates the logical and protocol handlers and
+     * sets the HandlerConfiguration.
+     * Only logical handlers are allowed with HTTPBinding.
+     * Setting SOAPHandlers throws WebServiceException
+     */
+    protected HandlerConfiguration createHandlerConfig(List handlerChain) {
+        List logicalHandlers = new ArrayList();
+        for (Handler handler : handlerChain) {
             if (!(handler instanceof LogicalHandler)) {
-                LocalizableMessageFactory messageFactory =
-                    new LocalizableMessageFactory(
-                    "com.sun.xml.internal.ws.resources.client");
-                Localizer localizer = new Localizer();
-                Localizable locMessage =
-                    messageFactory.getMessage("non.logical.handler.set",
-                    handler.getClass().toString());
-                throw new WebServiceException(localizer.localize(locMessage));
+                throw new WebServiceException(ClientMessages.NON_LOGICAL_HANDLER_SET(handler.getClass()));
+            } else {
+                logicalHandlers.add((LogicalHandler) handler);
             }
         }
-        super.setHandlerChain(chain);
+        return new HandlerConfiguration(
+                Collections.emptySet(),
+                Collections.emptySet(),
+                handlerChain,logicalHandlers,null,null);
     }
-
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/binding/SOAPBindingImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/binding/SOAPBindingImpl.java
new file mode 100644
index 00000000000..2b6e7db1407
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/binding/SOAPBindingImpl.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.binding;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.ws.api.BindingID;
+import com.sun.xml.internal.ws.api.SOAPVersion;
+import com.sun.xml.internal.ws.client.HandlerConfiguration;
+import com.sun.xml.internal.ws.encoding.soap.streaming.SOAP12NamespaceConstants;
+import com.sun.xml.internal.ws.handler.HandlerException;
+import com.sun.xml.internal.ws.resources.ClientMessages;
+
+import javax.xml.namespace.QName;
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPFactory;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.WebServiceFeature;
+import javax.xml.ws.handler.Handler;
+import javax.xml.ws.handler.LogicalHandler;
+import javax.xml.ws.handler.soap.SOAPHandler;
+import javax.xml.ws.soap.MTOMFeature;
+import javax.xml.ws.soap.SOAPBinding;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+
+/**
+ * @author WS Development Team
+ */
+public final class SOAPBindingImpl extends BindingImpl implements SOAPBinding {
+
+    public static final String X_SOAP12HTTP_BINDING =
+        "http://java.sun.com/xml/ns/jaxws/2003/05/soap/bindings/HTTP/";
+
+    private static final String ROLE_NONE = SOAP12NamespaceConstants.ROLE_NONE;
+    private Set roles;
+    //protected boolean enableMtom;
+    protected final SOAPVersion soapVersion;
+
+    private Set portKnownHeaders = Collections.emptySet();
+
+    /**
+     * Use {@link BindingImpl#create(BindingID)} to create this.
+     */
+    SOAPBindingImpl(BindingID bindingId) {
+        this(bindingId,EMPTY_FEATURES);
+    }
+
+    /**
+     * Use {@link BindingImpl#create(BindingID)} to create this.
+     *
+     * @param features
+     *      These features have a precedence over
+     *      {@link BindingID#createBuiltinFeatureList() the implicit features}
+     *      associated with the {@link BindingID}.
+     */
+    SOAPBindingImpl(BindingID bindingId, WebServiceFeature... features) {
+        super(bindingId);
+        this.soapVersion = bindingId.getSOAPVersion();
+        roles = new HashSet();
+        addRequiredRoles();
+        //Is this still required? comment out for now
+        //setupSystemHandlerDelegate(serviceName);
+
+        setFeatures(features);
+        this.features.addAll(bindingId.createBuiltinFeatureList());
+    }
+
+    /**
+     *  This method should be called if the binding has SOAPSEIModel
+     *  The Headers understood by the Port are set, so that they can be used for MU
+     *  processing.
+     *
+     * @param headers
+     */
+    public void setPortKnownHeaders(@NotNull Set headers) {
+        this.portKnownHeaders = headers;
+        // apply this change to HandlerConfiguration
+        setHandlerConfig(createHandlerConfig(getHandlerChain()));
+    }
+
+    /**
+     * This method separates the logical and protocol handlers.
+     * Also parses Headers understood by SOAPHandlers and
+     * sets the HandlerConfiguration.
+     */
+    protected HandlerConfiguration createHandlerConfig(List handlerChain) {
+        List logicalHandlers = new ArrayList();
+        List soapHandlers = new ArrayList();
+        Set handlerKnownHeaders = new HashSet();
+
+        for (Handler handler : handlerChain) {
+            if (handler instanceof LogicalHandler) {
+                logicalHandlers.add((LogicalHandler) handler);
+            } else if (handler instanceof SOAPHandler) {
+                soapHandlers.add((SOAPHandler) handler);
+                Set headers = ((SOAPHandler) handler).getHeaders();
+                if (headers != null) {
+                    handlerKnownHeaders.addAll(headers);
+                }
+            } else {
+                throw new HandlerException("handler.not.valid.type",
+                    handler.getClass());
+            }
+        }
+        return new HandlerConfiguration(roles,portKnownHeaders,handlerChain,
+                logicalHandlers,soapHandlers,handlerKnownHeaders);
+    }
+
+    protected void addRequiredRoles() {
+        roles.addAll(soapVersion.requiredRoles);
+    }
+
+    public Set getRoles() {
+        return roles;
+    }
+
+    /**
+     * Adds the next and other roles in case this has
+     * been called by a user without them.
+     * Creates a new HandlerConfiguration object and sets it on the BindingImpl.
+     */
+    public void setRoles(Set roles) {
+        if (roles == null) {
+            roles = new HashSet();
+        }
+        if (roles.contains(ROLE_NONE)) {
+            throw new WebServiceException(ClientMessages.INVALID_SOAP_ROLE_NONE());
+        }
+        this.roles = roles;
+        addRequiredRoles();
+        HandlerConfiguration oldConfig = getHandlerConfig();
+        setHandlerConfig(new HandlerConfiguration(this.roles, portKnownHeaders, oldConfig.getHandlerChain(),
+                oldConfig.getLogicalHandlers(),oldConfig.getSoapHandlers(),
+                oldConfig.getHandlerKnownHeaders()));
+    }
+
+
+    /**
+     * Used typically by the runtime to enable/disable Mtom optimization
+     */
+    public boolean isMTOMEnabled() {
+        return isFeatureEnabled(MTOMFeature.class);
+    }
+
+    /**
+     * Client application can override if the MTOM optimization should be enabled
+     */
+    public void setMTOMEnabled(boolean b) {
+        setFeatures(new MTOMFeature(b));
+    }
+
+    public SOAPFactory getSOAPFactory() {
+        return soapVersion.saajSoapFactory;
+    }
+
+    public MessageFactory getMessageFactory() {
+        return soapVersion.saajMessageFactory;
+    }
+
+    private static final WebServiceFeature[] EMPTY_FEATURES = new WebServiceFeature[0];
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/binding/WebServiceFeatureList.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/binding/WebServiceFeatureList.java
new file mode 100644
index 00000000000..76d40a4fcd0
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/binding/WebServiceFeatureList.java
@@ -0,0 +1,309 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+
+package com.sun.xml.internal.ws.binding;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.api.BindingID;
+import com.sun.xml.internal.ws.api.WSFeatureList;
+import com.sun.xml.internal.ws.api.FeatureConstructor;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLFeaturedObject;
+import com.sun.xml.internal.ws.model.RuntimeModelerException;
+import com.sun.xml.internal.ws.model.wsdl.WSDLPortImpl;
+import com.sun.xml.internal.ws.resources.ModelerMessages;
+
+import javax.xml.ws.RespectBinding;
+import javax.xml.ws.RespectBindingFeature;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.WebServiceFeature;
+import javax.xml.ws.soap.Addressing;
+import javax.xml.ws.soap.AddressingFeature;
+import javax.xml.ws.soap.MTOM;
+import javax.xml.ws.soap.MTOMFeature;
+import javax.xml.ws.spi.WebServiceFeatureAnnotation;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Constructor;
+import java.util.*;
+import java.util.logging.Logger;
+
+/**
+ * Represents a list of {@link WebServiceFeature}s that has bunch of utility methods
+ * pertaining to web service features.
+ *
+ * @author Rama Pulavarthi
+ */
+public final class WebServiceFeatureList implements WSFeatureList {
+    private Map, WebServiceFeature> wsfeatures =
+            new HashMap, WebServiceFeature>();
+    public WebServiceFeatureList() {
+    }
+
+    /**
+     * Delegate to this parent if non-null.
+     */
+    private
+    @Nullable
+    WSDLFeaturedObject parent;
+
+    public WebServiceFeatureList(@NotNull WebServiceFeature... features) {
+        if (features != null)
+            for (WebServiceFeature f : features) {
+                wsfeatures.put(f.getClass(), f);
+            }
+    }
+
+    /**
+     * Creates a list by reading featuers from the annotation on a class.
+     */
+    public WebServiceFeatureList(@NotNull Class endpointClass) {
+        parseAnnotations(endpointClass);
+    }
+
+    /**
+     * Reads {@link WebServiceFeatureAnnotation feature annotations} on a class
+     * and adds them to the list.
+     */
+    public void parseAnnotations(Class endpointClass) {
+        for (Annotation a : endpointClass.getAnnotations()) {
+            // TODO: this really needs generalization
+            WebServiceFeature ftr;
+            if (!(a.annotationType().isAnnotationPresent(WebServiceFeatureAnnotation.class))) {
+                continue;
+            } else if (a instanceof Addressing) {
+                Addressing addAnn = (Addressing) a;
+                ftr = new AddressingFeature(addAnn.enabled(), addAnn.required());
+            } else if (a instanceof MTOM) {
+                MTOM mtomAnn = (MTOM) a;
+                ftr = new MTOMFeature(mtomAnn.enabled(), mtomAnn.threshold());
+
+                // check conflict with @BindingType
+                BindingID bindingID = BindingID.parse(endpointClass);
+                MTOMFeature bindingMtomSetting = bindingID.createBuiltinFeatureList().get(MTOMFeature.class);
+                if (bindingMtomSetting != null && bindingMtomSetting.isEnabled() ^ ftr.isEnabled()) {
+                    throw new RuntimeModelerException(
+                            ModelerMessages.RUNTIME_MODELER_MTOM_CONFLICT(bindingID, ftr.isEnabled()));
+                }
+
+            } else if (a instanceof RespectBinding) {
+                RespectBinding rbAnn = (RespectBinding) a;
+                ftr = new RespectBindingFeature(rbAnn.enabled());
+            } else {
+                ftr = getWebServiceFeatureBean(a);
+            }
+            add(ftr);
+        }
+    }
+
+    private static WebServiceFeature getWebServiceFeatureBean(Annotation a) {
+        WebServiceFeatureAnnotation wsfa = a.annotationType().getAnnotation(WebServiceFeatureAnnotation.class);
+        Class beanClass = wsfa.bean();
+        WebServiceFeature bean;
+
+        Constructor ftrCtr = null;
+        String[] paramNames = null;
+        for (Constructor con : beanClass.getConstructors()) {
+            FeatureConstructor ftrCtrAnn = (FeatureConstructor) con.getAnnotation(FeatureConstructor.class);
+            if (ftrCtrAnn != null) {
+                if (ftrCtr == null) {
+                    ftrCtr = con;
+                    paramNames = ftrCtrAnn.value();
+                } else {
+                    throw new WebServiceException(ModelerMessages.RUNTIME_MODELER_WSFEATURE_MORETHANONE_FTRCONSTRUCTOR(a, beanClass));
+                }
+            }
+        }
+        if (ftrCtr == null) {
+            throw new WebServiceException(ModelerMessages.RUNTIME_MODELER_WSFEATURE_NO_FTRCONSTRUCTOR(a, beanClass));
+        }
+        if (ftrCtr.getParameterTypes().length != paramNames.length) {
+            throw new WebServiceException(ModelerMessages.RUNTIME_MODELER_WSFEATURE_ILLEGAL_FTRCONSTRUCTOR(a, beanClass));
+        }
+
+        try {
+            Object[] params = new Object[paramNames.length];
+            for (int i = 0; i < paramNames.length; i++) {
+                Method m = a.annotationType().getDeclaredMethod(paramNames[i]);
+                params[i] = m.invoke(a);
+            }
+            bean = (WebServiceFeature) ftrCtr.newInstance(params);
+        } catch (Exception e) {
+            throw new WebServiceException(e);
+        }
+        return bean;
+    }
+
+    public Iterator iterator() {
+        if (parent != null)
+            return new MergedFeatures(parent.getFeatures());
+        return wsfeatures.values().iterator();
+    }
+
+    public
+    @NotNull
+    WebServiceFeature[] toArray() {
+        if (parent != null)
+            return new MergedFeatures(parent.getFeatures()).toArray();
+        return wsfeatures.values().toArray(new WebServiceFeature[]{});
+    }
+
+    public boolean isEnabled(@NotNull Class feature) {
+        WebServiceFeature ftr = get(feature);
+        return ftr != null && ftr.isEnabled();
+    }
+
+
+    public
+    @Nullable
+             F get(@NotNull Class featureType) {
+        WebServiceFeature f = featureType.cast(wsfeatures.get(featureType));
+        if (f == null && parent != null) {
+            return parent.getFeatures().get(featureType);
+        }
+        return (F) f;
+    }
+
+    /**
+     * Adds a feature to the list if it's not already added.
+     */
+    public void add(@NotNull WebServiceFeature f) {
+        if (!wsfeatures.containsKey(f.getClass())) {
+            wsfeatures.put(f.getClass(), f);
+        }
+    }
+
+    /**
+     * Adds features to the list if it's not already added.
+     */
+    public void addAll(@NotNull WSFeatureList list) {
+        for (WebServiceFeature f : list)
+            add(f);
+    }
+
+    /**
+     * Extracts features from {@link WSDLPortImpl#getFeatures()}.
+     * Extra features that are not already set on binding.
+     * i.e, if a feature is set already on binding through someother API
+     * the coresponding wsdlFeature is not set.
+     *
+     * @param wsdlPort          WSDLPort model
+     * @param honorWsdlRequired If this is true add WSDL Feature only if wsd:Required=true
+     *                          In SEI case, it should be false
+     *                          In Provider case, it should be true
+     * @param reportConflicts   If true, checks if the feature setting in WSDL (wsdl extension or
+     *                          policy configuration) colflicts with feature setting in Deployed Service and
+     *                          logs warning if there are any conflicts.
+     */
+    public void mergeFeatures(@NotNull WSDLPort wsdlPort, boolean honorWsdlRequired, boolean reportConflicts) {
+        if (honorWsdlRequired && !isEnabled(RespectBindingFeature.class))
+            return;
+        if (!honorWsdlRequired) {
+            addAll(wsdlPort.getFeatures());
+            return;
+        }
+        // Add only if isRequired returns true, when honorWsdlRequired is true
+        for (WebServiceFeature wsdlFtr : wsdlPort.getFeatures()) {
+            if (get(wsdlFtr.getClass()) == null) {
+                try {
+                    // if it is a WSDL Extension , it will have required attribute
+                    Method m = (wsdlFtr.getClass().getMethod("isRequired"));
+                    try {
+                        boolean required = (Boolean) m.invoke(wsdlFtr);
+                        if (required)
+                            add(wsdlFtr);
+                    } catch (IllegalAccessException e) {
+                        throw new WebServiceException(e);
+                    } catch (InvocationTargetException e) {
+                        throw new WebServiceException(e);
+                    }
+                } catch (NoSuchMethodException e) {
+                    // this wsdlFtr is not an WSDL extension, just add it
+                    add(wsdlFtr);
+                }
+            } else if (reportConflicts) {
+                if (isEnabled(wsdlFtr.getClass()) != wsdlFtr.isEnabled()) {
+                    LOGGER.warning(ModelerMessages.RUNTIME_MODELER_FEATURE_CONFLICT(
+                            get(wsdlFtr.getClass()), wsdlFtr));
+                }
+
+            }
+        }
+    }
+
+    /**
+     * Set the parent features. Basically the parent feature list will be overriden
+     * by this feature list.
+     */
+    public void setParentFeaturedObject(@NotNull WSDLFeaturedObject parent) {
+        this.parent = parent;
+    }
+
+    /**
+     * A Union of this WebServiceFeatureList and the parent.
+     */
+    private final class MergedFeatures implements Iterator {
+        private final Stack features = new Stack();
+
+        public MergedFeatures(@NotNull WSFeatureList parent) {
+
+            for (WebServiceFeature f : wsfeatures.values()) {
+                features.push(f);
+            }
+
+            for (WebServiceFeature f : parent) {
+                if (!wsfeatures.containsKey(f.getClass())) {
+                    features.push(f);
+                }
+            }
+        }
+
+        public boolean hasNext() {
+            return !features.empty();
+        }
+
+        public WebServiceFeature next() {
+            if (!features.empty()) {
+                return features.pop();
+            }
+            throw new NoSuchElementException();
+        }
+
+        public void remove() {
+            if (!features.empty()) {
+                features.pop();
+            }
+        }
+
+        public WebServiceFeature[] toArray() {
+            return features.toArray(new WebServiceFeature[]{});
+        }
+    }
+
+    private static final Logger LOGGER = Logger.getLogger(WebServiceFeatureList.class.getName());
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/binding/soap/SOAPBindingImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/binding/soap/SOAPBindingImpl.java
deleted file mode 100644
index 60cad69f9a2..00000000000
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/binding/soap/SOAPBindingImpl.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package com.sun.xml.internal.ws.binding.soap;
-
-import com.sun.xml.internal.ws.binding.BindingImpl;
-import com.sun.xml.internal.ws.encoding.soap.streaming.SOAPNamespaceConstants;
-import com.sun.xml.internal.ws.encoding.soap.streaming.SOAP12NamespaceConstants;
-import com.sun.xml.internal.ws.handler.HandlerChainCaller;
-import com.sun.xml.internal.ws.spi.runtime.SystemHandlerDelegate;
-import com.sun.xml.internal.ws.spi.runtime.SystemHandlerDelegateFactory;
-import com.sun.xml.internal.ws.util.SOAPUtil;
-
-import com.sun.xml.internal.ws.util.localization.Localizable;
-import com.sun.xml.internal.ws.util.localization.LocalizableMessageFactory;
-import com.sun.xml.internal.ws.util.localization.Localizer;
-
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPFactory;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.handler.Handler;
-import javax.xml.ws.soap.SOAPBinding;
-import javax.xml.namespace.QName;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-
-
-/**
- * @author WS Development Team
- */
-public class SOAPBindingImpl extends BindingImpl implements SOAPBinding {
-
-
-    public static final String X_SOAP12HTTP_BINDING =
-        "http://java.sun.com/xml/ns/jaxws/2003/05/soap/bindings/HTTP/";
-
-    protected static String ROLE_NONE;
-
-    protected Set requiredRoles;
-    protected Set roles;
-    protected boolean enableMtom = false;
-
-
-     // called by DispatchImpl
-    public SOAPBindingImpl(String bindingId, QName serviceName) {
-        super(bindingId, serviceName);
-        setup(getBindingId(), getActualBindingId());
-        setupSystemHandlerDelegate(serviceName);
-    }
-
-     public SOAPBindingImpl(String bindingId) {
-        super(bindingId, null);
-        setup(getBindingId(), getActualBindingId());
-        setupSystemHandlerDelegate(null);
-    }
-
-    public SOAPBindingImpl(List handlerChain, String bindingId, QName serviceName) {
-        super(handlerChain, bindingId, serviceName);
-        setup(getBindingId(), getActualBindingId());
-        setupSystemHandlerDelegate(serviceName);
-    }
-
-    // if the binding id is unknown, no roles are added
-    protected void setup(String bindingId, String actualBindingId) {
-        requiredRoles = new HashSet();
-        if (bindingId.equals(SOAPBinding.SOAP11HTTP_BINDING)) {
-            requiredRoles.add(SOAPNamespaceConstants.ACTOR_NEXT);
-        } else if (bindingId.equals(SOAPBinding.SOAP12HTTP_BINDING)) {
-            requiredRoles.add(SOAP12NamespaceConstants.ROLE_NEXT);
-            requiredRoles.add(SOAP12NamespaceConstants.ROLE_ULTIMATE_RECEIVER);
-        }
-        ROLE_NONE = SOAP12NamespaceConstants.ROLE_NONE;
-        roles = new HashSet();
-        addRequiredRoles();
-        setRolesOnHandlerChain();
-        if (actualBindingId.equals(SOAP11HTTP_MTOM_BINDING)
-            || actualBindingId.equals(SOAP12HTTP_MTOM_BINDING)) {
-            setMTOMEnabled(true);
-        }
-    }
-
-    /**
-     * For a non standard SOAP1.2 binding, return actual SOAP1.2 binding
-     * For SOAP 1.1 MTOM binding, return SOAP1.1 binding
-     * For SOAP 1.2 MTOM binding, return SOAP 1.2 binding
-     */
-    @Override
-    public String getBindingId() {
-        String bindingId = super.getBindingId();
-        if (bindingId.equals(SOAPBindingImpl.X_SOAP12HTTP_BINDING)) {
-            return SOAP12HTTP_BINDING;
-        }
-        if (bindingId.equals(SOAPBinding.SOAP11HTTP_MTOM_BINDING)) {
-            return SOAP11HTTP_BINDING;
-        }
-        if (bindingId.equals(SOAPBinding.SOAP12HTTP_MTOM_BINDING)) {
-            return SOAP12HTTP_BINDING;
-        }
-        return bindingId;
-    }
-
-    /*
-    * Use this to distinguish SOAP12HTTP_BINDING or X_SOAP12HTTP_BINDING
-    */
-    @Override
-    public String getActualBindingId() {
-        return super.getBindingId();
-    }
-
-    /*
-     * When client sets a new handler chain, must also set roles on
-     * the new handler chain caller that gets created.
-     */
-    public void setHandlerChain(List chain) {
-        super.setHandlerChain(chain);
-        setRolesOnHandlerChain();
-    }
-
-    protected void addRequiredRoles() {
-        roles.addAll(requiredRoles);
-    }
-
-    public java.util.Set getRoles() {
-        return roles;
-    }
-
-    /*
-     * Adds the next and other roles in case this has
-     * been called by a user without them.
-     */
-    public void setRoles(Set roles) {
-        if (roles == null) {
-            roles = new HashSet();
-        }
-        if (roles.contains(ROLE_NONE)) {
-            LocalizableMessageFactory messageFactory =
-                new LocalizableMessageFactory("com.sun.xml.internal.ws.resources.client");
-            Localizer localizer = new Localizer();
-            Localizable locMessage =
-                messageFactory.getMessage("invalid.soap.role.none");
-            throw new WebServiceException(localizer.localize(locMessage));
-        }
-        this.roles = roles;
-        addRequiredRoles();
-        setRolesOnHandlerChain();
-    }
-
-
-    /**
-     * Used typically by the runtime to enable/disable Mtom optimization
-     *
-     * @return true or false
-     */
-    public boolean isMTOMEnabled() {
-        return enableMtom;
-    }
-
-    /**
-     * Client application can set if the Mtom optimization should be enabled
-     *
-     * @param b
-     */
-    public void setMTOMEnabled(boolean b) {
-        this.enableMtom = b;
-    }
-
-    public SOAPFactory getSOAPFactory() {
-        return SOAPUtil.getSOAPFactory(getBindingId());
-    }
-
-
-    public MessageFactory getMessageFactory() {
-        return SOAPUtil.getMessageFactory(getBindingId());
-    }
-
-    /**
-     * This call defers to the super class to get the
-     * handler chain caller. It then sets the roles on the
-     * caller before returning it.
-     *
-     * @see com.sun.xml.internal.ws.binding.BindingImpl#getHandlerChainCaller
-     */
-    public HandlerChainCaller getHandlerChainCaller() {
-        HandlerChainCaller caller = super.getHandlerChainCaller();
-        caller.setRoles(roles);
-        return chainCaller;
-    }
-
-    protected void setRolesOnHandlerChain() {
-        if (chainCaller != null) {
-            chainCaller.setRoles(roles);
-        }
-    }
-
-    protected void setupSystemHandlerDelegate(QName serviceName) {
-        SystemHandlerDelegateFactory shdFactory =
-            SystemHandlerDelegateFactory.getFactory();
-        if (shdFactory != null) {
-            setSystemHandlerDelegate((SystemHandlerDelegate)
-                shdFactory.getDelegate(serviceName));
-        }
-    }
-}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/AsyncHandlerService.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/AsyncHandlerService.java
deleted file mode 100644
index 6ccc0abcb98..00000000000
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/AsyncHandlerService.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package com.sun.xml.internal.ws.client;
-
-import javax.xml.ws.AsyncHandler;
-import javax.xml.ws.Response;
-import java.rmi.server.UID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.Executor;
-
-public class AsyncHandlerService {
-
-    private AsyncHandler _handler;
-    private UID _uid;
-    private Executor _executor;
-    private WSFuture wsfuture;
-    private Response response;
-
-    public AsyncHandlerService(AsyncHandler handler, Executor executor) {
-        _uid = new UID();
-        _handler = handler;
-        _executor = executor;
-    }
-
-    public synchronized UID getUID() {
-        return _uid;
-    }
-
-    public void executeWSFuture() {
-
-        _executor.execute((Runnable) wsfuture);
-    }
-
-    public WSFuture setupAsyncCallback(final Response result) {
-        response = result;
-
-        wsfuture = new WSFuture(new Callable() {
-
-            public Object call() throws Exception {
-                _handler.handleResponse(response);
-                return null;
-            }
-        });
-        return wsfuture;
-    }
-}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/spi/runtime/package-info.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/AsyncInvoker.java
similarity index 58%
rename from jaxws/src/share/classes/com/sun/xml/internal/ws/spi/runtime/package-info.java
rename to jaxws/src/share/classes/com/sun/xml/internal/ws/client/AsyncInvoker.java
index 0162dbfd3e4..855bf738504 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/spi/runtime/package-info.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/AsyncInvoker.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,11 +23,28 @@
  * have any questions.
  */
 
+package com.sun.xml.internal.ws.client;
+
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.pipe.Fiber.CompletionCallback;
+import com.sun.xml.internal.ws.api.pipe.Tube;
+
 /**
+ * Invokes {@link Tube}line asynchronously for the client's async API(for e.g.: Dispatch#invokeAsync}
+ * The concrete classes need to call {@link Stub#processAsync(Packet, RequestContext, CompletionCallback)} in
+ * run() method.
  *
- * 
    This document describes the SPI for the JAX-WS 2.0 runtime.
- *  Applications can use this SPI to interact with the runtime at
- *  various points to get access to information and to perform
- *  various operations such as security etc.
-*/
-package com.sun.xml.internal.ws.spi.runtime;
+ * @author Jitendra Kotamraju
+ */
+public abstract class AsyncInvoker implements Runnable {
+    /**
+     * Because of the object instantiation order,
+     * we can't take this as a constructor parameter.
+     */
+    protected AsyncResponseImpl responseImpl;
+
+    public void setReceiver(AsyncResponseImpl responseImpl) {
+        this.responseImpl = responseImpl;
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/AsyncResponseImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/AsyncResponseImpl.java
new file mode 100644
index 00000000000..86ecec2432e
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/AsyncResponseImpl.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.client;
+
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.util.CompletedFuture;
+
+import javax.xml.ws.AsyncHandler;
+import javax.xml.ws.Response;
+import javax.xml.ws.WebServiceException;
+import java.util.Map;
+import java.util.concurrent.FutureTask;
+
+/**
+ * {@link Response} implementation. When Runnbale is executed, it just hands the
+ * request to Fiber and returns. When the Fiber finishes the execution, it sets
+ * response in the {@link FutureTask}
+ *
+ * 
    
+ * {@link ResponseImpl} executes things synchronously and waits for the return
+ * parameter.
+ *
+ * @author Jitendra Kotamraju
+ */
+public final class AsyncResponseImpl extends FutureTask implements Response, ResponseContextReceiver {
+
+    /**
+     * Optional {@link AsyncHandler} that gets invoked
+     * at the completion of the task.
+     */
+    private final AsyncHandler handler;
+    private ResponseContext responseContext;
+    private final Runnable callable;
+
+    /**
+     *
+     * @param runnable
+     *      This {@link Runnable} is executed asynchronously.
+     * @param handler
+     *      Optional {@link AsyncHandler} to invoke at the end
+     *      of the processing. Can be null.
+     */
+    public AsyncResponseImpl(Runnable runnable, @Nullable AsyncHandler handler) {
+        super(runnable, null);
+        this.callable = runnable;
+        this.handler = handler;
+    }
+
+    @Override
+    public void run() {
+        // override so that AsyncInvoker calls set()
+        // when Fiber calls the callback
+        try {
+            callable.run();
+        } catch (WebServiceException e) {
+            //it could be a WebServiceException or a ProtocolException or any RuntimeException
+            // resulting due to some internal bug.
+            set(null, e);
+        } catch (Throwable e) {
+            //its some other exception resulting from user error, wrap it in
+            // WebServiceException
+            set(null, new WebServiceException(e));
+        }
+    }
+
+
+    public ResponseContext getContext() {
+        return responseContext;
+    }
+
+    public void setResponseContext(ResponseContext rc) {
+        responseContext = rc;
+    }
+
+    public void set(final T v, final Throwable t) {
+        // call the handler before we mark the future as 'done'
+        if (handler!=null) {
+            try {
+                /**
+                 * {@link Response} object passed into the callback.
+                 * We need a separate {@link java.util.concurrent.Future} because we don't want {@link ResponseImpl}
+                 * to be marked as 'done' before the callback finishes execution.
+                 * (That would provide implicit synchronization between the application code
+                 * in the main thread and the callback code, and is compatible with the JAX-RI 2.0 FCS.
+                 */
+                class CallbackFuture extends CompletedFuture implements Response {
+                    public CallbackFuture(T v, Throwable t) {
+                        super(v, t);
+                    }
+
+                    public Map getContext() {
+                        return AsyncResponseImpl.this.getContext();
+                    }
+                }
+                handler.handleResponse(new CallbackFuture(v, t));
+            } catch (Throwable e) {
+                super.setException(e);
+                return;
+            }
+        }
+        if (t != null) {
+            super.setException(t);
+        } else {
+            super.set(v);
+        }
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/BindingProviderProperties.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/BindingProviderProperties.java
index 0ea2574598b..427fe65402a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/BindingProviderProperties.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/BindingProviderProperties.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,22 +30,14 @@ import com.sun.xml.internal.ws.developer.JAXWSProperties;
 public interface BindingProviderProperties extends JAXWSProperties{
 
     //legacy properties
-    public static final String SERVICEIMPL_NAME = "serviceImplementationName";
+    @Deprecated
     public static final String HOSTNAME_VERIFICATION_PROPERTY =
         "com.sun.xml.internal.ws.client.http.HostnameVerificationProperty";
     public static final String HTTP_COOKIE_JAR =
         "com.sun.xml.internal.ws.client.http.CookieJar";
-    public static final String SECURITY_CONTEXT =
-        "com.sun.xml.internal.ws.security.context";
-    public static final String HTTP_STATUS_CODE =
-        "com.sun.xml.internal.ws.client.http.HTTPStatusCode";
 
     public static final String REDIRECT_REQUEST_PROPERTY =
         "com.sun.xml.internal.ws.client.http.RedirectRequestProperty";
-    public static final String SET_ATTACHMENT_PROPERTY =
-        "com.sun.xml.internal.ws.attachment.SetAttachmentContext";
-    public static final String GET_ATTACHMENT_PROPERTY =
-        "com.sun.xml.internal.ws.attachment.GetAttachmentContext";
     public static final String ONE_WAY_OPERATION =
         "com.sun.xml.internal.ws.server.OneWayOperation";
 
@@ -55,78 +47,9 @@ public interface BindingProviderProperties extends JAXWSProperties{
         "com.sun.xml.internal.ws.request.timeout";
 
     //JAXWS 2.0
-    public static final String JAXWS_RUNTIME_CONTEXT =
-        "com.sun.xml.internal.ws.runtime.context";
-    public static final String JAXWS_CONTEXT_PROPERTY =
-        "com.sun.xml.internal.ws.context.request";
-    public static final String JAXWS_HANDLER_CONTEXT_PROPERTY =
-        "com.sun.xml.internal.ws.handler.context";
-    public static final String JAXWS_RESPONSE_CONTEXT_PROPERTY =
-        "com.sun.xml.internal.ws.context.response";
-    public static final String JAXWS_CLIENT_ASYNC_HANDLER =
-        "com.sun.xml.internal.ws.client.dispatch.asynchandler";
-    public static final String JAXWS_CLIENT_ASYNC_RESPONSE_CONTEXT =
-        "com.sun.xml.internal.ws.client.dispatch.async.response.context";
+    public static final String JAXWS_HANDLER_CONFIG =
+        "com.sun.xml.internal.ws.handler.config";
     public static final String JAXWS_CLIENT_HANDLE_PROPERTY =
         "com.sun.xml.internal.ws.client.handle";
-    public static final String JAXB_CONTEXT_PROPERTY =
-        "com.sun.xml.internal.ws.jaxbcontext";
-
-    public static final String CLIENT_TRANSPORT_FACTORY =
-        "com.sun.xml.internal.ws.client.ClientTransportFactory";
-
-    public static final String JAXB_OUTPUTSTREAM =
-        "com.sun.xml.internal.bind.api.Bridge.outputStream";
-
-    public static final String XML_ENCODING_VALUE = "xml.encoding";                 // deprecated
-    public static final String ACCEPT_ENCODING_PROPERTY = "accept.encoding";
-
-    public static final String CONTENT_TYPE_PROPERTY = "Content-Type";
-    public static final String SOAP_ACTION_PROPERTY = "SOAPAction";
-    public static final String ACCEPT_PROPERTY = "Accept";
-
-    // FI + SOAP 1.1
-    public static final String FAST_INFOSET_TYPE_SOAP11 =
-        "application/fastinfoset";
-
-    // FI + SOAP 1.2
-    public static final String FAST_INFOSET_TYPE_SOAP12 =
-        "application/soap+fastinfoset";
-
-    // XML + XOP + SOAP 1.1
-    public static final String XOP_SOAP11_XML_TYPE_VALUE =
-        "application/xop+xml;type=\"text/xml\"";
-
-    // XML + XOP + SOAP 1.2
-    public static final String XOP_SOAP12_XML_TYPE_VALUE =
-        "application/xop+xml;type=\"application/soap+xml\"";
-
-    public static final String XML_CONTENT_TYPE_VALUE = "text/xml";
-
-    public static final String SOAP12_XML_CONTENT_TYPE_VALUE = "application/soap+xml";
-
-    public static final String STANDARD_ACCEPT_VALUE =
-        "application/xop+xml, text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2";
-
-    public static final String SOAP12_XML_ACCEPT_VALUE =
-        "application/soap+xml" + ", " + STANDARD_ACCEPT_VALUE;
-
-    public static final String XML_ACCEPT_VALUE =
-        XML_CONTENT_TYPE_VALUE + ", " + STANDARD_ACCEPT_VALUE;
-
-    public static final String XML_FI_ACCEPT_VALUE =
-        FAST_INFOSET_TYPE_SOAP11 + ", " + XML_ACCEPT_VALUE;
-
-    public static final String SOAP12_XML_FI_ACCEPT_VALUE =
-        FAST_INFOSET_TYPE_SOAP12 + ", " + SOAP12_XML_ACCEPT_VALUE;
-
-    public String DISPATCH_CONTEXT = "com.sun.xml.internal.ws.client.dispatch.context";
-    public String DISPATCH_MARSHALLER = "com.sun.xml.internal.ws.client.dispatch.marshaller";
-    public String DISPATCH_UNMARSHALLER = "com.sun.xml.internal.ws.client.dispatch.unmarshaller";
-    public static final String BINDING_ID_PROPERTY = "com.sun.xml.internal.ws.binding";
-
-//    // Content negotiation property: values "none", "pessimistic" and "optimistic"
-//    public static final String CONTENT_NEGOTIATION_PROPERTY =
-//        "com.sun.xml.internal.ws.client.ContentNegotiation";
 
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ClientTransportException.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ClientTransportException.java
index 56e8b57011a..4c50fe3a47a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ClientTransportException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ClientTransportException.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,15 +32,19 @@ import com.sun.xml.internal.ws.util.localization.Localizable;
  * @author WS Development Team
  */
 public class ClientTransportException extends JAXWSExceptionBase {
-    public ClientTransportException(String key, Object... args) {
-        super(key, args);
+    public ClientTransportException(Localizable msg) {
+        super(msg);
+    }
+
+    public ClientTransportException(Localizable msg, Throwable cause) {
+        super(msg, cause);
     }
 
     public ClientTransportException(Throwable throwable) {
         super(throwable);
     }
 
-    public String getResourceBundleName() {
+    public String getDefaultResourceBundleName() {
         return "com.sun.xml.internal.ws.resources.client";
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ContactInfoBase.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ContactInfoBase.java
deleted file mode 100644
index e78d3500b34..00000000000
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ContactInfoBase.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package com.sun.xml.internal.ws.client;
-
-import com.sun.xml.internal.ws.pept.encoding.Decoder;
-import com.sun.xml.internal.ws.pept.encoding.Encoder;
-import com.sun.xml.internal.ws.pept.ept.ContactInfo;
-import com.sun.xml.internal.ws.pept.ept.MessageInfo;
-import com.sun.xml.internal.ws.pept.presentation.TargetFinder;
-import com.sun.xml.internal.ws.pept.protocol.Interceptors;
-import com.sun.xml.internal.ws.pept.protocol.MessageDispatcher;
-import com.sun.xml.internal.ws.encoding.internal.InternalEncoder;
-import com.sun.xml.internal.ws.encoding.soap.ClientEncoderDecoder;
-import com.sun.xml.internal.ws.encoding.soap.SOAPDecoder;
-import com.sun.xml.internal.ws.encoding.soap.SOAPEPTFactory;
-import com.sun.xml.internal.ws.encoding.soap.SOAPEncoder;
-import com.sun.xml.internal.ws.spi.runtime.WSConnection;
-
-import javax.xml.ws.soap.SOAPBinding;
-
-
-/**
- * @author WS Development Team
- */
-public class ContactInfoBase implements ContactInfo, SOAPEPTFactory {
-    protected WSConnection _connection;
-    protected MessageDispatcher _messageDispatcher;
-    protected Encoder _encoder;
-    protected Decoder _decoder;
-    private String bindingId;
-    private InternalEncoder internalEncoder;
-
-    public ContactInfoBase(WSConnection connection,
-                           MessageDispatcher messageDispatcher, Encoder encoder, Decoder decoder,
-                           String bindingId) {
-        _connection = connection;
-        _messageDispatcher = messageDispatcher;
-        _encoder = encoder;
-        _decoder = decoder;
-        internalEncoder = new ClientEncoderDecoder();
-        this.bindingId = bindingId;
-    }
-
-    public ContactInfoBase() {
-        _connection = null;
-        _messageDispatcher = null;
-        _encoder = null;
-        _decoder = null;
-    }
-
-    /* (non-Javadoc)
-     * @see com.sun.pept.ept.ContactInfo#getConnection(com.sun.pept.ept.MessageInfo)
-     */
-    public WSConnection getConnection(MessageInfo arg0) {
-        return _connection;
-    }
-
-    /* (non-Javadoc)
-     * @see com.sun.pept.ept.EPTFactory#getMessageDispatcher(com.sun.pept.ept.MessageInfo)
-     */
-    public MessageDispatcher getMessageDispatcher(MessageInfo arg0) {
-        return _messageDispatcher;
-    }
-
-    /* (non-Javadoc)
-     * @see com.sun.pept.ept.EPTFactory#getEncoder(com.sun.pept.ept.MessageInfo)
-     */
-    public Encoder getEncoder(MessageInfo arg0) {
-        return _encoder;
-    }
-
-    /* (non-Javadoc)
-     * @see com.sun.pept.ept.EPTFactory#getDecoder(com.sun.pept.ept.MessageInfo)
-     */
-    public Decoder getDecoder(MessageInfo arg0) {
-        return _decoder;
-    }
-
-    /* (non-Javadoc)
-     * @see com.sun.pept.ept.EPTFactory#getInterceptors(com.sun.pept.ept.MessageInfo)
-     */
-    public Interceptors getInterceptors(MessageInfo arg0) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see com.sun.pept.ept.EPTFactory#getTargetFinder(com.sun.pept.ept.MessageInfo)
-     */
-    public TargetFinder getTargetFinder(MessageInfo arg0) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public SOAPEncoder getSOAPEncoder() {
-        return (SOAPEncoder) _encoder;
-    }
-
-    public SOAPDecoder getSOAPDecoder() {
-        return (SOAPDecoder) _decoder;
-    }
-
-    public InternalEncoder getInternalEncoder() {
-        return internalEncoder;
-    }
-
-    public String getBindingId() {
-        if (bindingId == null) {
-            return SOAPBinding.SOAP11HTTP_BINDING;
-        }
-
-        return bindingId;
-    }
-}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ContactInfoListImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ContactInfoListImpl.java
deleted file mode 100644
index 4f2e5b2103f..00000000000
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ContactInfoListImpl.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package com.sun.xml.internal.ws.client;
-
-import com.sun.xml.internal.ws.pept.ept.ContactInfoList;
-import com.sun.xml.internal.ws.pept.ept.ContactInfoListIterator;
-import com.sun.xml.internal.ws.encoding.soap.client.SOAP12XMLDecoder;
-import com.sun.xml.internal.ws.encoding.soap.client.SOAP12XMLEncoder;
-import com.sun.xml.internal.ws.encoding.soap.client.SOAPXMLDecoder;
-import com.sun.xml.internal.ws.encoding.soap.client.SOAPXMLEncoder;
-import com.sun.xml.internal.ws.protocol.soap.client.SOAPMessageDispatcher;
-import com.sun.xml.internal.ws.protocol.xml.client.XMLMessageDispatcher;
-
-import javax.xml.ws.soap.SOAPBinding;
-import java.util.ArrayList;
-
-/**
- * @author WS Development Team
- * List of {@link com.sun.pept.ept.ContactInfo}s
- */
-public class ContactInfoListImpl implements ContactInfoList {
-    private static final ArrayList arrayList = new ArrayList();
-    static {
-        arrayList.add(new ContactInfoBase(null,
-            new SOAPMessageDispatcher(),
-            new SOAPXMLEncoder(),
-            new SOAPXMLDecoder(), SOAPBinding.SOAP11HTTP_BINDING));
-        arrayList.add(new ContactInfoBase(null,
-            new SOAPMessageDispatcher(),
-            new SOAP12XMLEncoder(),
-            new SOAP12XMLDecoder(), SOAPBinding.SOAP12HTTP_BINDING));
-    }
-
-    /**
-     * Iterator over the list of {@link com.sun.pept.ept.ContactInfo}s
-     * @see com.sun.pept.ept.ContactInfoList#iterator()
-     */
-    public ContactInfoListIterator iterator() {
-        return new ContactInfoListIteratorBase(arrayList);
-    }
-
-}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ContentNegotiation.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ContentNegotiation.java
index da96a774917..a92766c6843 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ContentNegotiation.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ContentNegotiation.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,49 +22,56 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.ws.client;
 
-import com.sun.xml.internal.ws.pept.presentation.MessageStruct;
-import static com.sun.xml.internal.ws.client.BindingProviderProperties.CONTENT_NEGOTIATION_PROPERTY;
-
-import java.util.Map;
-
-public class ContentNegotiation {
+/**
+ * Content negotiation enum.
+ * 
    
+ * A value of {@link #none} means no content negotation at level of the
+ * client transport will be performed to negotiate the encoding of XML infoset.
+ * The default encoding will always be used.
+ * 
    
+ * A value of {@link #pessimistic} means the client transport will assume
+ * the default encoding of XML infoset for an outbound message unless informed
+ * otherwise by a previously received inbound message.
+ * (The client transport initially and pessimistically assumes that a service
+ * does not support anything other than the default encoding of XML infoset.)
+ * 
    
+ * A value of {@link #optimistic} means the client transport will assume
+ * a non-default encoding of XML infoset for an outbound message.
+ * (The client transport optimistically assumes that a service
+ * supports the non-default encoding of XML infoset.)
+ *
+ * @author Paul.Sandoz@Sun.Com
+ */
+public enum ContentNegotiation {
+    none,
+    pessimistic,
+    optimistic;
 
     /**
-     * Initializes content negotiation property in MessageStruct
-     * based on request context and system properties.
+     * Property name for content negotiation on {@link RequestContext}.
      */
-    static public void initialize(Map context, MessageStruct messageStruct) {
-        String value = (String) context.get(CONTENT_NEGOTIATION_PROPERTY);
-        if (value != null) {
-            if (value.equals("none") || value.equals("pessimistic") || value.equals("optimistic")) {
-                messageStruct.setMetaData(CONTENT_NEGOTIATION_PROPERTY, value.intern());
-            } else {
-                throw new SenderException("sender.request.illegalValueForContentNegotiation", value);
-            }
-        } else {
-            initFromSystemProperties(context, messageStruct);
-        }
-    }
+    public static final String PROPERTY = "com.sun.xml.internal.ws.client.ContentNegotiation";
 
     /**
-     * Initializes content negotiation property in MessageStruct
-     * based on system property of the same name.
+     * Obtain the content negotiation value from a system property.
+     * 
    
+     * This method will never throw a runtime exception.
+     *
+     * @return the content negotiation value.
      */
-    static public void initFromSystemProperties(Map context, MessageStruct messageStruct)
-        throws SenderException {
-        String value = System.getProperty(CONTENT_NEGOTIATION_PROPERTY);
+    public static ContentNegotiation obtainFromSystemProperty() {
+        try {
+            String value = System.getProperty(PROPERTY);
 
-        if (value == null) {
-            messageStruct.setMetaData(
-                CONTENT_NEGOTIATION_PROPERTY, "none");      // FI is off by default
-        } else if (value.equals("none") || value.equals("pessimistic") || value.equals("optimistic")) {
-            messageStruct.setMetaData(CONTENT_NEGOTIATION_PROPERTY, value.intern());
-            context.put(CONTENT_NEGOTIATION_PROPERTY, value.intern());
-        } else {
-            throw new SenderException("sender.request.illegalValueForContentNegotiation", value);
+            if (value == null) return none;
+
+            return valueOf(value);
+        } catch (Exception e) {
+            // Default to none for any unrecognized value or any other
+            // runtime exception thrown
+            return none;
         }
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ContextMap.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ContextMap.java
deleted file mode 100644
index 107e5076ffa..00000000000
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ContextMap.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package com.sun.xml.internal.ws.client;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.ws.BindingProvider;
-import static javax.xml.ws.BindingProvider.*;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.handler.MessageContext;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-public abstract class ContextMap extends HashMap
-    implements BindingProviderProperties {
-
-    /**
-     * Read-only list of known properties.
-     */
-    private static final Set KNOWN_PROPERTIES;
-
-    private static final HashMap _allowedClass = new HashMap();
-
-    protected BindingProvider _owner;
-    protected PortInfoBase portInfo;
-
-    public abstract ContextMap copy();
-
-    static {
-        //JAXWS 2.0 defined
-        _allowedClass.put(USERNAME_PROPERTY, java.lang.String.class);
-        _allowedClass.put(PASSWORD_PROPERTY, java.lang.String.class);
-        _allowedClass.put(ENDPOINT_ADDRESS_PROPERTY, java.lang.String.class);
-        _allowedClass.put(SESSION_MAINTAIN_PROPERTY, java.lang.Boolean.class);
-        _allowedClass.put(SOAPACTION_USE_PROPERTY, java.lang.Boolean.class);
-        _allowedClass.put(SOAPACTION_URI_PROPERTY, java.lang.String.class);
-
-        //now defined in jaxwscontext
-        _allowedClass.put(BindingProviderProperties.JAXB_CONTEXT_PROPERTY, JAXBContext.class);
-
-        Set temp = new HashSet();
-        //JAXWS 2.0 defined
-        temp.add(USERNAME_PROPERTY);
-        temp.add(PASSWORD_PROPERTY);
-        temp.add(ENDPOINT_ADDRESS_PROPERTY);
-        temp.add(SESSION_MAINTAIN_PROPERTY);
-        temp.add(SOAPACTION_USE_PROPERTY);
-        temp.add(SOAPACTION_URI_PROPERTY);
-
-        temp.add(BindingProviderProperties.JAXB_CONTEXT_PROPERTY);
-        //implementation specific
-        temp.add(BindingProviderProperties.ACCEPT_ENCODING_PROPERTY);
-        temp.add(BindingProviderProperties.CLIENT_TRANSPORT_FACTORY);
-        //used to get stub in runtime for handler chain
-        temp.add(BindingProviderProperties.JAXWS_CLIENT_HANDLE_PROPERTY);
-        temp.add(BindingProviderProperties.JAXWS_CLIENT_HANDLE_PROPERTY);
-
-        //JAXRPC 1.0 - 1.1 DEFINED - implementation specific
-        temp.add(BindingProviderProperties.HTTP_COOKIE_JAR);
-        temp.add(BindingProviderProperties.ONE_WAY_OPERATION);
-        temp.add(BindingProviderProperties.HTTP_STATUS_CODE);
-        temp.add(BindingProviderProperties.HOSTNAME_VERIFICATION_PROPERTY);
-        temp.add(BindingProviderProperties.REDIRECT_REQUEST_PROPERTY);
-        temp.add(BindingProviderProperties.SECURITY_CONTEXT);
-        temp.add(BindingProviderProperties.SET_ATTACHMENT_PROPERTY);
-        temp.add(BindingProviderProperties.GET_ATTACHMENT_PROPERTY);
-        //Tod:check with mark regarding property modification
-        //KNOWN_PROPERTIES = Collections.unmodifiableSet(temp);
-
-        temp.add(MessageContext.INBOUND_MESSAGE_ATTACHMENTS);
-        temp.add(MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS);
-        temp.add(MessageContext.WSDL_DESCRIPTION);
-        temp.add(MessageContext.WSDL_INTERFACE);
-        temp.add(MessageContext.WSDL_OPERATION);
-        temp.add(MessageContext.WSDL_PORT);
-        temp.add(MessageContext.WSDL_SERVICE);
-        temp.add(MessageContext.HTTP_REQUEST_METHOD);
-        temp.add(MessageContext.HTTP_REQUEST_HEADERS);
-        temp.add(MessageContext.HTTP_RESPONSE_CODE);
-        temp.add(MessageContext.HTTP_RESPONSE_HEADERS);
-        temp.add(MessageContext.PATH_INFO);
-        temp.add(MessageContext.QUERY_STRING);
-        // Content negotiation property for FI -- "none", "pessimistic", "optimistic"
-        temp.add(BindingProviderProperties.CONTENT_NEGOTIATION_PROPERTY);
-        temp.add(BindingProviderProperties.MTOM_THRESHOLOD_VALUE);
-        KNOWN_PROPERTIES = temp;
-    }
-
-    //used for dispatch
-    public ContextMap(PortInfoBase info, BindingProvider provider) {
-        _owner = provider;
-        if (info != null) {
-            this.portInfo = info;
-        }
-    }
-
-    /**
-     * Copy constructor.
-     */
-    public ContextMap(ContextMap original) {
-        super(original);
-        this._owner = original._owner;
-    }
-
-    //may not need this
-    public ContextMap(BindingProvider owner) {
-        this(null, owner);
-    }
-
-    boolean doValidation() {
-        return _owner != null;
-    }
-
-    public Object put(String name, Object value) {
-        if (doValidation()) {
-            validateProperty(name, value, true);
-            return super.put(name, value);
-        }
-        return null;
-    }
-
-    public Object get(String name) {
-        if (doValidation()) {
-            validateProperty(name, null, false);
-            return super.get(name);
-        }
-        return null;
-    }
-
-    public Iterator getPropertyNames() {
-        return keySet().iterator();
-    }
-
-
-    public Object remove(String name) {
-        if (doValidation()) {
-            validateProperty(name, null, false);
-            return super.remove(name);
-        }
-        return null;
-    }
-
-    private boolean isAllowedValue(String name, Object value) {
-        if ( name.equals(MessageContext.PATH_INFO) ||
-            name.equals(MessageContext.QUERY_STRING))
-                return true;
-
-        if (value == null)
-            return false;
-
-        return true;
-    }
-// no value check needed today
-//        Object[] values = _allowedValues.get(name);
-//        if (values != null) {
-//            boolean allowed = false;
-//            for (Object o : values) {
-//                if (STRING_CLASS.isInstance(o) && (STRING_CLASS.isInstance(value))) {
-//                    if (((java.lang.String) o).equalsIgnoreCase((java.lang.String) value)) {
-//                        allowed = true;
-//                        break;
-//                    }
-//                } else if (BOOLEAN_CLASS.isInstance(o) && (BOOLEAN_CLASS.isInstance(value))) {
-//                    if (Boolean.FALSE.equals(o) || Boolean.TRUE.equals(o)) {
-//                        allowed = true;
-//                        break;
-//                    }
-//                } else {
-//                    //log this
-//                }
-//            }
-//            return allowed;
-//        }
-
-
-
-    private boolean isAllowedClass(String propName, Object value) {
-
-        Class allowedClass = _allowedClass.get(propName);
-        if (allowedClass != null) {
-            return allowedClass.isInstance(value);
-        }
-        return true;
-    }
-
-    private void validateProperty(String name, Object value, boolean isSetter) {
-        if (name == null)
-            throw new WebServiceException(name + " is a User-defined property - property name can not be null. ",
-                new IllegalArgumentException("Name of property is null.  This is an invalid property name. "));
-
-        /* Spec clarifies that this check is not needed.
-        if (!KNOWN_PROPERTIES.contains(name)) {
-            //do validation check on not "javax.xml.ws."
-            if (name.startsWith("javax.xml.ws"))
-                throw new WebServiceException(name + " is a User-defined property - can not start with javax.xml.ws. package",
-                    new IllegalArgumentException("can not start with javax.xml.ws. package"));                                            //let's check the propertyContext
-        }
-        */
-        //is it alreadySet
-        //Object currentPropValue = get(name);
-        //if (currentPropValue != null) {
-        //  if (!isDynamic(name))
-        //      throw new WebServiceException("Property bound to Binding Instance",
-        //          new IllegalArgumentException("Cannot overwrite the Static Property"));
-        //}
-
-        if (isSetter) {
-            if (!isAllowedClass(name, value))
-                throw new WebServiceException(value + " is Not Allowed Class for property " + name,
-                    new IllegalArgumentException("Not Allowed Class for property"));
-
-            if (!isAllowedValue(name, value))
-                throw new WebServiceException(value + " is Not Allowed Value for property " + name,
-                    new IllegalArgumentException("Not Allowed value"));
-        }
-
-    }
-
- //currently not used
- /*   public static enum StyleAndUse {
-        RPC_LITERAL,
-        DOCLIT_WRAPPER_STYLE, DOCLIT_NONWRAPPER_STYLE
-    }
-*/
-}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/EndpointIFBase.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/EndpointIFBase.java
deleted file mode 100644
index 21139170af5..00000000000
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/EndpointIFBase.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package com.sun.xml.internal.ws.client;
-
-import com.sun.xml.internal.ws.pept.Delegate;
-import com.sun.xml.internal.ws.pept.ept.MessageInfo;
-import com.sun.xml.internal.ws.binding.BindingImpl;
-import com.sun.xml.internal.ws.spi.runtime.ClientTransportFactory;
-import com.sun.xml.internal.ws.transport.http.client.HttpClientTransportFactory;
-
-import javax.xml.ws.Binding;
-import javax.xml.ws.BindingProvider;
-
-import java.util.Map;
-
-/**
- * @author WS Development Team
- */
-public class EndpointIFBase implements com.sun.xml.internal.ws.pept.presentation.Stub,
-    com.sun.xml.internal.ws.spi.runtime.StubBase, BindingProvider, InternalBindingProvider {
-
-    protected Map _requestContext;
-    protected Map _responseContext;
-
-    protected String _bindingId = null;
-    protected Delegate _delegate = null;
-    protected BindingImpl binding;
-
-    private ClientTransportFactory _transportFactory;
-
-    void setResponseContext(ResponseContext context) {
-        _responseContext = context;
-    }
-
-    public void _setDelegate(Delegate delegate) {
-        _delegate = delegate;
-    }
-
-    public Delegate _getDelegate() {
-        return _delegate;
-    }
-
-    public ClientTransportFactory _getTransportFactory() {
-        _transportFactory =
-            (com.sun.xml.internal.ws.spi.runtime.ClientTransportFactory)getRequestContext().get(BindingProviderProperties.CLIENT_TRANSPORT_FACTORY);
-
-        if (_transportFactory == null) {
-            _transportFactory = new HttpClientTransportFactory();
-        }
-        return _transportFactory;
-    }
-
-    public void _setTransportFactory(ClientTransportFactory f) {
-        getRequestContext().put(BindingProviderProperties.CLIENT_TRANSPORT_FACTORY, f);
-        _transportFactory = f;
-    }
-
-    //toDo: have to update generator on PeptStub to getContext
-    public void updateResponseContext(MessageInfo messageInfo) {
-        ResponseContext responseContext = (ResponseContext)
-            messageInfo.getMetaData(BindingProviderProperties.JAXWS_RESPONSE_CONTEXT_PROPERTY);
-        if (responseContext != null) { // null in async case
-            setResponseContext(responseContext);
-        }
-    }
-
-    /**
-     * Get the JAXWSContext that is used in processing request messages.
-     * 
    
-     * Modifications to the request context do not affect asynchronous
-     * operations that have already been started.
-     *
-     * @return The JAXWSContext that is used in processing request messages.
-     */
-    public Map getRequestContext() {
-        if (_requestContext == null)
-            _requestContext = new RequestContext(this);
-
-        return _requestContext;
-    }
-
-    /**
-     * Get the JAXWSContext that resulted from processing a response message.
-     * 
    
-     * The returned context is for the most recently completed synchronous
-     * operation. Subsequent synchronous operation invocations overwrite the
-     * response context. Asynchronous operations return their response context
-     * via the Response interface.
-     *
-     * @return The JAXWSContext that is used in processing request messages.
-     */
-    public Map getResponseContext() {
-        if (_responseContext == null)
-            _responseContext = new ResponseContext(this);
-        return _responseContext;
-    }
-
-    public Binding getBinding() {
-        return binding;
-    }
-
-    public void _setBinding(BindingImpl binding) {
-        this.binding = binding;
-    }
-
-    /**
-     * returns binding id from BindingImpl
-     *
-     * @return the String representing the BindingID
-     */
-    public String _getBindingId() {
-        return _bindingId;
-    }
-
-}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/EndpointIFContext.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/EndpointIFContext.java
deleted file mode 100644
index 30b7cc894da..00000000000
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/EndpointIFContext.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package com.sun.xml.internal.ws.client;
-
-import com.sun.xml.internal.ws.server.RuntimeContext;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.handler.Handler;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * $author: WS Development Team
- */
-public class EndpointIFContext {
-
-    private RuntimeContext runtimeContext; //from annotationPro ess
-    private Class serviceInterface;    //prop can take out
-    private QName serviceName;
-    private Class sei;
-    private QName portName;
-    private ArrayList handlers;
-    private String endpointAddress;
-    private String bindingId;
-
-
-    public EndpointIFContext(Class sei) {
-        this.sei = sei;
-        handlers = new ArrayList();
-    }
-
-    public RuntimeContext getRuntimeContext() {
-        return runtimeContext;
-    }
-
-    public void setRuntimeContext(RuntimeContext runtimeContext) {
-        this.runtimeContext = runtimeContext;
-    }
-
-    public Class getServiceInterface() {
-        return serviceInterface;
-    }
-
-    public void setServiceInterface(Class serviceInterface) {
-        this.serviceInterface = serviceInterface;
-    }
-
-    public Class getSei() {
-        return sei;
-    }
-
-    public void setSei(Class sei) {
-        this.sei = sei;
-    }
-
-    public QName getPortName() {
-        if (portName == null){
-        if ((runtimeContext != null) && (runtimeContext.getModel() != null))
-            portName = runtimeContext.getModel().getPortName();
-        }
-        return portName;
-    }
-
-    public String getEndpointAddress() {
-        return endpointAddress;
-    }
-
-    public void setPortInfo(QName portQName, String endpoint, String bindingID) {
-        portName = portQName;
-        endpointAddress = endpoint;
-        this.bindingId = bindingID;
-    }
-
-    public String getBindingID() {
-        return bindingId;
-    }
-
-    public QName getServiceName() {
-        return serviceName;
-    }
-
-    public boolean contains(QName serviceName) {
-        if (serviceName.equals(this.serviceName))
-            return true;
-        return false;
-    }
-
-    public void setServiceName(QName serviceName) {
-        this.serviceName = serviceName;
-    }
-
-    public void setPortName(QName portName) {
-        this.portName = portName;
-    }
-
-    public void setBindingID(String bindingId) {
-        this.bindingId = bindingId;
-    }
-}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/EndpointIFInvocationHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/EndpointIFInvocationHandler.java
deleted file mode 100644
index f4480bc9e3f..00000000000
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/EndpointIFInvocationHandler.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package com.sun.xml.internal.ws.client;
-
-import com.sun.xml.internal.ws.pept.ept.MessageInfo;
-import com.sun.xml.internal.ws.pept.presentation.MessageStruct;
-import com.sun.xml.internal.ws.encoding.soap.internal.DelegateBase;
-import com.sun.xml.internal.ws.model.JavaMethod;
-import com.sun.xml.internal.ws.server.RuntimeContext;
-import com.sun.xml.internal.ws.wsdl.WSDLContext;
-import com.sun.xml.internal.ws.wsdl.parser.PortType;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.AsyncHandler;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.Service;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.util.concurrent.Executor;
-
-public class EndpointIFInvocationHandler
-    extends EndpointIFBase
-    implements InvocationHandler, com.sun.xml.internal.ws.client.BindingProviderProperties {
-
-    Object _proxy;
-    DelegateBase _delegate;
-
-    EndpointIFContext _endpointContext;
-
-    Class _portInterface;
-    QName _serviceQName;
-
-    RuntimeContext _rtcontext;
-    WSDLContext _wsdlContext;
-    boolean failure;
-    URL wsdlDocumentLocation;
-    WSServiceDelegate _service;
-
-    /**
-     * public constructor
-     */
-
-    public EndpointIFInvocationHandler(Class portInterface, EndpointIFContext eif, WSServiceDelegate service, QName serviceName) {
-
-        if ((eif.getBindingID() == null) || (eif.getRuntimeContext() == null)) {
-            failure = true;
-            return;
-        }
-        _endpointContext = eif;
-        _portInterface = portInterface;
-        _rtcontext = eif.getRuntimeContext();
-        _bindingId = eif.getBindingID();
-        _service = service;
-
-        if (serviceName != null) {
-            if (eif.contains(serviceName))
-                _serviceQName = serviceName;
-            else
-                throw new WebServiceException("Supplied service QName " +
-                    serviceName + " does not exist in this wsdl.");
-        } else
-            _serviceQName =
-                eif.getServiceName();
-
-        if (eif.getEndpointAddress() != null)   //temp workaround for local transport kw
-            getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
-                eif.getEndpointAddress());
-
-        ContactInfoListImpl cil = new ContactInfoListImpl();
-        //not sure I need this service argument
-        _delegate = new DelegateBase(cil, service);
-    }
-
-    public void setModel(RuntimeContext rtcontext) {
-        _rtcontext = rtcontext;
-    }
-
-    public void setProxy(Object p) {
-        _proxy = p;
-    }
-
-    public Object invoke(Object proxy, Method method, Object[] args) throws WebServiceException, Throwable {
-
-        try {
-            if (isSEIMethod(method, _portInterface)) {
-                return implementSEIMethod(method, args);
-            } else {
-                return method.invoke(this, args);
-            }
-        } catch (InvocationTargetException e) {
-            throw e.getCause();
-        }
-    }
-
-    /**
-     * Gets a new {@link com.sun.xml.internal.ws.pept.presentation.MessageStruct} from the Delegate, copies
-     * the data and metadata into the newly created MessageStruct, invokes Delegate.send, and
-     * returns the response.
-     */
-    public Object implementSEIMethod(Method method, Object[] parameters) throws Throwable {
-
-        MessageStruct messageStruct = _delegate.getMessageStruct();
-        int mmep = 0;
-        if (_rtcontext != null) {
-            JavaMethod jmethod = _rtcontext.getModel().getJavaMethod(method);
-            if (jmethod != null) {
-                int mep = jmethod.getMEP();
-                mmep = (mep == MessageStruct.REQUEST_RESPONSE_MEP) ?
-                    MessageStruct.REQUEST_RESPONSE_MEP : (mep == MessageStruct.ONE_WAY_MEP) ?
-                    MessageStruct.ONE_WAY_MEP : ((mep == MessageStruct.ASYNC_POLL_MEP) ?
-                    MessageStruct.ASYNC_POLL_MEP : MessageStruct.ASYNC_CALLBACK_MEP);
-            } else throw new WebServiceException("runtime model information for java Method " + method.getName() + " is not known .");
-        } //need to check if this is dispatch invocation
-
-        if (mmep == MessageStruct.ASYNC_CALLBACK_MEP) {
-            for (Object param : parameters) {
-                if (param != null && AsyncHandler.class.isAssignableFrom(param.getClass())) {
-                    //messageStruct.setMetaData(BindingProviderProperties.JAXWS_CLIENT_ASYNC_HANDLER, param);
-                    messageStruct.setMetaData(BindingProviderProperties.JAXWS_CLIENT_ASYNC_HANDLER,
-                        new AsyncHandlerService((AsyncHandler)param, getCurrentExecutor()));
-                }
-            }
-        }
-
-        messageStruct.setMethod(method);
-        messageStruct.setData(parameters);
-        RequestContext requestContext = (RequestContext)(java.util.Map)
-            ((BindingProvider) _proxy).getRequestContext();
-        requestContext.put(JAXWS_CLIENT_HANDLE_PROPERTY, _proxy);
-        messageStruct.setMetaData(JAXWS_RUNTIME_CONTEXT, _rtcontext);
-        messageStruct.setMetaData(JAXWS_CONTEXT_PROPERTY, requestContext);
-
-        //set mtom threshold value to
-        Object mtomThreshold = requestContext.get(MTOM_THRESHOLOD_VALUE);
-        messageStruct.setMetaData(MTOM_THRESHOLOD_VALUE, mtomThreshold);
-
-        messageStruct.setMEP(mmep);
-
-        // Initialize content negotiation property
-        ContentNegotiation.initialize(requestContext, messageStruct);
-
-        // Set MTOM processing for XML requests only
-        if (_rtcontext != null && _rtcontext.getModel() != null) {
-            javax.xml.ws.soap.SOAPBinding sb =
-                (binding instanceof javax.xml.ws.soap.SOAPBinding) ?
-                    (javax.xml.ws.soap.SOAPBinding) binding : null;
-            if (sb != null) {
-                _rtcontext.getModel().enableMtom(sb.isMTOMEnabled());
-            }
-        }
-
-        _delegate.send(messageStruct);
-        updateResponseContext((MessageInfo) messageStruct);
-        switch (messageStruct.getResponseType()) {
-            case MessageStruct.NORMAL_RESPONSE:
-                break;
-            case MessageStruct.CHECKED_EXCEPTION_RESPONSE:
-                if (_rtcontext.getModel().isCheckedException(method, messageStruct.getResponse().getClass()))
-                    throw (Throwable) messageStruct.getResponse();
-                throw (Exception) messageStruct.getResponse();
-            case MessageStruct.UNCHECKED_EXCEPTION_RESPONSE:
-                throw (RuntimeException) messageStruct.getResponse();
-        }
-        return messageStruct.getResponse();
-    }
-
-    boolean isSEIMethod(Method method, Class sei) {
-        return (sei.equals(method.getDeclaringClass())) ? true : false;
-    }
-
-    public EndpointIFContext getEndpointContext() {
-        return _endpointContext;
-    }
-
-    public QName getServiceQName() {
-        return _serviceQName;
-    }
-
-    public Class getPortInterface(){
-        return _portInterface;
-    }
-
-     Executor getCurrentExecutor(){
-        return _service.getExecutor();
-    }
-
-    public QName getWSDLPortTypeQName(){
-        return _service.getWSDLBinding(_endpointContext.getPortName()).getPortTypeName();
-    }
-}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/HandlerConfiguration.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/HandlerConfiguration.java
new file mode 100644
index 00000000000..9d86342bbd6
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/HandlerConfiguration.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.client;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.handler.Handler;
+import javax.xml.ws.handler.LogicalHandler;
+import javax.xml.ws.handler.soap.SOAPHandler;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * This class holds the handler information on the BindingProvider.
+ * HandlerConfiguration is immutable, and a new object is created
+ * when the BindingImpl is created or User calls Binding.setHandlerChain() or
+ * SOAPBinding.setRoles()
+ * During inovcation in Stub.process(), snapshot of the handler configuration is set in
+ * Packet.handlerConfig
+ * The information in the HandlerConfiguration is used by MUPipe and HandlerTube
+ * implementations.
+ *
+ * @author Rama Pulavarthi
+ */
+public class HandlerConfiguration {
+    private final Set roles;
+    /**
+     * This chain may contain both soap and logical handlers.
+     */
+    private final List handlerChain;
+    private final List logicalHandlers;
+    private final List soapHandlers;
+    private Set knownHeaders;
+    private Set handlerKnownHeaders;
+    /**
+     * @param roles                    This contains the roles assumed by the Binding implementation.
+     * @param portKnownHeaders    This contains the headers that are bound to the current WSDL Port
+     * @param handlerChain             This contains the handler chain set on the Binding
+     * @param logicalHandlers
+     * @param soapHandlers
+     * @param handlerKnownHeaders The set is comprised of headers returned from SOAPHandler.getHeaders()
+     *                                 method calls.
+     */
+    public HandlerConfiguration(Set roles, Set portKnownHeaders,
+                                List handlerChain,
+                                List logicalHandlers, List soapHandlers,
+                                Set handlerKnownHeaders) {
+        this.roles = roles;
+        this.handlerChain = handlerChain;
+        this.logicalHandlers = logicalHandlers;
+        this.soapHandlers = soapHandlers;
+        this.handlerKnownHeaders = handlerKnownHeaders;
+        this.knownHeaders = new HashSet();
+        if(portKnownHeaders != null)
+            knownHeaders.addAll(portKnownHeaders);
+        if(handlerKnownHeaders != null)
+            knownHeaders.addAll(handlerKnownHeaders);
+    }
+
+    public Set getRoles() {
+        return roles;
+    }
+
+    /**
+     *
+     * @return return a copy of handler chain
+     */
+    public List getHandlerChain() {
+        if(handlerChain == null)
+            return Collections.emptyList();
+        return new ArrayList(handlerChain);
+
+    }
+
+    public List getLogicalHandlers() {
+        return logicalHandlers;
+    }
+
+    public List getSoapHandlers() {
+        return soapHandlers;
+    }
+
+    public Set getKnownHeaders() {
+        return knownHeaders;
+    }
+
+    public Set getHandlerKnownHeaders() {
+        return handlerKnownHeaders;
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/HandlerConfigurator.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/HandlerConfigurator.java
new file mode 100644
index 00000000000..283b88ee2cb
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/HandlerConfigurator.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.client;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.api.client.WSPortInfo;
+import com.sun.xml.internal.ws.binding.BindingImpl;
+import com.sun.xml.internal.ws.handler.HandlerChainsModel;
+import com.sun.xml.internal.ws.util.HandlerAnnotationInfo;
+import com.sun.xml.internal.ws.util.HandlerAnnotationProcessor;
+
+import javax.jws.HandlerChain;
+import javax.xml.ws.Service;
+import javax.xml.ws.handler.Handler;
+import javax.xml.ws.handler.HandlerResolver;
+import javax.xml.ws.handler.PortInfo;
+import javax.xml.ws.soap.SOAPBinding;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Used by {@link WSServiceDelegate} to configure {@link BindingImpl}
+ * with handlers. The two mechanisms encapsulated by this abstraction
+ * is {@link HandlerChain} annotaion and {@link HandlerResolver}
+ * interface.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+abstract class HandlerConfigurator {
+    /**
+     * Configures the given {@link BindingImpl} object by adding handlers to it.
+     */
+    abstract void configureHandlers(@NotNull WSPortInfo port, @NotNull BindingImpl binding);
+
+    /**
+     * Returns a {@link HandlerResolver}, if this object encapsulates any {@link HandlerResolver}.
+     * Otherwise null.
+     */
+    abstract HandlerResolver getResolver();
+
+
+    /**
+     * Configures handlers by calling {@link HandlerResolver}.
+     * 
    
+     * When a null {@link HandlerResolver} is set by the user to
+     * {@link Service#setHandlerResolver(HandlerResolver)}, we'll use this object
+     * with null {@link #resolver}.
+     */
+    static final class HandlerResolverImpl extends HandlerConfigurator {
+        private final @Nullable HandlerResolver resolver;
+
+        public HandlerResolverImpl(HandlerResolver resolver) {
+            this.resolver = resolver;
+        }
+
+        void configureHandlers(@NotNull WSPortInfo port, @NotNull BindingImpl binding) {
+            if(resolver!=null)
+                binding.setHandlerChain(resolver.getHandlerChain(port));
+        }
+
+
+        HandlerResolver getResolver() {
+            return resolver;
+        }
+    }
+
+    /**
+     * Configures handlers from {@link HandlerChain} annotation.
+     *
+     * 
    
+     * This class is a simple
+     * map of PortInfo objects to handler chains. It is used by a
+     * {@link WSServiceDelegate} object, and can
+     * be replaced by user code with a different class implementing
+     * HandlerResolver. This class is only used on the client side, and
+     * it includes a lot of logging to help when there are issues since
+     * it deals with port names, service names, and bindings. All three
+     * must match when getting a handler chain from the map.
+     *
+     * 
    It is created by the {@link WSServiceDelegate}
+     * class , which uses {@link HandlerAnnotationProcessor} to create
+     * a handler chain and then it sets the chains on this class and they
+     * are put into the map. The ServiceContext uses the map to set handler
+     * chains on bindings when they are created.
+     */
+    static final class AnnotationConfigurator extends HandlerConfigurator {
+        private final HandlerChainsModel handlerModel;
+        private final Map chainMap = new HashMap();
+        private static final Logger logger = Logger.getLogger(
+            com.sun.xml.internal.ws.util.Constants.LoggingDomain + ".handler");
+
+        AnnotationConfigurator(WSServiceDelegate delegate) {
+            handlerModel = HandlerAnnotationProcessor.buildHandlerChainsModel(delegate.getServiceClass());
+            assert handlerModel!=null; // this class is suppeod to be called only when there's @HandlerCHain
+        }
+
+
+        void configureHandlers(WSPortInfo port, BindingImpl binding) {
+            //Check in cache first
+            HandlerAnnotationInfo chain = chainMap.get(port);
+
+            if(chain==null) {
+                logGetChain(port);
+                // Put it in cache
+                chain = handlerModel.getHandlersForPortInfo(port);
+                chainMap.put(port,chain);
+            }
+
+            if (binding instanceof SOAPBinding) {
+                ((SOAPBinding) binding).setRoles(chain.getRoles());
+            }
+
+            logSetChain(port,chain);
+            binding.setHandlerChain(chain.getHandlers());
+        }
+
+        HandlerResolver getResolver() {
+            return new HandlerResolver() {
+                public List getHandlerChain(PortInfo portInfo) {
+                    return new ArrayList(
+                        handlerModel.getHandlersForPortInfo(portInfo).getHandlers());
+                }
+            };
+        }
+        // logged at finer level
+        private void logSetChain(WSPortInfo info, HandlerAnnotationInfo chain) {
+            logger.finer("Setting chain of length " + chain.getHandlers().size() +
+                " for port info");
+            logPortInfo(info, Level.FINER);
+        }
+
+        // logged at fine level
+        private void logGetChain(WSPortInfo info) {
+            logger.fine("No handler chain found for port info:");
+            logPortInfo(info, Level.FINE);
+            logger.fine("Existing handler chains:");
+            if (chainMap.isEmpty()) {
+                logger.fine("none");
+            } else {
+                for (WSPortInfo key : chainMap.keySet()) {
+                    logger.fine(chainMap.get(key).getHandlers().size() +
+                        " handlers for port info ");
+                    logPortInfo(key, Level.FINE);
+                }
+            }
+        }
+
+        private void logPortInfo(WSPortInfo info, Level level) {
+            logger.log(level, "binding: " + info.getBindingID() +
+                "\nservice: " + info.getServiceName() +
+                "\nport: " + info.getPortName());
+        }
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/PortInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/PortInfo.java
new file mode 100644
index 00000000000..fd841e94cb7
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/PortInfo.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.client;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.api.BindingID;
+import com.sun.xml.internal.ws.api.EndpointAddress;
+import com.sun.xml.internal.ws.api.WSService;
+import com.sun.xml.internal.ws.api.client.WSPortInfo;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
+import com.sun.xml.internal.ws.binding.BindingImpl;
+import com.sun.xml.internal.ws.binding.WebServiceFeatureList;
+import com.sun.xml.internal.ws.model.wsdl.WSDLPortImpl;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.WebServiceFeature;
+import javax.xml.ws.WebServiceException;
+
+/**
+ * Information about a port.
+ * 
    
+ * This object is owned by {@link WSServiceDelegate} to keep track of a port,
+ * since a port maybe added dynamically.
+ *
+ * @author JAXWS Development Team
+ */
+public class PortInfo implements WSPortInfo {
+    private final @NotNull WSServiceDelegate owner;
+
+    public final @NotNull QName portName;
+    public final @NotNull EndpointAddress targetEndpoint;
+    public final @NotNull BindingID bindingId;
+
+    /**
+     * If a port is known statically to a WSDL, {@link PortInfo} may
+     * have the corresponding WSDL model. This would occur when the
+     * service was created with the WSDL location and the port is defined
+     * in the WSDL.
+     * 
    
+     * If this is a {@link SEIPortInfo}, then this is always non-null.
+     */
+    public final @Nullable WSDLPort portModel;
+
+    public PortInfo(WSServiceDelegate owner, EndpointAddress targetEndpoint, QName name, BindingID bindingId) {
+        this.owner = owner;
+        this.targetEndpoint = targetEndpoint;
+        this.portName = name;
+        this.bindingId = bindingId;
+        this.portModel = getPortModel(owner, name);
+    }
+
+    public PortInfo(@NotNull WSServiceDelegate owner, @NotNull WSDLPort port) {
+        this.owner = owner;
+        this.targetEndpoint = port.getAddress();
+        this.portName = port.getName();
+        this.bindingId = port.getBinding().getBindingId();
+        this.portModel = port;
+    }
+
+    /**
+     * Creates {@link BindingImpl} for this {@link PortInfo}.
+     *
+     * @param webServiceFeatures
+     *      User-specified features.
+     * @param portInterface
+     *      Null if this is for dispatch. Otherwise the interface the proxy is going to implement
+     */
+    public BindingImpl createBinding(WebServiceFeature[] webServiceFeatures, Class portInterface) {
+        WebServiceFeatureList r = new WebServiceFeatureList(webServiceFeatures);
+        if (portModel != null)
+            // merge features from WSDL
+            r.mergeFeatures(portModel, portInterface==null/*if dispatch, true*/, false);
+
+        // merge features from interceptor
+        for( WebServiceFeature wsf : owner.serviceInterceptor.preCreateBinding(this,portInterface,r) )
+            r.add(wsf);
+
+        BindingImpl bindingImpl = BindingImpl.create(bindingId, r.toArray());
+        owner.getHandlerConfigurator().configureHandlers(this,bindingImpl);
+
+        return bindingImpl;
+    }
+
+    //This method is used for Dispatch client only
+    private WSDLPort getPortModel(WSServiceDelegate owner, QName portName) {
+
+        if (owner.getWsdlService() != null){
+            Iterable ports = owner.getWsdlService().getPorts();
+            for (WSDLPortImpl port : ports){
+                if (port.getName().equals(portName))
+                    return port;
+            }
+        }
+        return null;
+    }
+
+//
+// implementation of API PortInfo interface
+//
+
+    @Nullable
+    public WSDLPort getPort() {
+        return portModel;
+    }
+
+    @NotNull
+    public WSService getOwner() {
+        return owner;
+    }
+
+    @NotNull
+    public BindingID getBindingId() {
+        return bindingId;
+    }
+
+    @NotNull
+    public EndpointAddress getEndpointAddress() {
+        return targetEndpoint;
+    }
+
+    /**
+     * @deprecated
+     *      Only meant to be used via {@link javax.xml.ws.handler.PortInfo}.
+     *      Use {@link WSServiceDelegate#getServiceName()}.
+     */
+    public QName getServiceName() {
+        return owner.getServiceName();
+    }
+
+    /**
+     * @deprecated
+     *      Only meant to be used via {@link javax.xml.ws.handler.PortInfo}.
+     *      Use {@link #portName}.
+     */
+    public QName getPortName() {
+        return portName;
+    }
+
+    /**
+     * @deprecated
+     *      Only meant to be used via {@link javax.xml.ws.handler.PortInfo}.
+     *      Use {@link #bindingId}.
+     */
+    public String getBindingID() {
+        return bindingId.toString();
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/PortInfoBase.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/PortInfoBase.java
deleted file mode 100644
index f05497a946c..00000000000
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/PortInfoBase.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package com.sun.xml.internal.ws.client;
-
-import javax.xml.namespace.QName;
-
-/**
- * JAXWS Development Team
- */
-public class PortInfoBase {
-
-    protected String targetEndpoint;
-    protected String defaultNamespace;
-    protected QName name;
-    protected QName portTypeName;
-    protected String bindingId;
-
-    public PortInfoBase(QName name) {
-        this.name = name;
-        targetEndpoint = "";
-        defaultNamespace = "";
-    }
-
-    public PortInfoBase(String targetEndpoint, QName name, String bindingId) {
-        this.targetEndpoint = targetEndpoint;
-        this.name = name;
-        this.bindingId = bindingId;
-    }
-
-    void setName(QName nm) {
-        name = nm;
-    }
-
-    public QName getName() {
-        return name;
-    }
-
-    void setTargetEndpoint(String endpoint) {
-        targetEndpoint = endpoint;
-    }
-
-    public String getTargetEndpoint() {
-        return targetEndpoint;
-    }
-
-    void setBindingId(String id) {
-        bindingId = id;
-    }
-
-    public String getBindingId() {
-        return bindingId;
-    }
-
-    void setPortTypeName(QName typeName) {
-        portTypeName = typeName;
-    }
-
-    public QName getPortTypeName() {
-        return portTypeName;
-    }
-
-    void setDefaultNamespace(String namespace) {
-        defaultNamespace = namespace;
-    }
-}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/RequestContext.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/RequestContext.java
index 94af3a29409..ddf63876902 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/RequestContext.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/RequestContext.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,27 +24,370 @@
  */
 package com.sun.xml.internal.ws.client;
 
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.ws.api.EndpointAddress;
+import com.sun.xml.internal.ws.api.PropertySet;
+import com.sun.xml.internal.ws.api.message.Packet;
+
 import javax.xml.ws.BindingProvider;
+import javax.xml.ws.WebServiceException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
 
+/**
+ * Request context implementation.
+ *
+ * 
    Why a custom map?
    
+ * 
    
+ * The JAX-WS spec exposes properties as a {@link Map}, but if we just use
+ * an ordinary {@link HashMap} for this, it doesn't work as fast as we'd like
+ * it to be. Hence we have this class.
+ *
+ * 
    
+ * We expect the user to set a few properties and then use that same
+ * setting to make a bunch of invocations. So we'd like to take some hit
+ * when the user actually sets a property to do some computation,
+ * then use that computed value during a method invocation again and again.
+ *
+ * 
    
+ * For this goal, we use {@link PropertySet} and implement some properties
+ * as virtual properties backed by methods. This allows us to do the computation
+ * in the setter, and store it in a field.
+ *
+ * 
    
+ * These fields are used by {@link Stub#process} to populate a {@link Packet}.
+ *
+ *
+ *
+ * 
    How it works?
    
+ * 
    
+ * We make an assumption that a request context is mostly used to just
+ * get and put values, not really for things like enumerating or size.
+ *
+ * 
    
+ * So we start by maintaining state as a combination of {@link #others}
+ * bag and strongly-typed fields. As long as the application uses
+ * just {@link Map#put}, {@link Map#get}, and {@link Map#putAll}, we can
+ * do things in this way. In this mode a {@link Map} we return works as
+ * a view into {@link RequestContext}, and by itself it maintains no state.
+ *
+ * 
    
+ * If {@link RequestContext} is in this mode, its state can be copied
+ * efficiently into {@link Packet}.
+ *
+ * 
    
+ * Once the application uses any other {@link Map} method, we move to
+ * the "fallback" mode, where the data is actually stored in a {@link HashMap},
+ * this is necessary for implementing the map interface contract correctly.
+ *
+ * 
    
+ * To be safe, once we fallback, we'll never come back to the efficient state.
+ *
+ *
+ *
+ * 
    Caution
    
+ * 
    
+ * Once we are in the fallback mode, none of the strongly typed field will
+ * be used, and they may contain stale values. So the only method
+ * the code outside this class can safely use is {@link #copy()},
+ * {@link #fill(Packet)}, and constructors. Do not access the strongly
+ * typed fields nor {@link #others} directly.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+@SuppressWarnings({"SuspiciousMethodCalls"})
+public final class RequestContext extends PropertySet {
+    /**
+     * The default value to be use for {@link #contentNegotiation} obtained
+     * from a system property.
+     * 
    
+     * This enables content negotiation to be easily switched on by setting
+     * a system property on the command line for testing purposes tests.
+     */
+    private static ContentNegotiation defaultContentNegotiation =
+            ContentNegotiation.obtainFromSystemProperty();
 
-public class RequestContext extends ContextMap {
+    /**
+     * Stores properties that don't fit the strongly-typed fields.
+     */
+    private final Map others;
 
-    public RequestContext(BindingProvider provider) {
-        super(provider);
+    /**
+     * The endpoint address to which this message is sent to.
+     *
+     * 
    
+     * This is the actual data store for {@link BindingProvider#ENDPOINT_ADDRESS_PROPERTY}.
+     */
+    private @NotNull EndpointAddress endpointAddress;
+
+    /**
+     * Creates {@link BindingProvider#ENDPOINT_ADDRESS_PROPERTY} view
+     * on top of {@link #endpointAddress}.
+     *
+     * @deprecated
+     *      always access {@link #endpointAddress}.
+     */
+    @Property(BindingProvider.ENDPOINT_ADDRESS_PROPERTY)
+    public String getEndPointAddressString() {
+        return endpointAddress.toString();
     }
 
-    public RequestContext(PortInfoBase port, BindingProvider provider) {
-        super(port, provider);
+    public void setEndPointAddressString(String s) {
+        if(s==null)
+            throw new IllegalArgumentException();
+        else
+            this.endpointAddress = EndpointAddress.create(s);
+    }
+
+    public void setEndpointAddress(@NotNull EndpointAddress epa) {
+        this.endpointAddress = epa;
+    }
+
+    public @NotNull EndpointAddress getEndpointAddress() {
+        return endpointAddress;
+    }
+
+    /**
+     * The value of {@link ContentNegotiation#PROPERTY}
+     * property.
+     */
+    public ContentNegotiation contentNegotiation = defaultContentNegotiation;
+
+    @Property(ContentNegotiation.PROPERTY)
+    public String getContentNegotiationString() {
+        return contentNegotiation.toString();
+    }
+
+    public void setContentNegotiationString(String s) {
+        if(s==null)
+            contentNegotiation = ContentNegotiation.none;
+        else {
+            try {
+                contentNegotiation = ContentNegotiation.valueOf(s);
+            } catch (IllegalArgumentException e) {
+                // If the value is not recognized default to none
+                contentNegotiation = ContentNegotiation.none;
+            }
+        }
+    }
+    /**
+     * The value of the SOAPAction header associated with the message.
+     *
+     * 
    
+     * For outgoing messages, the transport may sends out this value.
+     * If this field is null, the transport may choose to send ""
+     * (quoted empty string.)
+     *
+     * For incoming messages, the transport will set this field.
+     * If the incoming message did not contain the SOAPAction header,
+     * the transport sets this field to null.
+     *
+     * 
    
+     * If the value is non-null, it must be always in the quoted form.
+     * The value can be null.
+     *
+     * 
    
+     * Note that the way the transport sends this value out depends on
+     * transport and SOAP version.
+     *
+     * For HTTP transport and SOAP 1.1, BP requires that SOAPAction
+     * header is present (See {@BP R2744} and {@BP R2745}.) For SOAP 1.2,
+     * this is moved to the parameter of the "application/soap+xml".
+     */
+
+    private String soapAction;
+
+    @Property(BindingProvider.SOAPACTION_URI_PROPERTY)
+    public String getSoapAction(){
+        return soapAction;
+    }
+    public void setSoapAction(String sAction){
+        if(sAction == null) {
+            throw new IllegalArgumentException("SOAPAction value cannot be null");
+        }
+        soapAction = sAction;
+    }
+
+
+    /**
+     * {@link Map} exposed to the user application.
+     */
+    private final MapView mapView = new MapView();
+
+    /**
+     * Creates an empty {@link RequestContext}.
+     */
+    /*package*/ RequestContext() {
+        others = new HashMap();
     }
 
     /**
      * Copy constructor.
      */
-    private RequestContext(RequestContext original) {
-        super(original);
+    private RequestContext(RequestContext that) {
+        others = new HashMap(that.others);
+        endpointAddress = that.endpointAddress;
+        soapAction = that.soapAction;
+        contentNegotiation = that.contentNegotiation;
+        // this is fragile, but it works faster
+    }
+
+    /**
+     * The efficient get method that reads from {@link RequestContext}.
+     */
+    public Object get(Object key) {
+        if(super.supports(key))
+            return super.get(key);
+        else
+            return others.get(key);
+    }
+
+    /**
+     * The efficient put method that updates {@link RequestContext}.
+     */
+    public Object put(String key, Object value) {
+        if(super.supports(key))
+            return super.put(key,value);
+        else
+            return others.put(key,value);
+    }
+
+    /**
+     * Gets the {@link Map} view of this request context.
+     *
+     * @return
+     *      Always same object. Returned map is live.
+     */
+    public Map getMapView() {
+        return mapView;
+    }
+
+    /**
+     * Fill a {@link Packet} with values of this {@link RequestContext}.
+     */
+    public void fill(Packet packet) {
+        if(mapView.fallbackMap==null) {
+            if (endpointAddress != null)
+                packet.endpointAddress = endpointAddress;
+            packet.contentNegotiation = contentNegotiation;
+            if (soapAction != null) {
+                packet.soapAction = soapAction;
+            }
+            if(!others.isEmpty()) {
+                packet.invocationProperties.putAll(others);
+                //if it is not standard property it deafults to Scope.HANDLER
+                packet.getHandlerScopePropertyNames(false).addAll(others.keySet());
+            }
+        } else {
+            Set handlerScopePropertyNames = new HashSet();
+            // fallback mode, simply copy map in a slow way
+            for (Entry entry : mapView.fallbackMap.entrySet()) {
+                String key = entry.getKey();
+                if(packet.supports(key))
+                    packet.put(key,entry.getValue());
+                else
+                    packet.invocationProperties.put(key,entry.getValue());
+
+                //if it is not standard property it deafults to Scope.HANDLER
+                if(!super.supports(key)) {
+                    handlerScopePropertyNames.add(key);
+                }
+            }
+
+            if(!handlerScopePropertyNames.isEmpty())
+                packet.getHandlerScopePropertyNames(false).addAll(handlerScopePropertyNames);
+        }
     }
 
     public RequestContext copy() {
         return new RequestContext(this);
     }
+
+
+    private final class MapView implements Map {
+        private Map fallbackMap;
+
+        private Map fallback() {
+            if(fallbackMap==null) {
+                // has to fall back. fill in fallbackMap
+                fallbackMap = new HashMap(others);
+                // then put all known properties
+                for (Map.Entry prop : propMap.entrySet()) {
+                    fallbackMap.put(prop.getKey(),prop.getValue().get(RequestContext.this));
+                }
+            }
+            return fallbackMap;
+        }
+
+        public int size() {
+            return fallback().size();
+        }
+
+        public boolean isEmpty() {
+            return fallback().isEmpty();
+        }
+
+        public boolean containsKey(Object key) {
+            return fallback().containsKey(key);
+        }
+
+        public boolean containsValue(Object value) {
+            return fallback().containsValue(value);
+        }
+
+        public Object get(Object key) {
+            if (fallbackMap ==null) {
+                return RequestContext.this.get(key);
+            } else {
+                return fallback().get(key);
+            }
+        }
+
+        public Object put(String key, Object value) {
+            if(fallbackMap ==null)
+                return RequestContext.this.put(key,value);
+            else
+                return fallback().put(key, value);
+        }
+
+        public Object remove(Object key) {
+            if (fallbackMap ==null) {
+                return RequestContext.this.remove(key);
+            } else {
+                return fallback().remove(key);
+            }
+        }
+
+        public void putAll(Map t) {
+            for (Entry e : t.entrySet()) {
+                put(e.getKey(),e.getValue());
+            }
+        }
+
+        public void clear() {
+            fallback().clear();
+        }
+
+        public Set keySet() {
+            return fallback().keySet();
+        }
+
+        public Collection values() {
+            return fallback().values();
+        }
+
+        public Set> entrySet() {
+            return fallback().entrySet();
+        }
+    }
+
+    protected PropertyMap getPropertyMap() {
+        return propMap;
+    }
+
+    private static final PropertyMap propMap = parse(RequestContext.class);
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ResponseContext.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ResponseContext.java
index dcb6980c13d..d356061a801 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ResponseContext.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ResponseContext.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,22 +24,139 @@
  */
 package com.sun.xml.internal.ws.client;
 
-import javax.xml.ws.BindingProvider;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.message.AttachmentSet;
+import com.sun.xml.internal.ws.api.message.Attachment;
 
+import javax.xml.ws.handler.MessageContext;
+import javax.activation.DataHandler;
+import java.util.AbstractMap;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
 
-public class ResponseContext extends ContextMap {
-    public ResponseContext(BindingProvider provider) {
-        super(provider);
-    }
+/**
+ * Implements "response context" on top of {@link Packet}.
+ *
+ * 
    
+ * This class creates a read-only {@link Map} view that
+ * gets exposed to client applications after an invocation
+ * is complete.
+ *
+ * 
    
+ * The design goal of this class is to make it efficient
+ * to create a new {@link ResponseContext}, at the expense
+ * of making some {@link Map} operations slower. This is
+ * justified because the response context is mostly just
+ * used to query a few known values, and operations like
+ * enumeration isn't likely.
+ *
+ * 
    
+ * Some of the {@link Map} methods requre this class to
+ * build the complete {@link Set} of properties, but we
+ * try to avoid that as much as possible.
+ *
+ *
+ * 
    + * TODO: are we exposing all strongly-typed fields, or
+ * do they have appliation/handler scope notion?
+ * 
    
+ *
+ * @author Kohsuke Kawaguchi
+ */
+@SuppressWarnings({"SuspiciousMethodCalls"})    // IDE doesn't like me calling Map methods with key typed as Object
+public class ResponseContext extends AbstractMap {
+    private final Packet packet;
 
     /**
-     * Copy constructor.
+     * Lazily computed.
      */
-    private ResponseContext(ResponseContext original) {
-        super(original);
+    private Set> entrySet;
+
+    /**
+     * @param packet
+     *      The {@link Packet} to wrap.
+     */
+    public ResponseContext(Packet packet) {
+        this.packet = packet;
     }
 
-    public ResponseContext copy() {
-        return new ResponseContext(this);
+    public boolean containsKey(Object key) {
+        if(packet.supports(key))
+            return packet.containsKey(key);    // strongly typed
+
+        if(packet.invocationProperties.containsKey(key))
+            // if handler-scope, hide it
+            return !packet.getHandlerScopePropertyNames(true).contains(key);
+
+        return false;
     }
+
+    public Object get(Object key) {
+        if(packet.supports(key))
+            return packet.get(key);    // strongly typed
+
+        if(packet.getHandlerScopePropertyNames(true).contains(key))
+            return null;            // no such application-scope property
+
+        Object value =  packet.invocationProperties.get(key);
+
+        //add the attachments from the Message to the corresponding attachment property
+        if(key.equals(MessageContext.INBOUND_MESSAGE_ATTACHMENTS)){
+            Map atts = (Map) value;
+            if(atts == null)
+                atts = new HashMap();
+            AttachmentSet attSet = packet.getMessage().getAttachments();
+            for(Attachment att : attSet){
+                atts.put(att.getContentId(), att.asDataHandler());
+            }
+            return atts;
+        }
+        return value;
+    }
+
+    public Object put(String key, Object value) {
+        // response context is read-only
+        throw new UnsupportedOperationException();
+    }
+
+    public Object remove(Object key) {
+        // response context is read-only
+        throw new UnsupportedOperationException();
+    }
+
+    public void putAll(Map t) {
+        // response context is read-only
+        throw new UnsupportedOperationException();
+    }
+
+    public void clear() {
+        // response context is read-only
+        throw new UnsupportedOperationException();
+    }
+
+    public Set> entrySet() {
+        if(entrySet==null) {
+            // this is where the worst case happens. we have to clone the whole properties
+            // to get this view.
+
+            // use TreeSet so that toString() sort them nicely. It's easier for apps.
+            Map r = new HashMap();
+
+            // export application-scope properties
+            r.putAll(packet.invocationProperties);
+
+            // hide handler-scope properties
+            r.keySet().removeAll(packet.getHandlerScopePropertyNames(true));
+
+            // and all strongly typed ones
+            r.putAll(packet.createMapView());
+
+            entrySet = Collections.unmodifiableSet(r.entrySet());
+        }
+
+        return entrySet;
+    }
+
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/InternalBindingProvider.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ResponseContextReceiver.java
similarity index 72%
rename from jaxws/src/share/classes/com/sun/xml/internal/ws/client/InternalBindingProvider.java
rename to jaxws/src/share/classes/com/sun/xml/internal/ws/client/ResponseContextReceiver.java
index 9ab8ff9f955..7a086deec30 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/InternalBindingProvider.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ResponseContextReceiver.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,18 +22,22 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.ws.client;
 
-import com.sun.xml.internal.ws.binding.BindingImpl;
-
-
 /**
- * A utility interface for all the classes
- * that implement BindingProvider.
+ * Receives {@link ResponseContext} at the end of
+ * the message invocation.
  *
- * @see WebService#setBindingOnProvider(InternalBindingProvider,
- *      QName, String)
+ * @author Kohsuke Kawaguchi
  */
-public interface InternalBindingProvider {
-    public void _setBinding(BindingImpl binding);
+public interface ResponseContextReceiver {
+    /**
+     * Called upon the completion of the invocation
+     * to set a {@link ResponseContext}.
+     *
+     * 
    
+     * This method is invoked even when the invocation fails.
+     */
+    void setResponseContext(ResponseContext rc);
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ResponseImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ResponseImpl.java
new file mode 100644
index 00000000000..a48d8265f09
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ResponseImpl.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.client;
+
+import com.sun.xml.internal.ws.util.CompletedFuture;
+
+import javax.xml.ws.AsyncHandler;
+import javax.xml.ws.Response;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Future;
+import java.util.concurrent.FutureTask;
+
+/**
+ * {@link Response} implementation.
+ *
+ * @author Kohsuke Kawaguchi
+ * @author Kathy Walsh
+ */
+public final class ResponseImpl extends FutureTask implements Response, ResponseContextReceiver {
+
+    /**
+     * Optional {@link AsyncHandler} that gets invoked
+     * at the completion of the task.
+     */
+    private final AsyncHandler handler;
+    private ResponseContext responseContext;
+
+    private final Callable callable;
+
+    /**
+     *
+     * @param callable
+     *      This {@link Callable} is executed asynchronously.
+     * @param handler
+     *      Optional {@link AsyncHandler} to invoke at the end
+     *      of the processing. Can be null.
+     */
+    public ResponseImpl(Callable callable, AsyncHandler handler) {
+        super(callable);
+        this.callable = callable;
+        this.handler = handler;
+    }
+
+    @Override
+    public void run() {
+        // override so that we call set()
+        try {
+            set(callable.call(), null);
+        } catch (Throwable t) {
+            set(null, t);
+        }
+    }
+
+    protected void set(final T v, final Throwable t) {
+        // call the handler before we mark the future as 'done'
+        if (handler!=null) {
+            try {
+                /**
+                 * {@link Response} object passed into the callback.
+                 * We need a separate {@link Future} because we don't want {@link ResponseImpl}
+                 * to be marked as 'done' before the callback finishes execution.
+                 * (That would provide implicit synchronization between the application code
+                 * in the main thread and the callback code, and is compatible with the JAX-RI 2.0 FCS.
+                 */
+                class CallbackFuture extends CompletedFuture implements Response {
+                    public CallbackFuture(T v, Throwable t) {
+                        super(v, t);
+                    }
+
+                    public Map getContext() {
+                        return ResponseImpl.this.getContext();
+                    }
+                }
+                handler.handleResponse(new CallbackFuture(v, t));
+            } catch (Throwable e) {
+                super.setException(e);
+                return;
+            }
+        }
+        if (t != null) {
+            super.setException(t);
+        } else {
+            super.set(v);
+        }
+    }
+
+    public ResponseContext getContext() {
+        return responseContext;
+    }
+
+    public void setResponseContext(ResponseContext rc) {
+        responseContext = rc;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/SCAnnotations.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/SCAnnotations.java
new file mode 100644
index 00000000000..bbfbe66bfba
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/SCAnnotations.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.client;
+
+import com.sun.xml.internal.ws.util.JAXWSUtils;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebEndpoint;
+import javax.xml.ws.WebServiceClient;
+import javax.xml.ws.WebServiceException;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.ArrayList;
+
+/**
+ * Represents parsed {@link WebServiceClient} and {@link WebEndpoint}
+ * annotations on a {@link Service}-derived class.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+final class SCAnnotations {
+    SCAnnotations(final Class sc) {
+        AccessController.doPrivileged(new PrivilegedAction() {
+            public Void run() {
+                WebServiceClient wsc =sc.getAnnotation(WebServiceClient.class);
+                if(wsc==null)
+                    throw new WebServiceException("Service Interface Annotations required, exiting...");
+
+                String name = wsc.name();
+                String tns = wsc.targetNamespace();
+                serviceQName = new QName(tns, name);
+                try {
+                    wsdlLocation = JAXWSUtils.getFileOrURL(wsc.wsdlLocation());
+                } catch (IOException e) {
+                    // TODO: report a reasonable error message
+                    throw new WebServiceException(e);
+                }
+
+                for (Method method : sc.getDeclaredMethods()) {
+                    WebEndpoint webEndpoint = method.getAnnotation(WebEndpoint.class);
+                    if (webEndpoint != null) {
+                        String endpointName = webEndpoint.name();
+                        QName portQName = new QName(tns, endpointName);
+                        portQNames.add(portQName);
+                    }
+                    Class seiClazz = method.getReturnType();
+                    if (seiClazz!=void.class) {
+                        classes.add(seiClazz);
+                    }
+                }
+
+                return null;
+            }
+        });
+    }
+
+    QName serviceQName;
+    final ArrayList portQNames = new ArrayList();
+    final ArrayList classes = new ArrayList();
+    URL wsdlLocation;
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/SEIPortInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/SEIPortInfo.java
new file mode 100644
index 00000000000..f284eb22d9f
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/SEIPortInfo.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.client;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.ws.api.model.SEIModel;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
+import com.sun.xml.internal.ws.binding.BindingImpl;
+import com.sun.xml.internal.ws.binding.SOAPBindingImpl;
+import com.sun.xml.internal.ws.model.SOAPSEIModel;
+
+import javax.xml.ws.WebServiceFeature;
+
+
+/**
+ * {@link PortInfo} that has {@link SEIModel}.
+ *
+ * This object is created statically when {@link WSServiceDelegate} is created
+ * with an service interface.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+final class SEIPortInfo extends PortInfo {
+    public final Class sei;
+    /**
+     * Model of {@link #sei}.
+     */
+    public final SOAPSEIModel model;
+
+    public SEIPortInfo(WSServiceDelegate owner, Class sei, SOAPSEIModel model, @NotNull WSDLPort portModel) {
+        super(owner,portModel);
+        this.sei = sei;
+        this.model = model;
+        assert sei!=null && model!=null;
+    }
+
+    public BindingImpl createBinding(WebServiceFeature[] webServiceFeatures, Class portInterface) {
+         BindingImpl bindingImpl = super.createBinding(webServiceFeatures,portInterface);
+         if(bindingImpl instanceof SOAPBindingImpl) {
+            ((SOAPBindingImpl)bindingImpl).setPortKnownHeaders(model.getKnownHeaders());
+         }
+         //Not needed as set above in super.createBinding() call
+         //bindingImpl.setFeatures(webServiceFeatures);
+         return bindingImpl;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/SenderException.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/SenderException.java
index f712344fdf2..b7fbdb9a681 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/SenderException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/SenderException.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 SenderException extends JAXWSExceptionBase {
         super("sender.nestedError", arg);
     }
 
-    public String getResourceBundleName() {
+    public String getDefaultResourceBundleName() {
         return "com.sun.xml.internal.ws.resources.sender";
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ServiceContext.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ServiceContext.java
deleted file mode 100644
index 15c6ddb2775..00000000000
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ServiceContext.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package com.sun.xml.internal.ws.client;
-
-import com.sun.xml.internal.ws.handler.HandlerResolverImpl;
-import com.sun.xml.internal.ws.wsdl.WSDLContext;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-
-import org.xml.sax.EntityResolver;
-
-
-/**
- * $author: WS Development Team
- */
-public class ServiceContext {
-    private WSDLContext wsdlContext; //from wsdlParsing
-
-    private Class serviceClass;
-    private HandlerResolverImpl handlerResolver;
-    private QName serviceName; //supplied on creation of service
-    private final HashSet seiContext = new HashSet();
-    /**
-     * To be used to resolve WSDL resources.
-     */
-    private final EntityResolver entityResolver;
-    private HashMap> rolesMap = new HashMap>();
-    public ServiceContext(EntityResolver entityResolver) {
-        this.entityResolver = entityResolver;
-    }
-
-    public ServiceContext(Class serviceClass, QName serviceName, EntityResolver entityResolver) {
-        this.serviceClass = serviceClass;
-        this.serviceName = serviceName;
-        this.entityResolver = entityResolver;
-    }
-
-    public WSDLContext getWsdlContext() {
-        return wsdlContext;
-    }
-
-    public void setWsdlContext(WSDLContext wsdlContext) {
-        this.wsdlContext = wsdlContext;
-    }
-
-    public HandlerResolverImpl getHandlerResolver() {
-        return handlerResolver;
-    }
-
-    public void setHandlerResolver(HandlerResolverImpl resolver) {
-        this.handlerResolver = resolver;
-    }
-
-    public Set getRoles(QName portName) {
-        return rolesMap.get(portName);
-    }
-
-    public void setRoles(QName portName,Set roles) {
-        rolesMap.put(portName,roles);
-    }
-
-    public EndpointIFContext getEndpointIFContext(String className) {
-        for (EndpointIFContext eif: seiContext){
-            if (eif.getSei().getName().equals(className)){
-                //this is the one
-                return eif;
-            }
-        }
-        return null;
-    }
-
-    public HashSet getEndpointIFContext() {
-            return seiContext;
-        }
-
-    public void addEndpointIFContext(EndpointIFContext eifContext) {
-        this.seiContext.add(eifContext);
-    }
-
-     public void addEndpointIFContext(List eifContexts) {
-        this.seiContext.addAll(eifContexts);
-    }
-
-    public Class getServiceClass() {
-        return serviceClass;
-    }
-
-    public void setServiceClass(Class serviceClass) {
-        this.serviceClass = serviceClass;
-    }
-
-    public QName getServiceName() {
-        if (serviceName == null) {
-            if (wsdlContext != null) {
-                setServiceName(wsdlContext.getFirstServiceName());
-            }
-        }
-        return serviceName;
-    }
-
-    public void setServiceName(QName serviceName) {
-        assert(serviceName != null);
-        this.serviceName = serviceName;
-    }
-
-    public EntityResolver getEntityResolver() {
-        return entityResolver;
-    }
-
-    public String toString() {
-        return "ServiceContext{" +
-            "wsdlContext=" + wsdlContext +
-            ", handleResolver=" + handlerResolver +
-            ", serviceClass=" + serviceClass +
-            ", serviceName=" + serviceName +
-            ", seiContext=" + seiContext +
-            ", entityResolver=" + entityResolver +
-            "}";
-    }
-}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ServiceContextBuilder.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ServiceContextBuilder.java
deleted file mode 100644
index 40050dc48e7..00000000000
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ServiceContextBuilder.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
- * 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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package com.sun.xml.internal.ws.client;
-
-import com.sun.xml.internal.ws.handler.HandlerResolverImpl;
-import com.sun.xml.internal.ws.handler.PortInfoImpl;
-import com.sun.xml.internal.ws.model.RuntimeModel;
-import com.sun.xml.internal.ws.modeler.RuntimeModeler;
-import com.sun.xml.internal.ws.server.RuntimeContext;
-import com.sun.xml.internal.ws.util.HandlerAnnotationInfo;
-import com.sun.xml.internal.ws.util.HandlerAnnotationProcessor;
-import com.sun.xml.internal.ws.util.JAXWSUtils;
-import com.sun.xml.internal.ws.wsdl.WSDLContext;
-import org.xml.sax.EntityResolver;
-import javax.jws.HandlerChain;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceException;
-import javax.jws.WebService;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.ArrayList;
-
-/**
- * $author: WS Development Team
- */
-public abstract class ServiceContextBuilder {
-    private ServiceContextBuilder() {
-    }  // no instantication please
-
-    /**
-     * Creates a new {@link ServiceContext}.
-     */
-    public static ServiceContext build(URL wsdlLocation, QName serviceName, final Class service, EntityResolver er) throws WebServiceException {
-        ServiceContext serviceContext = new ServiceContext(service, serviceName, er);
-
-        if (wsdlLocation != null){
-            WSDLContext wsCtx = new WSDLContext(wsdlLocation, er);
-
-            //check if the serviceName is a valid one, if its not in the given WSDL fail
-            if(!wsCtx.contains(serviceName))
-                throw new ClientConfigurationException("service.invalidServiceName", serviceName, wsdlLocation);
-
-            serviceContext.setWsdlContext(wsCtx);
-        }
-
-        //if @HandlerChain present, set HandlerResolver on service context
-        HandlerChain handlerChain = (HandlerChain)
-        AccessController.doPrivileged(new PrivilegedAction() {
-            public Object run() {
-                return service.getAnnotation(HandlerChain.class);
-            }
-        });
-        if(handlerChain != null) {
-            HandlerResolverImpl hresolver = new HandlerResolverImpl(serviceContext);
-            serviceContext.setHandlerResolver(hresolver);
-        }
-        return serviceContext;
-    }
-
-    public static void completeServiceContext(QName portName, ServiceContext serviceContext, Class portInterface) {
-        if (portInterface != null)
-            processAnnotations(portName, serviceContext, portInterface);
-    }
-
-    private static void processAnnotations(QName portName, ServiceContext serviceContext, Class portInterface) throws WebServiceException {
-        WSDLContext wsdlContext = serviceContext.getWsdlContext();
-        EndpointIFContext eifc = serviceContext.getEndpointIFContext(portInterface.getName());
-        if ((eifc != null) && (eifc.getRuntimeContext() != null)) {
-            return;
-        }
-        if (eifc == null) {
-            eifc = new EndpointIFContext(portInterface);
-            serviceContext.addEndpointIFContext(eifc);
-        }
-
-        QName serviceName = serviceContext.getServiceName();
-
-        //if portName is null get it from the WSDL
-        if (portName == null) {
-            //get the first port corresponding to the SEI
-            QName portTypeName = RuntimeModeler.getPortTypeName(portInterface);
-            portName = wsdlContext.getWsdlDocument().getPortName(serviceContext.getServiceName(), portTypeName);
-        }
-
-        //still no portName, fail
-        if(portName == null)
-            throw new ClientConfigurationException("service.noPortName", portInterface.getName(), wsdlContext.getWsdlLocation().toString());
-
-        eifc.setPortName(portName);
-        String bindingId = wsdlContext.getBindingID(serviceName, portName);
-        RuntimeModeler modeler = new RuntimeModeler(portInterface,
-            serviceName, bindingId);
-        modeler.setPortName(portName);
-        RuntimeModel model = modeler.buildRuntimeModel();
-
-        eifc.setRuntimeContext(new RuntimeContext(model));
-    }
-
-    private ArrayList> getSEI(final Class sc) {
-
-        if (sc == null) {
-            throw new WebServiceException();
-        }
-
-        //check to make sure this is a service
-        if (!Service.class.isAssignableFrom(sc)) {
-            throw new WebServiceException("service.interface.required" +
-                sc.getName());
-        }
-
-        final ArrayList> classes = new ArrayList>();
-        AccessController.doPrivileged(new PrivilegedAction() {
-            public Object run() {
-                Method[] methods = sc.getDeclaredMethods();
-                for (final Method method : methods) {
-                    method.setAccessible(true);
-                    Class seiClazz = method.getReturnType();
-                    if ((seiClazz != null) && (!seiClazz.equals("void")))
-                        classes.add(seiClazz);
-
-                }
-                return null;
-            }
-        });
-
-        return classes;
-    }
-
-}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/Stub.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/Stub.java
new file mode 100644
index 00000000000..a1c51601440
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/Stub.java
@@ -0,0 +1,406 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.client;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.Closeable;
+import com.sun.xml.internal.ws.model.wsdl.WSDLProperties;
+import com.sun.xml.internal.ws.api.EndpointAddress;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.addressing.AddressingVersion;
+import com.sun.xml.internal.ws.api.addressing.WSEndpointReference;
+import com.sun.xml.internal.ws.api.message.Header;
+import com.sun.xml.internal.ws.api.message.HeaderList;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
+import com.sun.xml.internal.ws.api.pipe.Engine;
+import com.sun.xml.internal.ws.api.pipe.Fiber;
+import com.sun.xml.internal.ws.api.pipe.Tube;
+import com.sun.xml.internal.ws.binding.BindingImpl;
+import com.sun.xml.internal.ws.developer.JAXWSProperties;
+import com.sun.xml.internal.ws.developer.WSBindingProvider;
+import com.sun.xml.internal.ws.resources.ClientMessages;
+import com.sun.xml.internal.ws.util.Pool;
+import com.sun.xml.internal.ws.util.Pool.TubePool;
+import com.sun.xml.internal.ws.util.RuntimeVersion;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.EndpointReference;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.http.HTTPBinding;
+import javax.xml.ws.wsaddressing.W3CEndpointReference;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Executor;
+
+/**
+ * Base class for stubs, which accept method invocations from
+ * client applications and pass the message to a {@link Tube}
+ * for processing.
+ *
+ * 
    
+ * This class implements the management of pipe instances,
+ * and most of the {@link BindingProvider} methods.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public abstract class Stub implements WSBindingProvider, ResponseContextReceiver, Closeable {
+
+    /**
+     * Reuse pipelines as it's expensive to create.
+     * 
    
+     * Set to null when {@link #close() closed}.
+     */
+    private Pool tubes;
+
+    private final Engine engine;
+
+    /**
+     * The {@link WSServiceDelegate} object that owns us.
+     */
+    protected final WSServiceDelegate owner;
+
+    /**
+     * Non-null if this stub is configured to talk to an EPR.
+     * 
    
+     * When this field is non-null, its reference parameters are sent as out-bound headers.
+     * This field can be null even when addressing is enabled, but if the addressing is
+     * not enabled, this field must be null.
+     * 
    
+     * Unlike endpoint address, we are not letting users to change the EPR,
+     * as it contains references to services and so on that we don't want to change.
+     */
+    protected final @Nullable WSEndpointReference endpointReference;
+
+    protected final BindingImpl binding;
+
+    /**
+     * represents AddressingVersion on binding if enabled, otherwise null;
+     */
+    protected final AddressingVersion addrVersion;
+
+    public final RequestContext requestContext = new RequestContext();
+
+    /**
+     * {@link ResponseContext} from the last synchronous operation.
+     */
+    private ResponseContext responseContext;
+    @Nullable protected final WSDLPort wsdlPort;
+
+    /**
+     * {@link Header}s to be added to outbound {@link Packet}.
+     * The contents is determined by the user.
+     */
+    @Nullable private volatile Header[] userOutboundHeaders;
+
+    private final @Nullable WSDLProperties wsdlProperties;
+
+    /**
+     * @param master                 The created stub will send messages to this pipe.
+     * @param binding                As a {@link BindingProvider}, this object will
+     *                               return this binding from {@link BindingProvider#getBinding()}.
+     * @param defaultEndPointAddress The destination of the message. The actual destination
+     *                               could be overridden by {@link RequestContext}.
+     * @param epr                    To create a stub that sends out reference parameters
+     *                               of a specific EPR, give that instance. Otherwise null.
+     *                               Its address field will not be used, and that should be given
+     *                               separately as the defaultEndPointAddress.
+     */
+    protected Stub(WSServiceDelegate owner, Tube master, BindingImpl binding, WSDLPort wsdlPort, EndpointAddress defaultEndPointAddress, @Nullable WSEndpointReference epr) {
+        this.owner = owner;
+        this.tubes = new TubePool(master);
+        this.wsdlPort = wsdlPort;
+        this.binding = binding;
+        addrVersion = binding.getAddressingVersion();
+        // if there is an EPR, EPR's address should be used for invocation instead of default address
+        if(epr != null)
+            this.requestContext.setEndPointAddressString(epr.getAddress());
+        else
+            this.requestContext.setEndpointAddress(defaultEndPointAddress);
+        this.engine = new Engine(toString());
+        this.endpointReference = epr;
+        wsdlProperties = (wsdlPort==null) ? null : new WSDLProperties(wsdlPort);
+    }
+
+    /**
+     * Gets the port name that this stub is configured to talk to.
+     * 
    
+     * When {@link #wsdlPort} is non-null, the port name is always
+     * the same as {@link WSDLPort#getName()}, but this method
+     * returns a port name even if no WSDL is available for this stub.
+     */
+    protected abstract @NotNull QName getPortName();
+
+    /**
+     * Gets the service name that this stub is configured to talk to.
+     * 
    
+     * When {@link #wsdlPort} is non-null, the service name is always
+     * the same as the one that's inferred from {@link WSDLPort#getOwner()},
+     * but this method returns a port name even if no WSDL is available for
+     * this stub.
+     */
+    protected final @NotNull QName getServiceName() {
+        return owner.getServiceName();
+    }
+
+    /**
+     * Gets the {@link Executor} to be used for asynchronous method invocations.
+     * 
    
+     * Note that the value this method returns may different from invocations
+     * to invocations. The caller must not cache.
+     *
+     * @return always non-null.
+     */
+    public final Executor getExecutor() {
+        return owner.getExecutor();
+    }
+
+    /**
+     * Passes a message to a pipe for processing.
+     * 
    
+     * Unlike {@link Tube} instances,
+     * this method is thread-safe and can be invoked from
+     * multiple threads concurrently.
+     *
+     * @param packet         The message to be sent to the server
+     * @param requestContext The {@link RequestContext} when this invocation is originally scheduled.
+     *                       This must be the same object as {@link #requestContext} for synchronous
+     *                       invocations, but for asynchronous invocations, it needs to be a snapshot
+     *                       captured at the point of invocation, to correctly satisfy the spec requirement.
+     * @param receiver       Receives the {@link ResponseContext}. Since the spec requires
+     *                       that the asynchronous invocations must not update response context,
+     *                       depending on the mode of invocation they have to go to different places.
+     *                       So we take a setter that abstracts that away.
+     */
+    protected final Packet process(Packet packet, RequestContext requestContext, ResponseContextReceiver receiver) {
+        {// fill in Packet
+            packet.proxy = this;
+            packet.handlerConfig = binding.getHandlerConfig();
+            requestContext.fill(packet);
+            if (wsdlProperties != null) {
+                packet.addSatellite(wsdlProperties);
+            }
+            if (addrVersion != null) {
+                // populate request WS-Addressing headers
+                HeaderList headerList = packet.getMessage().getHeaders();
+                headerList.fillRequestAddressingHeaders(wsdlPort, binding, packet);
+
+
+                // Spec is not clear on if ReferenceParameters are to be added when addressing is not enabled,
+                // but the EPR has ReferenceParameters.
+                // Current approach: Add ReferenceParameters only if addressing enabled.
+                if (endpointReference != null)
+                    endpointReference.addReferenceParameters(packet.getMessage().getHeaders());
+            }
+
+            // to make it multi-thread safe we need to first get a stable snapshot
+            Header[] hl = userOutboundHeaders;
+            if(hl!=null)
+                packet.getMessage().getHeaders().addAll(hl);
+        }
+
+
+        Pool pool = tubes;
+        if (pool == null)
+            throw new WebServiceException("close method has already been invoked"); // TODO: i18n
+
+        Fiber fiber = engine.createFiber();
+        // then send it away!
+        Tube tube = pool.take();
+
+        try {
+            return fiber.runSync(tube, packet);
+        } finally {
+            // this allows us to capture the packet even when the call failed with an exception.
+            // when the call fails with an exception it's no longer a 'reply' but it may provide some information
+            // about what went wrong.
+
+            // note that Packet can still be updated after
+            // ResponseContext is created.
+            Packet reply = (fiber.getPacket() == null) ? packet : fiber.getPacket();
+            receiver.setResponseContext(new ResponseContext(reply));
+
+            pool.recycle(tube);
+        }
+    }
+
+    /**
+     * Passes a message through a {@link Tube}line for processing. The processing happens
+     * asynchronously and when the response is available, Fiber.CompletionCallback is
+     * called. The processing could happen on multiple threads.
+     *
+     * 
    
+     * Unlike {@link Tube} instances,
+     * this method is thread-safe and can be invoked from
+     * multiple threads concurrently.
+     *
+     * @param request         The message to be sent to the server
+     * @param requestContext The {@link RequestContext} when this invocation is originally scheduled.
+     *                       This must be the same object as {@link #requestContext} for synchronous
+     *                       invocations, but for asynchronous invocations, it needs to be a snapshot
+     *                       captured at the point of invocation, to correctly satisfy the spec requirement.
+     * @param completionCallback Once the processing is done, the callback is invoked.
+     */
+    protected final void processAsync(Packet request, RequestContext requestContext, final Fiber.CompletionCallback completionCallback) {
+        // fill in Packet
+        request.proxy = this;
+        request.handlerConfig = binding.getHandlerConfig();
+        requestContext.fill(request);
+        if (wsdlProperties != null) {
+            request.addSatellite(wsdlProperties);
+        }
+        if (AddressingVersion.isEnabled(binding)) {
+            if(endpointReference!=null)
+                endpointReference.addReferenceParameters(request.getMessage().getHeaders());
+        }
+
+        final Pool pool = tubes;
+        if (pool == null)
+            throw new WebServiceException("close method has already been invoked"); // TODO: i18n
+
+        Fiber fiber = engine.createFiber();
+        // then send it away!
+        final Tube tube = pool.take();
+        fiber.start(tube, request, new Fiber.CompletionCallback() {
+            public void onCompletion(@NotNull Packet response) {
+                pool.recycle(tube);
+                completionCallback.onCompletion(response);
+            }
+            public void onCompletion(@NotNull Throwable error) {
+                // let's not reuse tubes as they might be in a wrong state, so not
+                // calling pool.recycle()
+                completionCallback.onCompletion(error);
+            }
+        });
+    }
+
+    public void close() {
+        if (tubes != null) {
+            // multi-thread safety of 'close' needs to be considered more carefully.
+            // some calls might be pending while this method is invoked. Should we
+            // block until they are complete, or should we abort them (but how?)
+            Tube p = tubes.take();
+            tubes = null;
+            p.preDestroy();
+        }
+    }
+
+    public final WSBinding getBinding() {
+        return binding;
+    }
+
+    public final Map getRequestContext() {
+        return requestContext.getMapView();
+    }
+
+    public final ResponseContext getResponseContext() {
+        return responseContext;
+    }
+
+    public void setResponseContext(ResponseContext rc) {
+        this.responseContext = rc;
+    }
+
+    public String toString() {
+        return RuntimeVersion.VERSION + ": Stub for " + getRequestContext().get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY);
+    }
+
+    public final W3CEndpointReference getEndpointReference() {
+        if (binding.getBindingID().equals(HTTPBinding.HTTP_BINDING))
+            throw new java.lang.UnsupportedOperationException(ClientMessages.UNSUPPORTED_OPERATION("BindingProvider.getEndpointReference()", "XML/HTTP Binding", "SOAP11 or SOAP12 Binding"));
+        return getEndpointReference(W3CEndpointReference.class);
+    }
+
+    public final 
+    T getEndpointReference(Class clazz) {
+
+        if (binding.getBindingID().equals(HTTPBinding.HTTP_BINDING))
+            throw new java.lang.UnsupportedOperationException(ClientMessages.UNSUPPORTED_OPERATION("BindingProvider.getEndpointReference(Class class)", "XML/HTTP Binding", "SOAP11 or SOAP12 Binding"));
+
+        // we need to expand WSEndpointAddress class to be able to return EPR with arbitrary address.
+        if (endpointReference != null) {
+            return endpointReference.toSpec(clazz);
+        }
+        String eprAddress = requestContext.getEndpointAddress().toString();
+        QName portTypeName = null;
+        String wsdlAddress = null;
+        if(wsdlPort!=null) {
+            portTypeName = wsdlPort.getBinding().getPortTypeName();
+            wsdlAddress = eprAddress +"?wsdl";
+        }
+        AddressingVersion av = AddressingVersion.fromSpecClass(clazz);
+        if (av == AddressingVersion.W3C) {
+            // Supress writing ServiceName and EndpointName in W3C EPR,
+            // Until the ns for those metadata elements is resolved.
+            return new WSEndpointReference(
+                    AddressingVersion.W3C,
+                    eprAddress, null /*getServiceName()*/, null/*getPortName()*/, null /* portTypeName*/, null, null /*wsdlAddress*/, null).toSpec(clazz);
+        } else {
+            return new WSEndpointReference(
+                    AddressingVersion.MEMBER,
+                    eprAddress, getServiceName(), getPortName(), portTypeName, null, wsdlAddress, null).toSpec(clazz);
+        }
+    }
+
+//
+//
+// WSBindingProvider methods
+//
+//
+    public final void setOutboundHeaders(List
     headers) {
+        if(headers==null) {
+            this.userOutboundHeaders = null;
+        } else {
+            for (Header h : headers) {
+                if(h==null)
+                    throw new IllegalArgumentException();
+            }
+            userOutboundHeaders = headers.toArray(new Header[headers.size()]);
+        }
+    }
+
+    public final void setOutboundHeaders(Header... headers) {
+        if(headers==null) {
+            this.userOutboundHeaders = null;
+        } else {
+            for (Header h : headers) {
+                if(h==null)
+                    throw new IllegalArgumentException();
+            }
+            Header[] hl = new Header[headers.length];
+            System.arraycopy(headers,0,hl,0,headers.length);
+            userOutboundHeaders = hl;
+        }
+    }
+
+    public final List
     getInboundHeaders() {
+        return Collections.unmodifiableList((HeaderList)
+            responseContext.get(JAXWSProperties.INBOUND_HEADER_LIST_PROPERTY));
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java
index 772c605ad94..f9f039304dc 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * 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,36 +23,59 @@
  * have any questions.
  */
 
-/*
- * Copyright (c) 2005 Your Corporation. All Rights Reserved.
- */
 package com.sun.xml.internal.ws.client;
 
-import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver;
-import com.sun.xml.internal.ws.binding.http.HTTPBindingImpl;
-import com.sun.xml.internal.ws.binding.soap.SOAPBindingImpl;
-import com.sun.xml.internal.ws.client.dispatch.DispatchBase;
-import com.sun.xml.internal.ws.handler.PortInfoImpl;
-import com.sun.xml.internal.ws.model.RuntimeModel;
-import com.sun.xml.internal.ws.util.xml.XmlUtil;
-import com.sun.xml.internal.ws.wsdl.WSDLContext;
-import com.sun.xml.internal.ws.wsdl.parser.Binding;
-import org.xml.sax.EntityResolver;
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.Closeable;
+import com.sun.xml.internal.ws.api.BindingID;
+import com.sun.xml.internal.ws.api.EndpointAddress;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.WSService;
+import com.sun.xml.internal.ws.api.addressing.WSEndpointReference;
+import com.sun.xml.internal.ws.api.client.ServiceInterceptor;
+import com.sun.xml.internal.ws.api.client.ServiceInterceptorFactory;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLModel;
+import com.sun.xml.internal.ws.api.pipe.*;
+import com.sun.xml.internal.ws.api.server.Container;
+import com.sun.xml.internal.ws.api.server.ContainerResolver;
+import com.sun.xml.internal.ws.api.wsdl.parser.WSDLParserExtension;
+import com.sun.xml.internal.ws.binding.BindingImpl;
+import com.sun.xml.internal.ws.binding.WebServiceFeatureList;
+import com.sun.xml.internal.ws.client.HandlerConfigurator.AnnotationConfigurator;
+import com.sun.xml.internal.ws.client.HandlerConfigurator.HandlerResolverImpl;
+import com.sun.xml.internal.ws.client.sei.SEIStub;
+import com.sun.xml.internal.ws.developer.WSBindingProvider;
+import com.sun.xml.internal.ws.model.AbstractSEIModelImpl;
+import com.sun.xml.internal.ws.model.RuntimeModeler;
+import com.sun.xml.internal.ws.model.SOAPSEIModel;
+import com.sun.xml.internal.ws.model.wsdl.WSDLModelImpl;
+import com.sun.xml.internal.ws.model.wsdl.WSDLPortImpl;
+import com.sun.xml.internal.ws.model.wsdl.WSDLServiceImpl;
+import com.sun.xml.internal.ws.resources.ClientMessages;
+import com.sun.xml.internal.ws.resources.DispatchMessages;
+import com.sun.xml.internal.ws.resources.ProviderApiMessages;
+import com.sun.xml.internal.ws.util.ServiceConfigurationError;
+import com.sun.xml.internal.ws.util.ServiceFinder;
+import static com.sun.xml.internal.ws.util.xml.XmlUtil.createDefaultCatalogResolver;
+import com.sun.xml.internal.ws.wsdl.parser.RuntimeWSDLParser;
+import org.xml.sax.SAXException;
 
+import javax.jws.HandlerChain;
 import javax.xml.bind.JAXBContext;
 import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Dispatch;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.handler.Handler;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.transform.Source;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.ws.*;
 import javax.xml.ws.handler.HandlerResolver;
-import javax.xml.ws.handler.PortInfo;
-import javax.xml.ws.http.HTTPBinding;
-import javax.xml.ws.soap.SOAPBinding;
-import javax.xml.ws.spi.ServiceDelegate;
+import javax.xml.ws.soap.AddressingFeature;
+import java.io.IOException;
 import java.lang.reflect.Proxy;
+import java.net.MalformedURLException;
 import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.*;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
@@ -60,6 +83,7 @@ import java.util.concurrent.ThreadFactory;
 
 /**
  * Service objects provide the client view of a Web service.
+ *
  * 
    Service acts as a factory of the following:
  *